diff --git a/Content.Server/ADT/PickupHumans/PickupHumansSystem.cs b/Content.Server/ADT/PickupHumans/PickupHumansSystem.cs index 61708f705d2..fc48a49b7cd 100644 --- a/Content.Server/ADT/PickupHumans/PickupHumansSystem.cs +++ b/Content.Server/ADT/PickupHumans/PickupHumansSystem.cs @@ -9,6 +9,9 @@ using Content.Shared.Movement.Pulling.Events; using Content.Shared.Interaction.Events; using Content.Shared.Climbing.Events; +using Content.Shared.ADT.Spike; +using Robust.Shared.Random; +using Content.Shared.Buckle.Components; namespace Content.Server.ADT.PickupHumans; @@ -17,6 +20,7 @@ public sealed partial class PickupHumansSystem : SharedPickupHumansSystem [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; [Dependency] private readonly SharedContainerSystem _containerSystem = default!; [Dependency] private readonly SharedPopupSystem _popup = default!; + [Dependency] private readonly IRobustRandom _random = default!; public override void Initialize() { @@ -133,4 +137,39 @@ private void OnStandAttempt(EntityUid uid, TakenHumansComponent component, Stand args.Cancel(); } #endregion + + // SpikeSystem: метод, позволяющий снять человека на крюке с некоторой вероятностью в SpikeComponent + public override bool ShouldAllowPickup(EntityUid user, EntityUid target, PickupHumansComponent component) + { + if (SharedSpikeSystem.IsEntityImpaled(user, EntityManager)) + return false; + + if (SharedSpikeSystem.IsEntityImpaled(target, EntityManager)) + { + if (!TryComp(target, out var buckle) || !buckle.Buckled || buckle.BuckledTo == null) + { + return false; + } + + if (!TryComp(buckle.BuckledTo.Value, out var spikeComp)) + { + return false; + } + + if (!_random.Prob(spikeComp.PickupChance)) + { + _popup.PopupEntity(Loc.GetString("spike-pickup-failed"), user, user); + _popup.PopupEntity(Loc.GetString("spike-pickup-failed-target"), target, target); + return false; + } + else + { + _popup.PopupEntity(Loc.GetString("spike-pickup-success"), user, user); + _popup.PopupEntity(Loc.GetString("spike-pickup-success-target"), target, target); + return true; + } + } + + return true; + } } diff --git a/Content.Server/ADT/Shadekin/ShadekinSystem.cs b/Content.Server/ADT/Shadekin/ShadekinSystem.cs index 839126692f3..6b306b2fc0c 100644 --- a/Content.Server/ADT/Shadekin/ShadekinSystem.cs +++ b/Content.Server/ADT/Shadekin/ShadekinSystem.cs @@ -27,6 +27,8 @@ using Content.Server.Cuffs; using Content.Shared.Cuffs.Components; using Content.Shared.Mech.Components; +using Content.Shared.Buckle.Components; +using Content.Shared.ADT.Spike; using Content.Shared.Bed.Cryostorage; using Content.Shared.ADT.Components.PickupHumans; using Content.Shared.Construction.Components; @@ -111,7 +113,7 @@ public override void Update(float frameTime) comp.MinPowerAccumulator = Math.Clamp(comp.MinPowerAccumulator - 1f, 0f, comp.MinPowerRoof); } - if ((comp.MinPowerAccumulator >= comp.MinPowerRoof) && !comp.Blackeye) + if (comp.MinPowerAccumulator >= comp.MinPowerRoof && !comp.Blackeye) BlackEye(uid); if (!HasComp(uid) && comp.MaxedPowerAccumulator >= comp.MaxedPowerRoof) @@ -120,7 +122,7 @@ public override void Update(float frameTime) if (TryComp(uid, out var humanoid)) { var eye = humanoid.EyeColor; - if ((eye.R * 255f <= 30f && eye.G * 255f <= 30f && eye.B * 255f <= 30f) && !(comp.Blackeye)) + if (eye.R * 255f <= 30f && eye.G * 255f <= 30f && eye.B * 255f <= 30f && !comp.Blackeye) { comp.Blackeye = true; comp.PowerLevelGainEnabled = false; @@ -156,6 +158,10 @@ private void OnTeleport(EntityUid uid, ShadekinComponent comp, ShadekinTeleportA if (args.Handled) return; + // SpikeSystem: Чтобы сумеречники не имели возможности слезть с крюка + if (TryComp(uid, out var buckle) && buckle.BuckledTo != null && HasComp(buckle.BuckledTo.Value)) + return; + if (HasComp(uid)) return; @@ -204,6 +210,13 @@ public void TeleportRandomly(EntityUid uid, ShadekinComponent? comp) if (!Resolve(uid, ref comp)) return; + // SpikeSystem: Чтобы сумеречники не имели возможности слезть с крюка + if (TryComp(uid, out var buckle) && buckle.BuckledTo != null && HasComp(buckle.BuckledTo.Value)) + { + comp.MaxedPowerAccumulator = 0f; + return; + } + var coordsValid = false; var coords = Transform(uid).Coordinates; @@ -248,6 +261,10 @@ public void TeleportRandomly(EntityUid uid, ShadekinComponent? comp) public void TeleportRandomlyNoComp(EntityUid uid, float range = 5f) { + // SpikeSystem: Чтобы сумеречники не имели возможности слезть с крюка + if (TryComp(uid, out var buckle) && buckle.BuckledTo != null && HasComp(buckle.BuckledTo.Value)) + return; + var coordsValid = false; var coords = Transform(uid).Coordinates; diff --git a/Content.Server/ADT/Spike/SpikeSystem.cs b/Content.Server/ADT/Spike/SpikeSystem.cs new file mode 100644 index 00000000000..9fc5e8e43e8 --- /dev/null +++ b/Content.Server/ADT/Spike/SpikeSystem.cs @@ -0,0 +1,280 @@ +using Content.Server.DoAfter; +using Content.Shared.DoAfter; +using Content.Shared.ADT.Spike; +using Content.Shared.DragDrop; +using Content.Shared.Movement.Events; +using Content.Server.Popups; +using Robust.Shared.Random; +using Content.Shared.Buckle; +using Content.Shared.Buckle.Components; +using Content.Shared.Climbing.Events; +using Content.Shared.Humanoid; + + + +namespace Content.Server.ADT.CelticSpike +{ + public sealed class SpikeSystem : SharedSpikeSystem + { + [Dependency] private readonly DoAfterSystem _doAfterSystem = default!; + [Dependency] private readonly PopupSystem _popup = default!; + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly SharedBuckleSystem _buckle = default!; + private readonly HashSet _escapeInProgress = new(); + private readonly HashSet _escapeAuthorized = new(); + private readonly Dictionary _escapeDoAfters = new(); + private readonly HashSet _buckleAuthorized = new(); + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnDragDrop); + SubscribeLocalEvent(OnImpaleComplete); + SubscribeLocalEvent(OnRemoveComplete); + SubscribeLocalEvent(OnEscapeComplete); + SubscribeLocalEvent(OnUnstrapped); + SubscribeLocalEvent(OnCanDropTarget); + SubscribeLocalEvent(OnBuckleAttempt); + SubscribeLocalEvent(OnStrapAttempt); + SubscribeLocalEvent(OnUnbuckleAttempt); + SubscribeLocalEvent(OnMoveInput); + SubscribeLocalEvent(OnBuckleAttemptWhileImpaled); + SubscribeLocalEvent(OnAttemptClimbWhileImpaled); + SubscribeLocalEvent(OnDraggedWhileImpaled); + + + + } + + + private void OnDragDrop(EntityUid uid, SpikeComponent component, ref DragDropTargetEvent args) + { + if (args.User == args.Dragged) + { + args.Handled = true; + _popup.PopupEntity(Loc.GetString("spike-deny-self"), uid, args.User); + return; + } + + if (component.ImpaledEntity != null) + { + args.Handled = true; + _popup.PopupEntity(Loc.GetString("spike-deny-occupied"), uid, args.User); + return; + } + + if (TryComp(args.Dragged, out var draggedBuckle) && draggedBuckle.Buckled) + { + args.Handled = true; + return; + } + + StartImpaling(args.User, uid, args.Dragged); + args.Handled = true; + } + + + private void OnUnstrapped(EntityUid uid, SpikeComponent component, ref UnstrappedEvent args) + { + if (component.ImpaledEntity == args.Buckle.Owner) + { + component.ImpaledEntity = null; + if (_escapeDoAfters.TryGetValue(args.Buckle.Owner, out var id)) + { + _escapeDoAfters.Remove(args.Buckle.Owner); + _escapeInProgress.Remove(args.Buckle.Owner); + _doAfterSystem.Cancel(id); + } + } + } + + private void StartImpaling(EntityUid user, EntityUid spike, EntityUid target) + { + if (!HasComp(target)) + { + _popup.PopupEntity(Loc.GetString("spike-deny-not-mob"), spike, user); + return; + } + + if (user == target) + { + _popup.PopupEntity(Loc.GetString("spike-deny-self"), spike, user); + return; + } + + var doAfterEventArgs = new DoAfterArgs(EntityManager, user, TimeSpan.FromSeconds(5), new ImpaleDoAfterEvent(), spike, target: target) + { + BreakOnMove = true, + BreakOnDamage = true + }; + + _doAfterSystem.TryStartDoAfter(doAfterEventArgs); + } + + + + private void OnBuckleAttempt(EntityUid uid, SpikeComponent component, ref BuckleAttemptEvent args) + { + if (args.User == args.Buckle.Owner) + args.Cancelled = true; + } + + private void OnStrapAttempt(EntityUid uid, SpikeComponent component, ref StrapAttemptEvent args) + { + if (_buckleAuthorized.Contains(args.Buckle.Owner)) + return; + + args.Cancelled = true; + } + + private void OnBuckleAttemptWhileImpaled(EntityUid uid, BuckleComponent buckle, ref BuckleAttemptEvent args) + { + + if (!buckle.Buckled || buckle.BuckledTo == null) + return; + + if (HasComp(buckle.BuckledTo.Value)) + args.Cancelled = true; + } + + private void OnCanDropTarget(EntityUid uid, SpikeComponent component, ref CanDropTargetEvent args) + { + if (args.User == args.Dragged) + { + args.CanDrop = false; + args.Handled = true; + _popup.PopupEntity(Loc.GetString("spike-deny-self"), uid, args.User); + } + } + + private void OnImpaleComplete(EntityUid uid, SpikeComponent component, ImpaleDoAfterEvent args) + { + if (args.Cancelled || args.Handled || args.Target == null) + return; + + args.Handled = true; + + _buckleAuthorized.Add(args.Target.Value); + var buckled = _buckle.TryBuckle(args.Target.Value, args.User, uid); + _buckleAuthorized.Remove(args.Target.Value); + if (!buckled) + { + return; + } + + component.ImpaledEntity = args.Target.Value; + + var msg = Loc.GetString("spike-impale-success", ("target", args.Target.Value)); + _popup.PopupEntity(msg, args.Target.Value); + } + + private void OnRemoveComplete(EntityUid uid, SpikeComponent component, RemoveDoAfterEvent args) + { + if (args.Cancelled || args.Handled || component.ImpaledEntity == null) + return; + + args.Handled = true; + + var impaled = component.ImpaledEntity!.Value; + component.ImpaledEntity = null; + + _buckle.TryUnbuckle(impaled, args.User); + + var msg = Loc.GetString("spike-remove-success", ("target", impaled)); + _popup.PopupEntity(msg, impaled); + } + + private void OnEscapeComplete(EntityUid uid, SpikeComponent component, EscapeDoAfterEvent args) + { + _escapeInProgress.Remove(uid); + _escapeDoAfters.Remove(uid); + + if (args.Cancelled || args.Handled) + return; + + args.Handled = true; + + if (_random.Prob(component.EscapeChance)) + { + var impaled = args.User; + + _escapeAuthorized.Add(impaled); + _buckle.TryUnbuckle(impaled, impaled); + _escapeAuthorized.Remove(impaled); + + component.ImpaledEntity = null; + + var msg = Loc.GetString("spike-escape-success"); + _popup.PopupEntity(msg, impaled); + } + else + { + var msg = Loc.GetString("spike-escape-failure"); + _popup.PopupEntity(msg, uid); + } + } + + private void OnUnbuckleAttempt(EntityUid uid, BuckleComponent buckle, ref UnbuckleAttemptEvent args) + { + if (HasComp(args.Strap.Owner)) + { + if (!(args.User == uid && _escapeAuthorized.Contains(uid))) + args.Cancelled = true; + } + } + + private void OnMoveInput(EntityUid uid, BuckleComponent buckle, ref MoveInputEvent args) + { + if (!buckle.Buckled || buckle.BuckledTo == null) + return; + + if (!TryComp(buckle.BuckledTo.Value, out var spikeComp)) + return; + + if (!args.HasDirectionalMovement) + return; + + if (_escapeInProgress.Contains(uid)) + return; + + var spike = buckle.BuckledTo.Value; + var doAfterEventArgs = new DoAfterArgs(EntityManager, uid, TimeSpan.FromSeconds(5), new EscapeDoAfterEvent(), spike) + { + BreakOnMove = false, + BreakOnDamage = true + }; + + _escapeInProgress.Add(uid); + if (_doAfterSystem.TryStartDoAfter(doAfterEventArgs, out var id) && id != null) + _escapeDoAfters[uid] = id.Value; + } + + private void OnAttemptClimbWhileImpaled(EntityUid uid, BuckleComponent buckle, ref AttemptClimbEvent args) + { + if (!buckle.Buckled || buckle.BuckledTo == null) + return; + + if (!HasComp(buckle.BuckledTo.Value)) + return; + + args.Cancelled = true; + } + + private void OnDraggedWhileImpaled(EntityUid uid, BuckleComponent buckle, ref DragDropDraggedEvent args) + { + if (!buckle.Buckled || buckle.BuckledTo == null) + return; + + if (!HasComp(buckle.BuckledTo.Value)) + return; + + if (_escapeDoAfters.TryGetValue(uid, out var id)) + { + _escapeDoAfters.Remove(uid); + _escapeInProgress.Remove(uid); + _doAfterSystem.Cancel(id); + } + } + } +} diff --git a/Content.Server/Storage/Components/SpawnItemSelectorComponent.cs b/Content.Server/Storage/Components/SpawnItemSelectorComponent.cs new file mode 100644 index 00000000000..9539fb568c2 --- /dev/null +++ b/Content.Server/Storage/Components/SpawnItemSelectorComponent.cs @@ -0,0 +1,17 @@ +namespace Content.Server.Storage.Components +{ + /// + /// Allows forcing a single prototype id to be spawned by a SpawnItemsOnUse component. + /// The field is editable in-game via ViewVariables. + /// + [RegisterComponent] + public sealed partial class SpawnItemSelectorComponent : Component + { + /// + /// Prototype id to spawn when used. + /// + [ViewVariables(VVAccess.ReadWrite)] + [DataField("selectedItemId")] + public string? SelectedItemId = null; + } +} diff --git a/Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs b/Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs index ec02006b270..5806603f86a 100644 --- a/Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs +++ b/Content.Server/Storage/EntitySystems/SpawnItemsOnUseSystem.cs @@ -71,14 +71,26 @@ private void OnUseInHand(EntityUid uid, SpawnItemsOnUseComponent component, UseI return; var coords = Transform(args.User).Coordinates; - var spawnEntities = GetSpawns(component.Items, _random); EntityUid? entityToPlaceInHands = null; - foreach (var proto in spawnEntities) + // ADT-Tweak start. Добавил проверку на компонент выбора предмета для спавна. + // If this entity has a SpawnItemSelectorComponent with a selected id, spawn that one item instead + if (TryComp(uid, out var selector) && !string.IsNullOrWhiteSpace(selector.SelectedItemId)) { - entityToPlaceInHands = Spawn(proto, coords); + entityToPlaceInHands = Spawn(selector.SelectedItemId!, coords); _adminLogger.Add(LogType.EntitySpawn, LogImpact.Low, $"{ToPrettyString(args.User)} used {ToPrettyString(uid)} which spawned {ToPrettyString(entityToPlaceInHands.Value)}"); } + else + { + var spawnEntities = GetSpawns(component.Items, _random); + + foreach (var proto in spawnEntities) + { + entityToPlaceInHands = Spawn(proto, coords); + _adminLogger.Add(LogType.EntitySpawn, LogImpact.Low, $"{ToPrettyString(args.User)} used {ToPrettyString(uid)} which spawned {ToPrettyString(entityToPlaceInHands.Value)}"); + } + } + // ADT-Tweak end. // The entity is often deleted, so play the sound at its position rather than parenting if (component.Sound != null) diff --git a/Content.Shared/ADT/PickupHumans/Systems/SharedPickupHumansSystem.cs b/Content.Shared/ADT/PickupHumans/Systems/SharedPickupHumansSystem.cs index 6a4101caba3..87ab150b28e 100644 --- a/Content.Shared/ADT/PickupHumans/Systems/SharedPickupHumansSystem.cs +++ b/Content.Shared/ADT/PickupHumans/Systems/SharedPickupHumansSystem.cs @@ -194,11 +194,26 @@ private void OnDoAfter(EntityUid uid, PickupHumansComponent component, PickupHum if (!CanPickup(args.Args.User, uid, component)) return; + // ADT-Tweak-Halloween: CelticSpike PickupHumans restriction + if (!ShouldAllowPickup(args.Args.User, uid, component)) + { + args.Handled = true; + return; + } + // ADT-Tweak-End Pickup(args.Args.User, uid); args.Handled = true; } + /// + /// С какой либо вероятностью разрешает поднять сущность на ноги (виртуальный метод для сервера) + /// + public virtual bool ShouldAllowPickup(EntityUid user, EntityUid target, PickupHumansComponent component) + { + return true; + } + // ADT-Tweak-End /// /// Поднимает сущность на руки diff --git a/Content.Shared/ADT/Spike/SharedSpikeSystem.cs b/Content.Shared/ADT/Spike/SharedSpikeSystem.cs new file mode 100644 index 00000000000..ebb7622c4bc --- /dev/null +++ b/Content.Shared/ADT/Spike/SharedSpikeSystem.cs @@ -0,0 +1,34 @@ +using Robust.Shared.Serialization; +using Content.Shared.DoAfter; +using Content.Shared.Buckle.Components; + +namespace Content.Shared.ADT.Spike; + +public abstract partial class SharedSpikeSystem : EntitySystem +{ + public static bool IsEntityImpaled(EntityUid entity, IEntityManager entMan) + { + if (!entMan.TryGetComponent(entity, out BuckleComponent? buckle)) + return false; + + if (!buckle.Buckled || buckle.BuckledTo == null) + return false; + + return entMan.HasComponent(buckle.BuckledTo.Value); + } +} + +[Serializable, NetSerializable] +public sealed partial class ImpaleDoAfterEvent : SimpleDoAfterEvent +{ +} + +[Serializable, NetSerializable] +public sealed partial class RemoveDoAfterEvent : SimpleDoAfterEvent +{ +} + +[Serializable, NetSerializable] +public sealed partial class EscapeDoAfterEvent : SimpleDoAfterEvent +{ +} diff --git a/Content.Shared/ADT/Spike/SpikeComponent.cs b/Content.Shared/ADT/Spike/SpikeComponent.cs new file mode 100644 index 00000000000..87abb7ca8df --- /dev/null +++ b/Content.Shared/ADT/Spike/SpikeComponent.cs @@ -0,0 +1,26 @@ +using Robust.Shared.GameStates; + +namespace Content.Shared.ADT.Spike; + +[RegisterComponent, NetworkedComponent] +public sealed partial class SpikeComponent : Component +{ + /// + /// Энтити который находится на крюке + /// + [DataField("impaledEntity")] + public EntityUid? ImpaledEntity; + + /// + /// Шанс успешно сбежать с крюка + /// + [DataField] + public float EscapeChance = 0.3f; + + /// + /// Шанс успешно помочь кому то на крюке слезть с него + /// + [DataField] + public float PickupChance = 0.8f; + +} diff --git a/Content.Shared/Follower/Components/FollowerComponent.cs b/Content.Shared/Follower/Components/FollowerComponent.cs index ede810293ff..c60077319d6 100644 --- a/Content.Shared/Follower/Components/FollowerComponent.cs +++ b/Content.Shared/Follower/Components/FollowerComponent.cs @@ -1,10 +1,11 @@ using Robust.Shared.GameStates; +using Robust.Shared.Analyzers; namespace Content.Shared.Follower.Components; [RegisterComponent] [Access(typeof(FollowerSystem))] -[NetworkedComponent, AutoGenerateComponentState(RaiseAfterAutoHandleState = true)] +[NetworkedComponent, AutoGenerateComponentState(raiseAfterAutoHandleState: true)] public sealed partial class FollowerComponent : Component { [AutoNetworkedField, DataField("following")] diff --git a/Resources/Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/garland_broken.ogg b/Resources/Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/garland_broken.ogg new file mode 100644 index 00000000000..0e37dabd6a1 Binary files /dev/null and b/Resources/Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/garland_broken.ogg differ diff --git a/Resources/Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/garland_insert.ogg b/Resources/Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/garland_insert.ogg new file mode 100644 index 00000000000..8b61bae15ac Binary files /dev/null and b/Resources/Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/garland_insert.ogg differ diff --git a/Resources/Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/garland_swipe.ogg b/Resources/Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/garland_swipe.ogg new file mode 100644 index 00000000000..79be2a0d74b Binary files /dev/null and b/Resources/Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/garland_swipe.ogg differ diff --git a/Resources/Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/mishura.ogg b/Resources/Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/mishura.ogg new file mode 100644 index 00000000000..0fe27ffe535 Binary files /dev/null and b/Resources/Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/mishura.ogg differ diff --git a/Resources/Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/tree_top.ogg b/Resources/Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/tree_top.ogg new file mode 100644 index 00000000000..177043b46a2 Binary files /dev/null and b/Resources/Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/tree_top.ogg differ diff --git a/Resources/Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/tree_toys.ogg b/Resources/Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/tree_toys.ogg new file mode 100644 index 00000000000..a820b6edaaa Binary files /dev/null and b/Resources/Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/tree_toys.ogg differ diff --git a/Resources/Audio/ADT/Fun/Ban_DEF.ogg b/Resources/Audio/ADT/Fun/Ban_DEF.ogg new file mode 100644 index 00000000000..fb2815278b2 Binary files /dev/null and b/Resources/Audio/ADT/Fun/Ban_DEF.ogg differ diff --git a/Resources/Audio/ADT/Fun/Ban_MAT.ogg b/Resources/Audio/ADT/Fun/Ban_MAT.ogg new file mode 100644 index 00000000000..dfbd9c2c34d Binary files /dev/null and b/Resources/Audio/ADT/Fun/Ban_MAT.ogg differ diff --git a/Resources/Audio/ADT/Fun/Frostpunk.ogg b/Resources/Audio/ADT/Fun/Frostpunk.ogg new file mode 100644 index 00000000000..f719a60cb8a Binary files /dev/null and b/Resources/Audio/ADT/Fun/Frostpunk.ogg differ diff --git a/Resources/Audio/ADT/Fun/Screamer.ogg b/Resources/Audio/ADT/Fun/Screamer.ogg new file mode 100644 index 00000000000..035fd4ebd1d Binary files /dev/null and b/Resources/Audio/ADT/Fun/Screamer.ogg differ diff --git a/Resources/Audio/ADT/Fun/bell.ogg b/Resources/Audio/ADT/Fun/bell.ogg new file mode 100644 index 00000000000..58f07c92652 Binary files /dev/null and b/Resources/Audio/ADT/Fun/bell.ogg differ diff --git a/Resources/Audio/ADT/Fun/c4NY_music.ogg b/Resources/Audio/ADT/Fun/c4NY_music.ogg new file mode 100644 index 00000000000..bebf613488d Binary files /dev/null and b/Resources/Audio/ADT/Fun/c4NY_music.ogg differ diff --git a/Resources/Audio/ADT/Fun/danci_krono.ogg b/Resources/Audio/ADT/Fun/danci_krono.ogg new file mode 100644 index 00000000000..d80d918e7bb Binary files /dev/null and b/Resources/Audio/ADT/Fun/danci_krono.ogg differ diff --git a/Resources/Audio/ADT/Fun/nefertiti.ogg b/Resources/Audio/ADT/Fun/nefertiti.ogg new file mode 100644 index 00000000000..2e189cf7465 Binary files /dev/null and b/Resources/Audio/ADT/Fun/nefertiti.ogg differ diff --git a/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Catalog/fills/cargo.ftl b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Catalog/fills/cargo.ftl new file mode 100644 index 00000000000..c2afe355aa0 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Catalog/fills/cargo.ftl @@ -0,0 +1,7 @@ +ent-ADTCrateChocolateGorilla = ящик с шоколадной гориллой + .suffix = Новый Год + .desc = Ящик со статуей гориллы из шоколада. Съедобного шоколада. + +ent-ADTCrateChristmasTree = ящик с новогодней ёлкой + .suffix = Новый Год + .desc = Ящик с качественной новогодней ёлкой и набором игрушек для неё. diff --git a/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Catalog/fills/items/sparkler_pack.ftl b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Catalog/fills/items/sparkler_pack.ftl new file mode 100644 index 00000000000..4a3874e4b63 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Catalog/fills/items/sparkler_pack.ftl @@ -0,0 +1,3 @@ +ent-ADTSparklerPack = пачка бенгальских огней + .desc = Яркая упаковка с праздничными палочками. + .suffix = { "Новый Год" } diff --git a/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/gloves.ftl b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/gloves.ftl new file mode 100644 index 00000000000..9fa0ca391da --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/gloves.ftl @@ -0,0 +1,21 @@ +ent-ADTClothingHandsGlovesMittensRed = красные варежки + .desc = Красные, теплые, пахнут духом праздника. + .suffix = { "Новый Год" } +ent-ADTClothingHandsGlovesMittensBlue = синие варежки + .desc = Тронешь кого-то - он заледенеет. + .suffix = { "Новый Год" } +ent-ADTClothingHandsGlovesMittensGreen = зеленые варежки + .desc = Зима будет долгой, а работы много. Вперед на завод игрушек! + .suffix = { "Новый Год" } +ent-ADTClothingHandsGlovesSnowMaiden = перчатки Снегурочки + .desc = Тёплые перчатки для зимней поры. + .suffix = { "Новый Год" } +ent-ADTClothingHandsGlovesMittensRedGreen = красные варежки + .desc = Красные варежки с зелёными полосками. + .suffix = { "Новый Год" } +ent-ADTClothingHandsGlovesRed = красные перчатки + .desc = Тёплые красные перчатки. + .suffix = { "Новый Год" } +ent-ADTClothingHandsGlovesRed2 = { ent-ADTClothingHandsGlovesRed } + .desc = { ent-ADTClothingHandsGlovesRed.desc} + .suffix = { "Новый Год" } diff --git a/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Clothing/Head/hats.ftl b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Clothing/Head/hats.ftl new file mode 100644 index 00000000000..9134ec1702b --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Clothing/Head/hats.ftl @@ -0,0 +1,31 @@ +ent-ADTClothingHeadHatsSnowMaiden = шапка Снегурочки + .desc = Шапка главной помощницы Деда Мороза. + .suffix = { "Новый Год" } + +ent-ADTClothingHeadHornsDeer = оленьи рога + .desc = Рога основного средства передвижения Санты Клауса. + .suffix = { "Новый Год" } + +ent-ADTClothingHeadHatChristmas = новогодняя шапка + .desc = Красная новогодняя (или рождественская) шапка. + .suffix = { "Новый Год" } + +ent-ADTClothingHeadHatsMonkeyHoliday = новогодняя шапка для обезьяны + .desc = Макака тоже должна ощутить праздник, пон. + .suffix = { "Новый Год" } + +ent-ADTClothingHeadHatsCatHoliday = новогодняя кошачья шапка + .desc = Для вашего котика. + .suffix = { "Новый Год" } + +ent-ADTClothingHeadChristmasFlower = рождественский цветок + .desc = Кусочек омелы на вашей голове. + .suffix = { "Новый Год" } + +ent-ADTClothingHeadHatDedMoroz = шапка Деда Мороза + .desc = Шапка главного слушателя стишков и раздавателя подарков. + .suffix = { "Новый Год" } + +ent-ADTClothingHeadHatsAntenna = антенна + .desc = Бип-буп, с Новым Годом, кожаные мешки. + .suffix = { "Новый Год" } diff --git a/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Clothing/Head/masks.ftl b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Clothing/Head/masks.ftl new file mode 100644 index 00000000000..e378a1f7b68 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Clothing/Head/masks.ftl @@ -0,0 +1,8 @@ +ent-ADTClothingMaskBorodaDedMorozBig = шапка с большой бородой и усами Деда Мороза + .suffix = Новый Год + .suffix = Kasey + .desc = Пушистая шапочка Деда Мороза - волшебника, придуманного Землянами. Кажется, сзади виднеется веревочка, соединяющая шапочку с бородой... + +ent-ADTClothingMaskBorodaDedMoroz = борода и усы Дед Мороза + .desc = Борода Деда Мороза с усами люкс качества, позволит создать вам полный образ Деда Мороза или Санта Клауса. Дети не узнают папу, соседа, или актера. + .suffix = { "Новый Год" } diff --git a/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/misc.ftl b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/misc.ftl new file mode 100644 index 00000000000..f326b58f4f5 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/misc.ftl @@ -0,0 +1,3 @@ +ent-ADTClothingOuterDedMoroz = Шуба Деда Мороза + .desc = Новогодний костюм из качественного бархатистого материала. + .suffix = Новый Год \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/underwear.ftl b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/underwear.ftl new file mode 100644 index 00000000000..a47c100e7d4 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/underwear.ftl @@ -0,0 +1,27 @@ +ent-ADTClothingUnderwearSocksChristmasBeige = бежевые праздничные носки + .desc = Ноги чувствуют тепло от плотного слоя шерстки в них. + .suffix = { "Новый Год" } +ent-ADTClothingUnderwearSocksChristmasBlue = синие праздничные носки + .desc = Синие - словно лед. Теплые - как праздник. + .suffix = { "Новый Год" } +ent-ADTClothingUnderwearSocksChristmasFingerless = праздничные носки без пальцев + .desc = Когти не помеха для праздника! + .suffix = { "Новый Год" } +ent-ADTClothingUnderwearSocksChristmasRed = красные праздничные носки + .desc = Традиционные носки на Новый Год. + .suffix = { "Новый Год" } +ent-ADTClothingUnderwearSocksChristmasGreen = зеленые носки + .desc = Истинный эльф ходит в них. + .suffix = { "Новый Год" } +ent-ADTClothingUnderwearSocksChristmasGnome = носки гнома + .desc = Специально для помощников Санты, передвигающихся по ледяным шахтам. + .suffix = { "Новый Год" } +ent-ADTClothingUnderwearSocksChristmasRedWhite = красные носки + .desc = Простые праздничные красные носки. + .suffix = { "Новый Год" } +ent-ADTClothingUnderwearSocksChristmasFingerlessStripped = беспалые носки в полоску + .desc = Для тех, кому когти мешают греть ноги. + .suffix = { "Новый Год" } +ent-ADTClothingUnderwearSocksChristmasStripped = носки в полоску + .desc = Простые праздничные носки в полоску. + .suffix = { "Новый Год" } diff --git a/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Clothing/Uniform/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Clothing/Uniform/jumpsuits.ftl new file mode 100644 index 00000000000..f04dea43657 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Clothing/Uniform/jumpsuits.ftl @@ -0,0 +1,47 @@ +ent-ADTClothingUniformJumpsuitSweaterHolidayBeige = бежевый свитер + .desc = Этот свитер носит главная звезда праздника. + .suffix = { "Новый Год" } +ent-ADTClothingUniformJumpsuitSweaterHolidayBlue = синий свитер + .desc = Истинный скакун Санты изображен на этом теплом свитере. + .suffix = { "Новый Год" } +ent-ADTClothingUniformJumpsuitSweaterHolidayRedDark = красный праздничный свитер c черными штанами + .desc = Красная, теплая, яркая, праздничная и главное - стильная. Этим всё сказано. + .suffix = { "Новый Год" } +ent-ADTClothingUniformJumpsuitSweaterHolidayRedWhite = красный праздничный свитер c белыми штанами + .desc = Красная, теплая, яркая, праздничная. Этим всё сказано. + .suffix = { "Новый Год" } +ent-ADTClothingUniformJumpsuitElf = костюм Эльфа + .desc = Пахнет елью, досками, пихтой, а также праздником. + .suffix = { "Новый Год" } +ent-ADTClothingUniformSnowMaiden = костюм Снегурочки + .desc = Костюм с юбкой помощницы Деда Мороза. + .suffix = { "Новый Год" } +ent-ADTClothingUniformSchool = школьная форма + .desc = Японская школьная форма с Земли. Что-то она напоминает... + .suffix = { "Новый Год" } +ent-ADTClothingUniformMonkeyHolidaySuit = праздничная одежда для мартышек + .desc = Праздничная одежда для мартышек! + .suffix = { "Новый Год" } +ent-ADTClothingUniformRollNeckSnowman = водолазка со снеговиком + .desc = Красная водолазка с Мистером Снеговиком! + .suffix = { "Новый Год" } +ent-ADTClothingUniformShirtSpruce = костюм с рисунком ёлки + .desc = Серый костюм с рисунком, украшенным ёлкой. + .suffix = { "Новый Год" } +ent-ADTClothingUniformShirtDeer = костюм с рисунком оленя + .desc = Зелёный костюм с рисунком помощника Санты. + .suffix = { "Новый Год" } +ent-ADTClothingUniformJumpsuitSweaterHoliday = рождественский свитер + .desc = Зелёный свитер с полосами. + .suffix = { "Новый Год" } +ent-ADTClothingUniformShirtSnowflake = костюм с рисунком снежинок + .desc = Зелёный костюм с красивым рисунком красивого снегопада. + .suffix = { "Новый Год" } +ent-ADTClothingUniformShirtSnowman = костюм с рисунком снеговика + .desc = Красный костюм с рисунком простого снеговика. + .suffix = { "Новый Год" } + +ent-ADTClothingOuterDedMorozDarkred = шуба Деда Мороза + .desc = Яркая, мягкая на ощупь ткань. Напоминает беззаботное детство. + .suffix = { "Новый Год" } + .suffix = Kasey diff --git a/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Clothing/boots.ftl b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Clothing/boots.ftl new file mode 100644 index 00000000000..aa72f8477ad --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Clothing/boots.ftl @@ -0,0 +1,11 @@ +ent-ADTClothingFootElfBoots = сапоги Эльфа + .desc = Теплая обувь для работы в домике на севере! + .suffix = { "Новый Год" } +ent-ADTClothingFootBootsSnowMaiden = сапоги Снегурочки + .desc = Сапоги внучки Деда Мороза. + .suffix = { "Новый Год" } + +ent-ClothingShoesBootsMoroz = Валенки + .desc = Незаменимая теплая обувь, натуральные материалы, нескользящая подошва, утепленные на застежке Валенки. + .suffix = Новый год + .suffix = Kasey diff --git a/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Flavors/flavor-profiles.ftl new file mode 100644 index 00000000000..e4dc284d9eb --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Flavors/flavor-profiles.ftl @@ -0,0 +1,4 @@ +flavor-base-holiday = празднично +flavor-complex-milkshake = как приятный милкшейк +flavor-complex-tea-cimmanon-lemon = как горячий кисло-сладкий чай +flavor-complex-sbiten-cimmanon-lemon = как кисло-сладкий, немного крепкий мёд diff --git a/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Markers/Spawners/Random/drinks.ftl b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Markers/Spawners/Random/drinks.ftl new file mode 100644 index 00000000000..355f037d94e --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Markers/Spawners/Random/drinks.ftl @@ -0,0 +1,3 @@ +ent-ADTRandomNewYearDrinkSpawner = спавнер случайного новогоднего напитка + .desc = { ent-MarkerBase.desc } + .suffix = { "Новый год" } diff --git a/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Markers/Spawners/Random/food_meal.ftl b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Markers/Spawners/Random/food_meal.ftl new file mode 100644 index 00000000000..2bff4d2ffb8 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Markers/Spawners/Random/food_meal.ftl @@ -0,0 +1,3 @@ +ent-ADTRandomNewYearFoodSpawner = спавнер случайной новогодней еды + .desc = { ent-MarkerBase.desc } + .suffix = { "Новый год" } diff --git a/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.ftl b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.ftl new file mode 100644 index 00000000000..d9dcc380319 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.ftl @@ -0,0 +1,28 @@ +ent-ADTMulledWineGlass = стакан разогретого глинтвейна + .desc = Вкусный, пряный и тёплый новогодний напиток. + .suffix = { "Новый Год" } +ent-ADTMulledWineColdGlass = стакан глинтвейна + .desc = Вкусный и пряный новогодний напиток. + .suffix = { "Новый Год" } +ent-ADTChampagneMandarinGlass = стакан шампанского с мандарином + .desc = Шампанское, в которое намеренно кинули мандаринку. + .suffix = { "Новый Год" } +ent-ADTChristmasMilkshakeGlass = стакан новогоднего милкшейка + .desc = Молочный коктейль для приятного времяпрепровождения с близкими. + .suffix = { "Новый Год" } +ent-ADTTeaCinnamonLemonGlass = стакан чая с корицей и лимоном + .desc = Приятный, праздничный чай. + .suffix = { "Новый Год" } +ent-ADTSbitenCinnamonLemonGlass = стакан сбитня с корицей и лимоном + .desc = Приятный, праздничный напиток. Почти как чай. + .suffix = { "Новый Год" } +ent-ADTHotCocoaGlass = стакан горячего какао + .desc = Вкуснейший какао с зефиром. + .suffix = { "Новый Год" } +ent-ADTHotChocolateGlass = стакан горячего шоколада + .desc = Смотри не обожги губы. + .suffix = { "Новый Год" } +ent-ADTHotChocolateAllergicGlass = стакан гипоаллергенного горячего шоколада + .desc = Вкус хуже, чем у обычного, но не опасен для некоторых рас. + .suffix = { "Новый Год" } + diff --git a/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/cinnamon&carnation.ftl b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/cinnamon&carnation.ftl new file mode 100644 index 00000000000..a941ea27075 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/cinnamon&carnation.ftl @@ -0,0 +1,12 @@ +ent-ADTFoodCinnamon = палочка корицы + .desc = Ароматная палочка корицы. + .suffix = { "Новый Год" } +ent-ADTFoodCarnation = гвоздика + .desc = Это точно гвоздика? + .suffix = { "Новый Год" } +ent-ADTCarnationPack = пакет гвоздики + .desc = Обычный пакетик обычной гвоздики. + .suffix = { "Новый Год" } +ent-ADTCinnamonPack = упаковка корицы + .desc = Ароматная упаковка ароматных палочек. + .suffix = { "Новый Год" } diff --git a/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new_years_food.ftl b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new_years_food.ftl new file mode 100644 index 00000000000..b0096719aa8 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new_years_food.ftl @@ -0,0 +1,127 @@ +ent-ADTFoodSnackAtmosCake = атмосианский пряник + .desc = Пряник в виде маленького атмосианина. + .suffix = { "Новый Год" } + +ent-ADTFoodSnackBotanicCake = ботанический пряник + .desc = Пряник в виде маленького ботаника. + .suffix = { "Новый Год" } + +ent-ADTFoodSnackCandyStick = карамельная трость + .desc = Сладкая палочка в виде трости. + .suffix = { "Новый Год" } + +ent-ADTFoodSnackCargoCake = каргонианский пряник + .desc = Пряник в виде маленького каргонца. + .suffix = { "Новый Год" } + +ent-ADTFoodSnackCookieMan = пряничный человечек + .desc = Песочный пряник в виде человека. Начинайте с ног. + .suffix = { "Новый Год" } + +ent-ADTFoodSnackChefCake = шеф-пряник + .desc = Пряник в виде маленького повара. + .suffix = { "Новый Год" } + +ent-ADTFoodSnackDoctorCake = докторский пряник + .desc = Пряник в виде маленького врача. + .suffix = { "Новый Год" } + +ent-ADTFoodSnackGiftCake = пряник-подарок + .desc = Пряник в виде коробочки с подарком. Положите его в коробку для подарков, чертовы любители рекурсий. + .suffix = { "Новый Год" } + +ent-ADTFoodSnackGloveCake = печенье-варежка + .desc = Печенье в виде варежки Деда Мороза. + .suffix = { "Новый Год" } + +ent-ADTFoodSnackJanitoryCake = уборочный пряник + .desc = Пряник в виде маленького уборщика + .suffix = { "Новый Год" } + +ent-ADTFoodSnackMimeCake = мимский пряник + .desc = Пряник в виде маленького мима. Выпечен при содействии "Общества памяти Ло-Вюда". + .suffix = { "Новый Год" } + +ent-ADTFoodSnackNukieCake = ядерный пряник + .desc = Пряник в виде маленького плохого засранца в красном. + .suffix = { "Новый Год" } + +ent-ADTFoodSnackClownCake = клоунский пряник + .desc = Пряник в виде маленького клоуна. + .suffix = { "Новый Год" } + +ent-ADTFoodSnackGreytideCake = грейтайдный пряник + .desc = Пряник в виде маленького грейтайда. Если вы глава отдела - не ешьте. + .suffix = { "Новый Год" } + +ent-ADTFoodSnackScientistCake = научный пряник + .desc = Пряник в виде маленького ученого. + .suffix = { "Новый Год" } + +ent-ADTFoodSnackSecurityCake = щиткурный пряник + .desc = Пряник в виде маленького офицера СБ. + .suffix = { "Новый Год" } + +ent-ADTFoodSnackSnowflakeCake = печенье-снежинка + .desc = Печенье в виде снежинки. Осторожно, хрупкое. + .suffix = { "Новый Год" } + +ent-ADTFoodSnackSnowmanCake = пряник-снеговик + .desc = Пряник в виде маленького снеговика. + .suffix = { "Новый Год" } + +ent-ADTFoodSnackSocksCake = пряник-чулок + .desc = Пряник в виде рождественного чулка. + .suffix = { "Новый Год" } + +ent-ADTFoodSnackTreeCake = елочный пряник + .desc = Пряник в виде маленькой новогодней елочки. + .suffix = { "Новый Год" } + +ent-ADTFoodOlivierSalad = салат оливье + .desc = Закусочный салат русской кухни. Готовится из отварных корнеплодов, огурцов, яиц с мясом или варёной колбасой. И все это - в здоровой майонезной заправке. + .suffix = { "Новый Год" } + +ent-ADTFoodJelliedMeat = холодец + .desc = Специфичное блюдо - сгустившийся до состояния желе бульон с кусочками мяса. + .suffix = { "Новый Год" } + +ent-ADTFoodHerringUnderFurcoat = селёдка под шубой + .desc = Слоёный закусочный салат из филе карпа с отварными корнеплодами и яйцом под майонезом, самый популярный праздничный салат в кухне СССП. + .suffix = { "Новый Год" } + +ent-ADTFoodMeatHam = жареная ветчина с мёдом + .desc = Просоленный и копчёный свиной окорок, покрытый медовой глазурью. + .suffix = { "Новый Год" } + +ent-ADTFoodMeatHamPiece = ломтик ветчины с мёдом + .desc = Аккуратно нарезанный кусочек ветчины. + .suffix = { "Новый Год" } + +ent-ADTFoodCakePudding = пудинг + .desc = Десерт из яиц, сахара, молока и муки, сделанный на водяной бане. + .suffix = { "Новый Год" } + +ent-ADTFoodCakePuddingChristmas = новогодний пудинг + .desc = Мучной десерт, приготовляемый по передаваемому веками английскому рецепту. + .suffix = { "Новый Год" } + +ent-ADTBoxNewYearSnack1 = сладкий подарок "Космонавты" + .desc = Коробка с пряниками, выполненными в виде работников станции. + .suffix = { "Новый Год" } + +ent-ADTBoxNewYearSnack2 = сладкий подарок "Новогодний" + .desc = Коробка со сладостями в новогодней тематике. + .suffix = { "Новый Год" } + +ent-ADTBoxNewYearSnack3 = сладкий подарок "Плохиши" + .desc = Коробка со сладостями в виде самых нелюбимых ребят на станциях. + .suffix = { "Новый Год" } + +ent-ADTVendingMachineNewYear = НовогодоМат + .desc = Вендомат с множеством новогодних штучек. + .suffix = { "Новый Год" } + +ent-ADTChocolateGorillaLarge = шоколадная горилла + .desc = Сделанная целиком из молочного и белого шоколада статуя гориллы Петра из отдела снабжения. В полный рост. Съедобная. Нет, серьезно. + .suffix = { "Новый Год" } diff --git a/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/christmas_fireplace.ftl b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/christmas_fireplace.ftl new file mode 100644 index 00000000000..4706b1c5923 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/christmas_fireplace.ftl @@ -0,0 +1,6 @@ +ent-ADTChristmasFireplace = украшенный камин + .desc = Очаг, в котором горит огонь, к тому же украшенный под праздник. Уютно! + .suffix = { "Новый Год" } +ent-ADTChristmasFireplace2 = { ent-ADTChristmasFireplace } + .desc = { ent-ADTChristmasFireplace.desc } + .suffix = { "Новый Год" } diff --git a/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/new_year.ftl b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/new_year.ftl new file mode 100644 index 00000000000..03c1d457e08 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/new_year.ftl @@ -0,0 +1,24 @@ +ent-ADTCristmasWreath = рождественский венок + .desc = Типичное украшение в домах Земли в предрождественские дни. + .suffix = { "Новый Год" } +ent-ADTCristmasWreath2 = { ent-ADTCristmasWreath } + .desc = { ent-ADTCristmasWreath.desc } + .suffix = { "Новый Год" } +ent-ADTCristmasWreath3 = { ent-ADTCristmasWreath } + .desc = { ent-ADTCristmasWreath.desc } + .suffix = { "Новый Год" } +ent-ADTCristmasMistletoe = рождественская омела + .desc = Основное украшение в Англии на Земле. По традициям, персону, случайно оказавшуюся под висящей веткой омелы, позволялось поцеловать любому. + .suffix = { "Новый Год" } +ent-ADTCristmasMistletoe2 = { ent-ADTCristmasMistletoe } + .desc = { ent-ADTCristmasMistletoe.desc } + .suffix = { "Новый Год" } +ent-ADTTinselRed = красная мишура + .desc = Простое, но красивое красное украшение на праздник. + .suffix = { "Новый Год" } +ent-ADTTinselGold = золотистая мишура + .desc = Простое, но красивое золотистое украшение на праздник. + .suffix = { "Новый Год" } +ent-ADTTinselSilver = серебристая мишура + .desc = Простое, но красивое серебристое украшение на праздник. + .suffix = { "Новый Год" } diff --git a/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Misc/gift.ftl b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Misc/gift.ftl new file mode 100644 index 00000000000..d3e11b6bde2 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Misc/gift.ftl @@ -0,0 +1,27 @@ +ent-cardboardGift = картонный подарок + .desc = Подарок для тех, кто плохо работал на NanoTrasen в этом году. + .suffix = { "Новый год" } + +ent-ADTPresentRandomBlue = подарок, синий + .desc = Маленькая коробочка с невероятными сюрпризами внутри. + .suffix = { "Новый год" } + +ent-ADTPresentRandomGreen = подарок, зеленый + .desc = Маленькая коробочка с невероятными сюрпризами внутри. + .suffix = { "Новый год" } + +ent-ADTPresentRandomPurple = подарок, фиолетовый + .desc = Маленькая коробочка с невероятными сюрпризами внутри. + .suffix = { "Новый год" } + +ent-ADTPresentRandomRed = подарок, красный + .desc = Маленькая коробочка с невероятными сюрпризами внутри. + .suffix = { "Новый год" } + +ent-ADTPresentRandomInsaneSyndicate = подозрительный подарок + .desc = Маленькая коробочка с крайне невероятными сюрпризами внутри. + .suffix = { "Новый год" } + +ent-ADTRandomNewYearGiftSpawner = спавнер случайного новогоднего подарка + .desc = { ent-MarkerBase.desc } + .suffix = { "Новый год" } diff --git a/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.ftl b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.ftl new file mode 100644 index 00000000000..7f7ac031a42 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.ftl @@ -0,0 +1,3 @@ +ent-ADTSparkler = бенгальский огонь + .desc = Зажигательная смесь, которой отмечают праздники. + .suffix = { "Новый Год" } diff --git a/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Misc/toys.ftl b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Misc/toys.ftl new file mode 100644 index 00000000000..542bf02e00c --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Misc/toys.ftl @@ -0,0 +1,10 @@ +ent-coal = Уголь + .desc = Для самых непослушных. + .suffix = { "Новый год" } + +ent-toyC4Package = Подозрительный подарок + .desc = Подарок подозрительной наружности. Из него доносится еле слышное пиканье. + .suffix = { "Новый год" } +ent-toyC4 = Игрушечная с4 + .desc = Игрушка, которая поможет Вам ВЗОВАТЬСЯ от смеха. + .suffix = { "Новый год" } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Structures/christmas_tree.ftl b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Structures/christmas_tree.ftl new file mode 100644 index 00000000000..8d0df3d124f --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Objects/Structures/christmas_tree.ftl @@ -0,0 +1,59 @@ +ent-ADTChristmasPlasticTree = новогодняя пластиковая ёлка + .suffix = Новый Год + .desc = Передовая разработка отдела исследований - на ощупь, запах и вкус такая же, как и самая настоящая ёлка. Только иголки не осыпаются. + +ent-ADTGoldenStarGarland = золотая гирлянда + .suffix = Новый Год + .desc = Яркие звезды, сияя на ветках, освещают праздничную новогоднюю ёлку. Выглядит богато. + +ent-ADTSilverStarGarland = серебряная гирлянда + .suffix = Новый Год + .desc = Словно сосульки на ёлке, они сверкают и мигают. + +ent-ADTBaseStarGarland = гирлянда + .suffix = Новый Год + .desc = Классическая гирлянда. Мигает и сверкает. Автоматически придаёт новогоднее настроение. + +ent-ADTShinyGarland = сияющая гирлянда + .suffix = Новый Год + .desc = Как она сияет... ослепительно. Смотрите на неё только через специальные очки. + +ent-ADTTreeRedBalls = набор красных елочных шариков + .suffix = Новый Год + .desc = Набор елочных игрушек в виде сияющих шаров из пластика. Классическое украшение на ёлку. К тому же безопасное! + +ent-ADTTreeSilverBalls = набор серебряных елочных шариков + .suffix = Новый Год + .desc = Набор елочных игрушек в виде сияющих шаров из пластика. Классическое украшение на ёлку. К тому же безопасное! + +ent-ADTTreeGoldenBalls = набор золотых елочных шариков + .suffix = Новый Год + .desc = Набор елочных игрушек в виде сияющих шаров из пластика. Классическое украшение на ёлку. К тому же безопасное! + +ent-ADTTreeGoldenStar = золотая верхушка для ёлки + .suffix = Новый Год + .desc = Это самая яркая звёздочка на этой станции! Идеальное украшение для ёлки. + +ent-ADTTreeRedStar = красная верхушка для ёлки + .suffix = Новый Год + .desc = Это самая яркая звёздочка на этой станции! Идеальное украшение для ёлки. + +ent-ADTTreeSilverStar = серебряная верхушка для ёлки + .suffix = Новый Год + .desc = Это самая яркая звёздочка на этой станции! Идеальное украшение для ёлки. + +ent-ADTTreeSilverMishura = серебряная мишура для ёлки + .suffix = Новый Год + .desc = Она колется, но так красиво смотрится на ёлке. Только не давайте животным её съесть! + +ent-ADTTreeGoldenMishura = золотая мишура для ёлки + .suffix = Новый Год + .desc = Она колется, но так красиво смотрится на ёлке. Только не давайте животным её съесть! + +ent-ADTTreeRedMishura = красная мишура для ёлки + .suffix = Новый Год + .desc = Она колется, но так красиво смотрится на ёлке. Только не давайте животным её съесть! + +ent-ADTClothingBackpackDuffelChristmasToys = сумка с ёлочными игрушками + .suffix = Новый Год + .desc = Сумка, заполненная до краев шариками, гирляндами, мишурой и прочими украшениями для новогодней ёлки. diff --git a/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Reagents/new_year.ftl b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Reagents/new_year.ftl new file mode 100644 index 00000000000..1a3a35015bc --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Reagents/new_year.ftl @@ -0,0 +1,20 @@ +reagent-name-champagne-mandarin = шампанское с мандарином +reagent-desc-champagne-mandarin = Шампанское, в которое намеренно кинули мандаринку. +reagent-name-mulled-wine-cold = глинтвейн +reagent-desc-mulled-wine-cold = Вкусный и пряный новогодний напиток. +reagent-name-mulled-wine = разогретый глинтвейн +reagent-desc-mulled-wine = Вкусный, пряный и тёплый новогодний напиток. +reagent-name-carnation = гвоздика +reagent-desc-carnation = Это точно обычная гвоздика? +reagent-name-cinnamon = корица +reagent-desc-cinnamon = Ароматные палочки корицы. +reagent-name-christmas-milkshake = новогодний милкшейк +reagent-desc-christmas-milkshake = Молочный коктейль для приятного времяпрепровождения с близкими. +reagent-name-tea-cinnamon-lemon = чай с корицей и лимоном +reagent-desc-tea-cinnamon-lemon = Приятный, праздничный чай. +reagent-name-sbiten-cinnamon-lemon = сбитень с корицей и лимоном +reagent-desc-sbiten-cinnamon-lemon = Приятное праздничное подобие чая. +reagent-name-hot-chocolate = горячий шоколад +reagent-desc-hot-chocolate = Смотри не обожги губы. +reagent-name-hot-chocolate-allergic = гипоаллергенный горячий шоколад +reagent-desc-hot-chocolate-allergic = Вкус хуже, чем у обычного, но не опасен для некоторых рас. diff --git a/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Structures/Wallmount/Signs/posters.ftl b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Structures/Wallmount/Signs/posters.ftl new file mode 100644 index 00000000000..acef3b9a622 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/Structures/Wallmount/Signs/posters.ftl @@ -0,0 +1,11 @@ +ent-ADTPosterNewYear = 2569 - Новый год + .desc = Плакат, напоминающий о смене Земного года. + .suffix = Новый Год + +ent-ADTPosterNewYear2 = Счастливого Нового Года! + .desc = Плакат, поздравляющий персонал NanoTrasen с предстоящим праздником. + .suffix = Новый Год + +ent-ADTPosterNewYear3 = Поздравление от новогодней таяранки + .desc = Плакат, на котором таяранка, одетая в праздничную одежду, поздравляет вас с наступающим 2569 годом. + .suffix = Новый Год diff --git a/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/chemistry/component/solution-spike-component.ftl b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/chemistry/component/solution-spike-component.ftl new file mode 100644 index 00000000000..c2cf9a6a8c3 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/chemistry/component/solution-spike-component.ftl @@ -0,0 +1 @@ +adt-spike-solution-put = Вы кладёте { $spike-entity } в { $spiked-entity }. diff --git a/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/expendable-light-component.ftl b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/expendable-light-component.ftl new file mode 100644 index 00000000000..2af8eb89801 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/ADTGlobalEvents/NewYears/expendable-light-component.ftl @@ -0,0 +1,2 @@ +expendable-light-spent-sparkler-name = сгоревшие бенгальские огни +expendable-light-spent-sparkler-desc = Похоже, этот бенгальский огонь догорел. Кончился праздник. diff --git a/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl index d5dd54fc290..a8e193559af 100644 --- a/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl +++ b/Resources/Locale/ru-RU/ADT/Flavors/flavor-profiles.ftl @@ -38,8 +38,15 @@ flavor-complex-leafloverbeer = На вкус как слабость flavor-complex-scientificale = На вкус как плазма и хмель flavor-complex-uraniumale = На вкус радиактивно, небезопасно и рак. flavor-complex-goldenale = как эль, золото и исцеление +flavor-base-adtsuperscout = - На вкус как суперматерия +flavor-base-adtfunnyclown = как анекдот + +flavor-base-adtpoppy = маково flavor-complex-adtrelaxing = как довольно сильный наркотик +flavor-base-adtvanilla = ванильно +flavor-base-mandarin = сочная мандаринка +flavor-complex-ADTChocolateDrinkFlavor = как теплый растопленный шоколад flavor-complex-ADTCocoaDrink = как тепло, уют и какао flavor-base-adtsindipizza = зловеще сырно diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Crates/food.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Crates/food.ftl new file mode 100644 index 00000000000..81d079065d9 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Crates/food.ftl @@ -0,0 +1,7 @@ +ent-ADTCrateFoodOktoberfestSnack = ящик закусок к пиву + .desc = Ящик с набором колбасок и кренделей, чтобы закусывать пиво на Октоберфесте. Ну или в техах под карго. + .suffix = { "Октоберфест" } + +ent-ADTCrateHalloweenFood = ящик сладостей для Хеллоуина + .suffix = Хеллоуин + .desc = Ящик с кучей конфеток, леденцов, мармеладок и прочих сладостей. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Crates/fun.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Crates/fun.ftl index 4a8610cb812..be65d588adb 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Crates/fun.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/Crates/fun.ftl @@ -1,3 +1,7 @@ +ent-ADTCrateFunOktoberfestClothes = ящик одежды для Октоберфеста + .desc = Ящик с набором мужской и женской традиционной одежды для Октоберфеста. + .suffix = { "Октоберфест" } + ent-ADTCrateFunATV = ящик с квадроциклом .desc = Ящик с квадроциклом и ключами от него внутри. Да, оно там поместилось. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/boxes/other.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/boxes/other.ftl index 50b553eaa54..c4d6baf56e5 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/boxes/other.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Catalog/Fills/boxes/other.ftl @@ -1,3 +1,11 @@ +ent-ADTCandyBox = коробка конфет + .desc = Дарю тебе сердце! + .suffix = { "День Святого Валентина" } + +ent-ADTFoodBoxEclairs = коробка с эклерами + .desc = Картонная коробка со вкусным десертом. + .suffix = { "День Святого Валентина" } + ent-ADTFoodPackGummiesFilled = желейные конфеты "Space Gummy" .desc = Внутри поистине скрыто сокровище. .suffix = Заполненный diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Belt/belts.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Belt/belts.ftl index f93f68e1f64..dfb727e8c8e 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Belt/belts.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Belt/belts.ftl @@ -29,6 +29,10 @@ ent-ADTClothingBeltMedTSF = подсумок для медицины .desc = Подсумок, применяемый в экипировке пехотинца ТСФ для хранения медицинских принадлежностей. Можно прикрепить в слот кармана. .suffix = { "ТСФ" } +ent-ADTClothingBeltKilla = РПС "Тритон" + .suffix = Хеллоуин + .desc = Боевой нагрудник Тритон М43–А - Создан для размещёния и переноски элементов амуниции и снаряжения, для использования в умеренном и жарком климате. + ent-ADTClothingBeltMedicalBag = медицинская поясная сумка .desc = Небольшая, но вместительная сумка для хранения медикаментов. Тут даже поместится планшет для бумаги! .suffix = { "" } @@ -44,6 +48,10 @@ ent-ADTClothingBeltUtilityWebbingEngineering = жилет для инструм .desc = { ent-ADTClothingBeltUtilityWebbing.desc } .suffix = Инженерный +ent-ADTClothingBeltQuiverCupidon = колчан купидона + .desc = Для доставки влюбленностей, и пусть никто не уйдет без стрелы в сердце! + .suffix = { "День Святого Валентина" } + ent-ADTClothingBeltJudo = пояс корпоративного дзюдо .desc = Наниты пояса наделяют вас мастерством черного пояса по корпоративному дзюдо! diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/glasses.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/glasses.ftl index 003ce069b83..9717a4fb721 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/glasses.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Eyes/glasses.ftl @@ -7,9 +7,21 @@ ent-ADTClothingEyesGlassesMed = медицинские солнцезащитн ent-ADTClothingEyesGlassesPink = розовые очки .desc = Не замечай недостатков этого мира. +ent-ADTClothingEyesGlassesSollux = анаглифные очки + .desc = Ты настоящий маньяк компьютеров и ты знаешь ВСЕ КОДЫ. Все их. Ты непревзойдённый специалист ПЧЕЛОВОДЧЕСКОГО СЕТЕСТРОЕНИЯ. И хотя все твои друзья признают твои непревзойдённые достижения АБСОЛЮТНО ОХРЕНЕННОГО ХАКЕРА, ты чувствуешь, что мог бы быть лучше. Это одна из нескольких вещей, из-за которых ты ЗАНИМАЕШЬСЯ САМОБИЧЕВАНИЕМ без ОСОБЫХ НА ТО ПРИЧИН. + .suffix = Хеллоуин + ent-ADTClothingEyesGlassesMimicry = мимикрические очки .desc = Склизкие на вид очки, по одному виду чувствуется что они сделаны из кого-то... +ent-ADTNeonTacticalGlasses = неоновые тактические очки + .suffix = Хеллоуин + .desc = Обычные тактические очки, сделанные из поликарбоната кислотно-зелёного цвета. + +ent-ADTServantOfEvilGlasses = сварочные очки прислужника зла + .suffix = Хеллоуин + .desc = К сожалению, вместо защитных линз, здесь теперь обычное стекло, так что они утратили свои свойства. + ent-ClothingEyesNightVision = прибор ночного видения .desc = Прибор, позволяющий лучше видеть в темноте или при плохой освещенности. Обратной стороной является возможность стать ослепленным при воздействии яркой вспышки света. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Hands/gloves.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Hands/gloves.ftl index 217e7d211dc..91a8d09bc11 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Hands/gloves.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Hands/gloves.ftl @@ -1,9 +1,25 @@ +ent-ADTBioMercGloves = беспалые перчатки из биоткани + .suffix = Хеллоуин + .desc = Если вы подумали, что эти перчатки экологически чистые, то вы сильно ошибаетесь. Они сделаны из ткани с примесью биомассы, которая очень сильно напоминает кожу. Причем эта "кожа" неестественно теплая... + ent-ADTClothingHandsRabbitGloves = кроличьи перчатки .desc = Ох. Фурри. +ent-ADTRedMartialArtsGloves = красные перчатки для смешанных единоборств + .suffix = Хеллоуин + .desc = Беспалые перчатки, специально сделанные для смешанных единоборств. + +ent-ADTVyazovGloves = перчатки из измерения кошмаров + .suffix = Хеллоуин + .desc = У правой перчатки есть лезвия, кажется, которыми её бывший владелец расправлялся со своими жертвами. + ent-ADTClothingHandsFingerlessCombat = беспалые боевые перчатки .desc = Эти тактические перчатки огнеупорные и ударопрочные, и стали намного круче. +ent-ADTClothingHandsEmpressOfLightGloves = перчатки Императрицы света + .suffix = Хеллоуин + .desc = Величественно-синие. + # Кошачьи лапки ent-ADTClothingHandsCatPawsWhite = белые кошачьи лапки .desc = Супермягкие белые кошачьи лапки, специально для самых брутальных работников станции. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hardsuit-helmets.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hardsuit-helmets.ftl index 7b81510baad..893169ec77c 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hardsuit-helmets.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hardsuit-helmets.ftl @@ -46,8 +46,15 @@ ent-ADTDigitalHelm = шлем цифрового скафандра .desc = 100000101001000011000010000010001000111100010000101000011111010000010001000010100010010111000001000011011110000111101100001100001000011010110001001000100010011001000001000011111010000010000111100100001100001000100001010001000000100001110001000100011010000110101111111 ent-ADTClothingHeadHelmetHardsuitRaider = продвинутый шлем налётчика - .desc = Если вы видите этот скафандр, то не исключено, что в вас уже летит шприц снотворного + .desc = Если вы видите этот скафандр, то не исключено, что в вас уже летит шприц снотворного ent-ADTClothingHeadHelmetHardsuitRaiderCommon = мусорный шлем налётчика .desc = Самодельный скафандр для великого ограбления ent-ADTClothingHeadHelmetHardsuitIanHero = шлем скафандра корги - .desc = Вам определённо хочется погладить его по голове \ No newline at end of file + .desc = Вам определённо хочется погладить его по голове + +ent-ADTClothingHeadHelmetHardsuitEVENTServant = шлем скафандра прислуги рассвета + .desc = На шлеме светящийся розовым цветом T-образный символ. Сам же шлем сделан из крепкого сплава. +ent-ADTClothingHeadHelmetHardsuitEVENTMed = шлем скафандра медика рассвета + .desc = На шлеме светящийся розовым цветом T-образный символ. Сам же шлем сделан из крепкого сплава. +ent-ADTClothingHeadHelmetHardsuitEVENTsunshine = шлем скафандра владыки рассвета + .desc = На шлеме одна вертикальная фиолетовая линия, которая светится. Сам же шлем сделан из крепчайшего сплава. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hats.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hats.ftl index 24a98de60df..a5bab046a5e 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hats.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Head/hats.ftl @@ -50,13 +50,83 @@ ent-ADTClothingHeadHatsInvestigatorCap = фуражка следователя .desc = Слава NanoTrasen! .suffix = { "" } +ent-ADTClothingHeadHatsBavarianHat = баварская шляпа + .desc = Традиционная баварская шляпа. + .suffix = { "Октоберфест" } +ent-ADTClothingHeadHatsBavarianHatBlueBorder = баварская шляпа с голубой каймой + .desc = Традиционная баварская шляпа с голубой каймой. + .suffix = { "Октоберфест" } +ent-ADTClothingHeadHatsBavarianHatRedBorder = баварская шляпа с красной каймой + .desc = Традиционная баварская шляпа с красной каймой. + .suffix = { "Октоберфест" } +ent-ADTClothingHeadHatsBavarianHatGreenBorder = баварская шляпа с зеленой каймой + .desc = Традиционная баварская шляпа с зеленой каймой. + .suffix = { "Октоберфест" } +ent-ADTClothingHeadHatsBavarianHatBlue = синяя егерская шляпа + .desc = Егерская шляпа синего цвета, с пером. + .suffix = { "Октоберфест" } +ent-ADTClothingHeadHatsBavarianHatGreen = зеленая егерская шляпа + .desc = Егерская шляпа зеленого цвета, с пером. + .suffix = { "Октоберфест" } +ent-ADTClothingHeadHatsBavarianHatRed = красная егерская шляпа + .desc = Егерская шляпа красного цвета, с пером. + .suffix = { "Октоберфест" } + ent-ADTClothingHeadHatTrader = кепка торговца .desc = Бейсболка, окрашенная в цвета ТСФ .suffix = { "ТСФ" } +ent-ADTClothingHeadVyasovHat = потертая федора + .suffix = Хеллоуин + .desc = С виду очень потрепанная шляпа коричневого цвета, от неё веет кошмаром прямиком с улицы Вязова + +ent-ADTClothingHeadKillaHelmet = бронешлем ТШ-6 "Килла" + .suffix = Хеллоуин + .desc = Это просто реплика ТШ-6, но с тремя белыми полосками... В принципе, всё равно выглядит очень круто и стильно. + +ent-ADTClothingHeadXenomorph = шапка ксеноморфа + .suffix = Хеллоуин + .desc = Не пытайтесь в ней замаскироваться среди ксено на экспедиции. + +ent-ADTClothingHeadZombie = маска зомби + .suffix = Хеллоуин + .desc = Маска ужасного, зеленого, разлагающегося ожившего кошмара. Только не пытайтесь показаться в такой перед РХБЗЗ. + +ent-ADTClothingHeadHatChainSaw = голова демона-бензопилы + .suffix = Хеллоуин + .desc = Весь ад содрогается от его рева, даже демоны помнят его после перерождения! + +ent-ADTClothingHeadHatHornsSollux = Рога тролля + .suffix = Хеллоуин + .desc = Я в нем выгляжу глуп0. + +ent-ADTClothingHeadHatWinth = шляпа ведьмочки + .suffix = Хеллоуин + .desc = Для самых открытых ведьмочек. + +ent-ADTClothingHeadHatPoliceHat = кепка полицейского + .suffix = Хеллоуин + .desc = Кепка полицейского. Надеюсь, у него хорошие намерения. + +ent-ADTClothingHeadEmpressOfLightHelmet = коронет Императрицы света + .suffix = Хеллоуин + .desc = Величественно. + +ent-ADTClothingHeadLethalCompanyHelmet = шлем сотрудника Смертельной компании + .suffix = Хеллоуин + .desc = Шлем как шлем. Кажется, его кто-то до меня носил... + +ent-ADTClothingHeadRomanticHat = широкая красно-белая шляпа + .desc = Снимаю шляпу из уважения к вам! + .suffix = { "День Святого Валентина" } + ent-ADTClothingHeadOldFedora = старая федора .desc = Носящий её точно хочет показать, что он ценит старые принципы и поведения. Забавно, что при столь сильной потёртости она так и не утеряла форму. +ent-ADTClothingHeadDemonicHornsDeer = демонические рожки оленя + .suffix = Хеллоуин + .desc = Рога радио-демона. Бррр... + ent-ADTClothingHeadDrinkCap = питьевая кепка .desc = Красная кепка с прикреплёнными по бокам баночками и проведённой от них соломинкой. Этикетка на баночках стёрта, однако всё ещё можно прочитать состав - «содержит сахара в сто раз больше дневной нормы», и «теперь содержит на 33% БОЛЕЕ ЧИСТУЮ радиацию» diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Mask/mask.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Mask/mask.ftl index a4571aba034..bbbfcc51aa6 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Mask/mask.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Mask/mask.ftl @@ -2,6 +2,7 @@ ###ent-ADTClothingMaskGasLapkeeSet = белый противогаз СБ ### .desc = Не стандартный, но тем не менее одобренный ЦентКоммом очень плотно прилегающий к лицу противогаз с повышенной защитой от жары, взамен не защищающий от ударов тупыми предметами по лицу. ### .suffix = { "Именное, Lapkee" } + ent-ADTClothingMaskGasCE = противогаз старшего инженера .desc = Это элитный противогаз Старшего Инженера, которому может позавидовать даже Центральное Командование. Защищает от сварки. ent-ADTClothingMaskGasIlisium = дыхательная маска @@ -29,6 +30,38 @@ ent-ADTClothingMaskSquidGameManager = маска организатра Игр .suffix = Игры Кальмара .desc = Маска злобного гения. Или его подручного. Или скучного бюрократа, вынужденного считать сколько жадных до денег погибнет сегодня. +ent-ADTJasonHockeyMask = хоккейная маска маньяка + .suffix = Хеллоуин + .desc = Эта маска не только защитит вас от шайб, но и может скрыть ваше изуродованное лицо! + +ent-ADTClothingHeadHatTagilla = сварочная маска "УБЕЙ" + .suffix = Хеллоуин + .desc = Реплика сварочнай маски из бронестали, выполненная в спецраскраске "УБЕЙ". От реального прототипа унаследовала в основном только защиту от сварки. + +ent-ADTClothingHeadHatClownArmor = баллистическая маска клоуна-психопата + .suffix = Хеллоуин + .desc = OMFG YOU DO NOT KILL CLOWN! CLOWN KILLS YOU! + +ent-ADTMichaelMyersMask = маска Майкла Майерса + .suffix = Хеллоуин + .desc = Резиновая маска главного героя "Хеллоуина". + +ent-ADTPayDayChainsMask = маска клоуна грабителя + .suffix = Хеллоуин + .desc = А ведь люди говорили, что клоуны только в цирке. Оказывается еще и в денежных хранилищах. + +ent-ADTPayDayDallasMask = маска клоуна Патриот + .suffix = Хеллоуин + .desc = Надев эту маску, вы начинаете чувствовать себя настоящим патриотом! Но не в рамках закона. + +ent-ADTPayDayHoustonMask = маска умного клоуна + .suffix = Хеллоуин + .desc = С этими розовыми деталями на лбу люди точно поймут, что вы умный, в отличии от других! + +ent-ADTPayDayWolfMask = маска клоуна Волка с Уолл-стрит + .suffix = Хеллоуин + .desc = Одевая эту маску, вы почему то начинаете чувствовать разделение надвое и желание переворачивать маску совсем пропадает.. + ent-ClothingMaskMadHeretic = маска бездны .desc = Маска, созданная из страданий. Когда вы смотрите в ее глаза, она смотрит в ответ. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/cloaks.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/cloaks.ftl index a283a2de904..929f66899e6 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/cloaks.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/cloaks.ftl @@ -33,6 +33,15 @@ ent-ADTClothingNeckCloakNukeOps = плащ Ядерных Оперативник ent-ADTClothingNeckCloakKnight = плащ рыцаря .desc = Шёлковый и внушительный рыцарский плащ. За честь короны! .suffix = { "" } + +ent-ADTVergileCloak = плащ темного убийцы + .suffix = Хеллоуин + .desc = Длинный тёмно-синий плащ с серебряными пуговицами и белым вышитым узором, похожим на змею. + +ent-ADTClothingNeckCloakRedhat = мантия Красной шапочки + .suffix = Хеллоуин + .desc = Красная Шапочка, я тебя съем! сказал большой страшный серый волк. А попробуй! сказала красная шапочка, держа в руках лом + ent-ADTClothingNeckInvisibleCloak = плащ-невидимка .desc = Плащ, который скрывает владельца, приобретая цвета и очертание окружающей среды с помощью нанотехнологий. Также, он дает небольшую защиту от внешних воздействий, но обратная сторона таких свойств - замедление. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/misc.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/misc.ftl index 275b679b76e..d9f4c3a32b1 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/misc.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Neck/misc.ftl @@ -10,6 +10,14 @@ ent-ADTChokerWithSpike = чокер с шипами ent-ADTChokerWithHeart = чокер с сердцем .desc = Для послушных членов экипажа. +ent-ADTClownCollarCaterpillar = клоунский воротник-гусеница + .suffix = Хеллоуин + .desc = Некогда вымерший аттрибут Шута и Клоуна. + +ent-ADTVampireCloak = вампирский плащ с воротником + .suffix = Хеллоуин + .desc = Чёрный плащ с красной тканью во внутренней части плаща, сшитый из плотной, но при этом легкой ткани. Прекрасно защищает от солнечных лучей! + ent-ADTClothingNeckKubanoidPin = значок "Хуй Врагам Кубана" .desc = Кубан - одна из планет в отдаленном регионе ТСФ. Одним из её уроженцев является текущий глава департамента СБ в секторе, где располагается ваша станция. Но к сожалению, планета недавно подвергнулась рейду пиратов, который был отбит только благодаря героизму уроженцев Кубана. В честь этого и был выпущен этот значок и начата кампания по сбору помощи для восстановления. @@ -26,4 +34,4 @@ ent-ADTGoldCross = золотой крест .desc = Крест, выплавленный из золота. Для самых элитных священников НТ. ent-ADTClothingGeorgeRibbonPin = георгиевская лента - .desc = Двухцветная лента сочетает оранжевый и чёрный цвета, которые традиционно ассоциируются с огнём и порохом, символизируя мужество и героизм защитников Родины. + .desc = Двухцветная лента сочетает оранжевый и чёрный цвета, которые традиционно ассоциируются с огнём и порохом, символизируя мужество и героизм защитников Родины. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/armor.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/armor.ftl index df95ddbd2b4..e559ed48a16 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/armor.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/armor.ftl @@ -18,6 +18,19 @@ ent-ADTClothingGigaMuscles = мускулы ent-ADTClothingOuterArmorTSF = бронежилет армии ТСФ .desc = Стандартный бронежилет пехотинца Транс-Солнечной Федерации. .suffix = { "ТСФ" } + +ent-ADTCSIJArmor = бронежилет CSIJ + .suffix = Хеллоуин + .desc = Никто не знает, из чего сделан этот бронежилет, и лучше не знать... На спине есть инициалы CS - 'Cruelty Squad'. + +ent-ADTKillaArmor = бронежилет СОБ-12 "Килла" + .suffix = Хеллоуин + .desc = Реплика бронежилета "СОБ-12" под костюм "Киллы". Очень сильно похож по внешнему виду на 6Б13, хотя он им не является. + +ent-ADTTagillaArmor = разгрузочный жилет с бронепластинами + .suffix = Хеллоуин + .desc = Реплика бывалого плитника на основе модульной системы AVS. Установлена фронтальная панель на три подсумка. Да и, собственно, все. Ничего лишнего. + ent-ADTClothingOuterArmorMiner = костюм исследователя .desc = Не спасёт от давления, но хорошо защищает от фауны. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl index 56a09edf275..5ad0e46070c 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/coats.ftl @@ -60,6 +60,14 @@ ent-ADTClothingOuterCoatTrader = бомбер торговца .desc = Куртка-бомбер торговцев ТСФ .suffix = { "ТСФ" } +ent-ADTJasonBomber = куртка маньяка-убийцы + .suffix = Хеллоуин + .desc = Ходят слухи, что эта куртка принадлежит маньяку в хоккейной маске! + +ent-ADTStudentBomber = университетская куртка-бомбер + .suffix = Хеллоуин + .desc = Удобная студенческая куртка-бомбер с нашитой на ней большой английской буквой В. Довольно популярна среди студентов различных учебных заведений ТСФ. + ent-ADTClothingOuterCoatLabcoatCMOHike = походный халат Главного врача .desc = Частично открытый халат. Не сковывает движения. @@ -67,6 +75,8 @@ ent-ADTClothingOuterCoatLabcoatCMOHikeOpened = походный халат Гл .desc = Частично открытый халат. Не сковывает движения. .suffix = {"Раскрытый"} + + ent-ADTClothingOuterLeatherJacket = кожаная куртка .desc = Причёска «Помпадур» в комплект не входит. @@ -105,6 +115,9 @@ ent-ADTClothingOuterCoatDetectiveLoadoutOld = старый тренч ent-ADTClothingOuterCoatXCoat = икс-ключительное облачение .desc = Кажется, это облачение заигравшегося творца. +ent-ADTClothingOuterCoatRadioDemon = фрак радио-демона + .desc = А теперь... Не переключайтесь. + .suffix = {"Хеллоуин"} ent-ADTClothingOuterExplorerBomber = бомбер исследователя .desc = Вперёд навстречу новым исследованиям и приключениям!.. Как жаль, что на Лаваленде многие приключения ведут к смерти... От него пахнет... Пеплом? @@ -125,12 +138,14 @@ ent-ADTClothingOuterSpiderRobe = зловещая паучья роба ent-ADTClothingOuterTechpriestRobe = роба техно-жреца .desc = С мгновения того, как понял я слабость своей плоти, я был отвращён. + ent-ADTClothingOuterDavidsJacket = куртка парамедика .desc = Ярко-желтая сигнальная куртка, которую обожают парамедики конца XXI века. ent-ADTClothingOuterDavidsJacketValid = куртка эджраннера .desc = Ты на самой грани. Покажи им, что ты готов на всё. + ent-ADTClothingOuterWinterCoatLightColorAquamarine = аквамариновая лёгкая куртка .desc = Лёгкая, стильная, тёплая куртка. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/hardsuits.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/hardsuits.ftl index 87b6e99c14c..1ad5c0e5ba6 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/hardsuits.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/hardsuits.ftl @@ -45,12 +45,21 @@ ent-ADTClothingOuterHardsuitOBS5USSP = бронескафандр СССП ОБ .desc = ОБС-5 "Конрад", также известный как общевойсковой бронекостюм Model 5, представляет собой морально устрашающую модель единого общевойскового бронекостюма серии Konrad. Этот скафандр был разработан с учетом высокой защиты от стрелкового оружия и взрывов .suffix = { "СССП" } -ent-ADTDigitalHardsuit = цифровой скафандр +ent-ADTDigitalHardsuit = цифровой скафандр .desc = 100000101001000011000010000010001000111100010000101000011111010000010001000010100010010111000001000011011110000111101100001100001000011010110001001000100010011001000001000011111010000010000111100100001100001000100001010001000000100001110001000100011010000110101111111 ent-ADTHardsuitRaider = продвинутый скафандр налётчика - .desc = Если вы видите этот скафандр, то не исключено, что в вас уже летит шприц снотворного + .desc = Если вы видите этот скафандр, то не исключено, что в вас уже летит шприц снотворного ent-ADTHardsuitRaidercommon = мусорный скафандр налётчика .desc = Самодельный скафандр для великого ограбления ent-ADTIanHeroHardsuit = скафандр корги - .desc = Скафандр самого милого супергероя \ No newline at end of file + .desc = Скафандр самого милого супергероя + +ent-ADTEVENTServantHardsuit = скафандр прислуги рассвета + .desc = Плащ сделан уже из менее качественной синт-кожи, но всё так же со стальными вставками. Под плащом располагается глубинный скафандр, способный выдерживать экстремальное давление. + +ent-ADTEVENTLeaderHardsuit = скафандр владыки рассвета + .desc = Плащ сделан из крайне качественной кожи, со стальными вставками. Под плащом располагается глубинный скафандр, способный выдерживать экстремальное давление. + +ent-ADTEVENTMedHardsuit = скафандр медика рассвета + .desc = Плащ сделан уже из менее качественной синт-кожи, но всё так же со стальными вставками. Под плащом располагается глубинный скафандр, способный выдерживать экстремальное давление. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/misc.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/misc.ftl index f2adcef3a7c..60ffac8394e 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/misc.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/misc.ftl @@ -1,3 +1,12 @@ +ent-ADTClothingOuterRedCardigan = красный кардиган + .desc = Красный кардиган с белым рисунком. + .suffix = { "День Святого Валентина" } +ent-ADTClothingOuterBlackCardigan = черный кардиган + .desc = Черные кардиган с красным рисунком. + .suffix = { "День Святого Валентина" } +ent-ADTClothingOuterCupidonWings = крылья купидона + .desc = Мягкие, милые и почти как настоящие. + .suffix = { "День Святого Валентина" } ent-ADTClothingOuterClothingBox = коробка с подтяжками .desc = Коробка с вырезом для ног. ent-ADTClothingOuterApronBarber = фартук парикмахера diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/wintercoats.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/wintercoats.ftl index 65196673ca2..15560d032b3 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/wintercoats.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/OuterClothing/wintercoats.ftl @@ -12,3 +12,9 @@ ent-ADTClothingOuterHoodyBlack = чёрное худи ent-ADTClothingOuterHoodyWhite = белое худи .desc = Мягкое белое худи с капюшоном. + +ent-ADTClothingOuterFurCoatHeart = шуба + .desc = Шуба из белого меха, расшитая множеством ярко-красных сердечек. + +ent-ADTClothingOuterLowerFurCoat = шуба + .desc = Обычная шуба из белого меха. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Shoes/misc.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Shoes/misc.ftl index 85ac7d1208f..007571a5989 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Shoes/misc.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Shoes/misc.ftl @@ -6,6 +6,23 @@ ent-ADTClothingFootWhiteSandals = белые сандали ent-ADTClothingFootBlackBoots = чёрные сапоги .desc = В них удобно бегать хулиганам! + +ent-ADTClownNightmareShoes = кошмарные туфли клоуна + .suffix = Хеллоуин + .desc = Нет смысла бежать! Ты обречен! + +ent-ADTGreyClownPsyhoShoes = серые ботинки клоуна-психопата + .suffix = Хеллоуин + .desc = ПРИВ? n_n. Делаю, что хочу! И никто меня не остановит! + +ent-ADTEmpressOfLightShoes = туфли Императрицы света + .suffix = Хеллоуин + .desc = Величественные туфельки. + ent-ADTClothingShoesShaleBrealVulp = сланцы .suffix = "Бить вульп, Conjurer" .desc = "Божественные сланцы отшлёпавшие не одну вульпу." + +ent-ADTRadioDemonShoes = демонические туфли + .suffix = Хеллоуин + .desc = Туфли имеют вставки для чечётки. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Underwear/socks.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Underwear/socks.ftl index c0d2d549973..8d278d33d2b 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Underwear/socks.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Underwear/socks.ftl @@ -22,6 +22,13 @@ ent-ADTClothingUnderwearSocksThigh = высокие чулки ent-ADTClothingUnderwearSocksLaceThigh = кружевные чулки .desc = Красивые кружевные чулки. +ent-ADTClothingUnderwearSocksHeart = носки с сердечками + .desc = Теплый и милый подарок для любимого. + .suffix = { "День Святого Валентина" } +ent-ADTClothingUnderwearSocksStockingsHeart = длинные чулки с сердечками + .desc = Теплый и милый подарок для любимой. + .suffix = { "День Святого Валентина" } + ent-ADTClothingUnderwearSocksRabbit = носки с кроликами .desc = Теплый и необычные носочки в виде кроликов. @@ -79,6 +86,9 @@ ent-ADTClothingUnderwearSocksKneeCentcom = гольфы представител ent-ADTClothingUnderwearSocksThighCentcom = чулки представителей ЦентКом .desc = Чулки для представителей ЦК. Да... Даже некоторые из них носят чулки... +ent-ADTClothingUnderwearSocksKneeCreepy = страшные гольфы + .desc = Гольфы, что точно подойдут для Хеллоуина. + ent-ADTClothingUnderwearSocksCyan = голубые носки .desc = Обычные голубые носки. ent-ADTClothingUnderwearSocksKneeCyan = голубые гольфы diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl index b68e4e275dc..5073f88a56f 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpskirts.ftl @@ -138,10 +138,41 @@ ent-ADTClothingJumpskirtHopAlt = деловой костюм с юбкой гл ent-ADTClothingUniformJumpskirtJanimaid = костюм горничной .desc = Обновленный костюм горничной от НТ. +ent-ADTClothingUniformOktoberfestDirndlShort = дирндль с короткой юбкой + .desc = Стилизованное под традиционный наряд платье с короткой юбкой. + .suffix = { "Октоберфест" } +ent-ADTClothingUniformOktoberfestDirndlShortGreen = дирндль с зеленой короткой юбкой + .desc = Стилизованное под традиционный наряд платье с зеленой короткой юбкой. + .suffix = { "Октоберфест" } +ent-ADTClothingUniformOktoberfestDirndlShortRed = дирндль с красной короткой юбкой + .desc = Стилизованное под традиционный наряд платье с красной короткой юбкой. + .suffix = { "Октоберфест" } +ent-ADTClothingUniformOktoberfestDirndlShortBlue = дирндль с синей короткой юбкой + .desc = Стилизованное под традиционный наряд платье с синей короткой юбкой. + .suffix = { "Октоберфест" } +ent-ADTClothingUniformOktoberfestDirndlBlue = дирндль с синей юбкой + .desc = Стилизованное под традиционный наряд платье с синей юбкой. + .suffix = { "Октоберфест" } +ent-ADTClothingUniformOktoberfestDirndlGreen = дирндль с зеленой юбкой + .desc = Стилизованное под традиционный наряд платье с зеленой юбкой. + .suffix = { "Октоберфест" } +ent-ADTClothingUniformOktoberfestDirndlRed = дирндль с красной юбкой + .desc = Стилизованное под традиционный наряд платье с красной юбкой. + .suffix = { "Октоберфест" } + +ent-ADTClothingUniformRabbitDress = кроличий купальник + .desc = А куда здесь крепить КПК? + .suffix = { "" } + ent-ADTClothingUniformJumpskirtCMOHike = походная юбка-костюм главного врача .desc = Рубашка и мешковитая юбка, отлично подходящие для активной работы как вне, так и внутри своего отдела. .suffix = { "" } +ent-ADTClothingUniformJumpSkirtRedHat = костюм красной шапочки + .desc = Самое страшное, что ждёт эту шапочку, что вместо волка за нею придут вульпы + .suffix = Хеллоуин + + ent-ADTClothingUniformJumpskirtDetectiveOld = старая рубашка с юбкой, галстуком и подтяжками .desc = Носящая это точно хочет показать, что она ценит старые принципы и поведения. Всё это явно потрёпанно, но хозяйка этих вещей точно любит их. @@ -182,3 +213,18 @@ ent-ADTClothingUniformTangoDressBlack = чёрное платье для тан ent-ADTClothingUniformTangoDressWhite = белое платье для танго .desc = Грациозное белое платье для элегантных выступлений. + +ent-ADTClothingUniformBurgundyDress = бордовое платье + .desc = Короткое бордовое платье. + +ent-ADTClothingUniformBurgundyDressAlt = бордовое платье + .desc = Короткое бордовое платье. + +ent-ADTClothingUniformCocktailDress = коктельное платье + .desc = Платье с красно-белыми элементами и бантом посередине. + +ent-ADTClothingUniformEveningDress = вечернее платье + .desc = Платье средней длины, полуприлегающего силуэта, с глубоким вырезом и разрезом на бедре. + +ent-ADTClothingUniformGothDress = готическое платье + .desc = Платье цвета бордо с преобладанием тёмных оттенков и использованием изысканных материалов. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl index eb6c4179acf..d6a1bedf003 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Clothing/Uniforms/jumpsuits.ftl @@ -255,6 +255,28 @@ ent-ADTClothingJumpsuitSecOffMogesBlue = костюм офицера СБ с М ent-ADTClothingJumpsuitSecOffMogesGray = костюм офицера СБ с Могеса .desc = Не совсем формальный, но очень подходящий для трофиков костюм офицера, служившего в филиале Нанотрейзен на планете Могес. Заслужить право носить такой может только ветеран СБ. Стоять, СБ Могеса! +ent-ADTClothingUniformOktoberfestWhite = костюм для Октоберфеста с белой рубашкой + .desc = Традиционный баварский мужской костюм с короткими штанами и белой рубашкой. + .suffix = { "Октоберфест" } +ent-ADTClothingUniformOktoberfestBlueCheckered = костюм для Октоберфеста в голубую клетку + .desc = Традиционный баварский мужской костюм с короткими штанами и рубашкой в голубую клетку. + .suffix = { "Октоберфест" } +ent-ADTClothingUniformOktoberfestGreenCheckered = костюм для Октоберфеста в зеленую клетку + .desc = Традиционный баварский мужской костюм с короткими штанами и рубашкой в зеленую клетку. + .suffix = { "Октоберфест" } +ent-ADTClothingUniformOktoberfestRedCheckered = костюм для Октоберфеста в красную клетку + .desc = Традиционный баварский мужской костюм с короткими штанами и рубашкой в красную клетку. + .suffix = { "Октоберфест" } +ent-ADTClothingUniformOktoberfestGreenVest = костюм для Октоберфеста с зеленой жилеткой + .desc = Традиционный баварский мужской костюм с короткими штанами и зеленой жилеткой. + .suffix = { "Октоберфест" } +ent-ADTClothingUniformOktoberfestBlueVest = костюм для Октоберфеста с синей жилеткой + .desc = Традиционный баварский мужской костюм с короткими штанами и синей жилеткой. + .suffix = { "Октоберфест" } +ent-ADTClothingUniformOktoberfestRedVest = костюм для Октоберфеста с красной жилеткой + .desc = Традиционный баварский мужской костюм с короткими штанами и красной жилеткой. + .suffix = { "Октоберфест" } + ent-ADTClothingUniformCyberSun = костюм Киберсан .desc = Костюм Киберсан, стильно и практично! @@ -285,6 +307,90 @@ ent-ADTClothingUniformCorrectionsOfficerLight = лёгкая форма надз ent-ADTClothingUniformSecurityCadetLight = лёгкая форма кадета СБ .desc = Лёгкая форма кадета Службы Безопасности, короткие шорты по пояс, с заправленной в них футболкой, прямо говорят, что вы кадет. +ent-ADTOtherworldClownCostume = костюм потустороннего клоуна + .suffix = Хеллоуин + .desc = Костюм древнего существа, прибывшего из другого измерения, чтобы пугать людей и питаться их страхами... звучит как работа клоуна! + +ent-ADTBioMercUniform = униформа био-наёмника "Cruelty Squad" + .suffix = Хеллоуин + .desc = Поздравляю, ты родился в этом мире, где ценность жизни равна нулю. В этом мире всё уже сгнило, и всё стоит в вечной стагнации, и нет необходимости торопиться и делать мир лучше или хуже. Ты способен лишь существовать в этом мире, пропитанный ненавистью ко всему. Ты всего лишь биомасса среди других биомасс. + +ent-ADTJasonCostume = костюм маньяка + .suffix = Хеллоуин + .desc = Носи маску хоккеиста и убивай своих жертв при помощи мачете. + +ent-ADTVyasovCostume = костюм Вязова + .suffix = Хеллоуин + .desc = Кошмар на станции Вязова! + +ent-ADTHotlineMiamiUniform = студенческая форма + .suffix = Хеллоуин + .desc = Ходят легенды, что именно эту форму носил известный несколько сотен лет назад потрошитель из Майами. + +ent-ADTServantOfEvilUniform = униформа прислужника зла + .suffix = Хеллоуин + .desc = Удобный желтый комбинезон идеально подойдет для слуги зла! Ты обязан служить NT! слава NT!!! + +ent-ADTDudeShirt = майка Чувака + .suffix = Хеллоуин + .desc = Футболка с принтом стереотипного зелёного инопланетянина. К сожалению, наши предки не знали, что "инопланетяне" выглядят как антропоморфные животные... + +ent-ADTSquidGameOrganizerSuit = комбинезон организатора Игр Кальмара + .suffix = Хеллоуин + .desc = Комбинезон для того, кто прячется за маской и испытывает худшее и лучшее в других. + +ent-ADTSquidGamePlayerSuit = комбинезон игрока Игр Кальмара + .suffix = Хеллоуин + .desc = Комбинезон для того, кто проверяет себя на прочность и готовность на все. + +ent-ADTTagillaSuit = потрепанные тактические брюки + .suffix = Хеллоуин + .desc = Обычные тактические брюки с набедренным подсумком и наколенниками. Выглядит брутально и потрепанно. + +ent-ADTDJClownSuit = костюм клоуна DJ + .suffix = Хеллоуин + .desc = Странный с виду серый комбинезон, перепачканный кровью и пятнами от горчицы и кетчупа. Это основная одежда клоуна-психопата DJTricky. + +ent-ADTVampireSuit = вампирский костюм + .suffix = Хеллоуин + .desc = Обычная белая рубашка с красным жилетом и черные брюки. + +ent-ADTVergileSuit = чёрная водолазка с тёмно-синим жилетом + .suffix = Хеллоуин + .desc = Отвергни человечность и прими демоническое наследие отца. + +ent-ADTXenomorphSuit = костюм ксеноморфа + .suffix = Хеллоуин + .desc = Этот потрясающий хэллоуинский костюм вдохновлен страшным Ксеноморфом из культового фильма "Чужой". Он идеально подходит для любителей настоящей научной фантастики и желающих создать незабываемый облик на Хэллоуине. + +ent-ADTHalloweenMichaelMyersSuit = костюм Майкла Майерса + .suffix = Хеллоуин + .desc = Комбинезон героя фильма "Хеллоуин". + +ent-ADTHalloweenEmpressOfLightSuit = костюм Императрицы света + .suffix = Хеллоуин + .desc = Костюм Императрицы света. + +ent-ADTHalloweenEmpressOfLightSuitYellow = желтый костюм Императрицы света + .suffix = Хеллоуин + .desc = Желтый костюм Императрицы света. + +ent-ADTHalloweenBadPoliceSuit = костюм Плохого Полицейского + .suffix = Хеллоуин + .desc = Арестуйте меня, пожалуйста. + +ent-ADTHalloweenLethalCompanySuit = костюм сотрудника Смертельной компании + .suffix = Хеллоуин + .desc = Одноразовые сотрудники - это круто! + +ent-ADTJumpsuitHunterDemon = костюм охотника на демонов + .suffix = Хеллоуин + .desc = Служебный костюм "Охотники на Демонов Общественной Безопасности" или же "Охотник на Демонов". Выглядит потрепанно. + +ent-ADTClothingUniformAbibasBlackSuit = черный спортивный костюм + .desc = Спортивка для четких пацанов + .suffix = { "" } + ent-ADTClothingUniformJumpsuitCMOHike = походный костюм главного врача .desc = Рубашка и мешковитые штаны, отлично подходящие для активной работы как вне, так и внутри своего отдела. .suffix = { "" } @@ -304,6 +410,34 @@ ent-ADTClothingUniformJumpsuitMGDGuard = бронированный костюм .desc = Состоит из прочного бронежилета "Тактика" а также защиты для коленей и локтей, состоящих из кевлара. .suffix = { "MG&D" } +ent-ADTClothingUniformJumpsuitRomanticSuit = красно-белый костюм + .desc = Модный романтичный костюм. + .suffix = { "День Святого Валентина" } + +ent-ADTClothingUniformJumpsuitTurtleHeart = водолазка с сердцем + .desc = Милая забавная водолазка. + .suffix = { "День Святого Валентина" } + +ent-ADTClothingUniformJumpsuitDarkMan = темный мужской костюм + .desc = Стильные темные брюки и пиджак с красной оторочкой. + .suffix = { "День Святого Валентина" } + +ent-ADTClothingUniformJumpsuitBrightMan = светлый мужской костюм + .desc = Стильные светлые брюки и красный верх. + .suffix = { "День Святого Валентина" } + +ent-ADTClothingUniformJumpsuitCupidon = одеяние купидона + .desc = На 50% мифическое одеяние, на 50% - обернутая вокруг тела простыня. + .suffix = { "День Святого Валентина" } + +ent-ADTClothingUniformJumpsuitRedSweaterHeart = красный свитер с сердечком + .desc = Теплый, красный, с любовью. + .suffix = { "День Святого Валентина" } + +ent-ADTClothingUniformJumpsuitWhiteSweaterHeart = белый свитер с сердечком + .desc = Теплый, белый, с любовью. + .suffix = { "День Святого Валентина" } + ent-ADTCapitanUSSPUniform = униформа капитана флота СССП .desc = Стандартная повседневная униформа капитана космического флота СССП .suffix = { "СССП" } @@ -367,6 +501,12 @@ ent-ADTClothingJumpsuitDryadCoverings = подвязки дриады ent-ClothingUniformJumpsuitCommandGeneric = униформа командования .desc = Обычный комбинезон расцветки командования, не связанный с каким-либо конкретным отделом. +ent-ADTClothingUniformSwimsuitWinth = фиолетовый купальник + .desc = Фиолетовый купальник. + +ent-ADTClothingJumpsuitRadioDemonSuit = комбинезон радио-демона + .desc = Улыбка, моя дорогая, – ценный инструмент. Она вдохновляет твоих друзей, не даёт врагам раскусить твои планы и гарантирует, что, что бы ни случилось, именно ТЫ держишь всё под контролем. + ent-ADTClothingUniformJumpsuitClownAbyss = глубоководный клоунский костюм .desc = Старый клоунский костюм, судя по виду, переживший не одно кораблекрушение. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Markers/Spawners/misc.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Markers/Spawners/misc.ftl new file mode 100644 index 00000000000..cbe63997328 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Markers/Spawners/misc.ftl @@ -0,0 +1,7 @@ +ent-ADTHelloweenPlantRandom = спавнер декора к Хеллоуину + .desc = { ent-MarkerBase.desc } + .suffix = Хеллоуин + +ent-ADTHalloweenPosterRandom = спавнер настенного декора к Хеллоуину + .desc = { ent-MarkerBase.desc } + .suffix = Хеллоуин \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/NPCs/slimes.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/NPCs/slimes.ftl index 85dceedd8fa..a2003f5af25 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/NPCs/slimes.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/NPCs/slimes.ftl @@ -1,2 +1,10 @@ +ent-ADTMobAdultSlimesGreenHalloween = зеленый слайм + .suffix = Хеллоуин + .desc = Эта зеленая жижа явно не выглядит дружелюбно. Большая, склизкая пасть так и норовит вас поглотить, чтобы ваша плоть растворилась внутри. + +ent-ADTMobAdultSlimesGreenHalloweenAngry = ужасный зеленый слайм + .suffix = Хеллоуин + .desc = Эта злая зеленая жижа явно не выглядит дружелюбно. Большая, склизкая пасть так и норовит вас поглотить, чтобы ваша плоть растворилась внутри. + ent-ADTMobSlimesGeras = слайм .desc = Небольшой слайм, который не выглядит особо агрессивным. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Player/event.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Player/event.ftl new file mode 100644 index 00000000000..2bf5f93de33 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Mobs/Player/event.ftl @@ -0,0 +1,2 @@ +ent-ADTMobEVENTValue = Ценность + .desc = Существо, с женскими чертами с пушистой светло-бежевой шерстью, покрывающей её большие звериные уши, предплечья, ноги и нижнюю часть тела. На каждой из ее рук по три больших красных когтя, которые выполняют роль пальцев, при этом четвертый и пятый отогнуты. Красные выступы, похожие на когти, также есть на ее волосах, коленях и концах ступней diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks.ftl index 693f662550c..cfc6c7b4b9b 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Drinks/drinks.ftl @@ -86,6 +86,58 @@ ent-ADTDrinkLimeShadeGlass = { ent-DrinkGlass } .suffix = Лаймовый Шэйд .desc = { ent-DrinkGlass.desc } +ent-ADTDrinkCargoBeerGlass = { ent-DrinkGlass } + .suffix = Зубодробительное пиво "Каргония", Октоберфест + .desc = { ent-DrinkGlass.desc } + +ent-ADTDrinkLeafloverBeerGlass = { ent-DrinkGlass } + .suffix = Листолюб особый, Октоберфест + .desc = { ent-DrinkGlass.desc } + +ent-ADTDrinkScientificAleGlass = { ent-DrinkGlass } + .suffix = Научный плазмо-эль, Октоберфест + .desc = { ent-DrinkGlass.desc } + +ent-ADTDrinkUraniumAleGlass = { ent-DrinkGlass } + .suffix = Радиоактивный бледный эль "Отто", Октоберфест + .desc = { ent-DrinkGlass.desc } + +ent-ADTDrinkGoldenAleGlass = { ent-DrinkGlass } + .suffix = Золотой эль, Октоберфест + .desc = { ent-DrinkGlass.desc } + +ent-ADTDrinkSausageBeerGlass = { ent-DrinkGlass } + .suffix = Сосисочное пиво, Октоберфест + .desc = { ent-DrinkGlass.desc } + +ent-ADTDrinkTechnoBeerGlass = { ent-DrinkGlass } + .suffix = Пиво "Технарское", Октоберфест + .desc = { ent-DrinkGlass.desc } + +ent-ADTDrinkClassicPaulanerBeerGlass = { ent-DrinkGlass } + .suffix = Классический пауланер, Октоберфест + .desc = { ent-DrinkGlass.desc } + +ent-ADTDrinkLivseyBeerGlass = { ent-DrinkGlass } + .suffix = Пиво "Доктор Ливси", Октоберфест + .desc = { ent-DrinkGlass.desc } + +ent-ADTDrinkLuckyJonnyBeerGlass = { ent-DrinkGlass } + .suffix = Пиво "Счастливчик Джонни", Октоберфест + .desc = { ent-DrinkGlass.desc } + +ent-ADTDrinkSecUnfilteredBeerGlass = { ent-DrinkGlass } + .suffix = Пиво "Охранное нефильтрованное", Октоберфест + .desc = { ent-DrinkGlass.desc } + +ent-ADTDrinkGlyphidStoutBeerGlass = { ent-DrinkGlass } + .suffix = Глифидский стаут, Октоберфест + .desc = { ent-DrinkGlass.desc } + +ent-ADTDrinkCocoaGlass = стакан какао + .desc = Бодрящий и вкусный способ начать рабочий день + .suffix = Новый Год + ent-ADTDrinkOrangeTeaGlass = { ent-DrinkGlass } .suffix = Апельсиновый чай .desc = { ent-DrinkGlass.desc } @@ -113,3 +165,11 @@ ent-ADTTheSilverhandGlass = { ent-DrinkGlass } ent-ADTCoffeeBonBonGlass = { ent-DrinkGlass } .suffix = Кофе бон-бон .desc = { ent-DrinkGlass.desc } + +ent-ADTDrinkSuperScoutGlass = { ent-DrinkGlass } + .suffix = Пиво "Супер Скаут", Октоберфест + .desc = { ent-DrinkGlass.desc } + +ent-ADTDrinkFunnyClownGlass = { ent-DrinkGlass } + .suffix = Пиво "смешное бананопиво", Октоберфест + .desc = { ent-DrinkGlass.desc } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/Baked/cake.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/Baked/cake.ftl new file mode 100644 index 00000000000..01d0cd3aa1e --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/Baked/cake.ftl @@ -0,0 +1,20 @@ +ent-ADTFoodCakeChocolateGlazeHeart = торт в виде сердечка + .desc = Шоколадный торт в виде большого сердца, покрытый розовой глазурью. + .suffix = { "День Святого Валентина" } +ent-ADTFoodCakeChocolateGlazeHeartSlice = кусочек торта в виде сердечка + .desc = Небольшая часть шоколадного торта в виде сердца. + .suffix = { "День Святого Валентина" } + +ent-ADTFoodCakeChocolateHeart = торт в виде сердечка + .desc = Шоколадный торт в виде большого сердца, покрытый розовой глазурью. + .suffix = { "День Святого Валентина" } +ent-ADTFoodCakeChocolateHeartSlice = кусочек торта в виде сердечка + .desc = Небольшая часть шоколадного торта в виде сердца. + .suffix = { "День Святого Валентина" } + +ent-ADTFoodCakeStrawberryHeart = торт в виде сердечка + .desc = Шоколадный торт в виде большого сердца, покрытый розовой глазурью. + .suffix = { "День Святого Валентина" } +ent-ADTFoodCakeStrawberryHeartSlice = кусочек торта в виде сердечка + .desc = Небольшая часть шоколадного торта в виде сердца. + .suffix = { "День Святого Валентина" } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/Baked/misc.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/Baked/misc.ftl new file mode 100644 index 00000000000..685bb0096ab --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/Baked/misc.ftl @@ -0,0 +1,78 @@ +ent-ADTFoodBakedBrezel = брецель + .desc = Обычный крендель, популярная закуска на Октоберфесте. + .suffix = { "Октоберфест" } +ent-ADTFoodBakedBrezelPoppySeeds = брецель с маком + .desc = Крендель с маковой посыпкой, популярная закуская на Октоберфесте. + .suffix = { "Октоберфест" } +ent-ADTFoodBakedBrezelSalt = брецель с солью + .desc = Крендель с солью, популярная закуска на Октоберфесте. + .suffix = { "Октоберфест" } +ent-ADTFoodBakedBrezelChocolate = брецель с шоколадом + .desc = Крендель с шоколадной глазурью. Десерт для посиделок с пивом на Октоберфесте. + .suffix = { "Октоберфест" } +ent-ADTFoodBakedBrezelVanilla = брецель с ванилью + .desc = Крендель с ванильной глазурью. Десерт для посиделок с пивом на Октоберфесте. + .suffix = { "Октоберфест" } +ent-ADTFoodBakedBrezelPumpkin = брецель с тыквой + .desc = Крендель с тыквенной глазурью. Десерт для посиделок на Хеллоуине. + .suffix = Хеллоуин + +ent-ADTFoodBakedMuffinPumpkin = Кексик с тыквой + .desc = Тыквенный кексик с мордочкой на верхушке + .suffix = Хеллоуин + +ent-ADTFoodKulichSmall = маленький кулич + .desc = Крохотный кулич с изюмом, глазурью и посыпкой. Христос Воскресе! + .suffix = { "Пасха" } + +ent-ADTFoodKulichBig = большой кулич + .desc = Уже крупный кулич с изюмом, глазурью и посыпкой. Христос Воскресе! + .suffix = { "Пасха" } + +ent-ADTFoodKulichCheesy = творожный кулич + .desc = Тающий во рту кулич из нежнейшего творожного теста со сладкой глазурью сверху. Подойдет даже тем, кому мучное не по вкусу. Христос Воскресе! + .suffix = { "Пасха" } + +ent-ADTFoodSweetRoll = сладкий рулет + .desc = Дай-ка угадаю, ты хотел пошутить про кражу сладкого рулета? + .suffix = { "Пасха" } + +ent-ADTFoodCookieGhost = печенье призрак + .desc = Печенье в виде милого призрака, который вызывает лишь умиление. + .suffix = { "Хеллоуин" } + +ent-ADTFoodCookieSpider = печенье паук + .desc = Печенье в виде паука, который вряд ли вас укусит.. Если, конечно, вы не будете кусать его. + .suffix = { "Хеллоуин" } + +ent-ADTFoodCookieBlackcat = печенье кот + .desc = Печенье в виде черного кота, который не принесет неудачу.. у него ножек нет, чтобы перебегать дорогу. + .suffix = { "Хеллоуин" } + +ent-ADTFoodCookieKnight = печенье рыцарь + .desc = Печенье в виде рыцаря. Не содержит гвоздей. + .suffix = { "Хеллоуин" } + +ent-ADTFoodCookiePumpkin = кексик тыква + .desc = Печенье в виде тыквы, символа Хеллоуина! + .suffix = { "Хеллоуин" } + +ent-ADTFoodCookieSkull = печенье череп + .desc = Печенье в виде золотого черепа! + .suffix = { "Хеллоуин" } + +ent-ADTFoodDonutSpooky = пугающий пончик + .desc = Сладкий пончик в честь Хеллоуина. + .suffix = { "Хеллоуин" } + +ent-ADTFoodDonutJellySpooky = пугающий желейный пончик + .desc = Сладкий пончик в честь Хеллоуина. Содержит мармеладных червячков... а может и не мармеладных. + .suffix = { "Хеллоуин" } + +ent-ADTFoodCookieCaramelEar = слоёные ушки + .desc = Печенье из слоёного теста, которое имеет форму, напоминающую сердце. + .suffix = День Святого Валентина + +ent-ADTFoodCookieStrawberryHeart = клубничное печенье + .desc = Песочное печенье с ягодной начинкой из клубники. Думаю, ваша вторая половинка будет в восторге от такого десерта. + .suffix = День Святого Валентина diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/Baked/pie.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/Baked/pie.ftl new file mode 100644 index 00000000000..35f7039aa6e --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/Baked/pie.ftl @@ -0,0 +1,7 @@ +ent-ADTFoodPiePumpkin = тыквенный пирог + .suffix = Хеллоуин + .desc = Теплый, мягкий, вкусный и приготовленный с любовью к низкосортным ужастикам. + +ent-ADTFoodPiePumpkinSlice = кусочек тыквенного пирога + .suffix = Хеллоуин + .desc = Небольшая часть большой вкуснятины. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/chicken_meat.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/chicken_meat.ftl new file mode 100644 index 00000000000..d3f44b763ef --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/chicken_meat.ftl @@ -0,0 +1,26 @@ +ent-ADTChickenBody = куриная тушка + .desc = Общипанная и обезглавленная тушка курицы. Можно разделать на части, либо запечь целиком. + +ent-ADTFoodMeatChickenWing = сырое куриное крылышко + .desc = Куриное крылышко, еще сырое. Так и просится в кипящее масло. + +ent-ADTFoodMeatChickenLeg = сырая куриная ножка + .desc = Куриная ножка, еще сырая. Этот кусок мяса духовки просит! + +ent-ADTFoodMeatChickenBaked = запеченная курица + .desc = Тушка курицы, запеченная в духовке, с румяной корочкой и сочным мясом под ней. + +ent-ADTFoodMeatChickenBakedWithVegetables = запеченная фаршированная курица с овощами + .desc = Тушка курицы, фаршированная мясом и запеченная вместе с овощами. Такого блюда хватит на целый отдел разом. + +ent-ADTFoodMeatChickenBakedLeg = запеченная куриная ножка + .desc = Сочная и румяная куриная ножка с хрустящей кожицей. Не забудьте вытереть руки после еды. + +ent-ADTFoodMeatChickenBakedWing = запеченное куриное крылышко + .desc = Запеченное куриное крылышко. Вкуснятина. + +ent-ADTFoodMeatChickenBakedSlice = кусок запеченной курицы + .desc = Отрезанный от цельной запеченной курицы кусочек. + +ent-ADTFoodMeatChickenBakedStuffedSlice = кусок запеченной фаршированной курицы + .desc = Отрезанный от цельной запеченной и фаршированной курицы кусочек. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/creme_brulee.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/creme_brulee.ftl new file mode 100644 index 00000000000..702ca7bed82 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/creme_brulee.ftl @@ -0,0 +1,5 @@ +ent-ADTBrouletTorched = крем-брюле + .desc = Крем-брюле с хрустящей и поджаристой корочкой, напоминающей карамель. + +ent-ADTCremeBroulet = крем-брюле + .desc = Лёгкий крем-брюле без карамелизации сахара. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/mandarin.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/mandarin.ftl new file mode 100644 index 00000000000..e035257b6aa --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/mandarin.ftl @@ -0,0 +1,27 @@ +# by ModerN https://github.com/modern-nm/ for Adventure Time project https://discord.gg/D5hnyn2nFA +# плод +ent-ADTFoodMandarin = мандарин + .desc = Полезный, оранжевый. + .suffix = Новый год +# очищенный плод. +ent-ADTFoodMandarinPeeled = очищенный мандарин + .desc = Освобождённый от шкурки мандарин. Что, уже праздники? + .suffix = Новый год +# кожура +ent-ADTTrashMandarinPeel = мандариновая кожура + .desc = Пахнет новым годом. + .suffix = Новый год +# долька +ent-ADTFoodMandarinSlice = мандариновая долька + .desc = Пахнет новым годом. + .suffix = Новый год +# пакет семян +ent-ADTMandarinSeeds = пакет семян (мандарин) + .desc = Ох, скорей бы выросли! + .suffix = Новый год +# семяна +seeds-mandarin-name = мандарин +seeds-mandarin-display-name = мандарин +# сок +reagent-name-juice-mandarin = мандариновый сок +reagent-desc-juice-mandarin = И вкусно, и богато витамином C. Чего ещё желать? diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/meat.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/meat.ftl index 1bcb96dbc2c..6e8274d6a77 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/meat.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/meat.ftl @@ -6,6 +6,12 @@ ent-ADTFoodMeatShadekinCooked = стейк из сумеречника .desc = Приготовленный стейк. Выглядит не очень аппетитно. ent-ADTFoodMeatShadekinCutletCooked = котлета из сумеречника .desc = Выглядит как неудачная попытка пошутить. +ent-ADTFoodMeatWeissWurst = вайсвурст + .desc = Традиционная белая баварская колбаска из говядины, сала и специй. + .suffix = { "Октоберфест" } +ent-ADTFoodMeatBratWurst = братвурст + .desc = Зажаренная колбаска из свинины, очень жирная и аппетитная. + .suffix = { "Октоберфест" } ent-ADTFoodMeatFish = сырой кусок рыбы .desc = Даже в сыром виде он довольно вкусный. ent-ADTFoodFishCutlet = рыбный слайс diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/service_update.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/service_update.ftl new file mode 100644 index 00000000000..1e5867d182a --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/service_update.ftl @@ -0,0 +1,2 @@ +ent-ADTHypoAllergenChocolateBar = плитка гипоаллергенного шоколада + .desc = На вкус как картон, но теперь безопасный для унатхов, вульп и прочих. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/snacks.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/snacks.ftl index 02efc3187d8..8c7d2ddc444 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/snacks.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/snacks.ftl @@ -44,7 +44,7 @@ ent-ADTFoodPacketSpicyTrash = пустая упаковка от чипсов Ф ent-ADTFoodPacketBeefTrash = пустая упаковка от вяленой говядины .desc = Мусор -ent-ADTFoodPacketChickenTrash = пустая упаковка от сушеного куриного мяся +ent-ADTFoodPacketChickenTrash = пустая упаковка от сушеного куриного мяса .desc = Мусор ent-ADTFoodPacketHorseTrash = пустая упаковка от сушеной конины @@ -113,3 +113,176 @@ ent-ADTFoodSnackChocolateTrashPink = обертка от Розовый шоко ent-ADTFoodSnackChocolateTrashTwo = обертка от Двойного батончика .desc = Мусор + +ent-ADTFoodSnackBlackCandies = черные конфетки + .suffix = Хеллоуин + .desc = Это точно сладость. + +ent-ADTFoodSnackGreenCandies = зеленые конфетки + .suffix = Хеллоуин + .desc = Это точно сладость. + +ent-ADTFoodSnackRedCandies = красные конфетки + .suffix = Хеллоуин + .desc = Это точно сладость. + +ent-ADTFoodSnackVioletCandies = фиолетовые конфетки + .suffix = Хеллоуин + .desc = Это точно сладость. + +ent-ADTFoodSnackYellowCandies = желтые конфетки + .suffix = Хеллоуин + .desc = Это точно сладость. + +ent-ADTFoodSnackCandyBat = леденец в виде мыши + .suffix = Хеллоуин + .desc = Абсолютно безопасен и не разносит вирусов. + +ent-ADTFoodSnackBunny = шоколадный заяц + .suffix = Хеллоуин + .desc = Вкусен, шоколаден, ласков и возможно даже мерзавец. + +ent-ADTFoodSnackCoinCandies = шоколадная монетка + .suffix = Хеллоуин + .desc = Оказывается, что деньги тоже можно съесть? Можно. Является узаконенным платежным средством во всех детских садах NanoTrasen. + +ent-ADTFoodSnackBrains = желейные мозги + .suffix = Хеллоуин + .desc = Груол..мазгиииии. + +ent-ADTFoodSnackHeart = мармеладное сердце + .suffix = Хеллоуин + .desc = Это не атомное сердце, но, по крайней мере, лучше...чем ничего. + +ent-ADTFoodSnackWorms = горсть мармеладных червячков + .suffix = Хеллоуин + .desc = Куча из мармеладных червей с разными вкусами - от яблока до ананаса. + +ent-ADTFoodSnackHLCaramel = хеллоуинская карамельная трость + .suffix = Хеллоуин + .desc = Твёрдая карамельная палочка в форме трости. Жутко выглядит и успешно конкурирует с битой бармена за выбитые зубы! + +ent-ADTFoodSnackMintCaramel = мятная карамельная трость + .suffix = Хеллоуин + .desc = Твёрдая карамельная палочка в форме трости. На вкус напоминает мяту. + +ent-ADTFoodSnackCandyEyes = мармеладные глаза + .suffix = Хеллоуин + .desc = Вкусные и сладкие, с красной начинкой внутри. Их едят - а они глядят. + +ent-ADTFoodSnackCandyEyes1 = мармеладный глаз + .suffix = Хеллоуин + .desc = Вкусный и сладкий, с красной начинкой внутри. Его едят - а он смотрит. + +ent-ADTFoodSnackCandyEyes2 = мармеладные глаза + .suffix = Хеллоуин + .desc = Вкусные и сладкие, с красной начинкой внутри. Их едят - а они глядят. + +ent-ADTFoodSnackCandyCorn = кукурузная карамелька + .suffix = Хеллоуин + .desc = Маленькая карамелька, сладость ценою в один зуб. + +ent-ADTFoodSnackCandyBlue = синий леденец + .suffix = Хеллоуин + .desc = Обычный кусочек остывшей карамели, воткнутый в деревянную палочку. На вкус напоминает мяту. + +ent-ADTFoodSnackCandyGoW = леденец убийцы богов + .suffix = Хеллоуин + .desc = После того, как боги убили его семью, этот леденец поклялся убить всех богов Олимпа до единого. Говорят, он уже застревал в глотке одного из них. + +ent-ADTFoodSnackCandyGreen = зеленый леденец + .suffix = Хеллоуин + .desc = Обычный кусочек остывшей карамели, воткнутый в деревянную палочку. На вкус напоминает яблоко. + +ent-ADTFoodSnackCandyMine = леденец зеленого существа + .suffix = Хеллоуин + .desc = Он кого-то очень сильно напоми...что это за шипение у меня за спиной? + +ent-ADTFoodSnackCandyRed = красный леденец + .suffix = Хеллоуин + .desc = Обычный кусочек остывшей карамели, воткнутый в деревянную палочку. На вкус напоминает вишню. + +ent-ADTFoodSnackCandyApple = яблочный леденец + .suffix = Хеллоуин + .desc = Обычный кусочек остывшей карамели, воткнутый в деревянную палочку. На вкус напоминает яблоко. + +ent-ADTFoodSnackCandyPurple = фиолетовый леденец + .suffix = Хеллоуин + .desc = Обычный кусочек остывшей карамели, воткнутый в деревянную палочку. На вкус напоминает чернику. + +ent-ADTFoodSnackCandyYellow = желтый леденец + .suffix = Хеллоуин + .desc = Обычный кусочек остывшей карамели, воткнутый в деревянную палочку. На вкус напоминает лимон. + +ent-ADTFoodSnackCandyKinito = экзотический леденец + .suffix = Хеллоуин + .desc = Обычный кусочек остывшей карамели, воткнутый в деревянную палочку. На вкус напоминает страх. + +ent-ADTFoodSnackCandyPumpkin = тыквенный леденец + .suffix = Хеллоуин + .desc = Обычный кусочек остывшей карамели, воткнутый в деревянную палочку. На вкус напоминает тыкву... + +#День Святого Валентина +ent-ADTFoodSnackMinichoco1Bar = конфетка + .desc = Для тебя! + .suffix = { "День Святого Валентина" } + +ent-ADTFoodSnackMinichoco2Bar = конфетка + .desc = Для тебя! + .suffix = { "День Святого Валентина" } + +ent-ADTFoodSnackMinichoco3Bar = конфетка + .desc = Для тебя! + .suffix = { "День Святого Валентина" } + +ent-ADTFoodSnackCandyLove = леденец в виде сердечка + .desc = Любовь сладка, как никогда! + .suffix = { "День Святого Валентина" } + +ent-ADTFoodSnackMinichoco1 = кремовая конфетка + .desc = Внутри кремовая начинка! + .suffix = { "День Святого Валентина" } + +ent-ADTFoodSnackMinichoco2 = кофейная конфетка + .desc = Любимая конфета кофемана. + .suffix = { "День Святого Валентина" } + +ent-ADTFoodSnackMinichoco3 = сливочная конфетка + .desc = Ммм, как вкусно! + .suffix = { "День Святого Валентина" } + +ent-ADTFoodSnackMinichoco4 = клубничная конфетка + .desc = Ты моя клубничка! + .suffix = { "День Святого Валентина" } + +ent-ADTFoodSnackMinichoco5 = молочная конфетка + .desc = Очень сладкая! + .suffix = { "День Святого Валентина" } + +ent-ADTFoodBananChocolate = банан в шоколаде + .desc = Банан на палочке, покрытый шоколадной глазурью. + .suffix = { "День Святого Валентина" } + +ent-ADTFoodBananChocolatePink = банан в розовом шоколаде + .desc = Банан на палочке, покрытый розовой глазурью. + .suffix = { "День Святого Валентина" } + +ent-ADTFoodEclairBrown = эклер + .desc = Нежное пирожное с заварным кремом. + .suffix = { "День Святого Валентина" } + +ent-ADTFoodEclairChocolate = эклер с шоколадной глазурью + .desc = Нежное пирожное с заварным кремом, покрытое шоколадом. + .suffix = { "День Святого Валентина" } + +ent-ADTFoodEclairWhite = эклер с белой глазурью + .desc = Нежное пирожное с заварным кремом, покрытое белой глазурью. + .suffix = { "День Святого Валентина" } + +ent-ADTFoodEclairPink = эклер с розовой глазурью + .desc = Нежное пирожное с заварным кремом, покрытое розовой глазурью. + .suffix = { "День Святого Валентина" } + +ent-ADTFoodEggBoiledEaster = пасхальное яйцо + .desc = Нежное отварное яичко с окрашенной скорлупой. Христос воскресе! + .suffix = { "Пасха" } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/soup.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/soup.ftl index bce6c2276df..7bf6c2d551b 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/soup.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/soup.ftl @@ -1,5 +1,8 @@ ent-ADTFoodSoupSawdust = суп с опилками .desc = Ешьте, ведь потом вам нужно будет топить генератор... +ent-ADTFoodSoupPumpkin = тыквенный суп + .desc = Сытный и кремоподобный суп из тыквы и других овощей. + ent-ADTFoodSoupUzbekPilaf = плов .desc = Национальные блюдо восточной и среднеазиатской кухни. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/strawberry_mousse.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/strawberry_mousse.ftl new file mode 100644 index 00000000000..01a1bf5538e --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Consumable/Food/strawberry_mousse.ftl @@ -0,0 +1,2 @@ +ent-ADTStrawberryMousse = клубничный мусс + .desc = Лёгкий и воздушный десерт из замороженной клубники, который порадует вас своим ярким вкусом и ароматом. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Decoration/presentSelect.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Decoration/presentSelect.ftl new file mode 100644 index 00000000000..de1c44794b7 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Decoration/presentSelect.ftl @@ -0,0 +1,3 @@ +ent-ADTPresentSelected = { ent-PresentBase } + .desc = { ent-PresentBase.desc } + .suffix = Выбор подарка \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Fun/misc.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Fun/misc.ftl index aeeaea4c66b..6b692fffa59 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Fun/misc.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Fun/misc.ftl @@ -1,3 +1,6 @@ +ent-ADTHalloweenBroom = ведьмина метла + .suffix = Хеллоуин + .desc = Время полетать, ихихихиа! ent-ADTPaperCrane = бумажный журавлик .desc = Аккуратная поделка в виде журавлика, сделанная из бумаги. ent-ADTPaperShip = бумажный кораблик @@ -5,3 +8,7 @@ ent-ADTPaperShip = бумажный кораблик ent-UplinkLighterBox = коробка с контрабандными зажигалками или спичками. .desc = { ent-MysteryLighterBox.desc } .suffix = Uplink + +ent-ADTLethalCompanyAirHorn = велосипедный клаксон с баллоном + .suffix = Хеллоуин + .desc = Мощный гудок, который будет слышно по всей станции! \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/bowl.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/bowl.ftl new file mode 100644 index 00000000000..d9588404e2e --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/bowl.ftl @@ -0,0 +1,23 @@ +ent-ADTHalloweenCandyBowl = корзинка для хеллоуинских сладостей + .suffix = Хеллоуин + .desc = Сладость или гадость! + +ent-ADTHalloweenSmileCandyBowl = корзинка для хеллоуинских сладостей + .suffix = Хеллоуин + .desc = Сладость или гадость! + +ent-ADTHalloweenNTCandyBowl = корзинка NT для хеллоуинских сладостей + .suffix = Хеллоуин + .desc = Цель ЦК или ревизор! + +ent-ADTHalloweenSyndieCandyBowl = корзинка Синдиката для хеллоуинских сладостей + .suffix = Хеллоуин + .desc = Гадость или гадость! + +ent-ADTHalloweenZombieCandyBowl = зомби-корзинка для хеллоуинских сладостей + .suffix = Хеллоуин + .desc = Мазгиии или гадость! + +ent-ADTHalloweenSealCandyBowl = тюленья корзинка для хеллоуинских сладостей + .suffix = Хеллоуин + .desc = Сладость или гадость! Для настоящих космических котиков. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/candles.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/candles.ftl new file mode 100644 index 00000000000..75eb9beaf99 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/candles.ftl @@ -0,0 +1,12 @@ +ent-ADTGoldenCandleStick = золотой подсвечник + .suffix = Хеллоуин + .desc = Лампа, которая выглядит так, будто только что взята из древнего замка. + +ent-ADTSilverCandleStick = серебрянный подсвечник + .suffix = Хеллоуин + .desc = Лампа, которая выглядит так, будто только что взята из древнего замка. + +ent-ADTScullLamp = лампа-череп + .suffix = Хеллоуин + .desc = Лампа в виде черепа. Или это настоящий череп с лампочкой внутри? Или это светится неупокоенная душа? Никто не знает. + diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/valentine_cards.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/valentine_cards.ftl new file mode 100644 index 00000000000..611f489ef64 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Misc/valentine_cards.ftl @@ -0,0 +1,23 @@ +ent-ADTValentineCard1 = валентинка + .desc = Валентинка, на которой вы можете написать слова любви своей второй половинке + +ent-ADTValentineCard2 = { ent-ADTValentineCard1 } + .desc = { ent-ADTValentineCard1.desc } + +ent-ADTValentineCard3 = { ent-ADTValentineCard1 } + .desc = { ent-ADTValentineCard1.desc } + +ent-ADTValentineCard4 = { ent-ADTValentineCard1 } + .desc = { ent-ADTValentineCard1.desc } + +ent-ADTValentineCard5 = { ent-ADTValentineCard1 } + .desc = { ent-ADTValentineCard1.desc } + +ent-ADTValentineCard6 = { ent-ADTValentineCard1 } + .desc = { ent-ADTValentineCard1.desc } + +ent-ADTValentineCard7 = { ent-ADTValentineCard1 } + .desc = { ent-ADTValentineCard1.desc } + +ent-ADTValentineCard8 = { ent-ADTValentineCard1 } + .desc = { ent-ADTValentineCard1.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Service/Bouquets.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Service/Bouquets.ftl index 5b115d6a640..107d04e98b2 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Service/Bouquets.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Specific/Service/Bouquets.ftl @@ -10,3 +10,27 @@ ent-ADTObjectBouquetWithBeer = пивной букет .desc = Будьте уникальным! Подарите букет который можно съесть, заодно опрокинув по бутылочке пивасика. ent-ADTObjectLiliacBouquet = сиреневый букет .desc = Маленький шедевр генетики - розы сорта "Флидефарбен Розен". Приобрели не только цвет, но и запах сирени + +ent-ADTObjectBouquetDarkRose = букет чёрной розы + .desc = Цветы чёрных роз прорастают исключительно на трупах, однако, несмотря на мерзкое происхождение, они очень красивы. + .suffix = { "День Святого Валентина" } + +ent-ADTObjectBouquetGalakto = букет галакточертополоха + .desc= Подарите своему любимому химику на станции! + .suffix = { "День Святого Валентина" } + +ent-ADTObjectBouquetMac = букет мака + .desc = Длинный тонкий стебелёк, сверху — алый огонёк. Не растениее, а маяк — это ярко-красный мак! + .suffix = { "День Святого Валентина" } + +ent-ADTObjectBouquetMix = букет цветов + .desc = Букет из разных цветов, ярких и красочных, как ты! + .suffix = { "День Святого Валентина" } + +ent-ADTObjectBouquetRose = букет цветов + .desc = Эти розы для тебя + .suffix = { "День Святого Валентина" } + +ent-ADTObjectBouquetYellow = букет одуванчиков + .desc = Выглядит дешево и просто, однако важное — это внимание! + .suffix = { "День Святого Валентина" } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Storage/boxes.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Storage/boxes.ftl index 7a26597d0c8..901fc91a965 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Storage/boxes.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Storage/boxes.ftl @@ -1,3 +1,115 @@ +ent-ADTBoxNightmareClown = набор ужасающего костюма клоуна + .suffix = Хеллоуин + .desc = Если ты увидишь красный шарик... "Оно" тут. Обернись. + +ent-ADTBoxCrueltySquad = набор био-наемника Cruelty Squad + .suffix = Хеллоуин + .desc = Набор вещей, необходимых для работы в сфере заказных убийств. + +ent-ADTBoxJason = набор Маньяка из Пятницы 13-е + .suffix = Хеллоуин + .desc = Набор вещей маньяка в хоккейной маске, который очень жестоко расправляется со своими жертвами. + +ent-ADTBoxVyazov = набор Фредди Крюгера + .suffix = Хеллоуин + .desc = Набор вещей маньяка, приходящего в кошмарных снах. + +ent-ADTBoxHotlineMiami = набор Потрошителя из Майами + .suffix = Хеллоуин + .desc = Набор вещей любителя разговоров по телефону и психопата, известного как Майамский Потрошитель. + +ent-ADTBoxKilla = набор костюма Киллы + .suffix = Хеллоуин + .desc = Набор вещей для костюма босса бандитов с тремя полосками. С ним вы сможете навести суету и защитить свой торговый центр. + +ent-ADTBoxServantOfEvil = набор прислужника Зла + .suffix = Хеллоуин + .desc = Набор вещей для маленького и желтого прислужника Зла. Бана-а-а-нааа! + +ent-ADTBoxDude = набор вещей Чувака + .suffix = Хеллоуин + .desc = Набор вещей для костюма того самого Чувака! Избивай мужика в костюме хрена, и не забывай заставлять людей подписывать твою петицию! + +ent-ADTBoxSquidPlayers = набор игроков Игры Кальмара + .suffix = Хеллоуин + .desc = Коробка с пятью наборами одежды для игроков. + +ent-ADTBoxSquidOrganizer = набор организатора Игры Кальмара + .suffix = Хеллоуин + .desc = Коробка с набором для любого из организаторов Игр. + +ent-ADTBoxTagilla = набор одежды дикого начальника Завода + .suffix = Хеллоуин + .desc = Набор вещей для костюма обезумевшего работника "Полихима"", у которого двинулась крыша на почве попыток превзойти своего старшего брата. + +ent-ADTBoxNevadaClown = набор невадского клоуна-психопата + .suffix = Хеллоуин + .desc = Набор вещей для костюма клоун-психопата, проживавшего в Неваде и наводившего там суету. + +ent-ADTBoxTransilvania = набор Трансильванского Кровопийцы + .suffix = Хеллоуин + .desc = Набор вещей для костюма монстра-аристократа, прямиком из Трансильвании. + +ent-ADTBoxVergile = набор Верджила + .suffix = Хеллоуин + .desc = Коробка вещей человека, который после гибели матери разошелся со своим братом-близнецом, отверг свою человечность и принял демоническое наследие своего отца. + +ent-ADTXenoBox = набор ксеноморфа + .suffix = Хеллоуин + .desc = Коробка с набором нескольких костюмов ксеноморфа. + +ent-ADTSuperstarPoliceBox = набор полицейского-суперзвезды + .suffix = Хеллоуин + .desc = Костюм полицейского суперзвезды прямиком из Ревашоль. Только для ценителей саморазрушения! + +ent-ADTSuperstarPoliceWingmanBox = набор напарника полицейского-суперзвезды + .suffix = Хеллоуин + .desc = Костюм лейтенанта из 51-го участка, прибывшего помочь суперзвезде в деле с повешенным трупом возле бара. + +ent-ADTBunnyDancerBox = набор кроличьей танцовщицы + .suffix = Хеллоуин + .desc = Торт и шест в наборе не представлены. + +ent-ADTBoxHalloweenCandy = коробка хеллоуинских сладостей + .suffix = Хеллоуин + .desc = Их тут и правда очень много. + +ent-ADTPayDayBox = набор весёлых масок "4 костюма в один набор!" + .suffix = Хеллоуин + .desc = Набор из четырёх абсолютно непримечательных масок, которые помогут вам в быстрых выплатах от банка. + +ent-ADTChainSawManBox = набор Человека-бензопилы + .suffix = Хеллоуин + .desc = Набор вещей для костюма человека, полного амбиций и желаний, а именно: вкусно поесть, поспать на кровати, а также полапать женскую грудь! + +ent-ADTMichaelMyersBox = набор Майкла Майерса + .suffix = Хеллоуин + .desc = Коробка с костюмом главного героя старого, даже архаичного фильма "Хеллоуин". + +ent-ADTBoxRedHat = набор Красной Шапочки + .suffix = Хеллоуин + .desc = Бабушка, а почему у тебя такие большие зубы? + +ent-ADTBoxSollux = набор тролля "Близнецы" + .suffix = Хеллоуин + .desc = Да отстаньте от меня. + +ent-ADTBoxLethalCompany = набор сотрудника Смертельной компании + .suffix = Хеллоуин + .desc = Одноразовые сотрудники сегодня пользуются популярностью! + +ent-ADTBoxBadPolice = набор "плохого" полицейского + .suffix = Хеллоуин + .desc = Тот самый случай, когда хочется быть арестованным. + +ent-ADTBoxEmpressOfLight = набор императрицы света + .suffix = Хеллоуин + .desc = Набор из одежды, посвященной боссу из одной очень старой игры. + +ent-ADTBoxRadioDemon = набор радио-демона + .suffix = Хеллоуин + .desc = Набор из одежды, посвященной старому, стыдному оригинальному персонажу девушки с СДВГ. + ent-ADTBoxAICircuitBoard = коробка запасных плат законов ИИ .desc = Коробка запасных плат законов ИИ. На коробке имеется наклейка с текстом "Только для экстренных ситуаций!" diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Tools/gas_tanks.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Tools/gas_tanks.ftl new file mode 100644 index 00000000000..99638fa4c54 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Tools/gas_tanks.ftl @@ -0,0 +1,7 @@ +ent-ADTDoubleLethalCompanyOxygenTank = двойной аварийный кислородный баллон + .desc = Высококлассный двухбаллонный резервуар аварийного жизнеобеспечения. Вмещает приличное для своих небольших размеров количество кислорода. Вмещает 2,5 Л газа. + .suffix = Хеллоуин + +ent-ADTDoubleLethalCompanyNitrogenTank = двойной аварийный азотный баллон + .desc = Высококлассный двухбаллонный резервуар аварийного жизнеобеспечения. Вмещает приличное для своих небольших размеров количество азота. Вмещает 2,5 Л газа. + .suffix = Хеллоуин \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/hammer_tagilla.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/hammer_tagilla.ftl new file mode 100644 index 00000000000..82c2d1d683d --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/hammer_tagilla.ftl @@ -0,0 +1,7 @@ +ent-ADTTagillaSledgehammerToy = кувалда Тагиллы + .suffix = Хеллоуин + .desc = Мощная кувалда Тагиллы! На ваше счастье это лишь игрушка. + +ent-ADTTagillaSledgehammerReal = кувалда Тагиллы + .suffix = Хеллоуин + .desc = Мощная кувалда Тагиллы!... стоп, почему она такая тяжёлая.. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/melee.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/melee.ftl index c4bf5221050..96dd118c116 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/melee.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Objects/Weapons/Melee/melee.ftl @@ -60,6 +60,10 @@ ent-HereticBladeBlade = расколотый клинок ent-ADTWeaponSworldMimicry = мимикрический клинок .desc = Вам становится не по себе от одного вида данного меча и его носителя... +ent-ADTJasonMachette = мачете Джейсона + .suffix = Хеллоуин + .desc = Мачете одного из самых ужасающих маньяков. Сбоку маленькая надпись "полиуретан". + ent-ADTMosinBayonet = штык от винтовки Мосина .desc = Потому что раны от игольчатого штыка невозможно зашить... diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Decorations/plants.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Decorations/plants.ftl new file mode 100644 index 00000000000..820dc4cd706 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Decorations/plants.ftl @@ -0,0 +1,7 @@ +ent-ADTHalloweenPottedPlant1 = черепоцветочек + .suffix = Хеллоуин + .desc = Вам не кажется, что от него издается скрежет зубов. + +ent-ADTHalloweenPottedPlant2 = зомбицветочек + .suffix = Хеллоуин + .desc = Пахнет умиротворением и разложением. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Decorations/statues.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Decorations/statues.ftl index 8be644dd9f2..db3d902adca 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Decorations/statues.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Decorations/statues.ftl @@ -1,3 +1,11 @@ +ent-ADTStatueBeerMessiahLeft = статуя пивного мессии + .desc = Древняя гранитная статуя высшего существа, дарующего первым людям ПИВО + .suffix = Октоберфест, Левая + +ent-ADTStatueBeerMessiahRight = статуя пивного мессии + .desc = Древняя гранитная статуя высшего существа, дарующего первым людям ПИВО + .suffix = Октоберфест, Правая + ent-ADTStatueCryingAngel = { ent-ADTMobAngelCrying } .desc = { ent-ADTMobAngelCrying.desc } .suffix = { "Статуя" } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Dispensers/cauldron.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Dispensers/cauldron.ftl new file mode 100644 index 00000000000..3e7e4c61319 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Dispensers/cauldron.ftl @@ -0,0 +1,3 @@ +ent-ADTWitchCauldron = ведьминский котёл + .suffix = Хеллоуин + .desc = Я хочу приготовить что-нибудь... волшебное... \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/chairs.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/chairs.ftl index cd50e335e86..a97ddf27aba 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/chairs.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/chairs.ftl @@ -7,6 +7,10 @@ ent-ADTChairRed = красный деревянный стул ent-ADTChairWhite = белый деревянный стул .desc = Комфортный белый стул с белой спинкой и сидалищем +ent-ADTChairOktoberfest = роскошный праздничный стул + .desc = Комфортнейший стул для праздника пива. + .suffix = { "Октоберфест" } + ent-ADTChairRusty = ржавый стул .desc = Вам лучше не сидеть на нём. @@ -40,6 +44,10 @@ ent-ADTArmchairBlue = синее кресло ent-ADTArmchairBlue2 = { ent-ADTArmchairBlue } .desc = { ent-ADTArmchairWhite.desc } +ent-ADTSpiderStool = паучий стул + .suffix = Хеллоуин + .desc = Выглядит страшноватенько. + ent-ADTBarberChair = парикмахерское кресло .desc = Очень удобное кресло, предназначенное для работы парикмахера. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/misc.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/misc.ftl index 02342558ea7..eadb275111c 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/misc.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/misc.ftl @@ -1,2 +1,50 @@ ent-ADTDiscoBall = диско-шар .desc = Ярко светящаяся сфера из которой так и разбегается свет. + +ent-ADTHalloweenPumpkinLight1 = тыквенный светильник + .suffix = Хеллоуин + .desc = Фонарь, сделанный из тыквы. + +ent-ADTHalloweenPumpkinLight2 = тыквенный светильник + .suffix = Хеллоуин + .desc = Фонарь, сделанный из тыквы. + +ent-ADTHalloweenPumpkinLight3 = тыквенный светильник + .suffix = Хеллоуин + .desc = Фонарь, сделанный из тыквы. + +ent-ADTHalloweenPumpkinLight4 = тыквенный светильник + .suffix = Хеллоуин + .desc = Фонарь, сделанный из тыквы. + +ent-ADTHalloweenPumpkinLight5 = тыквенный светильник + .suffix = Хеллоуин + .desc = Фонарь, сделанный из тыквы. + +ent-ADTHalloweenCarvedPumpkinSmile = вырезанная тыква + .suffix = Хеллоуин + .desc = Тыква с вырезом в виде страшного лица + +ent-ADTHalloweenCarvedPumpkinCube = { ent-ADTHalloweenCarvedPumpkinSmile } + .suffix = { ent-ADTHalloweenCarvedPumpkinSmile.suffix } + .desc = { ent-ADTHalloweenCarvedPumpkinSmile.desc } + +ent-ADTHalloweenCarvedPumpkinWily = { ent-ADTHalloweenCarvedPumpkinSmile } + .suffix = { ent-ADTHalloweenCarvedPumpkinSmile.suffix } + .desc = { ent-ADTHalloweenCarvedPumpkinSmile.desc } + +ent-ADTSnowballsCrate = телега со снегом + .suffix = New Year + .desc = Ради неё вовсе не разрушают чьи-то планеты... Вовсе нет. + +ent-ADTNewYearKatalka = зимние сани + .suffix = New Year + .desc = Такси бизнес-класса, потому что упряжка не рассчитана под стадо оленей. + +ent-ADTSnowball = снежок + .suffix = New Year + .desc = Снаряд опаснее всякой пули... БЕРЕГИСЬ! + +ent-ADTSlimeHappines = экстракт счастья + .suffix = New Year + .desc = Концентрация искреннего счастья слаймолюдов, полученная абсолютно гуманным путём diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/tables.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/tables.ftl index 3b3f2207509..70093f47d42 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/tables.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Furniture/tables.ftl @@ -16,5 +16,13 @@ ent-ADTTableRoundWood = деревянный круглый столик ent-ADTTableRoundGlass = стеклянный круглый столик .desc = Круглый столик, сделанный из стекла. +ent-ADTTableOktoberfest = стол для Октоберфеста + .suffix = { "Октоберфест" } + .desc = Стол, способный выдержать очень много выпивки и закусок. + +ent-ADTTableOktoberfestOrange = стол с оранжевой скатертью для Октоберфеста + .suffix = { "Октоберфест" } + .desc = { ent-ADTTableOktoberfest } + ent-ADTTableRusty = ржавый стол .desc = Старый и ржавый металлический стол. Уж лучше поесть с пола, чем с него. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Machines/vending_machines.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Machines/vending_machines.ftl index 5d7516e35fa..eb045491d1b 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Machines/vending_machines.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Machines/vending_machines.ftl @@ -5,6 +5,10 @@ ent-ADTVendingMachineTSFArmoury = оружейная ТСФ .desc = Связанный с удаленным хранилищем шкаф, используемый для выдачи оружия и экипировки бойцов ТСФ. .suffix = { "ТСФ" } +ent-ADTVendingMachineHalloween = Хеллоуиномат + .suffix = Хеллоуин + .desc = Торговый автомат со всем, что нужно для Хеллоуина. + ent-ADTVendingMachinePill = ТаблеткоМат .desc = (Почти) практическое решение всех ваших болячек. ent-ADTVendingMachineParaDrobe = ПараШкаф @@ -30,5 +34,9 @@ ent-ADTVendingMachineCoffeeFree = Лучшие горячие напитки С .suffix = Бесплатный .desc = Подаются кипящими, чтобы оставались горячими всю смену! +ent-ADTVendingMachineLoveVend = Любовенд + .desc = С днём всех влюбленных! + .suffix = { "День Святого Валентина" } + ent-ADTVendingMachineBarberDrobe = БарберШкаф .desc = Торговый автомат со стильной одеждой для парикмахера. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Storage/Tanks/tanks.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Storage/Tanks/tanks.ftl new file mode 100644 index 00000000000..346d6ae1090 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Storage/Tanks/tanks.ftl @@ -0,0 +1,33 @@ +ent-ADTBeerTankCargo = бочка зубодробительного пива "Каргония" + .desc = Деревянная бочка, до краев заполненная напитком для настоящих профессионалов. + .suffix = { "Октоберфест" } +ent-ADTBeerTankLeaflover = бочка листолюба особого + .desc = Деревянная бочка, до краев заполненная пивом с нулевым содержанием алкоголя. Пахнет слабостью. + .suffix = { "Октоберфест" } +ent-ADTBeerTankScientificAle = бочка научного плазмо-эля + .desc = Деревянная бочка, до краев заполненная чистейшей плазменной амброзией. + .suffix = { "Октоберфест" } +ent-ADTBeerTankGoldenAle = бочка золотого эля + .desc = Деревянная бочка, до краев заполненная золотым элем. Прямиком из Кальдемонта. + .suffix = { "Октоберфест" } +ent-ADTBeerTankSausage = бочка сосисочного пива + .desc = Деревянная бочка, до краев заполненная лучшим сосисочным пивом. Звезда Октоберфеста. + .suffix = { "Октоберфест" } +ent-ADTBeerTankTechno = бочка пива "Технарское" + .desc = Деревянная бочка, до краев заполненная пивом "Технарское". Пахнет машинным маслом. + .suffix = { "Октоберфест" } +ent-ADTBeerTankClassicPaulaner = бочка классического пауланера + .desc = Большая бочка, до краев заполненная классическим пивом с многовековой историей. + .suffix = { "Октоберфест" } +ent-ADTBeerTankLivsey = бочка пива "Доктор Ливси" + .desc = Деревянная бочка, до краев заполненная пивом "Доктор Ливси". Если её лизнуть - на вкус как бикаридин. + .suffix = { "Октоберфест" } +ent-ADTBeerTankLuckyJonny = бочка пива "Счастливчик Джонни" + .desc = Деревянная бочка, до краев заполненная пивом "Счастливчик Джонни". В манифесте к бочке должна прилагаться форма для записи наркотрипа, но её забыли. + .suffix = { "Октоберфест" } +ent-ADTBeerTankSecUnfiltered = бочка пива "Охранное Нефильтрованное" + .desc = Деревянная бочка, до краев заполненная пивом "Охранное Нефильтрованное". Взята прямо с брифинга на Дельте. + .suffix = { "Октоберфест" } +ent-ADTBeerTankGlyphidStout = бочка пива "Глифидский Стаут" + .desc = Деревянная бочка, до краев заполненная пивом "Глифидский Стаут". Молли в комплекте не идет. + .suffix = { "Октоберфест" } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Storage/storage.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Storage/storage.ftl index bc875feffaf..9437155f43a 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Storage/storage.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Storage/storage.ftl @@ -1,2 +1,6 @@ +ent-ADTWoodenTradeRack = ярмарочный прилавок + .desc = Деревянный прилавок для выставления товаров на продажу. + .suffix = Октоберфест + ent-ADTPlantBox = ящик для растений .desc = Деревянный ящик для хранения разнообразных агро культур. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Wallmount/Signs/posters.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Wallmount/Signs/posters.ftl index 64c78a2f010..4bdc8c30cbf 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Wallmount/Signs/posters.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Wallmount/Signs/posters.ftl @@ -11,6 +11,14 @@ ent-ADTPosterLegitGreatFood = Шикарная еда! ent-ADTPosterLegitTurnOnSensors = Включи координаты! .desc = Напоминание от парамедиков - включите датчики в режим координат, чтобы если вы в беде - вас быстро нашли. +ent-ADTPosterLegitOktoberfest = Октоберфест! + .desc = Плакат с таяранкой, рекламирующий традиционный октябрьский праздник пива. + .suffix = { "Октоберфест" } + +ent-ADTPosterLegitOktoberfest2 = Октоберфест! + .desc = Плакат с пивной кружкой, напоминающий о традиционном октябрьском празднике пива. + .suffix = { "Октоберфест" } + ent-ADTPosterContrabandLustTayaran = Похотливая таяранка .desc = Плакат с таяранкой привлекательной внешности и в вызывающем костюме. Быть красивыми могут и таяры. @@ -202,3 +210,63 @@ ent-ADTPosterHalloweenSpiderWeb1 = паутина ent-ADTPosterHalloweenSpiderWeb2 = паутина .suffix = Хеллоуин .desc = Дом паука Аркадия. + +ent-ADTPosterHalloweenSpider = паучок + .suffix = Хеллоуин + .desc = Большой паук, который пришел украсть ваши сладости! + +ent-ADTPosterHappyHalloween = Счастливого Хеллоуина! + .suffix = Хеллоуин + .desc = Плакат в честь пугающего праздника - Хеллоуина. + +ent-ADTPosterHappyHalloween2 = Счастливого Хеллоуина! + .suffix = Хеллоуин + .desc = Плакат в честь пугающего праздника - Хеллоуина. + +ent-ADTPosterHappyHalloween3 = Счастливого Хеллоуина! + .suffix = Хеллоуин + .desc = Плакат в честь пугающего праздника - Хеллоуина. + +ent-ADTPosterTayarHalloween = Счастливого Хеллоуина! + .suffix = Хеллоуин + .desc = Плакат в честь пугающего праздника - Хеллоуина. + +ent-ADTPosterHalloweenSpooky = Тыква + .suffix = Хеллоуин + .desc = Постер с тыквой... стоп, она следит за мной?.. + +ent-ADTPosterHalloweenYummy = Пасть + .suffix = Хеллоуин + .desc = Постер с жуткой пастью, но не переживайте, она вас не съест.. пока что.. + +ent-ADTDVLoveContraband = Любовь, которая пронзает сердце. + .suffix = День Святого Валентина + .desc = Купите пиломеч для себя и своей второй половинки, а третий экземпляр мы подарим вам совершенно бесплатно! + +ent-ADTSpaceLoveContraband = Проведём этот день вместе! + .suffix = День Святого Валентина + .desc = Плакат с поздравлением ко Дню святого Валентина. + +ent-ADTValentinaLegit = Любовь это... + .suffix = День Святого Валентина + .desc = Летать вместе на воздушном шаре. + +ent-ADTValentina2Legit = Любовь это... + .suffix = День Святого Валентина + .desc = Ощущение, которое проникает в самое сердце. + +ent-ADTValentina3Legit = Любовь это... + .suffix = День Святого Валентина + .desc = Дарить своему избраннику сладость. + +ent-ADTValentina4Legit = Любовь это... + .suffix = День Святого Валентина + .desc = Счастье - это не только для двоих. + +ent-ADTValentina5Legit = Любовь это... + .suffix = День Святого Валентина + .desc = Просто быть вместе. + +ent-ADTValentina6Legit = Любовь это... + .suffix = День Святого Валентина + .desc = Верность своему возлюбленному. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Wallmount/hanging_hearts.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Wallmount/hanging_hearts.ftl new file mode 100644 index 00000000000..8e78b0fe744 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Wallmount/hanging_hearts.ftl @@ -0,0 +1,15 @@ +ent-ADTHangingHearts = висячие сердечки + .suffix = День Святого Валентина + .desc = Декоративные сердечки, свисающие с веревки. По крайней мере, они не настоящие. + +ent-ADTHangingHearts2 = { ent-ADTHangingHearts } + .suffix = { ent-ADTHangingHearts.suffix } + .desc = { ent-ADTHangingHearts.desc } + +ent-ADTHangingHearts3 = { ent-ADTHangingHearts } + .suffix = { ent-ADTHangingHearts.suffix } + .desc = { ent-ADTHangingHearts.desc } + +ent-ADTHangingHearts4 = { ent-ADTHangingHearts } + .suffix = { ent-ADTHangingHearts.suffix } + .desc = { ent-ADTHangingHearts.desc } diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Wallmount/triangles.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Wallmount/triangles.ftl new file mode 100644 index 00000000000..0a3fdab9d00 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/Wallmount/triangles.ftl @@ -0,0 +1,51 @@ +ent-ADTPosterHalloweenTrianglesBlackOrange1 = чёрно-оранживые флажки + .suffix = Хеллоуин + .desc = Чёрно-оранживые флажки. Аккуратней, за ними, возможно, спрятался паук! + +ent-ADTPosterHalloweenTrianglesBlackOrange2 = чёрно-оранживые флажки + .suffix = Хеллоуин + .desc = Чёрно-оранживые флажки. Аккуратней, за ними, возможно, спрятался паук! + +ent-ADTPosterHalloweenTrianglesBlackOrange3 = чёрно-оранживые флажки + .suffix = Хеллоуин + .desc = Чёрно-оранживые флажки. Аккуратней, за ними, возможно, спрятался паук! + +ent-ADTPosterHalloweenTrianglesBlackWhite1 = чёрно-белые флажки + .suffix = Хеллоуин + .desc = Чёрно-белые флажки. Аккуратней, за ними, возможно, спрятался призрак! + +ent-ADTPosterHalloweenTrianglesBlackWhite2 = чёрно-белые флажки + .suffix = Хеллоуин + .desc = Чёрно-белые флажки. Аккуратней, за ними, возможно, спрятался призрак! + +ent-ADTPosterHalloweenTrianglesBlackWhite3 = чёрно-белые флажки + .suffix = Хеллоуин + .desc = Чёрно-белые флажки. Аккуратней, за ними, возможно, спрятался призрак! + +ent-ADTPosterHalloweenTrianglesOrangeYellow1 = оранжево-жёлтые флажки + .suffix = Хеллоуин + .desc = Оранжево-жёлтые флажки. Аккуратней, за ними, возможно, спряталась злая тыква! + +ent-ADTPosterHalloweenTrianglesOrangeYellow2 = оранжево-жёлтые флажки + .suffix = Хеллоуин + .desc = Оранжево-жёлтые флажки. Аккуратней, за ними, возможно, спряталась злая тыква! + +ent-ADTPosterHalloweenTrianglesOrangeYellow3 = оранжево-жёлтые флажки + .suffix = Хеллоуин + .desc = Оранжево-жёлтые флажки. Аккуратней, за ними, возможно, спряталась злая тыква! + +ent-ADTPosterHalloweenTrianglesHappy1 = хеллоуинские флажки + .suffix = Хеллоуин + .desc = Счастливого Хеллоуина! + +ent-ADTPosterHalloweenTrianglesHappy2 = хеллоуинские флажки + .suffix = Хеллоуин + .desc = Счастливого Хеллоуина! + +ent-ADTPosterHalloweenTrianglesHappy3 = хеллоуинские флажки + .suffix = Хеллоуин + .desc = Счастливого Хеллоуина! + +ent-ADTPosterHalloweenTrianglesHappy4 = хеллоуинские флажки + .suffix = Хеллоуин + .desc = Счастливого Хеллоуина! \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/celtic-spike.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/celtic-spike.ftl new file mode 100644 index 00000000000..67eefc18675 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/prototypes/Entities/Structures/celtic-spike.ftl @@ -0,0 +1,2 @@ +ent-ADTCelticSpike = Кельтский крюк + .desc = Крюк для тех, для кого пятница подобна понедельнику. diff --git a/Resources/Locale/ru-RU/ADT/prototypes/Roles/roles.ftl b/Resources/Locale/ru-RU/ADT/prototypes/Roles/roles.ftl index 00696efa22c..010c991569c 100644 --- a/Resources/Locale/ru-RU/ADT/prototypes/Roles/roles.ftl +++ b/Resources/Locale/ru-RU/ADT/prototypes/Roles/roles.ftl @@ -16,3 +16,22 @@ ghost-role-information-EvilBot-description = Помогайте своему х ghost-role-information-EvilBot-rules = Вы - фамильяр. Слушайте приказы своего изобретателя vulpa-role-greeting = Вы стали жертвой зловещего изобретения. Теперь ваше тело крайне изменилось, и вы чувствуете, что хотите выполнять приказы того, кто вас превратил. Действие изобретения постепенно спадает.. vulpa-role-greeting-mindshild = Вы стали жертвой зловещего изобретения. Щит разума защитил вас от гипнотического воздействия. Действие изобретения постепенно спадает.. +ent-ADTWeaponWandSanta = Морозный посох + .desc = Приносит дух Рождества +ent-ADTSanta = Санта-Клаус + .desc = Он действительно существует +ent-ADTClothingBackpackSanta = Мешок Санты + .desc = Интересно, откуда там столько подарков +ent-ADTReindeer = Северный олень + .desc = Не терпится на нем покататься +ent-ADTReindeerCube = Кубик северного оленя + .desc = Намочите водой, чтобы появился северный олень +ent-ADTReindeerCubeBox = Коробка кубиков северного оленя + .desc = Намочите кубик водой, чтобы появился северный олень +ent-ADTGingerbreadCube = Кубик пряничного человечка + .desc = Намочите водой, чтобы появился пряничный человечек +ent-ADTGingerbreadCubeBox = Коробка кубиков пряничного человечка + .desc = Намочите кубик водой, чтобы появился пряничный человечек +ghost-role-information-Santa-name = Санта-Клаус +ghost-role-information-Santa-description = Принесите станции дух Рождества. Дарите подарки, катайтесь на оленях. Сделайте себе свиту из пряничных человечков +ghost-role-information-Santa-rules = Стандартные правила неантагониста diff --git a/Resources/Locale/ru-RU/ADT/reagents/meta/consumable/alcohol.ftl b/Resources/Locale/ru-RU/ADT/reagents/meta/consumable/alcohol.ftl index 3c5fc88062a..a68815e365a 100644 --- a/Resources/Locale/ru-RU/ADT/reagents/meta/consumable/alcohol.ftl +++ b/Resources/Locale/ru-RU/ADT/reagents/meta/consumable/alcohol.ftl @@ -87,3 +87,9 @@ jackie-welles-desc = Легенда среди киберпанков. Водк the-silverhand-name = сильверхенд the-silverhand-desc = Легенда среди киберпанков. Напиток рокер-боя и террориста, умершего как чёрный пёс. + +super-scout-name = суперматериальный нефильтрованный скаут делюкс +super-scout-desc = Великие учёные с планеты Бараса сварили нечто невероятное... Скаут из суперматериалов! + +funny-clown-name = смешное бананапиво +funny-clown-desc = Юмор в форме пива! diff --git a/Resources/Locale/ru-RU/ADT/reagents/meta/consumable/drinks.ftl b/Resources/Locale/ru-RU/ADT/reagents/meta/consumable/drinks.ftl index 71171757263..e36c26c3d8f 100644 --- a/Resources/Locale/ru-RU/ADT/reagents/meta/consumable/drinks.ftl +++ b/Resources/Locale/ru-RU/ADT/reagents/meta/consumable/drinks.ftl @@ -18,3 +18,6 @@ milk-eclipse-desc = Мороженое с чаем? Дайте два! arctic-explosion-name = арктический взрыв arctic-explosion-desc = Маленькая полярная шапка в вашем стакане. + +cocoa-drink-name = теплое какао +cocoa-drink-desc = Вкусный и бодрящий напиток из какао-порошка \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ADT/recipes/construction.ftl b/Resources/Locale/ru-RU/ADT/recipes/construction.ftl index 44cff232ee2..2af68400855 100644 --- a/Resources/Locale/ru-RU/ADT/recipes/construction.ftl +++ b/Resources/Locale/ru-RU/ADT/recipes/construction.ftl @@ -51,6 +51,9 @@ construction-name-red-chair = красный стул construction-name-church-bench-left-side = левая сторона церковной скамьи construction-name-church-bench-middle = средняя часть церковной скамьи construction-name-church-bench-right-side = правая сторона церковной скамьи +construction-name-oktoberfest-chair = стул для Октоберфеста +construction-name-oktoberfest-table = стол для Октоберфеста +construction-name-oktoberfest-orange-table = оранжевый стол для Октоберфеста construction-name-fireplace = камин construction-name-fireplace-white = белый камин construction-name-fireplace-wooden = деревянный камин @@ -173,6 +176,7 @@ construction-desc-white-office-sofa-right-side = Выглядит удобно. construction-desc-white-office-sofa-middle = Выглядит удобно. construction-desc-white-office-sofa-left-corner = Выглядит удобно. construction-desc-white-office-sofa-right-corner = Выглядит удобно. + construction-desc-banner-red = Это знамя в красных цветах. Типа крутое. construction-desc-banner-blue = Это знамя в синих цветах. Ай м блу, дабуди-дабудай. construction-desc-banner-green = Это знамя в зелёных цветах. Трава, листья, гуакамоле. @@ -199,6 +203,7 @@ construction-desc-banner-engineering = Это знамя, на котором п construction-desc-banner-medical = Это знамя, на котором представлены цвета медицинского отдела. Какое стерильное. construction-desc-banner-science = Это знамя, на котором представлены цвета научного отдела. Где знания безграничны, а техника безопасности игнорируется. construction-desc-banner-security = Это знамя, на котором представлены цвета отдела безопасности. Вы удивлены, что его ещё никто не испортил. + construction-desc-banner-human-flag = Это знамя центрального человеческого государства, управляющего Солнечной системой и колониями со столицей на планете Земля. construction-desc-statue-lenin = Без него ни одна площадь колонии СССП не обходится. Товарищи! Рабоче-крестьянская революция, о необходимости которой всё время говорили большевики, свершилась! construction-desc-statue-angel = Ангел-хранитель, который защищает вас от всех бед и несчастий. В трудный час вашей жизни он поможет вам преодолеть все ваши трудности. diff --git a/Resources/Locale/ru-RU/ADT/spike.ftl b/Resources/Locale/ru-RU/ADT/spike.ftl new file mode 100644 index 00000000000..18db43e9847 --- /dev/null +++ b/Resources/Locale/ru-RU/ADT/spike.ftl @@ -0,0 +1,12 @@ +spike-verb-impale = Насадить +spike-impale-success = {$target} насажен на крюк! +spike-remove-success = {$target} снят с крюка. +spike-escape-success = Вам удалось слезть со крюка! +spike-escape-failure = Вам не удалось слезть со крюка! +spike-deny-occupied = Крюк уже занят! +spike-deny-not-mob = Отпусти бедное животное! +spike-deny-self = Вы не можете насадить себя на крюк! +spike-pickup-success = Вам удалось сорвать жертву с крюка! +spike-pickup-success-target = Вас сорвали с крюка! +spike-pickup-failed = Вам не удалось сорвать жертву с крюка! +spike-pickup-failed-target = Кто-то пытался сорвать вас с крюка, но не смог! diff --git a/Resources/Maps/ADTMaps/Ghostbars/ghostbar_goob.yml b/Resources/Maps/ADTMaps/Ghostbars/ghostbar_goob.yml index 794b3d9a74e..4db4e7517e6 100644 --- a/Resources/Maps/ADTMaps/Ghostbars/ghostbar_goob.yml +++ b/Resources/Maps/ADTMaps/Ghostbars/ghostbar_goob.yml @@ -1284,6 +1284,20 @@ entities: rot: 3.141592653589793 rad pos: -18.5,-9.5 parent: 1 +- proto: ADTPosterHalloweenSpooky + entities: + - uid: 20 + components: + - type: Transform + pos: -6.5,-2.5 + parent: 1 +- proto: ADTPosterHalloweenYummy + entities: + - uid: 21 + components: + - type: Transform + pos: -6.5,-5.5 + parent: 1 - proto: ADTPosterLegitGreatFood entities: - uid: 22 @@ -1299,6 +1313,14 @@ entities: - type: Transform pos: -6.5,2.5 parent: 1 +- proto: ADTPosterNewYear + entities: + - uid: 24 + components: + - type: Transform + rot: -1.5707963267948966 rad + pos: -11.5,-0.5 + parent: 1 - proto: ADTPosterNoGood entities: - uid: 25 @@ -1322,6 +1344,28 @@ entities: rot: 3.141592653589793 rad pos: 8.5,5.5 parent: 1 +- proto: ADTPosterTayarHalloween + entities: + - uid: 28 + components: + - type: Transform + pos: -8.5,-5.5 + parent: 1 +- proto: ADTVendingMachineHalloween + entities: + - uid: 29 + components: + - type: Transform + pos: -7.5,-4.5 + parent: 1 + - type: Emagged +- proto: ADTVendingMachineNewYear + entities: + - uid: 30 + components: + - type: Transform + pos: -5.5,1.5 + parent: 1 - proto: ADTVendingMachinePrazatClothing entities: - uid: 31 diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Catalog/Catalog/cargo_food.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Catalog/Catalog/cargo_food.yml new file mode 100644 index 00000000000..7833d7e0a18 --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Catalog/Catalog/cargo_food.yml @@ -0,0 +1,19 @@ +- type: cargoProduct + id: ADTCargoChocolateGorilla + icon: + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/chocogorilla.rsi + state: chocogorilla + product: ADTCrateChocolateGorilla + cost: 1000 + category: cargoproduct-category-name-food + group: market + +- type: cargoProduct + id: ADTFunChristmasTree + icon: + sprite: ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi + state: christmas_tree + product: ADTCrateChristmasTree + cost: 250 + category: cargoproduct-category-name-fun + group: market diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Catalog/Fills/Boxes/food_packs.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Catalog/Fills/Boxes/food_packs.yml new file mode 100644 index 00000000000..5586efd086a --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Catalog/Fills/Boxes/food_packs.yml @@ -0,0 +1,44 @@ +#New Year +- type: entity + name: carnation pack + parent: BoxCardboard + id: ADTCarnationPack + description: Just a usual pack of an usual carnation. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Storage/carnation_pack.rsi + state: icon + - type: Item + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Storage/carnation_pack.rsi + size: Tiny + - type: Storage + grid: + - 0,0,5,0 + maxItemSize: Tiny + - type: StorageFill + contents: + - id: ADTFoodCarnation + amount: 6 + +- type: entity + name: cinnamon pack + parent: BoxCardboard + id: ADTCinnamonPack + description: A pack of cinnamon. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Storage/cinnamon_pack.rsi + state: icon + - type: Item + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Storage/cinnamon_pack.rsi + size: Tiny + - type: Storage + grid: + - 0,0,4,0 + maxItemSize: Tiny + - type: StorageFill + contents: + - id: ADTFoodCinnamon + amount: 5 diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Catalog/Fills/Boxes/gift.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Catalog/Fills/Boxes/gift.yml new file mode 100644 index 00000000000..973a95de0cb --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Catalog/Fills/Boxes/gift.yml @@ -0,0 +1,101 @@ +- type: entity + name: cardboard gift + parent: PresentRandom + id: cardboardGift + description: a gift for those who performed poorly on NanoTrasen this year. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Storage/gift.rsi + layers: + - state: icon + - type: SpawnItemsOnUse + items: + - id: PresentTrash + - id: coal + #- type: Item + # size: Ginormous + # sprite: ADT/Objects/Storage/gift.rsi + #- type: Storage + # maxTotalWeight: 24 + +#подарки от Празата: + +- type: entity + id: ADTPresentRandomBlue + parent: PresentRandom + suffix: Filled Safe, New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Fun/new_year_present.rsi + layers: + - state: blue + +- type: entity + id: ADTPresentRandomGreen + parent: PresentRandom + suffix: Filled Safe, New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Fun/new_year_present.rsi + layers: + - state: green + +- type: entity + id: ADTPresentRandomPurple + parent: PresentRandom + suffix: Filled Safe, New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Fun/new_year_present.rsi + layers: + - state: purple + +- type: entity + id: ADTPresentRandomRed + parent: PresentRandom + suffix: Filled Safe, New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Fun/new_year_present.rsi + layers: + - state: red + +- type: entity + id: ADTPresentRandomInsaneSyndicate + parent: PresentRandomInsane + suffix: Filled Insane, New Year + components: + - type: RandomGift + insaneMode: ADTUnSafe + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Fun/new_year_present.rsi + layers: + - state: syndicate + +#спавнер подарков + +- type: entity + parent: MarkerBase + id: ADTRandomNewYearGiftSpawner + name: random new year gift spawner + suffix: New Year + components: + - type: Sprite + layers: + - state: green + - sprite: ADT/ADTGlobalEvents/NewYears/Objects/Fun/new_year_present.rsi + state: red + - type: RandomSpawner + offset: 0 + prototypes: + - ADTPresentRandomRed + - ADTPresentRandomPurple + - ADTPresentRandomGreen + - ADTPresentRandomBlue + - cardboardGift + #chance: 0.7 + rarePrototypes: #временный прикол, который стоит потом убрать. + - toyC4Package + - ADTPresentRandomInsaneSyndicate + rareChance: 0.10 #Был 0.25. Даже с таким слишком часто падает. diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Catalog/Fills/Boxes/sparkler_pack.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Catalog/Fills/Boxes/sparkler_pack.yml new file mode 100644 index 00000000000..7f78217fcf2 --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Catalog/Fills/Boxes/sparkler_pack.yml @@ -0,0 +1,62 @@ +- type: entity + id: ADTSparklerPack + parent: [ BaseStorageItem, BaseBagOpenClose ] + name: pack of sparklers + suffix: New Year + description: A pack of sparklers to celebrate holidays + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi + layers: + - state: closed + - state: open + map: ["openLayer"] + visible: false + - state: stick0 + map: ["stick0"] + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi + visible: false + - state: stick1 + map: ["stick1"] + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi + visible: false + - state: stick2 + map: ["stick2"] + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi + visible: false + - state: stick3 + map: ["stick3"] + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi + visible: false + - state: stick4 + map: ["stick4"] + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi + visible: false + - type: Tag + tags: + - Trash + - type: PhysicalComposition + materialComposition: + Cardboard: 50 + - type: SpaceGarbage + - type: Storage + grid: + - 0,0,4,0 + - type: Item + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi + size: Small + - type: StorageFill + contents: + - id: ADTSparkler + amount: 5 + - type: ItemCounter + count: + tags: [ADTSparkler] + composite: true + layerStates: + - stick0 + - stick1 + - stick2 + - stick3 + - stick4 + - type: Appearance diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Catalog/Fills/Crates/fun.yml new file mode 100644 index 00000000000..57fa5fb1389 --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Catalog/Fills/Crates/fun.yml @@ -0,0 +1,45 @@ +- type: entity + id: ADTCrateChristmasTree + parent: CrateGenericSteel + name: crate of christmas tree + description: crate of christmas tree + suffix: New Year + components: + - type: StorageFill + contents: + - id: ADTChristmasPlasticTree + - id: ADTClothingBackpackDuffelChristmasToys + +- type: entity + id: ADTCrateChocolateGorilla + parent: CrateGenericSteel + name: crate of milki gorilla + description: crate of milki gorilla + suffix: New Year + components: + - type: StorageFill + contents: + - id: ADTChocolateGorillaLarge + +- type: entity + parent: ClothingBackpackDuffel + id: ADTClothingBackpackDuffelChristmasToys + name: bag of christmas toys + description: bag of christmas toys + suffix: New Year + components: + - type: StorageFill + contents: + - id: ADTGoldenStarGarland + - id: ADTSilverStarGarland + - id: ADTBaseStarGarland + - id: ADTShinyGarland + - id: ADTTreeRedBalls + - id: ADTTreeSilverBalls + - id: ADTTreeGoldenBalls + - id: ADTTreeGoldenStar + - id: ADTTreeRedStar + - id: ADTTreeSilverStar + - id: ADTTreeSilverMishura + - id: ADTTreeGoldenMishura + - id: ADTTreeRedMishura diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Catalog/VendingMachines/Inventories/newyearmat.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Catalog/VendingMachines/Inventories/newyearmat.yml new file mode 100644 index 00000000000..e30ea7067ae --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Catalog/VendingMachines/Inventories/newyearmat.yml @@ -0,0 +1,41 @@ +- type: vendingMachineInventory + id: ADTNewYearMateInventory + startingInventory: + ADTBoxNewYearSnack1: 10 + ADTBoxNewYearSnack2: 10 + ADTBoxNewYearSnack3: 10 + ADTSparklerPack: 5 + ADTClothingUniformJumpsuitSweaterHolidayBeige: 2 + ADTClothingUniformJumpsuitSweaterHolidayBlue: 2 + ADTClothingUniformJumpsuitSweaterHolidayRedDark: 2 + ADTClothingUniformJumpsuitSweaterHolidayRedWhite: 2 + ADTClothingUniformJumpsuitElf: 2 + ADTClothingUniformSnowMaiden: 4 + ADTClothingHeadHatsSnowMaiden: 4 + ADTClothingHandsGlovesSnowMaiden: 4 + ADTClothingUniformSchool: 4 + ADTClothingUniformMonkeyHolidaySuit: 2 + ADTClothingUniformRollNeckSnowman: 2 + ADTClothingUniformShirtSpruce: 2 + ADTClothingUniformShirtDeer: 2 + ADTClothingUniformJumpsuitSweaterHoliday: 2 + ADTClothingUniformShirtSnowflake: 2 + ADTClothingUniformShirtSnowman: 2 + # ADTClothingOuterDedMoroz: 4 + ADTClothingMaskBorodaDedMoroz: 4 + ADTClothingHeadHatDedMoroz: 4 + ADTClothingHeadHatsElf: 2 + ADTClothingHeadHatsAntenna: 2 + ADTClothingHeadHatsMonkeyHoliday: 2 + ADTClothingHeadHatsCatHoliday: 2 + ADTClothingHeadHornsDeer: 2 + ADTClothingHeadHatChristmas: 2 + ADTClothingHeadChristmasFlower: 2 + ADTClothingHandsGlovesMittensRed: 3 + ADTClothingHandsGlovesMittensBlue: 3 + ADTClothingHandsGlovesMittensGreen: 3 + ADTClothingHandsGlovesMittensRedGreen: 2 + ADTClothingHandsGlovesRed: 2 + ADTClothingHandsGlovesRed2: 2 + ADTClothingFootElfBoots: 2 + ADTClothingFootBootsSnowMaiden: 2 diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Clothing/Hands/gloves.yml new file mode 100644 index 00000000000..09c712160d9 --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Clothing/Hands/gloves.yml @@ -0,0 +1,84 @@ +#New Year +- type: entity + parent: ClothingHandsBase + id: ADTClothingHandsGlovesMittensRed + name: red mittens + description: Red, warm, festive. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_red.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_red.rsi + +- type: entity + parent: ClothingHandsBase + id: ADTClothingHandsGlovesMittensBlue + name: blue mittens + description: One touch and you will freeze someone. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_blue.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_blue.rsi + +- type: entity + parent: ClothingHandsBase + id: ADTClothingHandsGlovesMittensGreen + name: green mittens + description: The winter is long, we have a lot of work. Let's go to the toy factory! + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_green.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_green.rsi + +- type: entity + parent: ClothingHandsBase + id: ADTClothingHandsGlovesSnowMaiden + name: snow maiden's gloves + description: A gloves of Snow Maiden. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_snow_maiden.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_snow_maiden.rsi + +- type: entity + parent: ClothingHandsBase + id: ADTClothingHandsGlovesMittensRedGreen + name: red mittens + description: A red mittens with green stripes. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_red_green.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_red_green.rsi + +- type: entity + parent: ClothingHandsBase + id: ADTClothingHandsGlovesRed + name: red gloves + description: A red warm gloves. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_red.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_red.rsi + +- type: entity + parent: ClothingHandsBase + id: ADTClothingHandsGlovesRed2 #я честно без понятия, в чём разница между ними. + name: red gloves + description: A red warm gloves. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_red2.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_red2.rsi diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Clothing/Head/Hats/hats.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Clothing/Head/Hats/hats.yml new file mode 100644 index 00000000000..a87ee6a01d8 --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Clothing/Head/Hats/hats.yml @@ -0,0 +1,127 @@ +#New Year +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsElf + name: elf hat + description: A hat of a real worker. With glued ears. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/elf_hat.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/elf_hat.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsSnowMaiden + name: snow maiden's hat + description: A hat of a Snow Maiden. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_snow_maiden.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_snow_maiden.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHornsDeer + name: deer horns + description: A horns of Santa's helpers. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/deer_horns.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/deer_horns.rsi + clothingVisuals: + head: + - state: equipped-HELMET + - state: equipped-HELMET-linght + shader: unshaded + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatChristmas + name: christmas hat + description: A hat to celebrate christmas. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_christmas.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_christmas.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsMonkeyHoliday + name: monkey holiday hat + description: A holiday hat for monkeys. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_monkey_holiday.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_monkey_holiday.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsCatHoliday + name: cat holiday hat + description: A holiday hat for cats. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_cat_holiday.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_cat_holiday.rsi + - type: Tag + tags: + - CatWearable + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadChristmasFlower + name: christmas flower + description: A flower on your head + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_flower.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_flower.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatDedMoroz + suffix: New Year + name: hat ded moroz + description: "It is hat ded moroz" + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/ded_morozhat.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/ded_morozhat.rsi + +# - type: entity +# parent: ClothingOuterBase +# id: ADTClothingOuterDedMoroz +# suffix: New Year +# name: Ded Moroz suit +# description: Suit clothing ded moroz +# components: +# - type: Sprite +# sprite: ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter.rsi +# - type: Clothing +# sprite: ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsAntenna + name: antennas + description: For better pilot synchronization. + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/antennas.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/antennas.rsi #спрайты от Умы diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Clothing/Masks/mask.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Clothing/Masks/mask.yml new file mode 100644 index 00000000000..89bc0c9399a --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Clothing/Masks/mask.yml @@ -0,0 +1,31 @@ +- type: entity + parent: ClothingMaskBase + id: ADTClothingMaskBorodaDedMoroz + name: Boroda ded moroz + description: Boroda ded moroz + suffix: New Years + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Masks/ded_morozsetboroda.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Masks/ded_morozsetboroda.rsi + clothingVisuals: + mask: + - state: equipped-MASK + - type: BreathMask + +- type: entity + parent: ClothingMaskBase + id: ADTClothingMaskBorodaDedMorozBig + name: Boroda ded moroz + description: Boroda ded moroz + suffix: New Years + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Masks/ded_morozsetboroda_big.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Masks/ded_morozsetboroda_big.rsi + clothingVisuals: + mask: + - state: equipped-MASK + - type: BreathMask diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Clothing/OuterClothing/misc.yml new file mode 100644 index 00000000000..6600d87cb4f --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Clothing/OuterClothing/misc.yml @@ -0,0 +1,23 @@ +- type: entity + parent: ClothingOuterBase + id: ADTClothingOuterDedMorozDarkred + suffix: New Year + name: Dark red Ded Moroz suit + description: Suit clothing ded moroz + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter_darkred.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter_darkred.rsi # Спрайты Кейси + +- type: entity + parent: ClothingOuterBase + id: ADTClothingOuterDedMoroz + suffix: New Year + name: Ded Moroz suit + description: Suit clothing ded moroz + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter.rsi diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Clothing/Shoes/Boots.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Clothing/Shoes/Boots.yml new file mode 100644 index 00000000000..3565efb1326 --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Clothing/Shoes/Boots.yml @@ -0,0 +1,37 @@ +#New Year +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTClothingFootElfBoots + name: elf boots + description: Warm boots to work in a house on north. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/elf_boots.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/elf_boots.rsi + +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTClothingFootBootsSnowMaiden + name: snow maiden's boots + description: Warm boots of Snow Maiden. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/snow_maiden.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/snow_maiden.rsi + +- type: entity + parent: ClothingShoesBaseButcherable + id: ClothingShoesBootsMoroz + name: Валенки + description: Современная теплая обувь, натуральные материалы, нескользящая подошва, утепленные на застежке Валенки. + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/moroz_winterboots.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/moroz_winterboots.rsi + # - type: TemperatureProtection + # coefficient: 0.1 diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Clothing/Underwear/Socks/socks.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Clothing/Underwear/Socks/socks.yml new file mode 100644 index 00000000000..0f2dc935399 --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Clothing/Underwear/Socks/socks.yml @@ -0,0 +1,90 @@ +#New Year +- type: entity + parent: ADTClothingUnderwearSocksBase + id: ADTClothingUnderwearSocksChristmasBeige + name: beige socks + description: Feels warm from thick wool inside. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_beige.rsi + +- type: entity + parent: ADTClothingUnderwearSocksBase + id: ADTClothingUnderwearSocksChristmasBlue + name: blue socks + description: Blue like ice, warm like holidays. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_blue.rsi + +- type: entity + parent: ADTClothingUnderwearSocksBase + id: ADTClothingUnderwearSocksChristmasFingerless + name: fingerless socks + description: Claws won't stop holidays! + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_fingerless.rsi + +- type: entity + parent: ADTClothingUnderwearSocksBase + id: ADTClothingUnderwearSocksChristmasGnome + name: gnome socks + description: Made for walking in ice caves in Santa's residence. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_gnome.rsi + +- type: entity + parent: ADTClothingUnderwearSocksBase + id: ADTClothingUnderwearSocksChristmasGreen + name: green socks + description: A real Elf wears this. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_green.rsi + +- type: entity + parent: ADTClothingUnderwearSocksBase + id: ADTClothingUnderwearSocksChristmasRed + name: red socks + description: Traditional New Year holiday socks. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_red.rsi + +- type: entity + parent: ADTClothingUnderwearSocksBase + id: ADTClothingUnderwearSocksChristmasRedWhite + name: red socks with white stripe + description: Just a red socks. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_redwhite.rsi + +- type: entity + parent: ADTClothingUnderwearSocksBase + id: ADTClothingUnderwearSocksChristmasFingerlessStripped + name: fingerless stripped socks + description: Socks for those, whose claws won't let them to warm legs. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_fingerless_stripped.rsi + +- type: entity + parent: ADTClothingUnderwearSocksBase + id: ADTClothingUnderwearSocksChristmasStripped + name: stripped socks + description: A holiday stripped socks. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_stripped.rsi diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Clothing/Uniforms/Jumpskirt.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Clothing/Uniforms/Jumpskirt.yml new file mode 100644 index 00000000000..646576b1bd4 --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Clothing/Uniforms/Jumpskirt.yml @@ -0,0 +1,23 @@ +#New Year +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformSnowMaiden + name: snow maiden suit + description: A suit of a beautiful Snow Maiden. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpskirt/snow_maiden.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpskirt/snow_maiden.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformSchool + name: school uniform + description: Japan uniform fron Earth. It reminds me something... + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpskirt/uniform_school.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpskirt/uniform_school.rsi #спрайты от Умы diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Clothing/Uniforms/Jumpsuit.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Clothing/Uniforms/Jumpsuit.yml new file mode 100644 index 00000000000..13f81cdc337 --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Clothing/Uniforms/Jumpsuit.yml @@ -0,0 +1,144 @@ +#New Year +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpsuitSweaterHolidayBeige + name: beige sweater + description: A real star of the show is wearing this sweater. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_beige.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_beige.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpsuitSweaterHolidayBlue + name: blue sweater + description: A real Santa's raindeer is on this sweater. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_blue.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_blue.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpsuitSweaterHolidayRedDark + name: red sweater with black pants + description: Red, bright, warm, festive and most important - stylish. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_red_dark.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_red_dark.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpsuitSweaterHolidayRedWhite + name: red sweater with white pants + description: Red, bright, warm, festive. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_red_white.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_red_white.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpsuitElf + name: elf costume + description: Smells like wood, spruce and holidays. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/elf_costume.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/elf_costume.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformMonkeyHolidaySuit + name: monkey holiday costume + description: Holiday suit for monkeys. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/monkey_holiday_suit.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/monkey_holiday_suit.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformRollNeckSnowman + name: snowman roll-neck + description: A roll-neck with a mister snowman! + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/roll-neck_snowman.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/roll-neck_snowman.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformShirtSpruce + name: shirt with a spruce + description: A grey shirt with a picture of a Christmas tree. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_spruce.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_spruce.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformShirtDeer + name: shirt with a deer + description: A green shirt with a picture of a deer. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_deer.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_deer.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpsuitSweaterHoliday + name: holiday sweater + description: A green sweater with gift-like print. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_holiday.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_holiday.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformShirtSnowflake + name: shirt with a snowflake + description: A green shirt with a picture of a snowflake. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowflake.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowflake.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformShirtSnowman + name: shirt with a snowman + description: A red shirt with a picture of a snowman. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowman.rsi + - type: Clothing + sprite: ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowman.rsi diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Markers/Spawners/Random/drinks.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Markers/Spawners/Random/drinks.yml new file mode 100644 index 00000000000..ba4f4d94d7b --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Markers/Spawners/Random/drinks.yml @@ -0,0 +1,23 @@ +- type: entity + parent: MarkerBase + id: ADTRandomNewYearDrinkSpawner + name: random new year drink spawner + suffix: New Year + components: + - type: Sprite + layers: + - state: green + - sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi + state: sbiten_cinnamon_lemon + - type: RandomSpawner + offset: 0 + prototypes: + - ADTMulledWineGlass + - ADTMulledWineColdGlass + - ADTChampagneMandarinGlass + - ADTChristmasMilkshakeGlass + - ADTTeaCinnamonLemonGlass + - ADTSbitenCinnamonLemonGlass + - ADTHotCocoaGlass + - ADTHotChocolateGlass + - ADTHotChocolateAllergicGlass diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Markers/Spawners/Random/food_meal.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Markers/Spawners/Random/food_meal.yml new file mode 100644 index 00000000000..8f2c4f4c459 --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Markers/Spawners/Random/food_meal.yml @@ -0,0 +1,29 @@ +#спавнер еды +- type: entity + parent: MarkerBase + id: ADTRandomNewYearFoodSpawner + name: random new year food spawner + suffix: New Year + components: + - type: Sprite + layers: + - state: green + - sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi + state: stick + - type: RandomSpawner + offset: 0 + prototypes: + - ADTFoodOlivierSalad + - ADTFoodJelliedMeat + - ADTFoodHerringUnderFurcoat + - ADTFoodMeatHam + - ADTFoodCakePudding + - ADTFoodCakePuddingChristmas + - ADTBoxNewYearSnack1 + - ADTBoxNewYearSnack2 + - ADTBoxNewYearSnack3 + - ADTFoodMeatChickenBaked + - ADTFoodMeatChickenBakedWithVegetables + - ADTFoodMeatChickenBakedWing + - ADTFoodMeatChickenBakedLeg + #chance: 0.7 diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Consumable/Drinks/drinks.yml new file mode 100644 index 00000000000..304a8ca15dd --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Consumable/Drinks/drinks.yml @@ -0,0 +1,171 @@ +#New Years +- type: entity + parent: DrinkGlassBase + id: ADTMulledWineGlass + name: mulled-wine-name + description: mulled-wine-desc + suffix: New Year + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTMulledWine + Quantity: 30 + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi + state: mulled_wine + +- type: entity + parent: DrinkGlassBase + id: ADTMulledWineColdGlass + name: mulled-wine-cold-name + description: mulled-wine-cold-desc + suffix: New Year + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTMulledWineCold + Quantity: 30 + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi + state: mulled_wine_cold + +- type: entity + parent: DrinkGlassBase + id: ADTChampagneMandarinGlass + name: champagne-mandarin-name + description: champagne-mandarin-desc + suffix: New Year + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTChampagneMandarin + Quantity: 30 + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi + state: champagne_mandarin + +- type: entity + parent: DrinkGlassBase + id: ADTChristmasMilkshakeGlass + name: christmas-milkshake-name + description: christmas-milkshake-desc + suffix: New Year + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTChristmasMilkshake + Quantity: 30 + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi + state: christmas_milkshake + +- type: entity + parent: DrinkGlassBase + id: ADTTeaCinnamonLemonGlass + name: tea-cinnamon-lemon-name + description: tea-cinnamon-lemon-desc + suffix: New Year + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTTeaCinnamonLemon + Quantity: 30 + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi + state: warm_tea_cinnamon_lemon + +- type: entity + parent: DrinkGlassBase + id: ADTSbitenCinnamonLemonGlass + name: sbiten-cinnamon-lemon-name + description: sbiten-cinnamon-lemon-desc + suffix: New Year + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTSbitenCinnamonLemon + Quantity: 30 + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi + state: sbiten_cinnamon_lemon + +- type: entity + parent: DrinkGlassBase + id: ADTHotCocoaGlass + name: hot-cocoa-name + description: hot-cocoa-desc + suffix: New Year + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTHotCocoa + Quantity: 30 + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi + state: hot_cocoa + +- type: entity + parent: DrinkGlassBase + id: ADTHotChocolateGlass + name: hot-chocolate-name + description: hot-chocolate-desc + suffix: New Year + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTHotChocolate + Quantity: 30 + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi + state: hot_chocolate + +- type: entity + parent: DrinkGlassBase + id: ADTHotChocolateAllergicGlass + name: hot-chocolate-name-allergic + description: hot-chocolate-desc-allergic + suffix: New Year + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTHotChocolateAllergic + Quantity: 30 + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi + state: hot_chocolate diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Consumable/Food/food.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Consumable/Food/food.yml new file mode 100644 index 00000000000..dc073f9a7fc --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Consumable/Food/food.yml @@ -0,0 +1,363 @@ +#Гвоздика +- type: entity + name: carnation + parent: FoodProduceBase + id: ADTFoodCarnation + description: Is that really IS a carnation? + suffix: New Year + components: + - type: FlavorProfile + flavors: + - savory + - type: Food + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: ADTCarnation + Quantity: 5 + - type: Item + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/carnation.rsi + size: Tiny + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/carnation.rsi + - type: Extractable + juiceSolution: + reagents: + - ReagentId: ADTCarnation + Quantity: 5 + - type: SolutionSpiker + sourceSolution: food + ignoreEmpty: true + popup: adt-spike-solution-put + - type: Appearance + - type: DeleteOnTrigger + +#Корица +- type: entity + name: cinnamon + parent: FoodProduceBase + id: ADTFoodCinnamon + description: Fragrant cinnamon sticks. + suffix: New Year + components: + - type: FlavorProfile + flavors: + - sweet + - type: Food + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: ADTСinnamon + Quantity: 5 + - type: Item + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/cinnamon.rsi + size: Tiny + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/cinnamon.rsi + - type: Extractable + juiceSolution: + reagents: + - ReagentId: ADTСinnamon + Quantity: 5 + - type: SolutionSpiker + sourceSolution: food + ignoreEmpty: true + popup: adt-spike-solution-put + - type: Appearance + - type: DeleteOnTrigger + +#Печенье +- type: entity + name: atmos cake + parent: FoodSnackBase + id: ADTFoodSnackAtmosCake + description: atmos cake + suffix: New Year + components: + - type: FlavorProfile + flavors: + - sweet + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi + state: atmos + - type: Item + size: Tiny + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 2 + +- type: entity + name: botanic cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackBotanicCake + description: botanic cake + components: + - type: Sprite + state: botanic + +- type: entity + name: candy stick + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackCandyStick + description: candy stick + components: + - type: Sprite + state: stick + +- type: entity + name: cargo cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackCargoCake + description: cargo cake + components: + - type: Sprite + state: cargo + +- type: entity + name: cookie man + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackCookieMan + description: cookie man + components: + - type: Sprite + state: cookieman + +- type: entity + name: chef cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackChefCake + description: chef cake + components: + - type: Sprite + state: chef + +- type: entity + name: doctor cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackDoctorCake + description: doctor cake + components: + - type: Sprite + state: doctor + +- type: entity + name: gift cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackGiftCake + description: gift cake + components: + - type: Sprite + state: gift + +- type: entity + name: glove cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackGloveCake + description: glove cake + components: + - type: Sprite + state: glove + +- type: entity + name: janitory cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackJanitoryCake + description: janitory cake + components: + - type: Sprite + state: janitory + +- type: entity + name: mime cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackMimeCake + description: mime cake + components: + - type: Sprite + state: mime + +- type: entity + name: nukie cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackNukieCake + description: nukie cake + components: + - type: Sprite + state: nukie + +- type: entity + name: clown cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackClownCake + description: clown cake + components: + - type: Sprite + state: clown + +- type: entity + name: greytide cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackGreytideCake + description: greytide cake + components: + - type: Sprite + state: greytide + +- type: entity + name: scientist cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackScientistCake + description: scientist cake + components: + - type: Sprite + state: scientist + +- type: entity + name: security cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackSecurityCake + description: security cake + components: + - type: Sprite + state: security + +- type: entity + name: snowflake cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackSnowflakeCake + description: snowflake cake + components: + - type: Sprite + state: snowflake + +- type: entity + name: snowman cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackSnowmanCake + description: snowman cake + components: + - type: Sprite + state: snowman + +- type: entity + name: socks cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackSocksCake + description: socks cake + components: + - type: Sprite + state: socks + +- type: entity + name: tree cake + parent: ADTFoodSnackAtmosCake + id: ADTFoodSnackTreeCake + description: tree cake + components: + - type: Sprite + state: tree + +#Коробки со сладостями + +- type: entity + id: ADTBoxNewYearSnack1 + parent: BaseStorageItem + name: new year snackbox 1 + description: new year snackbox 1 + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi + state: box1 + - type: Item + size: Large + - type: Storage + maxItemSize: Small + grid: + - 0,0,2,3 + - type: ContainerContainer + containers: + storagebase: !type:Container + - type: PhysicalComposition + materialComposition: + Cardboard: 100 + - type: StorageFill + contents: + - id: ADTFoodSnackAtmosCake + amount: 1 + - id: ADTFoodSnackBotanicCake + amount: 1 + - id: ADTFoodSnackCargoCake + amount: 2 + - id: ADTFoodSnackChefCake + amount: 1 + - id: ADTFoodSnackDoctorCake + amount: 2 + - id: ADTFoodSnackJanitoryCake + amount: 1 + - id: ADTFoodSnackScientistCake + amount: 1 + - id: ADTFoodSnackSecurityCake + amount: 1 + - id: ADTFoodSnackYellowCandies + amount: 1 + +- type: entity + name: new year snackbox 2 + description: new year snackbox 2 + parent: ADTBoxNewYearSnack1 + id: ADTBoxNewYearSnack2 + components: + - type: Sprite + state: box2 + - type: StorageFill + contents: + - id: ADTFoodSnackCandyStick + amount: 3 + - id: ADTFoodSnackCookieMan + amount: 2 + - id: ADTFoodSnackGiftCake + amount: 1 + - id: ADTFoodSnackGloveCake + amount: 1 + - id: ADTFoodSnackSnowflakeCake + amount: 1 + - id: ADTFoodSnackSnowmanCake + amount: 1 + - id: ADTFoodSnackSocksCake + amount: 1 + - id: ADTFoodSnackTreeCake + amount: 1 + - id: ADTFoodSnackCoinCandies + amount: 1 + +- type: entity + name: new year snackbox 3 + description: new year snackbox 3 + parent: ADTBoxNewYearSnack1 + id: ADTBoxNewYearSnack3 + components: + - type: Sprite + state: box3 + - type: StorageFill + contents: + - id: ADTFoodSnackMimeCake + amount: 1 + - id: ADTFoodSnackNukieCake + amount: 3 + - id: ADTFoodSnackClownCake + amount: 2 + - id: ADTFoodSnackGreytideCake + amount: 3 + - id: ADTFoodSnackCoinCandies + amount: 2 + - id: ADTFoodSnackBlackCandies + amount: 1 diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Consumable/Food/meals.yml new file mode 100644 index 00000000000..45824dab996 --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Consumable/Food/meals.yml @@ -0,0 +1,211 @@ +#новогодние блюда + +- type: entity + name: olivier salad + parent: FoodBowlBase + id: ADTFoodOlivierSalad + description: olivier salad + suffix: New Year + components: + - type: FlavorProfile + flavors: + - ADTOlivier + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi + layers: + - state: bowl + - state: olivier + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 9 + - ReagentId: Vitamin + Quantity: 3 + +- type: entity + name: jellied meat + parent: ADTFoodMealBase + id: ADTFoodJelliedMeat + description: jellied meat + suffix: New Year + components: + - type: Tag + tags: + - Cooked + - Meat + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi + layers: + #- state: plate_small + - state: jellymeat + - type: FlavorProfile + flavors: + - ADTJellymeat + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Protein + Quantity: 8 + - type: Item + size: Normal + - type: Food + transferAmount: 5 + # trash: FoodPlateSmall + +- type: entity + name: herring under furcoat + parent: ADTFoodMealBase + id: ADTFoodHerringUnderFurcoat + description: herring under furcoat + suffix: New Year + components: + - type: Tag + tags: + - Cooked + - Meat + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi + layers: + - state: plate_small + - state: herring + - type: FlavorProfile + flavors: + - ADTHerringUnderFurcoat + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 9 + - ReagentId: Protein + Quantity: 3 + - ReagentId: Vitamin + Quantity: 3 + - type: Item + size: Normal + - type: Food + transferAmount: 6 + # trash: FoodPlateSmall + +- type: entity + name: ham + parent: ADTFoodMealBase + id: ADTFoodMeatHam + description: ham + suffix: New Year + components: + - type: Tag + tags: + - Cooked + - Meat + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi + layers: + - state: plate + - state: ham + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 18 + - ReagentId: Protein + Quantity: 6 + - type: SliceableFood + count: 6 + slice: ADTFoodMeatHamPiece + - type: Item + size: Normal + - type: Food + transferAmount: 4 + # trash: FoodPlate + +- type: entity + name: ham piece + parent: ADTFoodMealBase + id: ADTFoodMeatHamPiece + description: ham piece + suffix: New Year + components: + - type: Tag + tags: + - Cooked + - Meat + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi + layers: + - state: hampiece + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Protein + Quantity: 1 + - type: Item + size: Normal + - type: Food + transferAmount: 6 + +- type: entity + name: pudding + parent: FoodCakeBase + id: ADTFoodCakePudding + description: pudding + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi + layers: + #- state: plate_small + - state: pudding + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 12 + - ReagentId: Protein + Quantity: 3 + - ReagentId: Vitamin + Quantity: 3 + - type: Item + size: Normal + - type: Food + transferAmount: 6 + # trash: FoodPlateSmall + +- type: entity + name: christmas pudding + parent: FoodCakeBase + id: ADTFoodCakePuddingChristmas + description: christmas pudding + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi + layers: + #- state: plate_small + - state: christmaspudding + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 15 + - ReagentId: Protein + Quantity: 3 + - ReagentId: Vitamin + Quantity: 4 + - type: Item + size: Normal + - type: Food + transferAmount: 6 + # trash: FoodPlateSmall diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Consumable/Food/snacks.yml new file mode 100644 index 00000000000..92177c4adfd --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Consumable/Food/snacks.yml @@ -0,0 +1,76 @@ +#шоколадная горилла +- type: entity + id: ADTChocolateGorillaLarge + parent: BaseStructure + name: chocolate gorilla + description: chocolate gorilla + suffix: New Year + placement: + mode: SnapgridCenter + components: + - type: Clickable + - type: InteractionOutline + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.45 + density: 100 + mask: + - Impassable + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/chocogorilla.rsi + state: chocogorilla + - type: Pullable + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 400 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 75 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:SpawnEntitiesBehavior + spawn: + Log: + min: 2 + max: 8 + - type: StaticPrice + price: 10 + - type: Physics + bodyType: Static + - type: Anchorable + - type: Appearance + - type: Food + - type: InjectableSolution + solution: food + - type: RefillableSolution + solution: food + - type: SolutionContainerManager + solutions: + food: + maxVol: 550 + reagents: + - ReagentId: Nutriment + Quantity: 350 + - ReagentId: Theobromine + Quantity: 105 + - ReagentId: CocoaPowder + Quantity: 35 + - type: FlavorProfile + flavors: + - chocolate + - type: Tag + tags: + - FoodSnack + - type: Rotatable diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Decoration/flora.yml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Decoration/new_year.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Decoration/new_year.yml new file mode 100644 index 00000000000..1f3137fa713 --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Decoration/new_year.yml @@ -0,0 +1,91 @@ +- type: entity + parent: BaseSign + id: NewYearDecorationBase + abstract: true + suffix: New Year + components: + - type: WallMount + arc: 360 + - type: Sprite + drawdepth: WallTops + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Decoration/cristmas_wreaths.rsi + snapCardinals: true + +#Венки и омелы от lunalita +- type: entity + parent: NewYearDecorationBase + id: ADTCristmasWreath + name: christmas wreath + description: A typical decoration in houses on Earth in the run-up to Christmas. + components: + - type: Sprite + state: christmaswreath_01 + +- type: entity + parent: NewYearDecorationBase + id: ADTCristmasWreath2 + name: christmas wreath + description: A typical decoration in houses on Earth in the run-up to Christmas. + components: + - type: Sprite + state: christmaswreath_02 + +- type: entity + parent: NewYearDecorationBase + id: ADTCristmasWreath3 + name: christmas wreath + description: A typical decoration in houses on Earth in the run-up to Christmas. + components: + - type: Sprite + state: christmaswreath_03 + +- type: entity + parent: NewYearDecorationBase + id: ADTCristmasMistletoe + name: christmas wmistletoe + description: A main decoration in houses in England on Earth in the run-up to Christmas. + components: + - type: Sprite + state: christmasmistletoe_01 + +- type: entity + parent: NewYearDecorationBase + id: ADTCristmasMistletoe2 + name: christmas wmistletoe + description: A main decoration in houses in England on Earth in the run-up to Christmas. + components: + - type: Sprite + state: christmasmistletoe_02 + +#Мишура от auriss093 +- type: entity + parent: NewYearDecorationBase + id: ADTTinselRed + name: red tinsel + description: Simple, yet effective decoration for holidays. + components: + - type: Sprite + drawdepth: WallTops + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Decoration/tinsel.rsi + state: redtinsel + snapCardinals: true + +- type: entity + parent: ADTTinselRed + id: ADTTinselGold + name: gold tinsel + description: Simple, yet effective decoration for holidays. Painted in gold. + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Decoration/tinsel.rsi + state: goldtinsel + +- type: entity + parent: ADTTinselRed + id: ADTTinselSilver + name: silver tinsel + description: Simple, yet effective decoration for holidays. Painted in silver. + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Decoration/tinsel.rsi + state: silvertinsel diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Misc/garland.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Misc/garland.yml new file mode 100644 index 00000000000..61825496e5e --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Misc/garland.yml @@ -0,0 +1,216 @@ + +#Гирлянды + +- type: entity + name: goldenstar garland + parent: BaseItem + id: ADTGoldenStarGarland + description: A light emitting device that would look like from ancient castle. + suffix: New Year + components: + - type: Tag + tags: + - ADTGoldenStarGarland + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi + state: goldenstar_garland + - type: Item + #sprite: ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi + size: Normal + +- type: entity + name: silverstar garland + parent: BaseItem + id: ADTSilverStarGarland + description: A light emitting device that would look like from ancient castle. + suffix: New Year + components: + - type: Tag + tags: + - ADTSilverStarGarland + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi + state: silverstar_garland + - type: Item + size: Normal + +- type: entity + name: base garland + parent: BaseItem + id: ADTBaseStarGarland + description: A light emitting device that would look like from ancient castle. + suffix: New Year + components: + - type: Tag + tags: + - ADTBaseStarGarland + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi + state: basestar_garland + - type: Item + size: Normal + +- type: entity + name: shiny garland + parent: BaseItem + id: ADTShinyGarland + description: A light emitting device that would look like from ancient castle. + suffix: New Year + components: + - type: Tag + tags: + - ADTShinyGarland + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi + state: shiny_garland + - type: Item + size: Normal + +#Новогодние шарики +- type: entity + name: red tree balls + parent: BaseItem + id: ADTTreeRedBalls + description: red tree balls + suffix: New Year + components: + - type: Tag + tags: + - ADTTreeRedBalls + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi + state: red_balls + - type: Item + size: Normal + +- type: entity + name: silver tree balls + parent: BaseItem + id: ADTTreeSilverBalls + description: silver tree balls + suffix: New Year + components: + - type: Tag + tags: + - ADTTreeSilverBalls + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi + state: silver_balls + - type: Item + size: Normal + +- type: entity + name: golden tree balls + parent: BaseItem + id: ADTTreeGoldenBalls + description: silver tree balls + suffix: New Year + components: + - type: Tag + tags: + - ADTTreeGoldenBalls + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi + state: golden_balls + - type: Item + size: Normal + +#звезды + +- type: entity + name: golden tree star + parent: BaseItem + id: ADTTreeGoldenStar + description: golden tree star + suffix: New Year + components: + - type: Tag + tags: + - ADTTreeGoldenStar + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi + state: golden_star + - type: Item + size: Small + +- type: entity + name: red tree star + parent: BaseItem + id: ADTTreeRedStar + description: red tree star + suffix: New Year + components: + - type: Tag + tags: + - ADTTreeRedStar + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi + state: red_star + - type: Item + size: Small + +- type: entity + name: silver tree star + parent: BaseItem + id: ADTTreeSilverStar + description: silver tree star + suffix: New Year + components: + - type: Tag + tags: + - ADTTreeSilverStar + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi + state: silver_star + - type: Item + size: Small + +#мишура + +- type: entity + name: silver mishura + parent: BaseItem + id: ADTTreeSilverMishura + description: silver mishura + suffix: New Year + components: + - type: Tag + tags: + - ADTTreeSilverMishura + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi + state: silver_mishura + - type: Item + size: Small + +- type: entity + name: golden mishura + parent: BaseItem + id: ADTTreeGoldenMishura + description: golden mishura + suffix: New Year + components: + - type: Tag + tags: + - ADTTreeGoldenMishura + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi + state: golden_mishura + - type: Item + size: Small + +- type: entity + name: red mishura + parent: BaseItem + id: ADTTreeRedMishura + description: red mishura + suffix: New Year + components: + - type: Tag + tags: + - ADTTreeRedMishura + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi + state: red_mishura + - type: Item + size: Small diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Misc/sparkler.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Misc/sparkler.yml new file mode 100644 index 00000000000..f86c93f7f67 --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Misc/sparkler.yml @@ -0,0 +1,78 @@ +- type: entity + name: sparkler + suffix: New Year + parent: BaseItem + id: ADTSparkler + description: A combustible mixture, that is mostly used in holidays. + components: + - type: Tag + tags: + - ADTSparkler + - Trash + - type: SpaceGarbage + - type: ExpendableLight + spentName: expendable-light-spent-sparkler-name + spentDesc: expendable-light-spent-sparkler-desc + glowDuration: 60 + fadeOutDuration: 8 + iconStateLit: lit-icon + iconStateSpent: unlit-icon + turnOnBehaviourID: turn_on + fadeOutBehaviourID: fade_out + litSound: + path: /Audio/Items/Flare/flare_on.ogg + loopedSound: /Audio/Items/Flare/flare_burn.ogg + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi + layers: + - map: [ enum.ExpendableLightVisualLayers.Base ] + state: unlit-icon + - map: [ enum.ExpendableLightVisualLayers.Glow ] + state: lit-icon + visible: false + shader: unshaded + - map: [ enum.ExpendableLightVisualLayers.Overlay ] + state: burnt-icon + - type: Item + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi + heldPrefix: unlit + size: Tiny + - type: Appearance + - type: PointLight + enabled: false + color: "#fff095" + radius: 0.5 + energy: 0.5 + netsync: false + - type: IgnitionSource + temperature: 500 + - type: LightBehaviour + behaviours: + - !type:FadeBehaviour # have the radius start small and get larger as it starts to burn + id: turn_on + maxDuration: 6.0 + startValue: 1.5 + endValue: 5.0 + - !type:RandomizeBehaviour # just flickers. + id: turn_on + interpolate: Nearest + minDuration: 0.001 + maxDuration: 0.001 + startValue: 2.0 + endValue: 4.0 + property: Energy + isLooped: true + - !type:RandomizeBehaviour # just when fades away + id: fade_out + interpolate: Nearest + minDuration: 0.001 + maxDuration: 0.001 + startValue: 2.0 + endValue: 4.0 + property: Energy + isLooped: true + - !type:FadeBehaviour # fade out radius as it burns out + id: fade_out + maxDuration: 8.0 + startValue: 5.0 + endValue: 0.5 diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Structures/Furniture/christmas_tree.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Structures/Furniture/christmas_tree.yml new file mode 100644 index 00000000000..4d097c54ff3 --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Structures/Furniture/christmas_tree.yml @@ -0,0 +1,184 @@ +- type: entity + id: ADTChristmasPlasticTree + parent: BaseStructure + name: plastic christmas tree + description: A very festive tree for a very festive holiday. + suffix: New Year + placement: + mode: SnapgridCenter + components: + - type: Clickable + - type: InteractionOutline + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.45 + density: 100 + mask: + - Impassable + - type: Sprite + drawdepth: Overdoors + sprite: ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi + state: christmas_tree + noRot: true + offset: "0.0,0.3" + - type: Pullable + #- type: PointLight + # radius: 1.6 + # energy: 1.2 + # enabled: false + # mask: /Textures/Effects/LightMasks/cone.png + # autoRot: true + # offset: "0, 0.6" + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 400 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 75 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:SpawnEntitiesBehavior + spawn: + Log: + min: 2 + max: 8 + #- type: Storage + # maxSlots: 7 + # maxItemSize: Normal + # whitelist: + # tags: + # - ADTGoldenStarGarland + - type: ItemSlots + slots: + garland: + ejectSound: /Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/garland_swipe.ogg # ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys + insertSound: /Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/garland_insert.ogg + name: Garland + #startingItem: null + priority: 1 + whitelist: + tags: + - ADTGoldenStarGarland + - ADTSilverStarGarland + - ADTBaseStarGarland + - ADTShinyGarland + mishura: + ejectSound: /Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/mishura.ogg + insertSound: /Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/mishura.ogg + name: Mishura + #startingItem: null + priority: 1 + whitelist: + tags: + - ADTTreeRedMishura + - ADTTreeGoldenMishura + - ADTTreeSilverMishura + tree_top: + ejectSound: /Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/tree_top.ogg + insertSound: /Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/tree_top.ogg + name: TreeTop + #startingItem: null + priority: 1 + whitelist: + tags: + - ADTTreeGoldenStar + - ADTTreeRedStar + - ADTTreeSilverStar + tree_toys: + ejectSound: /Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/tree_toys.ogg + insertSound: /Audio/ADT/ADTGlobalEvents/NewYear/Tree/christmas_tree/Toys/tree_toys.ogg + name: TreeToys + #startingItem: null + priority: 1 + whitelist: + tags: + - ADTTreeRedBalls + - ADTTreeSilverBalls + - ADTTreeGoldenBalls + - type: ItemMapper + mapLayers: + goldenstar_garland: + whitelist: + tags: + - ADTGoldenStarGarland + silverstar_garland: + whitelist: + tags: + - ADTSilverStarGarland + basestar_garland: + whitelist: + tags: + - ADTBaseStarGarland + shiny_garland: + whitelist: + tags: + - ADTShinyGarland + red_balls: + whitelist: + tags: + - ADTTreeRedBalls + silver_balls: + whitelist: + tags: + - ADTTreeSilverBalls + golden_balls: + whitelist: + tags: + - ADTTreeGoldenBalls + red_star: + whitelist: + tags: + - ADTTreeRedStar + golden_star: + whitelist: + tags: + - ADTTreeGoldenStar + silver_star: + whitelist: + tags: + - ADTTreeSilverStar + silver_mishura: + whitelist: + tags: + - ADTTreeSilverMishura + red_mishura: + whitelist: + tags: + - ADTTreeRedMishura + golden_mishura: + whitelist: + tags: + - ADTTreeGoldenMishura + sprite: ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi + - type: ContainerContainer + containers: + garland: !type:ContainerSlot + mishura: !type:ContainerSlot + tree_top: !type:ContainerSlot + tree_toys: !type:ContainerSlot + #storagebase: !type:Container + # ents: [] + #- type: UserInterface + # interfaces: + # - key: enum.StorageUiKey.Key + # type: StorageBoundUserInterface + - type: StaticPrice + price: 10 + - type: Transform + anchored: true + - type: Physics + bodyType: Static + - type: Anchorable + - type: Appearance diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Toys/toys.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Toys/toys.yml new file mode 100644 index 00000000000..443b6275bed --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Objects/Toys/toys.yml @@ -0,0 +1,67 @@ +- type: entity + name: Suspicious gift + description: A gift of suspicious appearance. A barely audible beeping sound comes from it. + parent: BaseItem + id: toyC4Package + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toyPackage.rsi + state: icon + layers: + - state: icon + map: ["enum.TriggerVisualLayers.Base"] + - type: Item + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toyPackage.rsi + size: Small + - type: SpawnItemsOnUse + items: + - id: toyC4 + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + parent: BaseItem + id: toyC4 + name: toy c4 + description: A toy that will help you EXPLODE with laughter. + suffix: Новый год + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toy.rsi + state: icon + - type: Item + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toy.rsi + size: Tiny + # - type: ItemCooldown + - type: EmitSoundOnUse + sound: + path: /Audio/ADT/Fun/c4NY_music.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/ADT/Fun/bell.ogg + - type: EmitSoundOnActivate + sound: + path: /Audio/ADT/Fun/bell.ogg + - type: MeleeWeapon + wideAnimationRotation: 135 + soundHit: + path: /Audio/ADT/Fun/bell.ogg + damage: + types: + Blunt: 0 + - type: UseDelay + delay: 28 + +- type: entity + parent: BaseItem + id: coal + name: coal + description: For the naughtiest ones. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Fun/coal.rsi + state: icon + - type: Item + size: Tiny diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Structures/Decorations/christmas_fireplace.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Structures/Decorations/christmas_fireplace.yml new file mode 100644 index 00000000000..ea3ab2f69de --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Structures/Decorations/christmas_fireplace.yml @@ -0,0 +1,37 @@ +- type: entity + id: ADTChristmasFireplace + parent: Fireplace + suffix: New Year + name: christmas fireplace + description: A place that has fire, decorated for a holiday. Cozy! + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Structures/Decoration/christmas_fireplase.rsi + layers: + - state: christmas_fireplace_01 + - state: fireplace_fire4 + shader: unshaded + - state: fireplace_glow + shader: unshaded + - type: Construction + graph: ADTChristmasFireplace + node: christmasfireplace + +- type: entity + id: ADTChristmasFireplace2 + parent: Fireplace + suffix: New Year + name: christmas fireplace + description: A place that has fire, decorated for a holiday. Cozy! + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Structures/Decoration/christmas_fireplase.rsi + layers: + - state: christmas_fireplace_02 + - state: fireplace_fire4 + shader: unshaded + - state: fireplace_glow + shader: unshaded + - type: Construction + graph: ADTChristmasFireplace2 + node: christmasfireplace2 diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Structures/Machines/vending_machines.yml new file mode 100644 index 00000000000..9703175ff7a --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Structures/Machines/vending_machines.yml @@ -0,0 +1,33 @@ +- type: entity + parent: VendingMachine + id: ADTVendingMachineNewYear + name: NewYearMate + description: A vending machine for New Year things. + suffix: New Year + components: + - type: VendingMachine + pack: ADTNewYearMateInventory + offState: off + brokenState: broken + normalState: normal-unshaded + denyState: deny-unshaded + #- type: Advertise + # pack: ClothesMateAds + - type: Speech + # - type: Tag + # tags: + # - DroneUsable + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Structures/Machines/VendingMachines/newyearmate.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 1.8 + energy: 1.6 + color: "#1ca9d4" diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Structures/Wallmount/Signs/poster.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Structures/Wallmount/Signs/poster.yml new file mode 100644 index 00000000000..bec94f4534e --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Entities/Structures/Wallmount/Signs/poster.yml @@ -0,0 +1,38 @@ +#Новогодние постеры + +- type: entity + parent: ADTPosterBase + id: ADTPosterNewYear + name: "2569" + description: Poster that celebrates New Year on Earth. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Structures/Wallmounts/poster_new_year.rsi + state: new_year + - type: PointLight + radius: 3 + energy: 2 + color: "#5469e6" + +- type: entity + parent: ADTPosterBase + id: ADTPosterNewYear2 + name: happy new year + description: Poster that celebrates New Year on Earth. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Structures/Wallmounts/poster_new_year.rsi + state: new_year2 + +- type: entity + parent: ADTPosterBase + id: ADTPosterNewYear3 + name: new year tayaran + description: Poster that celebrates New Year on Earth. + suffix: New Year + components: + - type: Sprite + sprite: ADT/ADTGlobalEvents/NewYears/Structures/Wallmounts/poster_new_year.rsi + state: new_year3 diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Flavors/flavors.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Flavors/flavors.yml new file mode 100644 index 00000000000..c7fab2c44e6 --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Flavors/flavors.yml @@ -0,0 +1,35 @@ +#New Year +- type: flavor + id: ADTHoliday + flavorType: Base + description: flavor-base-holiday + +- type: flavor + id: ADTMilkshake + flavorType: Complex + description: flavor-complex-milkshake + +- type: flavor + id: ADTTeaCinnamonLemon + flavorType: Complex + description: flavor-complex-tea-cimmanon-lemon + +- type: flavor + id: ADTSbitenCinnamonLemon + flavorType: Complex + description: flavor-complex-sbiten-cimmanon-lemon + +- type: flavor + id: ADTOlivier + flavorType: Complex + description: flavor-complex-olivier + +- type: flavor + id: ADTJellymeat + flavorType: Complex + description: flavor-complex-jellymeat + +- type: flavor + id: ADTHerringUnderFurcoat + flavorType: Complex + description: flavor-complex-herring diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/InventoryTemplates/cat_inventory_template.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/InventoryTemplates/cat_inventory_template.yml new file mode 100644 index 00000000000..b3996474b6f --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/InventoryTemplates/cat_inventory_template.yml @@ -0,0 +1,34 @@ +- type: inventoryTemplate + id: adtcat + slots: + - name: head + slotTexture: head + slotFlags: HEAD + uiWindowPos: 1,0 + strippingWindowPos: 1,0 + displayName: Head + whitelist: + tags: + - CatWearable + + - name: mask + slotTexture: mask + slotFlags: MASK + uiWindowPos: 1,1 + strippingWindowPos: 1,1 + displayName: Mask + whitelist: + tags: + - PetWearable + + - name: suitstorage + slotTexture: suit_storage + slotFlags: SUITSTORAGE + slotGroup: SecondHotbar + stripTime: 3 + uiWindowPos: 2,0 + strippingWindowPos: 2,5 + displayName: Suit Storage + whitelist: + components: + - GasTank diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Reagents/Consumable/Drink/new_year.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Reagents/Consumable/Drink/new_year.yml new file mode 100644 index 00000000000..e88c72d23b9 --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Reagents/Consumable/Drink/new_year.yml @@ -0,0 +1,141 @@ +- type: reagent + id: ADTChampagneMandarin + name: reagent-name-champagne-mandarin + parent: Champagne + desc: reagent-desc-champagne-mandarin + recognizable: true + metamorphicSprite: + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi + state: champagne_mandarin + +- type: reagent + id: ADTMulledWineCold + name: reagent-name-mulled-wine-cold + parent: BaseAlcohol + desc: reagent-desc-mulled-wine-cold + physicalDesc: reagent-physical-desc-cloudy + flavor: cold + color: "#743636" + metamorphicSprite: + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi + state: mulled_wine_cold + +- type: reagent + id: ADTMulledWine + name: reagent-name-mulled-wine + parent: BaseDrink + desc: reagent-desc-mulled-wine + physicalDesc: reagent-physical-desc-cloudy + flavor: ADTHoliday + color: "#743636" + metamorphicSprite: + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi + state: mulled_wine + +- type: reagent + id: ADTCarnation #гвоздика, чисто нужна для напитков. + name: reagent-name-carnation + parent: BaseDrink + desc: reagent-desc-carnation + physicalDesc: reagent-physical-desc-cloudy + flavor: savory + color: "#673d0c" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 0.5 + +- type: reagent + id: ADTСinnamon #корица, тоже для напитков. + name: reagent-name-cinnamon + parent: BaseDrink + desc: reagent-desc-cinnamon + physicalDesc: reagent-physical-desc-cloudy + flavor: sweet + color: "#9f5525" + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 0.5 + +- type: reagent + id: ADTHotChocolate + name: reagent-name-hot-chocolate + parent: BaseDrink + desc: reagent-desc-hot-chocolate + physicalDesc: reagent-physical-desc-aromatic + flavor: ADTChocolateDrinkFlavor + color: "#9c9289" + metamorphicSprite: + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi + state: hot_chocolate + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Theobromine + amount: 0.05 + +- type: reagent + id: ADTHotChocolateAllergic + name: reagent-name-hot-chocolate-allergic + parent: BaseDrink + desc: reagent-desc-hot-chocolate-allergic + physicalDesc: reagent-physical-desc-aromatic + flavor: ADTChocolateDrinkFlavor + color: "#9c9289" + metamorphicSprite: + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi + state: hot_chocolate + +- type: reagent + id: ADTHotCocoa + name: reagent-name-hot-cocoa + parent: BaseDrink + desc: reagent-desc-hot-cocoa + physicalDesc: reagent-physical-desc-aromatic + flavor: ADTCocoaDrinkFlavor + color: "#b29b7b" + metamorphicSprite: + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi + state: hot_cocoa + +- type: reagent + id: ADTTeaCinnamonLemon + name: reagent-name-tea-cinnamon-lemon + parent: BaseDrink + desc: reagent-desc-tea-cinnamon-lemon + physicalDesc: reagent-physical-desc-aromatic + flavor: ADTTeaCinnamonLemon + color: "#5b3b15" + metamorphicSprite: + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi + state: warm_tea_cinnamon_lemon + +- type: reagent + id: ADTChristmasMilkshake + name: reagent-name-christmas-milkshake + parent: BaseSoda + desc: reagent-desc-christmas-milkshake + physicalDesc: reagent-physical-desc-creamy + flavor: ADTMilkshake + color: "#c7c5c1" + metamorphicSprite: + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi + state: christmas_milkshake + +- type: reagent + id: ADTSbitenCinnamonLemon + name: reagent-name-sbiten-cinnamon-lemon + parent: BaseAlcohol + desc: reagent-desc-sbiten-cinnamon-lemon + physicalDesc: reagent-physical-desc-aromatic + flavor: ADTSbitenCinnamonLemon + color: "#5a3a28" + metamorphicSprite: + sprite: ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi + state: sbiten_cinnamon_lemon diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Recipes/Construction/Graph/drinks.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Recipes/Construction/Graph/drinks.yml new file mode 100644 index 00000000000..bbbdf1c8ed0 --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Recipes/Construction/Graph/drinks.yml @@ -0,0 +1,16 @@ +- type: constructionGraph + id: DrinkBurst + start: start + graph: + + - node: start + edges: + - to: burst + completed: + - !type:DamageEntity + damage: + Blunt: 6 #стеклу не важно, какой урон, главное чтобы был 5. + steps: + - minTemperature: 353 + + - node: burst diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Recipes/Construction/Graph/fireplace.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Recipes/Construction/Graph/fireplace.yml new file mode 100644 index 00000000000..8188853dd4d --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Recipes/Construction/Graph/fireplace.yml @@ -0,0 +1,56 @@ +#New Year +- type: constructionGraph + id: ADTChristmasFireplace + start: start + graph: + - node: start + edges: + - to: christmasfireplace + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: Steel + amount: 15 + doAfter: 5 + + - node: christmasfireplace + entity: ADTChristmasFireplace + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 15 + - !type:DeleteEntity {} + steps: + - tool: Prying + doAfter: 5 + +- type: constructionGraph + id: ADTChristmasFireplace2 + start: start + graph: + - node: start + edges: + - to: christmasfireplace2 + completed: + - !type:SnapToGrid + southRotation: true + steps: + - material: Steel + amount: 15 + doAfter: 5 + + - node: christmasfireplace2 + entity: ADTChristmasFireplace2 + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 15 + - !type:DeleteEntity {} + steps: + - tool: Prying + doAfter: 5 diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Recipes/Cooking/meal_recipe.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Recipes/Cooking/meal_recipe.yml new file mode 100644 index 00000000000..28e13624574 --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Recipes/Cooking/meal_recipe.yml @@ -0,0 +1,100 @@ +#рецепты + +- type: microwaveMealRecipe + id: ADTFoodOlivierSaladRecipe + name: olivier salad recipe + result: ADTFoodOlivierSalad + time: 15 + group: Holidays + reagents: + Mayo: 5 + solids: + FoodBowlBig: 1 + FoodPotato: 2 + FoodMeat: 1 + FoodCarrot: 1 + FoodEgg: 1 + recipeType: + - Assembler + +- type: microwaveMealRecipe + id: ADTFoodJelliedMeatRecipe + name: jellied meat recipe + result: ADTFoodJelliedMeat + time: 20 + group: Holidays + reagents: + Water: 15 + TableSalt: 5 + UncookedAnimalProteins: 10 + solids: + FoodMeat: 1 + FoodPlateSmall: 1 + recipeType: + - Assembler + +- type: microwaveMealRecipe + id: ADTFoodHerringUnderFurcoatRecipe + name: herring under furcoat recipe + result: ADTFoodHerringUnderFurcoat + time: 15 + group: Holidays + reagents: + Mayo: 5 + solids: + FoodCarrot: 2 + FoodEgg: 1 + FoodMeatFish: 1 + FoodPlateSmall: 1 + recipeType: + - Assembler + +- type: microwaveMealRecipe + id: ADTFoodMeatHamRecipe + name: ham with mead recipe + result: ADTFoodMeatHam + group: Holidays + time: 25 + reagents: + Blackpepper: 5 + TableSalt: 5 + solids: + FoodMeat: 2 + FoodPlate: 1 + recipeType: + - Oven + +- type: microwaveMealRecipe + id: ADTFoodCakePuddingRecipe + name: puding recipe + result: ADTFoodCakePudding + time: 10 + group: Holidays + reagents: + Water: 15 + Milk: 10 + Flour: 10 + Sugar: 15 + Egg: 6 + solids: + FoodPlateSmall: 1 + recipeType: + - Oven + +- type: microwaveMealRecipe + id: ADTFoodCakePuddingChristmasRecipe + name: christmas puding recipe + result: ADTFoodCakePuddingChristmas + time: 10 + group: Holidays + reagents: + Water: 15 + Milk: 10 + Flour: 10 + Sugar: 15 + Egg: 6 + solids: + FoodPlateSmall: 1 + ADTFoodSnackCandyStick: 2 + recipeType: + - Oven diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Recipes/Reactions/new_year.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Recipes/Reactions/new_year.yml new file mode 100644 index 00000000000..6c2eb260e1a --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Recipes/Reactions/new_year.yml @@ -0,0 +1,203 @@ +- type: reaction + id: ADTChampagneMandarin + reactants: + Champagne: + amount: 2 + ADTJuiceMandarin: + amount: 1 + products: + ADTChampagneMandarin: 3 +- type: reaction + id: ADTMulledWineCold + reactants: + ADTСinnamon: + amount: 1 + ADTCarnation: + amount: 2 + JuiceLemon: + amount: 1 + Wine: + amount: 2 + products: + ADTMulledWineCold: 6 +- type: reaction + id: ADTMulledWine + minTemp: 353 + reactants: + ADTMulledWineCold: + amount: 0.5 + products: + ADTMulledWine: 0.5 + +- type: reaction + id: ADTChristmasMilkshake + reactants: + Milk: + amount: 3 + IceCream: + amount: 1 + CocoaPowder: + amount: 2 + products: + ADTChristmasMilkshake: 6 + +- type: reaction + id: ADTTeaCinnamonLemon + reactants: + Tea: + amount: 3 + JuiceLemon: + amount: 2 + ADTСinnamon: + amount: 1 + products: + ADTTeaCinnamonLemon: 6 + +- type: reaction + id: ADTSbitenCinnamonLemon + minTemp: 373 #температура кипячения. ~99°C + reactants: + Water: + amount: 2 + Mead: + amount: 1 #заменить на мёд. КОГДА ОН ПОЯВИТСЯ + JuiceLemon: + amount: 1 + ADTСinnamon: + amount: 1 + ADTCarnation: + amount: 1 + products: + ADTSbitenCinnamonLemon: 6 + +- type: reaction + id: ADTHotCocoa + minTemp: 373 + reactants: + ADTCocoaDrink: + amount: 2 + Cream: + amount: 1 + products: + ADTHotCocoa: 3 + +- type: reaction + id: ADTCocoaDrink + reactants: + CocoaPowder: + amount: 1 + Water: + amount: 4 + Milk: + amount: 1 + products: + ADTCocoaDrink: 6 + +- type: reaction + id: ADTHotChocolate + minTemp: 373 + reactants: + Nutriment: + amount: 10 + Theobromine: + amount: 3 + CocoaPowder: + amount: 1 #просто перемолотая плитка шоколада. + products: + ADTHotChocolate: 15 + +- type: reaction + id: ADTHotChocolateAllergic + minTemp: 373 + reactants: + Nutriment: + amount: 8 + CocoaPowder: + amount: 1 #просто перемолотая плитка гипо-шоколада. + products: + ADTHotChocolateAllergic: 10 + +#технически не совсем приготовление напитка, но всё же +- type: microwaveMealRecipe + id: RecipeMulledWineWarm + name: warm mulled wine recipe + result: ADTMulledWineGlass + time: 10 + group: Holidays + reagents: + ADTMulledWineCold: 30 + solids: + DrinkGlass: 1 + +- type: microwaveMealRecipe + id: RecipeMulledWineWarm2 + name: warm mulled wine recipe + result: ADTMulledWineGlass + time: 10 + group: Holidays + reagents: + ADTMulledWineCold: 30 + solids: + ADTMulledWineGlass: 1 #Костыли, но по-другому я никак не могу придумать. + +- type: microwaveMealRecipe + id: RecipeADTHotChocolate + name: hot chocolate recipe + result: ADTHotChocolateGlass + time: 10 + group: Holidays + solids: + DrinkGlass: 1 + FoodSnackChocolateBar: 2 + +- type: microwaveMealRecipe + id: RecipeADTHotChocolate2 + name: hot chocolate recipe + result: ADTHotChocolateGlass + time: 10 + group: Holidays + solids: + ADTHotChocolateGlass: 1 + FoodSnackChocolateBar: 2 + +- type: microwaveMealRecipe + id: RecipeADTHotChocolateAllergic + name: hot hypoallergen chocolate recipe + result: ADTHotChocolateAllergicGlass + time: 10 + group: Holidays + solids: + DrinkGlass: 1 + ADTHypoAllergenChocolateBar: 2 + +- type: microwaveMealRecipe + id: RecipeADTHotChocolateAllergic2 + name: hot hypoallergen chocolate recipe + result: ADTHotChocolateAllergicGlass + time: 10 + group: Holidays + solids: + ADTHotChocolateAllergicGlass: 1 + ADTHypoAllergenChocolateBar: 2 + +- type: microwaveMealRecipe + id: RecipeADTHotCocoa + name: hot cocoa recipe + result: ADTHotCocoaGlass + time: 10 + group: Holidays + reagents: + ADTCocoaDrink: 30 + solids: + DrinkGlass: 1 + +- type: microwaveMealRecipe + id: RecipeADTHotCocoa2 + name: hot cocoa recipe + result: ADTHotCocoaGlass + time: 10 + group: Holidays + reagents: + ADTCocoaDrink: 30 + solids: + ADTHotCocoaGlass: 1 diff --git a/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Recipes/tags.yml b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Recipes/tags.yml new file mode 100644 index 00000000000..31d2d05d945 --- /dev/null +++ b/Resources/Prototypes/ADT/ADTGlobalEvents/NewYears/Recipes/tags.yml @@ -0,0 +1,5 @@ +- type: Tag + id: ADTSparkler + +- type: Tag + id: CatWearable diff --git a/Resources/Prototypes/ADT/Barks/misc.yml b/Resources/Prototypes/ADT/Barks/misc.yml index 5a8fc984434..a7c36074bc6 100644 --- a/Resources/Prototypes/ADT/Barks/misc.yml +++ b/Resources/Prototypes/ADT/Barks/misc.yml @@ -4,12 +4,12 @@ sound: /Audio/ADT/Voice/Vocal-Barks/noise-bark.ogg roundStart: false -- type: speechBark - id: SkeletonBarkOne - name: bark-skeleton-first-name # @@@ QWERTY barks update - sound: - collection: ADTSkeletonBark # Новое обновление от старого любителя барков @@@ QWERTY - roundStart: false +# - type: speechBark +# id: SkeletonBarkOne +# name: bark-skeleton-first-name # @@@ QWERTY barks update +# sound: +# collection: ADTSkeletonBark # Новое обновление от старого любителя барков @@@ QWERTY +# roundStart: false - type: speechBark id: CanineVoice @@ -53,19 +53,19 @@ sound: /Audio/ADT/Voice/Vocal-Barks/oneshot-robot.ogg roundStart: false -- type: speechBark - id: FatalErrorSans - name: bark-fatalerror-sans-name # @@@ QWERTY barks update - sound: - collection: ADTFatalErrorSans - roundStart: false +# - type: speechBark +# id: FatalErrorSans +# name: bark-fatalerror-sans-name # @@@ QWERTY barks update +# sound: +# collection: ADTFatalErrorSans +# roundStart: false -- type: speechBark - id: Gaster - name: bark-gaster-name # @@@ QWERTY barks update - sound: - collection: ADTGaster - roundStart: false +# - type: speechBark +# id: Gaster +# name: bark-gaster-name # @@@ QWERTY barks update +# sound: +# collection: ADTGaster +# roundStart: false - type: speechBark id: Sam diff --git a/Resources/Prototypes/ADT/Body/Parts/chicken.yml b/Resources/Prototypes/ADT/Body/Parts/chicken.yml new file mode 100644 index 00000000000..1762834a61c --- /dev/null +++ b/Resources/Prototypes/ADT/Body/Parts/chicken.yml @@ -0,0 +1,69 @@ +#- type: entity +# id: ADTChickenWing +# name: chicken wing +# parent: PartAnimal +# noSpawn: true +# components: +# - type: Sprite +# sprite: ADT/Mobs/Animals/chicken_parts.rsi +# layers: +# - state: torso_m +# - type: BodyPart +# partType: Hand +# symmetry: Left + +#- type: entity +# id: ADTChickenLeg +# name: chicken legs +# parent: PartAnimal +# noSpawn: true +# components: +# - type: Sprite +# sprite: ADT/Mobs/Animals/chicken_parts.rsi +# layers: +# - state: l_leg +# - state: r_leg +# - type: BodyPart +# partType: Leg +# - type: MovementBodyPart + +- type: entity + id: ADTChickenBody + name: chicken body + parent: PartAnimal + # noSpawn: true + components: + - type: Sprite + sprite: ADT/Mobs/Animals/chicken_parts.rsi + layers: + - state: torso_m + - type: BodyPart + partType: Torso + - type: Damageable + damageContainer: Biological + - type: Extractable + juiceSolution: + reagents: + - ReagentId: Fat + Quantity: 10 + - ReagentId: Blood + Quantity: 20 + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: UncookedAnimalProteins + Quantity: 30 + - ReagentId: Fat + Quantity: 20 + - type: MovementBodyPart + - type: Item + size: Normal + - type: Butcherable + spawned: + - id: FoodMeatChicken + amount: 2 + - id: ADTFoodMeatChickenWing + amount: 2 + - id: ADTFoodMeatChickenLeg + amount: 2 diff --git a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_food.yml new file mode 100644 index 00000000000..54b8d7be0d0 --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_food.yml @@ -0,0 +1,129 @@ +- type: cargoProduct + id: ADTFoodBeerTankCargo + icon: + sprite: ADT/Structures/Storage/beertank.rsi + state: cargobeer + product: ADTBeerTankCargo + cost: 1500 + category: cargoproduct-category-name-food + group: market + +- type: cargoProduct + id: ADTFoodBeerTankLeaflover + icon: + sprite: ADT/Structures/Storage/beertank.rsi + state: leafloverbeer + product: ADTBeerTankLeaflover + cost: 1500 + category: cargoproduct-category-name-food + group: market + +- type: cargoProduct + id: ADTFoodBeerTankScientific + icon: + sprite: ADT/Structures/Storage/beertank.rsi + state: scientificale + product: ADTBeerTankScientificAle + cost: 1500 + category: cargoproduct-category-name-food + group: market + +- type: cargoProduct + id: ADTFoodBeerTankGoldenAle + icon: + sprite: ADT/Structures/Storage/beertank.rsi + state: goldenale + product: ADTBeerTankGoldenAle + cost: 1500 + category: cargoproduct-category-name-food + group: market + +- type: cargoProduct + id: ADTFoodBeerTankSausage + icon: + sprite: ADT/Structures/Storage/beertank.rsi + state: sausagebeer + product: ADTBeerTankSausage + cost: 1500 + category: cargoproduct-category-name-food + group: market + +- type: cargoProduct + id: ADTFoodBeerTankTechno + icon: + sprite: ADT/Structures/Storage/beertank.rsi + state: technobeer + product: ADTBeerTankTechno + cost: 1500 + category: cargoproduct-category-name-food + group: market + +- type: cargoProduct + id: ADTFoodBeerTankClassicPaulaner + icon: + sprite: ADT/Structures/Storage/beertank.rsi + state: paulanerbeer + product: ADTBeerTankClassicPaulaner + cost: 1500 + category: cargoproduct-category-name-food + group: market + +- type: cargoProduct + id: ADTFoodBeerTankLivsey + icon: + sprite: ADT/Structures/Storage/beertank.rsi + state: livseybeer + product: ADTBeerTankLivsey + cost: 1500 + category: cargoproduct-category-name-food + group: market + +- type: cargoProduct + id: ADTFoodBeerTankLuckyJonny + icon: + sprite: ADT/Structures/Storage/beertank.rsi + state: luckyjonnybeer + product: ADTBeerTankLuckyJonny + cost: 1500 + category: cargoproduct-category-name-food + group: market + +- type: cargoProduct + id: ADTFoodBeerTankSecUnfiltered + icon: + sprite: ADT/Structures/Storage/beertank.rsi + state: secunfilteredbeer + product: ADTBeerTankSecUnfiltered + cost: 1500 + category: cargoproduct-category-name-food + group: market + +- type: cargoProduct + id: ADTFoodBeerTankGlyphidStout + icon: + sprite: ADT/Structures/Storage/beertank.rsi + state: glyphidstout + product: ADTBeerTankGlyphidStout + cost: 1500 + category: cargoproduct-category-name-food + group: market + +- type: cargoProduct + id: ADTFoodOktoberfestSnack + icon: + sprite: ADT/Objects/Consumable/Food/Baked/misc.rsi + state: brezel_salt + product: ADTCrateFoodOktoberfestSnack + cost: 1500 + category: cargoproduct-category-name-food + group: market + +- type: cargoProduct + id: ADTCargoHalloweenSnack + icon: + sprite: ADT/Objects/Misc/halloween_smilecandy_bowl.rsi + state: icon-0 + product: ADTCrateHalloweenFood + cost: 2700 + category: cargoproduct-category-name-food + group: market diff --git a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml index 6e3c1fa27b3..74087fe6712 100644 --- a/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/ADT/Catalog/Cargo/cargo_fun.yml @@ -1,3 +1,13 @@ +- type: cargoProduct + id: ADTFunOktoberfestClothes + icon: + sprite: ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlblue.rsi + state: icon + product: ADTCrateFunOktoberfestClothes + cost: 750 + category: cargoproduct-category-name-fun + group: market + - type: cargoProduct id: ADTFunATV icon: @@ -25,6 +35,17 @@ product: ADTRingsCrate category: cargoproduct-category-name-fun cost: 8000 + +- type: cargoProduct + id: ADTFunHalloweenCloth + icon: + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: pennywise + product: ADTCrateHalloweenCloth + cost: 4250 + category: cargoproduct-category-name-fun + group: market + - type: cargoProduct id: ADTFunSprayPaints icon: diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Boxes/boxes.yml b/Resources/Prototypes/ADT/Catalog/Fills/Boxes/boxes.yml index 3d5eaf5e9ce..351668d11a5 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Boxes/boxes.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Boxes/boxes.yml @@ -1,3 +1,834 @@ +# Nightmare Clown + +- type: entity + id: ADTBoxNightmareClown + parent: BaseStorageItem + name: clown Nightmare Suit + description: clown Nightmare Suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: pennywise + #layers: + #- state: pennywise + - type: Item + size: Ginormous + - type: ClothingSpeedModifier + walkModifier: 0.8 + sprintModifier: 0.8 + - type: Storage + maxItemSize: Huge + grid: + - 0,0,8,6 + - type: ContainerContainer + containers: + storagebase: !type:Container + - type: PhysicalComposition + materialComposition: + Cardboard: 100 + - type: StorageFill + contents: + - id: ADTOtherworldClownCostume + amount: 1 + - id: ADTClownCollarCaterpillar + amount: 1 + - id: ADTClownNightmareShoes + amount: 1 + - id: ClothingHandsGlovesColorWhite + amount: 1 + - id: BikeHorn + amount: 1 + - id: ClothingMaskClown + amount: 1 + - id: BalloonSyn + amount: 1 + +# Cruelty Squad + +- type: entity + id: ADTBoxCrueltySquad + parent: ADTBoxNightmareClown + name: bio-merc of cruelty squad suit + description: bio-merc of cruelty squad suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: сrueltysquad + #layers: + #- state: base + #- state: сrueltysquad + - type: StorageFill + contents: + - id: ADTCSIJArmor + amount: 1 + - id: ADTNeonTacticalGlasses + amount: 1 + - id: ADTBioMercGloves + amount: 1 + - id: ADTBioMercUniform + amount: 1 + - id: ClothingShoesBootsCombat + amount: 1 + +# Jason + +- type: entity + id: ADTBoxJason + parent: ADTBoxNightmareClown + name: Friday 13 suit + description: Friday 13 suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: jasonvoorhees + #layers: + #- state: base + #- state: jasonvoorhees + - type: StorageFill + contents: + - id: ADTJasonBomber + amount: 1 + - id: ADTJasonHockeyMask + amount: 1 + - id: ADTJasonMachette + amount: 1 + - id: ADTJasonCostume + amount: 1 + - id: ClothingShoesBootsCombat + amount: 1 + - id: ClothingHandsGlovesColorBlack + amount: 1 + +# Vyazov + +- type: entity + id: ADTBoxVyazov + parent: ADTBoxNightmareClown + name: Freddy Krueger suit + description: Freddy Krueger suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: freddy + #layers: + #- state: base + #- state: freddy + - type: StorageFill + contents: + - id: ADTVyasovCostume + amount: 1 + - id: ADTClothingHeadVyasovHat + amount: 1 + - id: ADTVyazovGloves + amount: 1 + +# Hotline Miami + +- type: entity + id: ADTBoxHotlineMiami + parent: ADTBoxNightmareClown + name: Hotline Miami suit + description: Hotline Miami suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: jecket + #layers: + #- state: base + #- state: jecket + - type: Item + size: Ginormous + - type: Storage + maxItemSize: Ginormous + - type: StorageFill + contents: + - id: BaseBallBat + amount: 1 + - id: ClothingHeadHatRichard + amount: 1 + - id: ClothingShoesBootsLaceup + amount: 1 + - id: ADTHotlineMiamiUniform + amount: 1 + - id: ADTStudentBomber + amount: 1 + +# Killa + +- type: entity + id: ADTBoxKilla + parent: ADTBoxNightmareClown + name: Killa suit + description: Killa suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: killa + #layers: + #- state: base + #- state: killa + - type: StorageFill + contents: + - id: ADTClothingHeadKillaHelmet + amount: 1 + - id: ADTKillaArmor + amount: 1 + - id: ClothingShoesBootsCombat + amount: 1 + - id: ADTClothingUniformAbibasBlackSuit + amount: 1 + +# Servant of Evil + +- type: entity + id: ADTBoxServantOfEvil + parent: ADTBoxNightmareClown + name: servant of evil suit + description: servant of evil suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: minion + #layers: + #- state: base + #- state: minion + - type: StorageFill + contents: + - id: ADTServantOfEvilUniform + amount: 1 + - id: ADTServantOfEvilGlasses + amount: 1 + - id: ClothingHandsGlovesColorBlack + amount: 1 + - id: ClothingShoesBootsCombat + amount: 1 + +# Dude + +- type: entity + id: ADTBoxDude + parent: ADTBoxNightmareClown + name: Dude suit + description: Dude suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: postal2 + #layers: + #- state: base + #- state: postal2 + - type: Item + size: Ginormous + - type: Storage + maxItemSize: Ginormous + - type: StorageFill + contents: + - id: ADTDudeShirt + amount: 1 + - id: ClothingShoesBootsCombat + amount: 1 + - id: ClothingOuterCoatJensen + amount: 1 + - id: Shovel + amount: 1 + - id: ClothingEyesGlassesSunglasses + amount: 1 + - id: BoxFolderClipboard + amount: 1 + +# Squid Game Player + +- type: entity + id: ADTBoxSquidPlayers + parent: ADTBoxNightmareClown + name: Squid Game players uniforms + description: Squid Game players uniforms + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: squid_player + #layers: + #- state: base + - type: StorageFill + contents: + - id: ADTSquidGamePlayerSuit + amount: 5 + - id: ClothingShoesColorWhite + amount: 5 + +# Squid Game Organizer + +- type: entity + id: ADTBoxSquidOrganizer + parent: ADTBoxNightmareClown + name: Squid Game organizer uniform + description: Squid Game organizer uniform + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: squid_org + #layers: + #- state: base + - type: StorageFill + contents: + - id: ADTSquidGameOrganizerSuit + amount: 1 + - id: ADTClothingHeadSquidGameHood + amount: 1 + - id: ADTClothingMaskSquidGameWorker + amount: 1 + - id: ADTClothingMaskSquidGameSoldier + amount: 1 + - id: ADTClothingMaskSquidGameManager + amount: 1 + - id: ClothingHandsGlovesColorBlack + amount: 1 + - id: ClothingShoesBootsLaceup + amount: 1 + +# Tagilla + +- type: entity + id: ADTBoxTagilla + parent: ADTBoxNightmareClown + name: Tagilla box + description: Tagilla box + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: tagilla + #layers: + #- state: base + #- state: tagilla + - type: StorageFill + contents: + - id: ADTTagillaSuit + amount: 1 + - id: ADTClothingHeadHatTagilla + amount: 1 + - id: ADTRedMartialArtsGloves + amount: 1 + - id: ADTTagillaArmor + amount: 1 + - id: ADTTagillaSledgehammerToy + orGroup: ToyOrRealSledge + - id: ADTTagillaSledgehammerReal + prob: 0.1 + orGroup: ToyOrRealSledge + - id: ClothingShoesBootsCombat + amount: 1 + +# Nevada Clown + +- type: entity + id: ADTBoxNevadaClown + parent: ADTBoxNightmareClown + name: the costume of the Nevada psychopathic clown + description: the costume of the Nevada psychopathic clown + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: tricky + #layers: + #- state: base + #- state: tricky + - type: StorageFill + contents: + - id: ADTDJClownSuit + amount: 1 + - id: ADTClothingHeadHatClownArmor + amount: 1 + - id: ADTGreyClownPsyhoShoes + amount: 1 + +# Transilvania + +- type: entity + id: ADTBoxTransilvania + parent: ADTBoxNightmareClown + name: the costume vampire + description: the costume vampire + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: vampire + #layers: + #- state: base + #- state: vampire + - type: StorageFill + contents: + - id: ADTVampireSuit + amount: 1 + - id: ADTVampireCloak + amount: 1 + - id: ClothingShoesBootsLaceup + amount: 1 + - id: ClothingHandsGlovesColorWhite + amount: 1 + +# Vergile + +- type: entity + id: ADTBoxVergile + parent: ADTBoxNightmareClown + name: Vergile box + description: Vergile box + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: vergil + #layers: + #- state: base + #- state: vergil + - type: StorageFill + contents: + - id: ADTVergileSuit + amount: 1 + - id: ADTVergileCloak + amount: 1 + - id: ADTClothingHandsFingerlessCombat + amount: 1 + - id: ClothingShoesBootsLaceup + amount: 1 + +# Xeno + +- type: entity + id: ADTXenoBox + parent: ADTBoxNightmareClown + name: Xeno box + description: Xeno box + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: xeno + #layers: + #- state: base + #- state: xeno + - type: StorageFill + contents: + - id: ADTXenomorphSuit + amount: 3 + - id: ADTClothingHeadXenomorph + amount: 3 + +# Superstar Police + +- type: entity + id: ADTSuperstarPoliceBox + parent: ADTBoxNightmareClown + name: police-superstar box + description: police-superstar box + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: harry + #layers: + #- state: base + #- state: harry + - type: StorageFill + contents: + - id: ClothingUniformJumpsuitSuperstarCop + amount: 1 + - id: ClothingOuterDiscoAssBlazer + amount: 1 + - id: ClothingNeckHorrific + amount: 1 + - id: ClothingShoesGreenLizardskin + amount: 1 + +# Superstar Police Wingman + +- type: entity + id: ADTSuperstarPoliceWingmanBox + parent: ADTBoxNightmareClown + name: police-superstar wingman box + description: police-superstar wingman box + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: kim + #layers: + #- state: base + #- state: kim + - type: StorageFill + contents: + - id: ClothingEyesBinoclardLenses + amount: 1 + - id: ClothingHandsGlovesAerostatic + amount: 1 + - id: ClothingShoesAerostatic + amount: 1 + - id: ClothingOuterAerostaticBomberJacket + amount: 1 + - id: ClothingUniformJumpsuitAerostatic + amount: 1 + - id: BoxFolderClipboard + amount: 1 + +# Bunny Dancer + +- type: entity + id: ADTBunnyDancerBox + parent: ADTBoxNightmareClown + name: bunny dancer box + description: bunny dancer box + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: rabbit + #layers: + #- state: base + #- state: rabbit + - type: StorageFill + contents: + - id: ADTClothingUniformRabbitDress + amount: 1 + - id: ClothingHeadHatBunny + amount: 1 + - id: ADTClothingHandsRabbitGloves + amount: 1 + +# Halloween Candy + +- type: entity + id: ADTBoxHalloweenCandy + parent: ADTBoxNightmareClown + name: halloween candy box + description: halloween candy box + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: base + - type: Storage + whitelist: + tags: + - ADTCandies + maxItemSize: Normal + grid: + - 0,0,5,5 + - type: StorageFill + contents: + - id: ADTFoodSnackCandyBat + - id: ADTFoodSnackCandyYellow + - id: ADTFoodSnackCandyGreen + - id: ADTFoodSnackCandyApple + - id: ADTFoodSnackCandyEyes2 + - id: ADTFoodSnackCandyEyes + - id: ADTFoodSnackCandyEyes1 + - id: ADTFoodSnackMintCaramel + - id: ADTFoodSnackHLCaramel + - id: ADTFoodSnackWorms + - id: ADTFoodSnackHeart + - id: ADTFoodSnackBlackCandies + - id: ADTFoodCookieGhost + - id: ADTFoodCookieBlackcat + - id: ADTFoodSnackCandyRed + - id: ADTFoodSnackBunny + - id: ADTFoodSnackCandyPurple + - id: ADTFoodSnackCandyPumpkin + - id: ADTFoodSnackCandyKinito + - id: ADTFoodCookieSpider + - id: ADTFoodDonutSpooky + - id: ADTFoodCookieKnight + - id: ADTFoodCookiePumpkin + - id: ADTFoodCookieSkull + - id: ADTFoodSnackCandyCorn + - id: ADTFoodDonutJellySpooky + - id: ADTFoodBakedMuffinPumpkin + - id: ADTFoodSnackBrains + - id: ADTFoodSnackCoinCandies + - id: ADTFoodSnackYellowCandies + - id: ADTFoodSnackVioletCandies + - id: ADTFoodSnackCandyGoW + - id: ADTFoodSnackCandyBlue + - id: ADTFoodSnackCandyMine + - id: ADTFoodSnackRedCandies + - id: ADTFoodSnackGreenCandies + +# PayDay + +- type: entity + id: ADTPayDayBox + parent: ADTBoxNightmareClown + name: police-superstar box + description: police-superstar box + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: payday + #layers: + #- state: base + #- state: harry + - type: StorageFill + contents: + - id: ADTPayDayChainsMask + amount: 1 + - id: ADTPayDayDallasMask + amount: 1 + - id: ADTPayDayHoustonMask + amount: 1 + - id: ADTPayDayWolfMask + amount: 1 + - id: ClothingShoesBootsLaceup + amount: 4 + - id: ClothingUniformJumpsuitLawyerGood + amount: 1 + - id: ClothingUniformJumpsuitLawyerBlue + amount: 1 + - id: ClothingUniformJumpsuitLawyerRed + amount: 1 + - id: ClothingUniformJumpsuitLawyerBlack + amount: 1 + - id: ClothingHandsGlovesNitrile + amount: 4 + +# Chainsaw Man + +- type: entity + id: ADTChainSawManBox + parent: ADTBoxNightmareClown + name: police-superstar box + description: police-superstar box + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: chainsaw + #layers: + #- state: base + #- state: harry + - type: StorageFill + contents: + - id: ADTClothingHeadHatChainSaw + amount: 1 + - id: ADTJumpsuitHunterDemon + amount: 1 + - id: ClothingShoesColorRed + amount: 1 + +# Michael Myers + +- type: entity + id: ADTMichaelMyersBox + parent: ADTBoxNightmareClown + name: michael myers box + description: michael myers box + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: michael + #layers: + #- state: base + #- state: harry + - type: StorageFill + contents: + - id: ADTMichaelMyersMask + amount: 1 + - id: ADTHalloweenMichaelMyersSuit + amount: 1 + +- type: entity + id: ADTBoxRedHat + parent: ADTBoxNightmareClown + name: red box + description: red hat box + suffix: Halloweeen + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: redhat + #layers: + #- state: base + #- state: harry + - type: StorageFill + contents: + - id: ADTClothingNeckCloakRedhat + - id: ADTClothingHeadHatHoodRedhat + - id: ADTClothingUniformJumpSkirtRedHat + +# - type: entity +# id: ADTBoxSollux +# parent: ADTBoxNightmareClown +# name: sollux box +# description: sollux box +# suffix: Halloweeen +# components: +# - type: Sprite +# sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi +# state: sollux +# #layers: +# #- state: base +# #- state: harry +# - type: StorageFill +# contents: +# - id: ADTClothingEyesGlassesSollux +# - id: ADTClothingHeadHatHornsSollux +# - id: ADTClothingShoesBootsSollux +# - id: ADTClothingUniformJumpsuitSollux +# - type: Storage +# maxItemSize: Normal +# grid: +# - 0,0,3,2 +# - type: Item +# size: Large + +# Bad Police + +- type: entity + id: ADTBoxBadPolice + parent: ADTBoxNightmareClown + name: Bad Police box + description: Bad Police box + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: bad_police + - type: StorageFill + contents: + - id: ADTHalloweenBadPoliceSuit + amount: 1 + - id: ADTClothingHeadHatPoliceHat + amount: 1 + +# Lethal Company + +- type: entity + id: ADTBoxLethalCompany + parent: ADTBoxNightmareClown + name: Lethal Company box + description: Lethal Company box + suffix: Halloween + components: + - type: StaticPrice + price: 20 + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: lethal_company + - type: StorageFill + contents: + - id: ADTHalloweenLethalCompanySuit + amount: 1 + - id: ADTClothingHeadLethalCompanyHelmet + amount: 1 + - id: ClothingHandsGlovesColorBlack + amount: 1 + - id: ClothingShoesBootsJack + amount: 1 + - id: ADTDoubleLethalCompanyOxygenTankFilled + amount: 1 + - id: ADTDoubleLethalCompanyNitrogenTankFilled + amount: 1 + - id: ADTLethalCompanyAirHorn + prob: 0.3 + +# Empress of light + +- type: entity + id: ADTBoxEmpressOfLight + parent: ADTBoxNightmareClown + name: Empress of Light costume box + description: Empress of Light costume box + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: empress_of_light + - type: StorageFill + contents: + - id: ADTHalloweenEmpressOfLightSuit + amount: 1 + - id: ADTHalloweenEmpressOfLightSuitYellow + amount: 1 + - id: ADTClothingHeadEmpressOfLightHelmet + amount: 1 + - id: ADTClothingHandsEmpressOfLightGloves + amount: 1 + - id: ADTEmpressOfLightShoes + amount: 1 + +- type: entity + id: ADTCandyBox + parent: BaseStorageItem + name: candy box + description: I give you my heart! + components: + - type: Sprite + sprite: ADT/Objects/Specific/Service/loveday_candy.rsi + state: chocobox + - type: Item + size: Small + - type: Storage + maxItemSize: Tiny + grid: + - 0,0,1,2 + - type: ContainerContainer + containers: + storagebase: !type:Container + - type: PhysicalComposition + materialComposition: + Cardboard: 100 + - type: StorageFill + contents: + - id: ADTFoodSnackCandyLove + amount: 1 + - id: ADTFoodSnackMinichoco1Bar + amount: 1 + - id: ADTFoodSnackMinichoco2Bar + amount: 1 + - id: ADTFoodSnackMinichoco3Bar + amount: 1 + - id: ADTFoodSnackMinichoco4 + amount: 1 + - id: ADTFoodSnackMinichoco5 + amount: 1 + +# ~~Gaylord~~ Alasor from Hazbin Hotel +- type: entity + id: ADTBoxRadioDemon + parent: ADTBoxNightmareClown + name: radio demon suit + description: radio demon suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Storage/Boxes/halloween_box.rsi + state: alastor + - type: StorageFill + contents: + - id: ADTClothingHeadDemonicHornsDeer + amount: 1 + - id: ADTClothingOuterCoatRadioDemon + amount: 1 + - id: ADTClothingJumpsuitRadioDemonSuit + amount: 1 + - id: ADTRadioDemonShoes + amount: 1 + # - id: ADTRadioDemonMonocle + # amount: 1 + - type: entity parent: ADTFoodPackGummies id: ADTFoodPackGummiesFilled diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/ADT/Catalog/Fills/Crates/food.yml new file mode 100644 index 00000000000..c97e8641d6e --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/Fills/Crates/food.yml @@ -0,0 +1,43 @@ +- type: entity + id: ADTCrateFoodOktoberfestSnack + parent: CratePlastic + name: oktoberfest snack crate + description: oktoberfest snack crate + suffix: Oktoberfest + components: + - type: StorageFill + contents: + - id: ADTFoodMeatWeissWurst + amount: 5 + - id: ADTFoodMeatBratWurst + amount: 5 + - id: ADTFoodBakedBrezel + amount: 5 + - id: ADTFoodBakedBrezelPoppySeeds + amount: 3 + - id: ADTFoodBakedBrezelSalt + amount: 3 + - id: ADTFoodBakedBrezelChocolate + amount: 3 + - id: ADTFoodBakedBrezelVanilla + amount: 3 + +# halloween + +- type: entity + id: ADTCrateHalloweenFood + parent: CratePlastic + name: halloween candy crate + description: halloween candy crate + suffix: Halloween + components: + - type: StorageFill + contents: + - id: ADTBoxHalloweenCandy + amount: 4 + - id: ADTHalloweenCandyBowl + - id: ADTHalloweenSmileCandyBowl + - id: ADTHalloweenNTCandyBowl + - id: ADTHalloweenSyndieCandyBowl + - id: ADTHalloweenZombieCandyBowl + - id: ADTHalloweenSealCandyBowl diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/ADT/Catalog/Fills/Crates/fun.yml index c86f025fc43..ec82e634681 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Crates/fun.yml @@ -26,6 +26,58 @@ - id: ADTObjectBouquetWithBeer - id: ADTObjectLiliacBouquet +- type: entity + id: ADTCrateFunOktoberfestClothes + parent: CratePlastic + name: oktoberfest clothing crate + description: oktoberfest clothing crate + suffix: Oktoberfest + components: + - type: StorageFill + contents: + - id: ADTClothingUniformOktoberfestWhite + amount: 1 + - id: ADTClothingUniformOktoberfestBlueCheckered + amount: 1 + - id: ADTClothingUniformOktoberfestGreenVest + amount: 1 + - id: ADTClothingUniformOktoberfestRedCheckered + amount: 1 + - id: ADTClothingUniformOktoberfestGreenCheckered + amount: 1 + - id: ADTClothingUniformOktoberfestBlueVest + amount: 1 + - id: ADTClothingUniformOktoberfestRedVest + amount: 1 + - id: ADTClothingUniformOktoberfestDirndlShort + amount: 1 + - id: ADTClothingUniformOktoberfestDirndlShortGreen + amount: 1 + - id: ADTClothingUniformOktoberfestDirndlShortRed + amount: 1 + - id: ADTClothingUniformOktoberfestDirndlShortBlue + amount: 1 + - id: ADTClothingUniformOktoberfestDirndlBlue + amount: 1 + - id: ADTClothingUniformOktoberfestDirndlRed + amount: 1 + - id: ADTClothingUniformOktoberfestDirndlGreen + amount: 1 + - id: ADTClothingHeadHatsBavarianHat + amount: 1 + - id: ADTClothingHeadHatsBavarianHatBlueBorder + amount: 1 + - id: ADTClothingHeadHatsBavarianHatRedBorder + amount: 1 + - id: ADTClothingHeadHatsBavarianHatGreenBorder + amount: 1 + - id: ADTClothingHeadHatsBavarianHatBlue + amount: 1 + - id: ADTClothingHeadHatsBavarianHatGreen + amount: 1 + - id: ADTClothingHeadHatsBavarianHatRed + amount: 2 + - type: entity id: ADTCrateFunATV parent: CrateLivestock @@ -53,6 +105,46 @@ amount: 1 - id: ADTVehicleKeySyndicateSegway amount: 1 + +# halloween + +- type: entity + id: ADTCrateHalloweenCloth + parent: CratePlastic + name: halloween clothing crate + description: halloween clothing crate + suffix: Halloween + components: + - type: StorageFill + contents: + - id: ADTBoxHalloweenCandy + amount: 4 + - id: ADTBoxNightmareClown + - id: ADTBoxCrueltySquad + - id: ADTBoxJason + - id: ADTBoxVyazov + - id: ADTBoxHotlineMiami + - id: ADTBoxKilla + - id: ADTBoxServantOfEvil + - id: ADTBoxDude + - id: ADTBoxSquidPlayers + - id: ADTBoxSquidOrganizer + - id: ADTBoxTagilla + - id: ADTBoxNevadaClown + - id: ADTBoxTransilvania + - id: ADTBoxVergile + - id: ADTXenoBox + - id: ADTSuperstarPoliceBox + - id: ADTSuperstarPoliceWingmanBox + - id: ADTBunnyDancerBox + - id: ADTPayDayBox + - id: ADTChainSawManBox + # - id: ADTBoxSollux + - id: ADTBoxRedHat + - id: ADTBoxBadPolice + - id: ADTBoxLethalCompany + - id: ADTBoxEmpressOfLight + - type: entity id: ADTCrateFunSprayPaints name: spray paint crate diff --git a/Resources/Prototypes/ADT/Catalog/Fills/Items/gas_tanks.yml b/Resources/Prototypes/ADT/Catalog/Fills/Items/gas_tanks.yml index 279fa95d680..497475afc46 100644 --- a/Resources/Prototypes/ADT/Catalog/Fills/Items/gas_tanks.yml +++ b/Resources/Prototypes/ADT/Catalog/Fills/Items/gas_tanks.yml @@ -1,3 +1,31 @@ +- type: entity + id: ADTDoubleLethalCompanyOxygenTankFilled + parent: ADTDoubleLethalCompanyOxygenTank + suffix: Filled + components: + - type: GasTank + outputPressure: 21.3 + air: + # 31 minutes + volume: 5 + moles: + - 2.051379050 # oxygen + temperature: 293.15 + +- type: entity + id: ADTDoubleLethalCompanyNitrogenTankFilled + parent: ADTDoubleLethalCompanyNitrogenTank + suffix: Filled + components: + - type: GasTank + air: + # 31 minutes + volume: 5 + moles: + - 0 # oxygen not included + - 2.051379050 # nitrogen + temperature: 293.15 + - type: entity id: ADTHyperNobliumTankFilled parent: OxygenTank @@ -31,4 +59,4 @@ - type: Item sprite: ADT/Objects/Tanks/hypernob.rsi - type: Clothing - sprite: ADT/Objects/Tanks/hypernob.rsi + sprite: ADT/Objects/Tanks/hypernob.rsi \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/loveland.yml b/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/loveland.yml new file mode 100644 index 00000000000..e6fbf6c25f3 --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/loveland.yml @@ -0,0 +1,45 @@ +- type: vendingMachineInventory + id: ADTLoveLandInventory + startingInventory: + ADTClothingHeadRomanticHat: 3 + ADTClothingUniformJumpsuitRomanticSuit: 3 + ADTClothingUniformJumpsuitTurtleHeart: 5 + ADTClothingOuterRedCardigan: 3 + ADTClothingOuterBlackCardigan: 3 + ADTClothingUniformJumpsuitDarkMan: 3 + ADTClothingUniformJumpsuitBrightMan: 3 + ADTClothingUniformJumpsuitRedSweaterHeart: 3 + ADTClothingUniformJumpsuitWhiteSweaterHeart: 3 + ADTClothingUniformBurgundyDress: 3 + ADTClothingUniformBurgundyDressAlt: 3 + ADTClothingUniformCocktailDress: 3 + ADTClothingUniformEveningDress: 3 + ADTClothingUniformGothDress: 3 + ClothingShoesBootsLaceup: 2 + ADTClothingBeltQuiverCupidon: 2 + ADTClothingUniformJumpsuitCupidon: 2 + ADTClothingUnderwearSocksHeart: 3 + ADTClothingUnderwearSocksStockingsHeart: 3 + ADTCandyBox: 5 + ADTFoodCakeChocolateHeart: 5 + ADTFoodBoxEclairs: 5 + ADTFoodBananChocolate: 5 + ADTFoodBananChocolatePink: 5 + ADTObjectBouquetDarkRose : 2 + ADTObjectBouquetRose: 3 + ADTObjectBouquetYellow: 5 + ADTValentineCard1: 4 + ADTValentineCard2: 4 + ADTValentineCard3: 4 + ADTValentineCard4: 4 + ADTValentineCard5: 4 + ADTValentineCard6: 4 + ADTValentineCard7: 4 + ADTValentineCard8: 4 + ADTStrawberryMousse: 5 + ADTBrouletTorched: 5 + ADTCremeBroulet: 5 + ADTFoodCookieCaramelEar: 5 + ADTFoodCookieStrawberryHeart: 5 + ADTFoodCakeStrawberryHeart: 5 + ADTFoodCakeChocolateGlazeHeart: 5 diff --git a/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/vendingMachine.yml b/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/vendingMachine.yml new file mode 100644 index 00000000000..24893a403ab --- /dev/null +++ b/Resources/Prototypes/ADT/Catalog/VendingMachines/Inventories/vendingMachine.yml @@ -0,0 +1,41 @@ +- type: vendingMachineInventory + id: ADTHalloweenMateInventory + startingInventory: + ADTBoxHalloweenCandy: 6 + ADTHalloweenCandyBowl: 3 + ADTHalloweenSmileCandyBowl: 3 + ADTHalloweenNTCandyBowl: 3 + ADTHalloweenSyndieCandyBowl: 2 + ADTHalloweenZombieCandyBowl: 2 + ADTHalloweenSealCandyBowl: 2 + ADTHalloweenBroom: 4 + ADTGoldenCandleStick: 3 + ADTSilverCandleStick: 3 + ADTScullLamp: 3 + ADTBoxRadioDemon: 3 + ADTBoxNightmareClown: 3 + ADTBoxCrueltySquad: 3 + ADTBoxJason: 3 + ADTBoxVyazov: 3 + ADTBoxHotlineMiami: 3 + ADTBoxKilla: 3 + ADTBoxServantOfEvil: 3 + ADTBoxDude: 3 + ADTBoxSquidPlayers: 3 + ADTBoxSquidOrganizer: 3 + ADTBoxTagilla: 3 + ADTBoxNevadaClown: 3 + ADTBoxTransilvania: 3 + ADTBoxVergile: 3 + ADTXenoBox: 3 + ADTSuperstarPoliceBox: 3 + ADTSuperstarPoliceWingmanBox: 3 + ADTBunnyDancerBox: 3 + ADTPayDayBox: 3 + ADTChainSawManBox: 3 + ADTMichaelMyersBox: 2 + # ADTBoxSollux: 2 + ADTBoxRedHat: 2 + ADTBoxBadPolice: 2 + ADTBoxLethalCompany: 3 + ADTBoxEmpressOfLight: 3 diff --git a/Resources/Prototypes/ADT/Catalog/revolution_toolbox_sets.yml b/Resources/Prototypes/ADT/Catalog/revolution_toolbox_sets.yml index fc0f37a244d..7c2ce7438e3 100644 --- a/Resources/Prototypes/ADT/Catalog/revolution_toolbox_sets.yml +++ b/Resources/Prototypes/ADT/Catalog/revolution_toolbox_sets.yml @@ -45,6 +45,7 @@ - ADTPassagerRDIDCard - ADTCustomLawCircuitBoard - HandheldCrewMonitor + # - ADTBoxSollux - type: thiefBackpackSet id: ADTGunsmith diff --git a/Resources/Prototypes/ADT/Decals/petals.yml b/Resources/Prototypes/ADT/Decals/petals.yml new file mode 100644 index 00000000000..7cc2c585608 --- /dev/null +++ b/Resources/Prototypes/ADT/Decals/petals.yml @@ -0,0 +1,7 @@ +- type: decal + id: ADTFlowow + snapCardinals: true + defaultSnap: false + sprite: + sprite: ADT/Decals/petals.rsi + state: flowow \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml index edb6e3b5132..148bde5c4ef 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Back/backpacks.yml @@ -123,4 +123,30 @@ - type: Sprite sprite: ADT/Clothing/Back/winrar.rsi - type: ExplosionResistance - damageCoefficient: 0.9 \ No newline at end of file + damageCoefficient: 0.9 + +- type: entity + parent: ClothingBackpack + id: ADTClothingBackpackSanta + name: ADTClothingBackpackSanta + description: ADTClothingBackpackSanta + components: + - type: Sprite + sprite: ADT/Clothing/Back/santa_backpack.rsi + - type: Storage + maxItemSize: Huge + grid: + - 0,0,19,9 + - type: LimitedItemGiver + spawnEntries: + - id: PresentRandom + orGroup: present + - id: PresentRandomCash # buy your own. + prob: 0.1 + orGroup: present + - id: PresentRandomCoal # naughty + prob: 0.05 + orGroup: present + receivedPopup: christmas-tree-got-gift + deniedPopup: christmas-tree-no-gift + requiredHoliday: FestiveSeason \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml index 36e16ddfcf1..2694c5041dc 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Belt/belts.yml @@ -213,6 +213,22 @@ - type: Item size: Small +#РПС Киллы + +- type: entity + id: ADTClothingBeltKilla + parent: ClothingBeltMilitaryWebbing + name: Triton belt + description: Triton belt + suffix: Halloween + components: + - type: Storage + maxItemSize: Normal + - type: Sprite + sprite: ADT/Clothing/Belt/killa_webbing.rsi + - type: Clothing + sprite: ADT/Clothing/Belt/killa_webbing.rsi + - type: entity parent: ClothingBeltStorageBase id: ADTClothingBeltMedicalBag @@ -426,6 +442,21 @@ - !type:ComboStunEffect stunTime: 1 dropItems: false +#День Святого Валентина + +- type: entity + parent: ClothingBeltQuiver + id: ADTClothingBeltQuiverCupidon + name: cupidon quiver + description: cupidon quiver + suffix: Valentine Day + components: + - type: Sprite + sprite: ADT/Clothing/Belt/cupidon_quiver.rsi + layers: + - state: icon + - map: [ "enum.StorageContainerVisualLayers.Fill" ] + visible: false # USSP diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml index f8269d4eb47..45b598df475 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Eyes/glasses.yml @@ -55,6 +55,7 @@ tags: - WhitelistChameleon - HudMedical + - type: entity parent: ClothingEyesBase id: ADTClothingEyesGlassesMimicry @@ -65,7 +66,46 @@ - type: Clothing sprite: ADT/Clothing/Eyes/Glasses/mimicry.rsi + # halloween + +- type: entity + parent: ClothingEyesBase + id: ADTNeonTacticalGlasses + name: neon tactical glasses + description: Ordinary tactical glasses made of acid-green polycarbonate. + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Eyes/Glasses/neontactical.rsi + state: icon + - type: Clothing + sprite: ADT/Clothing/Eyes/Glasses/neontactical.rsi +- type: entity + parent: ClothingEyesBase + id: ADTServantOfEvilGlasses + name: welding glasses + description: welding glasses + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Eyes/Glasses/servant_of_evil.rsi + state: icon + - type: Clothing + sprite: ADT/Clothing/Eyes/Glasses/servant_of_evil.rsi + +- type: entity + parent: ClothingEyesBase + id: ADTClothingEyesGlassesSollux + name: welding glasses + description: welding glasses + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Eyes/Glasses/sollux_captor.rsi + state: icon + - type: Clothing + sprite: ADT/Clothing/Eyes/Glasses/sollux_captor.rsi - type: entity parent: [ClothingEyesBase, BaseMajorContraband] diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Hands/fill.txt b/Resources/Prototypes/ADT/Entities/Clothing/Hands/fill.txt deleted file mode 100644 index b4954caf47d..00000000000 --- a/Resources/Prototypes/ADT/Entities/Clothing/Hands/fill.txt +++ /dev/null @@ -1 +0,0 @@ -# Данный файл существует по причине того что Githab плохо дружит с пустыми папками, при работе с этой папкой этот файл можно спокойно удалить \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml index fc0d36e7cee..ecd99686e8b 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Hands/gloves.yml @@ -1,3 +1,98 @@ +# ADT-Halloween-start + +- type: entity + parent: ClothingHandsBase + id: ADTClothingHandsRabbitGloves + name: Rabbit Gloves + description: Shhh. Furry. + components: + - type: Sprite + sprite: ADT/Clothing/Hands/Gloves/rabbit_gloves.rsi + - type: Clothing + sprite: ADT/Clothing/Hands/Gloves/rabbit_gloves.rsi + - type: Fiber + fiberMaterial: fibers-synthetic + - type: FingerprintMask + +- type: entity + parent: ClothingHandsBase + id: ADTClothingHandsEmpressOfLightGloves + name: empress of light gloves + description: Majestic and blue. + components: + - type: Sprite + sprite: ADT/Clothing/Hands/Gloves/empress_of_light_gloves.rsi + - type: Clothing + sprite: ADT/Clothing/Hands/Gloves/empress_of_light_gloves.rsi + - type: Fiber + fiberMaterial: fibers-synthetic + - type: FingerprintMask + +# ADT-Halloween-end + +- type: entity + parent: ClothingHandsBase + id: ADTBioMercGloves + name: fingerless tactical bio-fabric gloves + description: If you thought that this glove is environmentally friendly, then you are very mistaken. This glove is made of a fabric with an admixture of biomass, which strongly resembles leather. Moreover, this "skin" is unnaturally warm... + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Hands/Gloves/biomerc_gloves.rsi + - type: Clothing + sprite: ADT/Clothing/Hands/Gloves/biomerc_gloves.rsi + - type: Fiber + fiberMaterial: fibers-synthetic + +- type: entity + parent: ClothingHandsBase + id: ADTVyazovGloves + name: gloves from the dimension of nightmares + description: The right glove has blades, it seems, with which its former owner dealt with his victims. + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Hands/Gloves/vyazov_gloves.rsi + - type: Clothing + sprite: ADT/Clothing/Hands/Gloves/vyazov_gloves.rsi + - type: Fiber + fiberMaterial: fibers-synthetic + - type: MeleeWeapon + damage: + types: + Slash: 8 + soundHit: + path: /Audio/Weapons/bladeslice.ogg + animation: WeaponArcFist + +- type: entity + parent: ClothingHandsGlovesBoxingRed + id: ADTRedMartialArtsGloves + name: red gloves for martial arts + description: red gloves for martial arts + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Hands/Gloves/red_martial_gloves.rsi + - type: Clothing + sprite: ADT/Clothing/Hands/Gloves/red_martial_gloves.rsi + - type: Fiber + fiberMaterial: fibers-synthetic + +- type: entity + parent: ClothingHandsBase + id: ADTClothingHandsFingerlessCombat + name: fingerless combat gloves + description: These tactical gloves are fireproof and shockproof, and have become much cooler. + components: + - type: Sprite + sprite: ADT/Clothing/Hands/Gloves/fingerless_combat.rsi + - type: Clothing + sprite: ADT/Clothing/Hands/Gloves/fingerless_combat.rsi + - type: Fiber + fiberMaterial: fibers-insulative + fiberColor: fibers-black + #region Paws # ADT Paws - type: entity diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/hardsuit-helmets.yml index dab59b484ab..257a994183f 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/hardsuit-helmets.yml @@ -480,4 +480,35 @@ Blunt: 0.95 Slash: 0.95 Piercing: 0.95 - Heat: 0.95 \ No newline at end of file + Heat: 0.95 + +#EVENT_ABYSS +- type: entity + parent: [ ClothingHeadHardsuitBase , ADTClothingHeadHelmetHardsuitRiotERT ] + id: ADTClothingHeadHelmetHardsuitEVENTServant + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/event_servant_helmet.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/event_servant_helmet.rsi + +- type: entity + parent: [ ClothingHeadHardsuitBase , ADTClothingHeadHelmetHardsuitRiotERT ] + id: ADTClothingHeadHelmetHardsuitEVENTMed + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/event_med_helmet.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/event_med_helmet.rsi + +- type: entity + parent: [ ClothingHeadHardsuitBase , ClothingHeadHelmetHardsuitSyndieCommander ] + id: ADTClothingHeadHelmetHardsuitEVENTsunshine + categories: [ HideSpawnMenu ] + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hardsuits/event_sunshine_helmet.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hardsuits/event_sunshine_helmet.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml index ea0e9d3b62d..f2196525d6e 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/hats.yml @@ -220,6 +220,92 @@ - type: Clothing sprite: ADT/Clothing/Head/Hats/beret_ce.rsi +#октоберфест + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsBavarianHat + name: bavarian hat + description: Traditional bavarian hat + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/bavarian_hat.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Head/Hats/bavarian_hat.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsBavarianHatBlueBorder + name: bavarian hat with blue border + description: Traditional bavarian hat with a blue border + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/bavarian_hatborderblue.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Head/Hats/bavarian_hatborderblue.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsBavarianHatRedBorder + name: bavarian hat with red border + description: Traditional bavarian hat with a red border + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/bavarian_hatborderred.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Head/Hats/bavarian_hatborderred.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsBavarianHatGreenBorder + name: bavarian hat with green border + description: Traditional bavarian hat with a green border + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/bavarian_hatbordergreen.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Head/Hats/bavarian_hatbordergreen.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsBavarianHatBlue + name: bavarian blue hat + description: Traditional bavarian blue hat with a feather + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/bavarian_hatblue.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Head/Hats/bavarian_hatblue.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsBavarianHatGreen + name: bavarian green hat + description: Traditional bavarian green hat with a feather + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/bavarian_hatgreen.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Head/Hats/bavarian_hatgreen.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatsBavarianHatRed + name: bavarian red hat + description: Traditional bavarian red hat with a feather + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/bavarian_hatred.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Head/Hats/bavarian_hatred.rsi #спрайты от SHIONE + - type: entity parent: ClothingHeadBase id: ADTClothingHeadHatTrader @@ -234,6 +320,150 @@ - type: Clothing sprite: ADT/Clothing/Head/Hats/trader.rsi + + # halloween + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatPoliceHat + name: police hat + description: Just a police hat. I hope the policeman has good intentions against me... + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/police_cap.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/police_cap.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadEmpressOfLightHelmet + name: empress of light coronet + description: Looks majestic. + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/empress_of_light_helmet.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/empress_of_light_helmet.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadLethalCompanyHelmet + name: lethal company helmet + description: Just a helmet. Seems like a guy that was once wearing it tried his best not to die. Who knows? + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/lethal_company_helmet.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/lethal_company_helmet.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadVyasovHat + name: shabby fedora + description: It looks very shabby brown in color, it smells like a nightmare straight from Vyazova Street + suffix: Halloween + components: + - type: Tag + tags: # ignore "WhitelistChameleon" tag + - WhitelistChameleon + - type: Sprite + sprite: ADT/Clothing/Head/Hats/vyazovhat.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/vyazovhat.rsi + +- type: entity + parent: ADTClothingHeadUSSPjuggernautHelmetArmored + id: ADTClothingHeadKillaHelmet + name: Killa helmet + description: Killa helmet + suffix: Halloween + components: + - type: Tag + tags: # ignore "WhitelistChameleon" tag + - WhitelistChameleon + - type: Sprite + sprite: ADT/Clothing/Head/Hats/killahelmet.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/killahelmet.rsi + - type: Armor + modifiers: + coefficients: + Piercing: 0.95 + Heat: 0.95 + - type: ExplosionResistance + damageCoefficient: 0.95 + - type: CoveredSlot + slots: [eyes, mask, ears] + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadXenomorph + name: Xenomorph head + description: Xenomorph head + suffix: Halloween + components: + - type: Tag + tags: # ignore "WhitelistChameleon" tag + - WhitelistChameleon + - type: Sprite + sprite: ADT/Clothing/Head/Hats/xeno_head.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/xeno_head.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadZombie + name: zombie head + description: zombie head + suffix: Halloween + components: + - type: Tag + tags: # ignore "WhitelistChameleon" tag + - WhitelistChameleon + - type: Sprite + sprite: ADT/Clothing/Head/Hats/zombie_head.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/zombie_head.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatChainSaw + name: fox head + description: "It's a fox head. Snort snort snort!" + components: + - type: Sprite + sprite: ADT/Clothing/Head/Misc/hatchainsaw.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Misc/hatchainsaw.rsi + - type: IngestionBlocker + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatWinth + name: winth hat + suffix: Halloween + description: winth hat + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/winth_hat.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/winth_hat.rsi + +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatHornsSollux + name: sollux hat + description: sollux hat + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/sollux_captor.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/sollux_captor.rsi + - type: entity parent: ClothingHeadBase id: ADTClothingHeadHatConsultantCentcomCap @@ -317,6 +547,19 @@ heatingCoefficient: 1.025 coolingCoefficient: 0.5 +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadRomanticHat + name: wide red and white hat + description: I take off my hat out of respect for you! + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/romantic_hat.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/romantic_hat.rsi + - type: StaticPrice + price: 10 + # USSP USSP - type: entity @@ -453,6 +696,7 @@ id: ADTClothingHeadDemonicHornsDeer name: demonic deer horns description: A horns of radio demon. Essh... + suffix: Halloween components: - type: Sprite sprite: ADT/Clothing/Head/Hats/demonic_deer_horns.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/helmets.yml index 4f55ae593aa..75b6a5bd155 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/helmets.yml @@ -32,6 +32,33 @@ tags: - WhitelistChameleon +#head hat armored +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadUSSPjuggernautHelmetArmored + name: USSP Armored jugger hard helmet + description: An armored hard hat. Provides the best of both worlds in both protection & utility - perfect for the engineer on the frontlines. + components: + - type: Sprite + sprite: ADT/Clothing/Head/Hats/ussphelmet.rsi + - type: Clothing + sprite: ADT/Clothing/Head/Hats/ussphelmet.rsi + - type: FlashImmunity + - type: EyeProtection + protectionTime: 5 + - type: Armor #Copied from the sec helmet, as it's hard to give these sane values without locational damage existing. + modifiers: + coefficients: + Blunt: 0.6 + Slash: 0.6 + Piercing: 0.6 + Heat: 0.8 + - type: ExplosionResistance + damageCoefficient: 0.70 + - type: GroupExamine + - type: CoveredSlot + slots: [eyes, mask, ears] + - type: entity parent: ClothingHeadBase id: ADTClothingHeadHelmetMGDGuard diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/ADT/Entities/Clothing/Head/hoods.yml index afabfc435d7..019383efe60 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Head/hoods.yml @@ -33,6 +33,7 @@ - WhitelistChameleon - type: Sprite sprite: ADT/Clothing/Head/hoods/squidgame.rsi + state: icon - type: Clothing sprite: ADT/Clothing/Head/hoods/squidgame.rsi - type: HideLayerClothing @@ -43,6 +44,25 @@ - HeadSide - type: IdentityBlocker +- type: entity + parent: ClothingHeadBase + id: ADTClothingHeadHatHoodRedhat + categories: [ HideSpawnMenu ] + name: redhat + suffix: Halloween + description: wearing it, you feel the illusion of security + components: + - type: Sprite + sprite: ADT/Clothing/Head/hoods/redhat.rsi + - type: Clothing + sprite: ADT/Clothing/Head/hoods/redhat.rsi + - type: HideLayerClothing + slots: + - Hair + - Snout + - HeadTop + - HeadSide + - type: entity parent: ClothingHeadBase id: ADTClothingHeadHatHoodChaplainLeader diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml b/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml index 357c86cacfe..7cd172c485c 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Masks/mask.yml @@ -1,3 +1,20 @@ +# TODO: Не стал удалять прототипы, можно будет их по нужде в будущем переносить, или все сразу скопом +# - type: entity +# parent: ClothingMaskBase +# id: ADTJasonHockeyMask +# name: hockey mask of maniac +# description: hockey mask of maniac +# suffix: Halloween +# components: +# - type: Sprite +# sprite: ADT/Clothing/Mask/jason.rsi +# - type: Clothing +# sprite: ADT/Clothing/Mask/jason.rsi +# clothingVisuals: +# mask: +# - state: equipped-MASK +# - type: BreathMask + - type: entity parent: ClothingMaskBase id: ADTClothingMaskSquidGameWorker @@ -81,6 +98,76 @@ # coefficients: # Piercing: 0.95 # Heat: 0.95 + +# - type: entity +# parent: ClothingMaskBase +# id: ADTMichaelMyersMask +# name: Michael Myers mask +# description: Michael Myers mask +# suffix: Halloween +# components: +# - type: Sprite +# sprite: ADT/Clothing/Mask/michael_myersmask.rsi +# - type: Clothing +# sprite: ADT/Clothing/Mask/michael_myersmask.rsi +# clothingVisuals: +# mask: +# - state: equipped-MASK +# - type: BreathMask + +# # PayDay2 mask +# - type: entity +# parent: ClothingMaskBase +# id: ADTPayDayChainsMask +# name: squid game worker mask +# description: squid game worker mask +# suffix: Halloween +# components: +# - type: Sprite +# sprite: ADT/Clothing/Mask/payday_chains.rsi +# - type: Clothing +# sprite: ADT/Clothing/Mask/payday_chains.rsi +# - type: BreathMask + +# - type: entity +# parent: ClothingMaskBase +# id: ADTPayDayDallasMask +# name: squid game worker mask +# description: squid game worker mask +# suffix: Halloween +# components: +# - type: Sprite +# sprite: ADT/Clothing/Mask/payday_dallas.rsi +# - type: Clothing +# sprite: ADT/Clothing/Mask/payday_dallas.rsi +# - type: BreathMask + +# - type: entity +# parent: ClothingMaskBase +# id: ADTPayDayHoustonMask +# name: squid game worker mask +# description: squid game worker mask +# suffix: Halloween +# components: +# - type: Sprite +# sprite: ADT/Clothing/Mask/payday_houston.rsi +# - type: Clothing +# sprite: ADT/Clothing/Mask/payday_houston.rsi +# - type: BreathMask + +# - type: entity +# parent: ClothingMaskBase +# id: ADTPayDayWolfMask +# name: squid game worker mask +# description: squid game worker mask +# suffix: Halloween +# components: +# - type: Sprite +# sprite: ADT/Clothing/Mask/payday_wolf.rsi +# - type: Clothing +# sprite: ADT/Clothing/Mask/payday_wolf.rsi +# - type: BreathMask + # - type: entity # parent: ClothingMaskGasSecurity # id: ADTClothingMaskGasLapkeeSet @@ -229,6 +316,130 @@ slots: - Snout + + # halloween + +- type: entity + parent: ClothingMaskBase + id: ADTJasonHockeyMask + name: hockey mask of maniac + description: hockey mask of maniac + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Mask/jason.rsi + - type: Clothing + sprite: ADT/Clothing/Mask/jason.rsi + clothingVisuals: + mask: + - state: equipped-MASK + - type: BreathMask + +- type: entity + parent: WeldingMaskBase + id: ADTClothingHeadHatTagilla + name: Tagilla mask + description: Tagilla mask + components: + - type: Sprite + sprite: ADT/Clothing/Mask/tagilla_mask.rsi + - type: Clothing + sprite: ADT/Clothing/Mask/tagilla_mask.rsi + - type: Armor + modifiers: + coefficients: + Piercing: 0.95 + Heat: 0.95 + +- type: entity + parent: ClothingMaskBase + id: ADTClothingHeadHatClownArmor + name: ballistic mask of a psychopathic clown + description: OMFG YOU DO NOT KILL CLOWN! CLOWN KILLS YOU! + components: + - type: Sprite + sprite: ADT/Clothing/Mask/clownballistic_mask.rsi + - type: Clothing + sprite: ADT/Clothing/Mask/clownballistic_mask.rsi + clothingVisuals: + mask: + - state: equipped-MASK + - type: BreathMask + - type: Armor + modifiers: + coefficients: + Piercing: 0.95 + Heat: 0.95 + +- type: entity + parent: ClothingMaskBase + id: ADTMichaelMyersMask + name: Michael Myers mask + description: Michael Myers mask + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Mask/michael_myersmask.rsi + - type: Clothing + sprite: ADT/Clothing/Mask/michael_myersmask.rsi + clothingVisuals: + mask: + - state: equipped-MASK + - type: BreathMask + +# PayDay2 mask +- type: entity + parent: ClothingMaskBase + id: ADTPayDayChainsMask + name: squid game worker mask + description: squid game worker mask + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Mask/payday_chains.rsi + - type: Clothing + sprite: ADT/Clothing/Mask/payday_chains.rsi + - type: BreathMask + +- type: entity + parent: ClothingMaskBase + id: ADTPayDayDallasMask + name: squid game worker mask + description: squid game worker mask + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Mask/payday_dallas.rsi + - type: Clothing + sprite: ADT/Clothing/Mask/payday_dallas.rsi + - type: BreathMask + +- type: entity + parent: ClothingMaskBase + id: ADTPayDayHoustonMask + name: squid game worker mask + description: squid game worker mask + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Mask/payday_houston.rsi + - type: Clothing + sprite: ADT/Clothing/Mask/payday_houston.rsi + - type: BreathMask + +- type: entity + parent: ClothingMaskBase + id: ADTPayDayWolfMask + name: squid game worker mask + description: squid game worker mask + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Mask/payday_wolf.rsi + - type: Clothing + sprite: ADT/Clothing/Mask/payday_wolf.rsi + - type: BreathMask + - type: entity id: ADTMaskCoif parent: BaseItem @@ -500,6 +711,7 @@ id: ADTMFDoomMask name: MF-Doom mask description: "I keep hearing these strange sounds coming from the kitchen. holy shit, it’s the slender man!" + suffix: Halloween components: - type: Sprite sprite: ADT/Clothing/Mask/mfdoom.rsi diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Masks/specific.yml b/Resources/Prototypes/ADT/Entities/Clothing/Masks/specific.yml index 1c96e811955..c3aea64abd4 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Masks/specific.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Masks/specific.yml @@ -7,7 +7,7 @@ - type: VoiceMask voiceMaskName: "???" action: null - barkId: Mettaton + # barkId: Mettaton - type: HideLayerClothing slots: - Snout diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/Cloaks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/Cloaks.yml index 4b2d19531f5..ded61514cb4 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Neck/Cloaks.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Neck/Cloaks.yml @@ -85,6 +85,41 @@ - type: Sprite sprite: ADT/Clothing/Neck/Cloaks/nukeops_cloak.rsi #спрайты от floppo4ka + + # halloween + +- type: entity + parent: ClothingOuterStorageBase + id: ADTVergileCloak + name: Vergile cloak + description: Vergile cloak + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Misc/vergile_cloak.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Misc/vergile_cloak.rsi + +- type: entity + parent: ClothingNeckBase + id: ADTClothingNeckCloakRedhat + name: redhat cloak + description: redhat cloak + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Neck/Cloaks/redhat.rsi + - type: Clothing + sprite: ADT/Clothing/Neck/Cloaks/redhat.rsi + - type: ContainerContainer + containers: + toggleable-clothing: !type:ContainerSlot {} + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadHatHoodRedhat + requiredSlot: + - neck + slot: head + - type: entity parent: ClothingNeckBase id: ADTClothingNeckInvisibleCloak diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Neck/misc.yml b/Resources/Prototypes/ADT/Entities/Clothing/Neck/misc.yml index 440a247607e..b93988d755a 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Neck/misc.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Neck/misc.yml @@ -43,6 +43,29 @@ - type: StaticPrice price: 40 + + # halloween + +- type: entity + parent: ClothingNeckBase + id: ADTClownCollarCaterpillar + name: clown collar-caterpillar + description: A once-extinct attribute of a Buffoon and a Clown + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Neck/Misc/clowncollar.rsi + +- type: entity + parent: ClothingNeckBase + id: ADTVampireCloak + name: vampire cloak + description: vampire cloak + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Neck/Misc/vampire_cloak.rsi + - type: entity parent: ClothingNeckPinBase id: ADTClothingNeckKubanoidPin diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml index 9777c1512bc..dd25fd53412 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/armor.yml @@ -184,6 +184,76 @@ - type: Item size: Large + + # halloween + +- type: entity + parent: ClothingOuterArmorBasic + id: ADTTagillaArmor + name: Tagilla bulletproof vest + description: Tagilla bulletproof vest + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Armor/tagilla_armor.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Armor/tagilla_armor.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.85 + Heat: 0.9 + - type: ExplosionResistance + damageCoefficient: 0.90 + #- type: Storage + # capacity: 12 + +- type: entity + parent: ClothingOuterArmorBasic + id: ADTKillaArmor + name: Killa armor vest + description: Killa armor vest + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Armor/killa_armor.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Armor/killa_armor.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.85 + Heat: 0.9 + - type: ExplosionResistance + damageCoefficient: 0.9 + - type: ClothingSpeedModifier + walkModifier: 0.90 + sprintModifier: 0.90 + +- type: entity + parent: ClothingOuterArmorBasic + id: ADTCSIJArmor + name: CSIJ bulletproof vest + description: No one knows what this bulletproof vest is made of, and it's better not to know... On the back there are the initials CS - 'Cruelty Squad'. + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Armor/CSIJ_armor.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Armor/CSIJ_armor.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.85 + - type: ExplosionResistance + damageCoefficient: 0.9 + - type: entity parent: [ClothingOuterArmorBasic, BadgeOnClothing] id: ADTClothingOuterArmorMiner @@ -532,4 +602,4 @@ - type: GroupExamine - type: ClothingSpeedModifier walkModifier: 0.75 - sprintModifier: 0.75 + sprintModifier: 0.75 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml index 5cbfab26bbe..59230342264 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/coats.yml @@ -223,6 +223,32 @@ Slash: 0.95 Heat: 0.90 + + # halloween + +- type: entity + parent: ClothingOuterStorageBase + id: ADTJasonBomber + name: maniac bomber + description: maniac bomber + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/jason.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/jason.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ADTStudentBomber + name: student bomber + description: student bomber + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Coats/hotline_student.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Coats/hotline_student.rsi # Med - type: entity diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuits.yml index f0a6bdf2671..fc7c390dab8 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/hardsuits.yml @@ -574,3 +574,37 @@ - type: ToggleableClothing clothingPrototype: ADTClothingHeadHelmetHardsuitIanHero - type: CargoSellBlacklist + +#EVENT_ABYSS +- type: entity + parent: [ClothingOuterHardsuitBase, ADTClothingOuterERTRiotHardsuit ] + id: ADTEVENTServantHardsuit + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/event_servant_hardsuit.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/event_servant_hardsuit.rsi + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadHelmetHardsuitEVENTServant + +- type: entity + parent: [ClothingOuterHardsuitBase, ClothingOuterHardsuitSyndieCommander ] + id: ADTEVENTLeaderHardsuit + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/event_sunshine_hardsuit.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/event_sunshine_hardsuit.rsi + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadHelmetHardsuitEVENTsunshine + +- type: entity + parent: [ClothingOuterHardsuitBase, ClothingOuterHardsuitSyndieMedic] + id: ADTEVENTMedHardsuit + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Hardsuits/event_med_hardsuit.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Hardsuits/event_med_hardsuit.rsi + - type: ToggleableClothing + clothingPrototype: ADTClothingHeadHelmetHardsuitEVENTMed diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/misc.yml index dd14bbe9a95..fb6ab8258d1 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/misc.yml @@ -9,6 +9,44 @@ - type: Clothing sprite: ADT/Clothing/OuterClothing/Misc/apron_pathologist.rsi +#День Святого Валентина + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterRedCardigan + name: red cardigan + description: red cardigan + suffix: Valentine Day + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Misc/red_cardigan.rsi #спрайты от @lunalita + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Misc/red_cardigan.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ADTClothingOuterBlackCardigan + name: black cardigan + description: black cardigan + suffix: Valentine Day + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Misc/black_cardigan.rsi #спрайты от @lunalita + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Misc/black_cardigan.rsi + +- type: entity + parent: ClothingOuterBase + id: ADTClothingOuterCupidonWings + name: cupidon wings + description: cupidon wings + suffix: Valentine Day + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/Misc/cupidon_wings.rsi #спрайты от @lunalita + - type: Clothing + sprite: ADT/Clothing/OuterClothing/Misc/cupidon_wings.rsi + #Коробка с подтяжками (для клунь) - type: entity diff --git a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/wintercoats.yml index 84d81efd12d..01ded58c3c0 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/OuterClothing/wintercoats.yml @@ -58,3 +58,29 @@ sprite: ADT/Clothing/OuterClothing/WinterCoats/hoody_white.rsi - type: Clothing sprite: ADT/Clothing/OuterClothing/WinterCoats/hoody_white.rsi + +- type: entity + parent: ClothingOuterWinterCoat + id: ADTClothingOuterFurCoatHeart + name: fur coat + description: A white fur coat embroidered with many bright red hearts. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/WinterCoats/fur_coat.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/WinterCoats/fur_coat.rsi + - type: StaticPrice + price: 120 + +- type: entity + parent: ClothingOuterWinterCoat + id: ADTClothingOuterLowerFurCoat + name: fur coat + description: An ordinary fur coat made of white fur. + components: + - type: Sprite + sprite: ADT/Clothing/OuterClothing/WinterCoats/lower_fur_coat.rsi + - type: Clothing + sprite: ADT/Clothing/OuterClothing/WinterCoats/lower_fur_coat.rsi + - type: StaticPrice + price: 120 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/ADT/Entities/Clothing/Shoes/misc.yml index af35d78216b..d58f2a56ca0 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Shoes/misc.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Shoes/misc.yml @@ -50,6 +50,45 @@ - type: StaticPrice price: 10 + + # halloween + +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTClownNightmareShoes + name: clown nightmare shoes + description: No way. + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Misc/clownnightmareshoes.rsi + - type: Clothing + sprite: ADT/Clothing/Shoes/Misc/clownnightmareshoes.rsi + +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTGreyClownPsyhoShoes + name: grey clown psyho shoes + description: grey clown psyho shoes + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Misc/greyclownshoes.rsi + - type: Clothing + sprite: ADT/Clothing/Shoes/Misc/greyclownshoes.rsi + +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTEmpressOfLightShoes + name: empress of light shoes + description: empress of light shoes + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Misc/empress_of_light_shoes.rsi + - type: Clothing + sprite: ADT/Clothing/Shoes/Misc/empress_of_light_shoes.rsi + - type: entity parent: ClothingShoesBaseButcherable id: ADTClothingShoesShaleBrealVulp @@ -76,3 +115,15 @@ bluntStaminaDamageFactor: 2.0 angle: 60 animation: WeaponArcThrust + +- type: entity + parent: ClothingShoesBaseButcherable + id: ADTRadioDemonShoes + name: radio demon suit + description: No way. No fucking way. + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Shoes/Misc/demongentleman.rsi + - type: Clothing + sprite: ADT/Clothing/Shoes/Misc/demongentleman.rsi \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks/socks.yml b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks/socks.yml index a5ae121e573..a5fd9a1d53e 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks/socks.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Underwear/Socks/socks.yml @@ -55,6 +55,29 @@ - type: Sprite sprite: ADT/Clothing/Underwear/Socks/lace_socks_thigh.rsi + +#День Святого Валентина + +- type: entity + parent: ADTClothingUnderwearSocksBase + id: ADTClothingUnderwearSocksHeart + name: socks with hearts + description: socks with hearts + suffix: Valentine Day + components: + - type: Sprite + sprite: ADT/Clothing/Underwear/Socks/socks_heart.rsi #Спрайты от lunalita + +- type: entity + parent: ADTClothingUnderwearSocksBase + id: ADTClothingUnderwearSocksStockingsHeart + name: stockings with hearts + description: socks with hearts + suffix: Valentine Day + components: + - type: Sprite + sprite: ADT/Clothing/Underwear/Socks/stockings_heart.rsi #Спрайты от lunalita + #Stockings - type: entity diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml index 14d913814f8..383824c6b24 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/Jumpsuits.yml @@ -852,6 +852,92 @@ - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/jumpsuit_sec_moges_gray.rsi +#октоберфест + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformOktoberfestWhite + name: oktoberfest white suit + description: Traditional Bavarian men's suit with short trousers and a white shirt. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_white.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_white.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformOktoberfestBlueCheckered + name: oktoberfest blue checkered suit + description: Traditional Bavarian men's suit with short trousers and a blue checkered shirt. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluecheck.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluecheck.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformOktoberfestGreenVest + name: oktoberfest suit with a green vest + description: Traditional Bavarian men's suit with short trousers and a green vest. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greenvest.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greenvest.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformOktoberfestRedCheckered + name: oktoberfest red checkered suit + description: Traditional Bavarian men's suit with short trousers and a red checkered shirt. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redcheck.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redcheck.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformOktoberfestGreenCheckered + name: oktoberfest green checkered suit + description: Traditional Bavarian men's suit with short trousers and a green checkered shirt. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greencheck.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greencheck.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformOktoberfestBlueVest + name: oktoberfest suit with a blue vest + description: Traditional Bavarian men's suit with short trousers and a blue vest. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluevest.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluevest.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformOktoberfestRedVest + name: oktoberfest suit with a red vest + description: Traditional Bavarian men's suit with short trousers and a red vest. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redvest.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redvest.rsi #спрайты от SHIONE + - type: entity parent: ClothingUniformBase id: ADTClothingUniformCyberSun @@ -966,6 +1052,264 @@ sprite: ADT/Clothing/Uniforms/Jumpsuit/mimicry.rsi - type: Clothing sprite: ADT/Clothing/Uniforms/Jumpsuit/mimicry.rsi + +# ADT-HALLOWEEN-START + +- type: entity + parent: ClothingUniformBase + id: ADTOtherworldClownCostume + name: otherworldly clown costume + description: A costume of an ancient being who came from another dimension to frighten people and feed on their fears... sounds like the work of a clown! + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/otherworld_clown.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/otherworld_clown.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTBioMercUniform + name: bio-mercenary uniform + description: Congratulations, you were born in this world where the value of life is zero. In this world, everything is already rotten, and everything is in eternal stagnation, and there is no need to hurry and make the world better or worse. You can only exist in this world, saturated with hatred for everything. You are just a biomass among other biomass. + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/bio_merc.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/bio_merc.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTJasonCostume + name: maniac costume + description: Wear a hockey player mask and kill the victims with a machete. + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/jason.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/jason.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTVyasovCostume + name: Vyasov costume + description: A nightmate on the Vyasov station! + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/vyasov.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/vyasov.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTHotlineMiamiUniform + name: student uniform + description: A legend told, that this uniform wear a Miami killer + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/hotlinemiami.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/hotlinemiami.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTServantOfEvilUniform + name: suit of the servant of evil + description: suit of the servant of evil + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/servant_evil.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/servant_evil.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTDudeShirt + name: dude's t-shirt + description: dude's t-shirt + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/dude_shirt.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/dude_shirt.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTSquidGameOrganizerSuit + name: squid game organizer suit + description: squid game organizer suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/squid_org.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/squid_org.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTSquidGamePlayerSuit + name: squid game player suit + description: squid game player suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/squid_player.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/squid_player.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTTagillaSuit + name: Tagilla pants + description: Tagilla pants + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/tagilla_pants.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/tagilla_pants.rsi + #- type: Storage + # capacity: 5 + +- type: entity + parent: ClothingUniformBase + id: ADTDJClownSuit + name: DJ clown suit + description: DJ clown suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/djclown.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/djclown.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTVampireSuit + name: vampire suit + description: vampire suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/vampire_suit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/vampire_suit.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTVergileSuit + name: Vergile suit + description: Vergile suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/vergile_suit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/vergile_suit.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTXenomorphSuit + name: xenomorph suit + description: xenomorph suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/xenomorph_suit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/xenomorph_suit.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTHalloweenMichaelMyersSuit + name: Michael Myers suit + description: Michael Myers suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/michael_suit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/michael_suit.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTHalloweenEmpressOfLightSuit + name: Empress of Light suit + description: Empress of Light suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/empress_of_light.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/empress_of_light.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTHalloweenEmpressOfLightSuitYellow + name: Empress of Light yellow suit + description: Empress of Light yellow suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/empress_of_light_yellow.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/empress_of_light_yellow.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTHalloweenBadPoliceSuit + name: Bad Police suit + description: Bad Police suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/bad_police.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/bad_police.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTHalloweenLethalCompanySuit + name: Lethal Company suit + description: Lethal Company suit + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/lethal_company.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/lethal_company.rsi + +# ADT-HALLOWEEN-END + +- type: entity + parent: ClothingUniformBase + id: ADTJumpsuitHunterDemon + name: qm jumpsuit warm + description: A sharp turtleneck made for the hardy work environment of supply. + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/suit_hunterdemon.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/suit_hunterdemon.rsi + + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformAbibasBlackSuit + name: black sport suit + description: Sportsuit for real buddies. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/black_abibas.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/black_abibas.rsi # Med - type: entity @@ -1076,6 +1420,94 @@ - type: ExplosionResistance damageCoefficient: 0.75 +#LoveDay + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpsuitRomanticSuit + name: red and white suit + description: Fashionable romantic costume + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/romantic_suit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/romantic_suit.rsi + - type: StaticPrice + price: 10 + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpsuitTurtleHeart + name: turtleneck sweater with a heart + description: Cute funny turtleneck. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/turtle_heart.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/turtle_heart.rsi + +#День Святого Валентина + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpsuitDarkMan + name: dark man suit + description: dark man suit + suffix: Valentine Day + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/dark_man_suit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/dark_man_suit.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpsuitBrightMan + name: bright man suit + description: bright man suit + suffix: Valentine Day + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/bright_man_suit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/bright_man_suit.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpsuitCupidon + name: cupidon suit + description: cupidon suit + suffix: Valentine Day + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/cupidon_suit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/cupidon_suit.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpsuitRedSweaterHeart + name: red sweater with heart + description: red sweater with heart + suffix: Valentine Day + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/redsweaterheart_suit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/redsweaterheart_suit.rsi + +- type: entity + parent: ClothingUniformBase + id: ADTClothingUniformJumpsuitWhiteSweaterHeart + name: white sweater with heart + description: white sweater with heart + suffix: Valentine Day + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpsuit/whitesweaterheart_suit.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpsuit/whitesweaterheart_suit.rsi + - type: entity parent: ClothingUniformBase id: ADTClothingRomanShirt diff --git a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml index b45dbe0b618..5967c78d4bb 100644 --- a/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/ADT/Entities/Clothing/Uniforms/jumpskirts.yml @@ -413,6 +413,102 @@ map: ["foldedLayer"] visible: false +#октоберфест + +- type: entity + parent: ClothingUniformSkirtBase + id: ADTClothingUniformOktoberfestDirndlShort + name: dirndl short + description: Traditional German dress with a short skirt. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshort.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshort.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingUniformSkirtBase + id: ADTClothingUniformOktoberfestDirndlShortGreen + name: dirndl short green + description: Traditional German dress with a green short skirt. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortgreen.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortgreen.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingUniformSkirtBase + id: ADTClothingUniformOktoberfestDirndlShortRed + name: dirndl short red + description: Traditional German dress with a red short skirt. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortred.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortred.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingUniformSkirtBase + id: ADTClothingUniformOktoberfestDirndlShortBlue + name: dirndl short blue + description: Traditional German dress with a blue short skirt. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortblue.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortblue.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingUniformSkirtBase + id: ADTClothingUniformOktoberfestDirndlBlue + name: dirndl blue + description: Traditional German dress with a blue skirt. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlblue.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlblue.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingUniformSkirtBase + id: ADTClothingUniformOktoberfestDirndlRed + name: dirndl red + description: Traditional German dress with a red skirt. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlred.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlred.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingUniformSkirtBase + id: ADTClothingUniformOktoberfestDirndlGreen + name: dirndl green + description: Traditional German dress with a green skirt. + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlgreen.rsi #спрайты от SHIONE + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlgreen.rsi #спрайты от SHIONE + +- type: entity + parent: ClothingUniformSkirtBase + id: ADTClothingUniformRabbitDress + name: rabbit black dress + description: soo...how pick a PDA in this? + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/rabbit_dress.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/rabbit_dress.rsi # Med - type: entity @@ -579,6 +675,73 @@ - type: StaticPrice price: 85 +# Одежда на день святого Валентина + +- type: entity + parent: ClothingUniformSkirtBase + id: ADTClothingUniformBurgundyDress + name: burgundy dress + description: The dress is medium-length, semi-fitting, with a deep neckline and a thigh-high slit. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress.rsi + - type: StaticPrice + price: 55 + +- type: entity + parent: ClothingUniformSkirtBase + id: ADTClothingUniformBurgundyDressAlt + name: burgundy dress + description: Short burgundy dress. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress_alt.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress_alt.rsi + - type: StaticPrice + price: 55 + +- type: entity + parent: ClothingUniformSkirtBase + id: ADTClothingUniformCocktailDress + name: cocktail dress + description: A dress with red and white elements and a bow in the middle. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/cocktail_dress.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/cocktail_dress.rsi + - type: StaticPrice + price: 35 + +- type: entity + parent: ClothingUniformSkirtBase + id: ADTClothingUniformEveningDress + name: evening dress + description: The dress is medium-length, semi-fitting, with a deep neckline and a thigh-high slit. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/evening_dress.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/evening_dress.rsi + - type: StaticPrice + price: 65 + +- type: entity + parent: ClothingUniformSkirtBase + id: ADTClothingUniformGothDress + name: goth dress + description: A stylish black swimsuit for the beach or pool. + components: + - type: Sprite + sprite: ADT/Clothing/Uniforms/Jumpskirt/goth_dress.rsi + - type: Clothing + sprite: ADT/Clothing/Uniforms/Jumpskirt/goth_dress.rsi + - type: StaticPrice + price: 35 + - type: entity parent: ClothingUniformSkirtBase id: ADTClothingUniformSwimBlack diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/Random/misc.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/Random/misc.yml new file mode 100644 index 00000000000..3a046e5ba47 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Markers/Spawners/Random/misc.yml @@ -0,0 +1,26 @@ +# halloween + +- type: entity + parent: MarkerBase + id: ADTHalloweenPosterRandom2 + name: random helloween wall decor spawner + abstract: true + #decription: random helloween wall decor spawner + suffix: Halloween + components: + - type: Sprite + layers: + - state: red + - sprite: ADT/Objects/Decoration/poster_helloween.rsi + state: spider + - type: RandomSpawner + offset: 0 + prototypes: + - ADTPosterHalloweenSpooky + - ADTPosterHalloweenYummy + - ADTPosterHalloweenSpider + - ADTPosterHalloweenSpiderWeb1 + - ADTPosterHalloweenSpiderWeb2 + - ADTPosterHappyHalloween + - ADTPosterTayarHalloween + chance: 1 diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/Random/plants.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/Random/plants.yml new file mode 100644 index 00000000000..fe3ce2b7a2e --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Markers/Spawners/Random/plants.yml @@ -0,0 +1,23 @@ +- type: entity + parent: MarkerBase + id: ADTHelloweenPlantRandom + name: random helloween decor spawner + #decription: random helloween decor spawner + suffix: Helloween + components: + - type: Sprite + layers: + - state: red + - sprite: ADT/Structures/Decoration/Plants/potted_plant_helloween.rsi + state: plant1 + - type: RandomSpawner + offset: 0 + prototypes: + - ADTHalloweenPumpkinLight1 + - ADTHalloweenPumpkinLight2 + - ADTHalloweenPumpkinLight3 + - ADTHalloweenPumpkinLight4 + - ADTHalloweenPumpkinLight5 + - ADTHalloweenPottedPlant1 + - ADTHalloweenPottedPlant2 + chance: 1 diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/Random/posters.yml new file mode 100644 index 00000000000..5d4c02daa49 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Markers/Spawners/Random/posters.yml @@ -0,0 +1,25 @@ +- type: entity + parent: MarkerBase + id: ADTHalloweenPosterRandom + name: random helloween wall decor spawner + #decription: random helloween wall decor spawner + suffix: Halloween + components: + - type: Sprite + layers: + - state: red + - sprite: ADT/Structures/Wallmounts/poster_helloween.rsi + state: spider + - type: RandomSpawner + offset: 0 + prototypes: + - ADTPosterHalloweenSpooky + - ADTPosterHalloweenYummy + - ADTPosterHalloweenSpider + - ADTPosterHalloweenSpiderWeb1 + - ADTPosterHalloweenSpiderWeb2 + - ADTPosterHappyHalloween + - ADTPosterHappyHalloween2 + - ADTPosterHappyHalloween3 + - ADTPosterTayarHalloween + chance: 1 diff --git a/Resources/Prototypes/ADT/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/ADT/Entities/Markers/Spawners/ghost_roles.yml index b61a698084f..551de0f7b5a 100644 --- a/Resources/Prototypes/ADT/Entities/Markers/Spawners/ghost_roles.yml +++ b/Resources/Prototypes/ADT/Entities/Markers/Spawners/ghost_roles.yml @@ -348,4 +348,26 @@ layers: - state: green +- type: entity + id: ADTSpawnPointSanta + name: Santa spawn point + suffix: New Year + parent: MarkerBase + components: + - type: GhostRole + name: ghost-role-information-Santa-name + description: ghost-role-information-Santa-description + rules: ghost-role-information-Santa-rules + raffle: + settings: default + requirements: + - !type:OverallPlaytimeRequirement + time: 54000 # 15h + - type: GhostRoleMobSpawner + prototype: ADTSanta + - type: Sprite + sprite: Markers/jobs.rsi + layers: + - state: green + diff --git a/Resources/Prototypes/ADT/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/ADT/Entities/Mobs/NPCs/slimes.yml index ecb28e92c1c..cec95585d6c 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/NPCs/slimes.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/NPCs/slimes.yml @@ -1,3 +1,47 @@ +- type: entity + parent: MobAdultSlimes + id: ADTMobAdultSlimesGreenHalloween + name: green halloween slime + description: green halloween slime + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Mobs/halloween_slime.rsi + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: green_adult_slime + - type: DamageStateVisuals + states: + Alive: + Base: green_adult_slime + Dead: + Base: green_adult_slime_dead + - type: MeleeWeapon + damage: + types: + Blunt: 6 + Structural: 4 + Caustic: 1 + Poison: 4 + - type: LanguageSpeaker + languages: + Bubblish: Speak + +- type: entity + parent: ADTMobAdultSlimesGreenHalloween + id: ADTMobAdultSlimesGreenHalloweenAngry + name: green halloween slime angry + suffix: Angry + components: + - type: NpcFactionMember + factions: + - SimpleHostile + - type: GhostRole + description: ghost-role-information-angry-slimes-description + - type: LanguageSpeaker + languages: + Bubblish: Speak + - type: entity name: slime description: A slime. diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Player/event.yml b/Resources/Prototypes/ADT/Entities/Mobs/Player/event.yml new file mode 100644 index 00000000000..56e4e337a0d --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Mobs/Player/event.yml @@ -0,0 +1,58 @@ +# Почему бы и нет, создал файл для ивентовых монстров + +- type: entity + id: ADTMobEVENTValue + parent: BaseMobAsteroid + components: + - type: Sprite + sprite: ADT/Mobs/Animals/value.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: value + - type: DamageStateVisuals + states: + Alive: + Base: icon + Dead: + Base: dead + - type: MovementSpeedModifier + baseWalkSpeed : 3.5 + baseSprintSpeed : 4.0 + - type: MobThresholds + thresholds: + 0: Alive + 100: Dead + - type: MeleeWeapon + damage: + types: + Slash: 10 + Piercing: 2 + - type: PassiveDamage + allowedStates: + - Alive + damageCap: 40 + damage: + types: + Heat: -10 + Cold: -10 + groups: + Brute: -10 + - type: Armor + modifiers: + coefficients: + Blunt: 0.35 + Slash: 0.35 + Piercing: 0.35 + Heat: 0.20 + Caustic: 0.35 + - type: Hands + hands: + hand_right: + location: Right + hand_left: + location: Left + hand_extra_1: + location: Middle + hand_extra_2: + location: Middle + diff --git a/Resources/Prototypes/ADT/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/ADT/Entities/Mobs/Player/humanoid.yml index 5d7c3f62fe3..6eabbd10c52 100644 --- a/Resources/Prototypes/ADT/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/ADT/Entities/Mobs/Player/humanoid.yml @@ -976,3 +976,35 @@ jumpsuit: ClothingUniformJumpsuitColorWhite gloves: ClothingHandsGlovesColorWhite outerClothing: ADTOuterClothingCoatsCrazyScientist + +- type: entity + name: ADTSanta-name + id: ADTSanta + parent: MobHuman + suffix: New Year + components: + - type: GhostTakeoverAvailable + - type: Loadout + prototypes: [ ADTRoleSantaGear ] + - type: RandomHumanoidAppearance + randomizeName: false + +- type: startingGear + id: ADTRoleSantaGear + equipment: + jumpsuit: ADTClothingUniformRollNeckSnowman + gloves: ClothingHandsGlovesColorWhite + back: ADTClothingBackpackSanta + ears: ClothingHeadsetGrey + shoes: ClothingShoesBootsWinter + id: ADTVisitorPDA + outerClothing: ClothingOuterHardsuitSanta + suitstorage: OxygenTankFilled + storage: + back: + - BoxSurvivalEngineering + - ClothingHeadHatSantahat + - ClothingOuterSanta + - ADTReindeerCubeBox + - ADTWeaponWandSanta + - ADTGingerbreadCubeBox diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks.yml index 27a5e9de371..ce813932b34 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/drinks.yml @@ -371,6 +371,227 @@ sprite: ADT/Objects/Consumable/Drinks/limeshade.rsi state: icon +- type: entity + parent: DrinkGlass + id: ADTDrinkCargoBeerGlass + suffix: CargoBeer + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTCargoBeer + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/cargobeer.rsi + state: icon + + +- type: entity + parent: DrinkGlass + id: ADTDrinkLeafloverBeerGlass + suffix: LeafloverBeer + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTLeafloverBeer + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/leafloverbeer.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: ADTDrinkScientificAleGlass + suffix: ScientificAle + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTScientificAle + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/scientificale.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: ADTDrinkUraniumAleGlass + suffix: UraniumAle + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTUraniumAle + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/uraniumale.rsi + state: icon + - type: RadiationSource + intensity: 0.1 + +- type: entity + parent: DrinkGlass + id: ADTDrinkGoldenAleGlass + suffix: GoldenAle + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTGoldenAle + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/goldenale.rsi + state: icon + + +- type: entity + parent: DrinkGlass + id: ADTDrinkSausageBeerGlass + suffix: SausageBeer + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTSausageBeer + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/sausagebeer.rsi + state: icon + + +- type: entity + parent: DrinkGlass + id: ADTDrinkTechnoBeerGlass + suffix: TechnoBeer + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTTechnoBeer + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/technarbeer.rsi + state: icon + + +- type: entity + parent: DrinkGlass + id: ADTDrinkClassicPaulanerBeerGlass + suffix: ClassicPaulanerBeer + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTClassicPaulanerBeer + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/classicalpaulaner.rsi + state: icon + + +- type: entity + parent: DrinkGlass + id: ADTDrinkLivseyBeerGlass + suffix: LivseyBeer + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTLivseyBeer + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/doctorlivsey.rsi + state: icon + + +- type: entity + parent: DrinkGlass + id: ADTDrinkLuckyJonnyBeerGlass + suffix: LuckyJonnyBeer + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTLuckyJonnyBeer + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/luckyjonny.rsi + state: icon + + +- type: entity + parent: DrinkGlass + id: ADTDrinkSecUnfilteredBeerGlass + suffix: SecUnfilteredBeer + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTSecUnfilteredBeer + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/secbeer.rsi + state: icon + + +- type: entity + parent: DrinkGlass + id: ADTDrinkGlyphidStoutBeerGlass + suffix: GlyphidStoutBeer + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTGlyphidStoutBeer + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/glyfidstout.rsi + state: icon + + +- type: entity + parent: DrinkGlassBase + id: ADTDrinkCocoaGlass + name: hot cocoa + description: A heated drink consisting cocoa powder. + components: + - type: Drink + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTCocoaDrink + Quantity: 30 + - type: Sprite + sprite: ADT/Objects/Consumable/Drinks/cocoa_drink.rsi + + - type: entity parent: DrinkGlass id: ADTDrinkOrangeTeaGlass @@ -422,60 +643,92 @@ parent: DrinkGlass id: ADTTeqilaOldFashionGlass components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTTeqilaOldFashion - Quantity: 30 - - type: Icon - sprite: Corvax/Objects/Consumable/Drinks/oldFashioned.rsi - state: icon + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTTeqilaOldFashion + Quantity: 30 + - type: Icon + sprite: Corvax/Objects/Consumable/Drinks/oldFashioned.rsi + state: icon - type: entity parent: DrinkGlass id: ADTJackieWellesGlass components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ADTJackieWelles - Quantity: 30 - - type: Icon - sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi - state: icon + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTJackieWelles + Quantity: 30 + - type: Icon + sprite: Objects/Consumable/Drinks/ginvodkaglass.rsi + state: icon - type: entity parent: DrinkGlass id: ADTTheSilverhandGlass + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTTheSilverhand + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/silverhand.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: ADTCoffeeBonBonGlass + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ADTCoffeeBonBon + Quantity: 30 + - type: Icon + sprite: ADT/Objects/Consumable/Drinks/cocoa_drink.rsi + state: icon + +- type: entity + parent: DrinkGlass + id: ADTDrinkSuperScoutGlass + suffix: SuperScout components: - type: SolutionContainerManager solutions: drink: maxVol: 30 reagents: - - ReagentId: ADTTheSilverhand + - ReagentId: ADTSuperScoutBeer Quantity: 30 - type: Icon - sprite: ADT/Objects/Consumable/Drinks/silverhand.rsi + sprite: ADT/Objects/Consumable/Drinks/superbeer.rsi state: icon - type: entity parent: DrinkGlass - id: ADTCoffeeBonBonGlass + id: ADTDrinkFunnyClownGlass + suffix: Funnyclown components: - type: SolutionContainerManager solutions: drink: maxVol: 30 reagents: - - ReagentId: ADTCoffeeBonBon + - ReagentId: ADTFunnyClownBeer Quantity: 30 - type: Icon - sprite: ADT/Objects/Consumable/Drinks/cocoa_drink.rsi + sprite: ADT/Objects/Consumable/Drinks/clownbeer.rsi state: icon - type: entity diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/juice.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/juice.yml new file mode 100644 index 00000000000..8ad27ca6dfc --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Drinks/juice.yml @@ -0,0 +1,9 @@ +#сок +- type: reagent + id: ADTJuiceMandarin + name: reagent-name-juice-mandarin + parent: BaseDrink + desc: reagent-desc-juice-mandarin + physicalDesc: reagent-physical-desc-citric + flavor: ADTmandarin + color: "#E78108" diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/cake.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/cake.yml new file mode 100644 index 00000000000..61242f53c3f --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/cake.yml @@ -0,0 +1,126 @@ +- type: entity + name: chocolate glaze cake + parent: FoodCakeBase + id: ADTFoodCakeChocolateGlazeHeart + description: A cake with added chocolate. + components: + - type: Sprite + state: chocolate_heart + - type: SliceableFood + slice: ADTFoodCakeChocolateGlazeHeartSlice + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 20 + - ReagentId: Theobromine + Quantity: 5 + - ReagentId: Vitamin + Quantity: 5 + +- type: entity + name: slice of chocolate cake + parent: FoodCakeSliceBase + id: ADTFoodCakeChocolateGlazeHeartSlice + components: + - type: Sprite + state: chocolate-slice-heart + - type: SolutionContainerManager + solutions: + food: + maxVol: 8 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Theobromine + Quantity: 1 + - ReagentId: Vitamin + Quantity: 1 + +- type: entity + name: chocolate heart cake + parent: FoodCakeBase + id: ADTFoodCakeChocolateHeart + description: The heart-shaped cake is made from chocolate sponge cake, covered with chocolate cream and ganache, and decorated with icing. + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/cake.rsi + state: chocolate-heart + - type: SliceableFood + slice: ADTFoodCakeChocolateHeartSlice + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 20 + - ReagentId: Theobromine + Quantity: 5 + - ReagentId: Vitamin + Quantity: 5 + +- type: entity + name: slice of chocolate cake + parent: FoodCakeSliceBase + id: ADTFoodCakeChocolateHeartSlice + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/cake.rsi + state: chocolate-slice-heart + - type: SolutionContainerManager + solutions: + food: + maxVol: 8 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Theobromine + Quantity: 1 + - ReagentId: Vitamin + Quantity: 1 + +- type: entity + name: strawberry heart cake + parent: FoodCakeBase + id: ADTFoodCakeStrawberryHeart + description: A dessert made from cookies, filled with cottage cheese and strawberries, and topped with chocolate cream and fresh strawberries. Perfect for your significant other. + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/cake.rsi + state: strawberry-heart + - type: SliceableFood + slice: ADTFoodCakeStrawberryHeartSlice + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 20 + - ReagentId: Theobromine + Quantity: 5 + - ReagentId: Vitamin + Quantity: 5 + +- type: entity + name: slice of strawberry cake + parent: FoodCakeSliceBase + id: ADTFoodCakeStrawberryHeartSlice + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/cake.rsi + state: strawberry-slice-heart + - type: SolutionContainerManager + solutions: + food: + maxVol: 8 + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Theobromine + Quantity: 1 + - ReagentId: Vitamin + Quantity: 1 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/cookies.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/cookies.yml new file mode 100644 index 00000000000..3d8fbe7f90e --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/cookies.yml @@ -0,0 +1,95 @@ +- type: entity + name: ADTCandy-catName + parent: FoodBakedBase + id: ADTFoodCookieBlackcat + description: ADTCandy-catDesc + suffix: Halloween + components: + - type: Food + - type: FlavorProfile + flavors: + - sweet + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Baked/cookies.rsi + state: cookie_blackcat + - type: SolutionContainerManager + solutions: + food: + maxVol: 7 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - type: Tag + tags: + - ADTMothFriendlyFood + - ADTCandies + +- type: entity + name: ADTCandy-GhostName + parent: ADTFoodCookieBlackcat + id: ADTFoodCookieGhost + description: ADTCandy-GhostDesc + suffix: Halloween + components: + - type: Sprite + state: cookie_ghost + +- type: entity + name: ADTCandy-knightName + parent: ADTFoodCookieBlackcat + id: ADTFoodCookieKnight + description: ADTCandy-KnightDesc + suffix: Halloween + components: + - type: Sprite + state: cookie_knight + +- type: entity + name: ADTCandy-SpiderName + parent: ADTFoodCookieBlackcat + id: ADTFoodCookieSpider + description: ADTCandy-SpiderDesc + suffix: Halloween + components: + - type: Sprite + state: cookie_spider + +- type: entity + name: ADTCandy-SpiderName + parent: ADTFoodCookieBlackcat + id: ADTFoodCookiePumpkin + description: ADTCandy-SpiderDesc + suffix: Halloween + components: + - type: Sprite + state: cookie_pumpkin + +- type: entity + name: scull gingerbread + parent: ADTFoodCookieBlackcat + id: ADTFoodCookieSkull + description: scull gingerbread + suffix: Halloween + components: + - type: Sprite + state: cookie_skull + +- type: entity + name: caramel ear + parent: ADTFoodCookieBlackcat + id: ADTFoodCookieCaramelEar + description: A heart-shaped pastry made from puff pastry. + suffix: Valentine's day + components: + - type: Sprite + state: caramel_ear + +- type: entity + name: strawberry heart + parent: ADTFoodCookieBlackcat + id: ADTFoodCookieStrawberryHeart + description: Strawberry shortbread cookies with a strawberry filling. I think your significant other will love this dessert. + suffix: Valentine's day + components: + - type: Sprite + state: strawberry_heart diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/donuts.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/donuts.yml new file mode 100644 index 00000000000..ac3a58adc69 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/donuts.yml @@ -0,0 +1,29 @@ +- type: entity + name: candy spooky + parent: FoodDonutPlain + id: ADTFoodDonutSpooky + description: candy spooky + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Baked/donuts.rsi + state: spooky + - type: Tag + tags: + - ADTMothFriendlyFood + - ADTCandies + +- type: entity + name: candy spooky jelly + parent: FoodDonutJellyPlain + id: ADTFoodDonutJellySpooky + description: candy spooky jelly + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Baked/donuts.rsi + state: jelly-spooky + - type: Tag + tags: + - ADTMothFriendlyFood + - ADTCandies diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/misc.yml index 61152295933..75ca841d40c 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/misc.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/misc.yml @@ -1,3 +1,299 @@ +- type: entity + name: brezel + parent: FoodBakedBase + id: ADTFoodBakedBrezel + description: The usual pretzel, a popular snack at Oktoberfest. + suffix: Oktoberfest + components: + - type: Food + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Baked/misc.rsi #спрайты от празата + layers: + - state: brezel + - type: FlavorProfile + flavors: + - bun + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 3 + - type: Tag + tags: + - ADTMothFriendlyFood + +- type: entity + name: brezel with poppy seeds + parent: FoodBakedBase + id: ADTFoodBakedBrezelPoppySeeds + description: The brezel with poppy seeds, a popular snack at Oktoberfest. + suffix: Oktoberfest + components: + - type: Food + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Baked/misc.rsi #спрайты от празата + layers: + - state: brezel_poppy + - type: FlavorProfile + flavors: + - bun + - adt_poppy + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 3 + - type: Tag + tags: + - ADTMothFriendlyFood + +- type: entity + name: brezel with salt + parent: FoodBakedBase + id: ADTFoodBakedBrezelSalt + description: The brezel with salt, a popular snack at Oktoberfest. + suffix: Oktoberfest + components: + - type: Food + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Baked/misc.rsi #спрайты от празата + layers: + - state: brezel_salt + - type: FlavorProfile + flavors: + - bun + - salty + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 3 + - type: Tag + tags: + - ADTMothFriendlyFood + +- type: entity + name: brezel with chocolate + parent: FoodBakedBase + id: ADTFoodBakedBrezelChocolate + description: The brezel with chocolate, a sweet snack for Oktoberfest. + suffix: Oktoberfest + components: + - type: Food + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Baked/misc.rsi #спрайты от празата + layers: + - state: brezel_chocolate + - type: FlavorProfile + flavors: + - bun + - chocolate + - sweet + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 3 + - type: Tag + tags: + - ADTMothFriendlyFood + +- type: entity + name: brezel with vanilla + parent: FoodBakedBase + id: ADTFoodBakedBrezelVanilla + description: Brezel with vanilla glaze, a sweet snack for Oktoberfest + suffix: Oktoberfest + components: + - type: Food + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Baked/misc.rsi #спрайты от празата + layers: + - state: brezel_vanilla + - type: FlavorProfile + flavors: + - bun + - sweet + - adt_vanilla + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 3 + - type: Tag + tags: + - ADTMothFriendlyFood + +- type: entity + name: pretzel vanilla + parent: ADTFoodBakedBrezelVanilla + id: ADTFoodBakedBrezelPumpkin + description: pretzel vanilla + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Baked/misc.rsi + state: pretzelpump + +- type: entity + name: muffin pumpkin + parent: FoodBakedBase + id: ADTFoodBakedMuffinPumpkin + description: muffin pumpkin + suffix: Halloween + components: + - type: Food + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Baked/misc.rsi + state: muffin_pumpkin + - type: FlavorProfile + flavors: + - bun + - sweet + - adt_vanilla + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Vitamin + Quantity: 2 + - type: Tag + tags: + - ADTMothFriendlyFood + - ADTCandies + +# Кулич все таки не торт + +- type: entity + name: kulich small + parent: FoodBakedBase + id: ADTFoodKulichSmall + description: kulich small + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Baked/easter.rsi + state: small + - type: FlavorProfile + flavors: + - sweet + - type: SolutionContainerManager + solutions: + food: + maxVol: 8 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Vitamin + Quantity: 1 + - type: Tag + tags: + - ADTMothFriendlyFood + +- type: entity + name: kulich big + parent: FoodBakedBase + id: ADTFoodKulichBig + description: kulich big + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Baked/easter.rsi + state: big + - type: FlavorProfile + flavors: + - sweet + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 25 + - ReagentId: Vitamin + Quantity: 5 + - type: Tag + tags: + - ADTMothFriendlyFood + - type: Item + size: Normal + +- type: entity + name: kulich cheesy + parent: FoodBakedBase + id: ADTFoodKulichCheesy + description: kulich cheesy + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Baked/easter.rsi + state: cheesy + - type: FlavorProfile + flavors: + - sweet + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Vitamin + Quantity: 2 + - type: Tag + tags: + - ADTMothFriendlyFood + # - ADTCarnivoreFriendlyFood + - type: Item + size: Small + +- type: entity + name: sweet roll + parent: FoodBakedBase + id: ADTFoodSweetRoll + description: sweet roll + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Baked/easter.rsi + state: sweetroll + - type: FlavorProfile + flavors: + - sweet + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Vitamin + Quantity: 2 + - type: Tag + tags: + - ADTMothFriendlyFood + - type: Item + size: Small + - type: entity name: berried delight parent: FoodBakedBase diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/pie.yml new file mode 100644 index 00000000000..cf0020d7f82 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Baked/pie.yml @@ -0,0 +1,43 @@ +- type: entity + name: pumpkin pie + parent: FoodPieBase + id: ADTFoodPiePumpkin + description: A pie containing sweet, sweet love... and pumpkin. + suffix: Halloween + components: + - type: FlavorProfile + flavors: + - sweet + - adt_pumpkin + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Baked/pumpkin_pie.rsi + state: pumpkin_pie + - type: SliceableFood + slice: ADTFoodPiePumpkinSlice + - type: Tag + tags: + - Fruit + - Pie + - type: StaticPrice + price: 5 + +- type: entity + name: slice of pumpkin pie + parent: FoodPieSliceBase + id: ADTFoodPiePumpkinSlice + suffix: Halloween + components: + - type: FlavorProfile + flavors: + - sweet + - adt_pumpkin + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Baked/pumpkin_pie.rsi + state: slice + - type: Tag + tags: + - Fruit + - Pie + - Slice + - type: StaticPrice + price: 1 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/box.yml index 4c59f69e2e1..6a600b8352f 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/box.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/Containers/box.yml @@ -39,3 +39,60 @@ contents: - id: KnifePlastic - id: ADRFoodPizzaSindi + +- type: entity + parent: [ BoxCardboard, BaseBagOpenClose ] + id: ADTFoodBoxEclairs + name: eclairs obx + description: Mmm, Eclairs. + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Snacks/eclairs.rsi + state: box + layers: + - state: box + - state: box-open + map: ["openLayer"] + visible: false + - state: eclairs_1 + map: ["eclairs_1"] + visible: false + - state: eclairs_2 + map: ["eclairs_2"] + visible: false + - state: eclairs_3 + map: ["eclairs_3"] + visible: false + - state: eclairs_4 + map: ["eclairs_4"] + visible: false + - type: Storage + grid: + - 0,0,3,0 + whitelist: + tags: + - Donut + - type: Item + sprite: ADT/Objects/Consumable/Food/Snacks/eclairs.rsi + size: Small + # heldPrefix: box + - type: StorageFill + contents: + - id: ADTFoodEclairBrown + amount: 1 + - id: ADTFoodEclairChocolate + amount: 1 + - id: ADTFoodEclairWhite + amount: 1 + - id: ADTFoodEclairPink + amount: 1 + - type: ItemCounter + count: + tags: [Donut] + composite: true + layerStates: + - eclairs_1 + - eclairs_2 + - eclairs_3 + - eclairs_4 + - type: Appearance diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/creme_brulee.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/creme_brulee.yml new file mode 100644 index 00000000000..abd3e37b082 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/creme_brulee.yml @@ -0,0 +1,47 @@ +- type: entity + name: creme brulee + parent: FoodInjectableBase + id: ADTBrouletTorched + description: A creme brulee with a crispy and toasty caramel-like crust. + components: + - type: Food + trash: + - FoodPlateTin + utensil: Fork + - type: FlavorProfile + flavors: + - sweet + - type: Sprite + sprite: ADT/Objects/Consumable/Food/creme_brulee.rsi + state: broulet_torched + - type: SolutionContainerManager + solutions: + food: + maxVol: 26 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Theobromine + Quantity: 5 + - ReagentId: Vitamin + Quantity: 5 + +- type: entity + name: creme brulee + parent: ADTBrouletTorched + id: ADTCremeBroulet + description: A light creme brulee without caramelized sugar. + components: + - type: Sprite + state: creme_broulet + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Theobromine + Quantity: 5 + - ReagentId: Vitamin + Quantity: 5 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/mandarin.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/mandarin.yml new file mode 100644 index 00000000000..f64a3456161 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/mandarin.yml @@ -0,0 +1,111 @@ +#by ModerN for Adventure Time project +# плод +- type: entity + name: mandarin + parent: FoodProduceBase + id: ADTFoodMandarin + description: Healthy, very orange. + suffix: NewYear + components: + - type: SolutionContainerManager + solutions: + food: + maxVol: 9 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Vitamin + Quantity: 4 + - type: Sprite + sprite: ADT/Objects/Specific/Hydroponics/mandarin.rsi + - type: Produce + seedId: ADTmandarin + - type: Extractable + juiceSolution: + reagents: + - ReagentId: ADTJuiceMandarin + Quantity: 10 + - type: SpawnItemsOnUse + items: + - id: ADTTrashMandarinPeel + - id: ADTFoodMandarinPeeled + - type: Tag + tags: + - Fruit + + #очищенный плод. +- type: entity + name: mandarin + parent: BaseItem + id: ADTFoodMandarinPeeled + description: Peeled mandarin. Is it holidays already? + suffix: NewYear + components: + - type: Sprite + sprite: ADT/Objects/Specific/Hydroponics/mandarin.rsi + state: peeledprod + - type: Produce + seedId: ADTmandarin + - type: SolutionContainerManager + solutions: + food: + maxVol: 9 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Vitamin + Quantity: 4 + - type: Extractable + juiceSolution: + reagents: + - ReagentId: ADTJuiceMandarin + Quantity: 10 + - type: SpawnItemsOnUse + items: + - id: ADTFoodMandarinSlice + uses: 8 + - type: Tag + tags: + - Fruit + +# кожура +- type: entity + name: mandarin peel + parent: BaseItem + id: ADTTrashMandarinPeel + suffix: NewYear + components: + - type: Sprite + sprite: ADT/Objects/Specific/Hydroponics/mandarin.rsi + state: peel + - type: Item + sprite: ADT/Objects/Specific/Hydroponics/mandarin.rsi + heldPrefix: peel + - type: Tag + tags: + - Trash + - type: SpaceGarbage + +# долька +- type: entity + name: mandarin slice + parent: ProduceSliceBase + id: ADTFoodMandarinSlice + description: Mmm, tropical. + suffix: NewYear + components: + - type: FlavorProfile + flavors: + - ADTmandarin + - type: Item + size: Tiny + - type: Sprite + sprite: ADT/Objects/Specific/Hydroponics/mandarin.rsi + - type: Extractable + juiceSolution: + reagents: + - ReagentId: ADTJuiceMandarin + Quantity: 2 + - type: Tag + tags: + - Fruit diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meat.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meat.yml index 9fa7bcf1069..961c292b5fa 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meat.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/meat.yml @@ -118,6 +118,285 @@ graph: ShadekinCutlet node: shadekin cutlet +- type: entity + name: weisswurst + parent: FoodMeatBase + id: ADTFoodMeatWeissWurst + description: Traditional white Bavarian sausage made of veal, lard and spices. + suffix: Oktoberfest + components: + - type: Tag + tags: + - Cooked + - Meat + - type: Sprite + sprite: ADT/Objects/Consumable/Food/meat.rsi #спрайт от Празата + state: weisswurst + - type: FlavorProfile + flavors: + - meaty + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Protein + Quantity: 8 + - ReagentId: Vitamin + Quantity: 8 + +- type: entity + name: bratwurst + parent: FoodMeatBase + id: ADTFoodMeatBratWurst + description: Fried pork sausage, very appetizing, but greasy. + suffix: Oktoberfest + components: + - type: Tag + tags: + - Cooked + - Meat + - type: Sprite + sprite: ADT/Objects/Consumable/Food/meat.rsi #спрайт от Празата + state: bratwurst + - type: FlavorProfile + flavors: + - meaty + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Protein + Quantity: 8 + - ReagentId: Vitamin + Quantity: 8 + +#куриные ножки и крылышки. И запеченные варианты всего этого + +- type: entity + name: raw chicken wing + parent: FoodMeatRawBase + id: ADTFoodMeatChickenWing + description: Raw wing of chicken. Remember to wash your hands! + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/chicken_meat.rsi + state: raw_wing + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: UncookedAnimalProteins + Quantity: 6 + - ReagentId: Fat + Quantity: 3 + - type: SliceableFood + count: 1 + slice: FoodMeatChickenCutlet + - type: InternalTemperature + conductivity: 0.41 + #- type: Construction + # graph: ChickenSteak + # node: start + # defaultTarget: cooked chicken + - type: Item + size: Small + +- type: entity + name: raw chicken leg + parent: FoodMeatRawBase + id: ADTFoodMeatChickenLeg + description: Raw leg of chicken. Remember to wash your hands! + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/chicken_meat.rsi + state: raw_leg + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: UncookedAnimalProteins + Quantity: 6 + - ReagentId: Fat + Quantity: 6 + - type: SliceableFood + count: 1 + slice: FoodMeatChickenCutlet + - type: InternalTemperature + conductivity: 0.41 + - type: Item + size: Small + +- type: entity + name: baked chicken + parent: FoodMeatBase + id: ADTFoodMeatChickenBaked + description: A whole baked chicken. + components: + - type: Tag + tags: + - Cooked + - Meat + - type: Sprite + sprite: ADT/Objects/Consumable/Food/chicken_meat.rsi + state: chicken_baked + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 24 + - ReagentId: Protein + Quantity: 24 + - type: SliceableFood + count: 12 + slice: ADTFoodMeatChickenBakedSlice + - type: Item + size: Normal + - type: Food + transferAmount: 6 + +- type: entity + name: stuffed chicken with vegetables + parent: FoodMeatBase + id: ADTFoodMeatChickenBakedWithVegetables + description: stuffed chicken with vegetables. + components: + - type: Tag + tags: + - Cooked + - Meat + - type: Sprite + sprite: ADT/Objects/Consumable/Food/chicken_meat.rsi + layers: + - state: plate + - state: chicken_baked_wvegs + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 36 + - ReagentId: Protein + Quantity: 24 + - type: SliceableFood + count: 12 + slice: ADTFoodMeatChickenBakedStuffedSlice + - type: Item + size: Normal + - type: Food + transferAmount: 6 + # trash: FoodPlate + +- type: entity + name: baked chicken wing + parent: FoodMeatBase + id: ADTFoodMeatChickenBakedWing + description: A baked wing of chicken. + components: + - type: Tag + tags: + - Cooked + - Meat + - type: Sprite + sprite: ADT/Objects/Consumable/Food/chicken_meat.rsi + state: wing_cooked + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Protein + Quantity: 3 + - type: Item + size: Small + - type: Food + transferAmount: 6 + +- type: entity + name: baked chicken leg + parent: FoodMeatBase + id: ADTFoodMeatChickenBakedLeg + description: A baked leg of chicken. + components: + - type: Tag + tags: + - Cooked + - Meat + - type: Sprite + sprite: ADT/Objects/Consumable/Food/chicken_meat.rsi + state: leg_cooked + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 4 + - ReagentId: Protein + Quantity: 3 + - type: Item + size: Small + - type: Food + transferAmount: 7 + +- type: entity + name: slice of baked chicken + parent: FoodMeatBase + id: ADTFoodMeatChickenBakedSlice + description: A slace of baked chicken. + components: + - type: Tag + tags: + - Cooked + - Meat + - type: Sprite + sprite: ADT/Objects/Consumable/Food/chicken_meat.rsi + state: baked_slice + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 2 + - ReagentId: Protein + Quantity: 2 + - type: Item + size: Small + - type: Food + transferAmount: 4 + +- type: entity + name: slice of stuffed baked chicken + parent: FoodMeatBase + id: ADTFoodMeatChickenBakedStuffedSlice + description: A slace of baked and stuffed chicken. + components: + - type: Tag + tags: + - Cooked + - Meat + - type: Sprite + sprite: ADT/Objects/Consumable/Food/chicken_meat.rsi + state: baked_stuffed_slice + - type: SolutionContainerManager + solutions: + food: + reagents: + - ReagentId: Nutriment + Quantity: 3 + - ReagentId: Protein + Quantity: 2 + - type: Item + size: Small + - type: Food + transferAmount: 5 + - type: entity name: raw fish fillet parent: FoodMeatBase diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml index 0ea924228cd..8b23d17a3f3 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/snacks.yml @@ -501,6 +501,622 @@ - type: Sprite state: two-trash + +# halloween +# Просто конфеты разные + +- type: entity + name: black candies + parent: FoodSnackBase + id: ADTFoodSnackBlackCandies + description: black candies + suffix: Halloween + components: + - type: FlavorProfile + flavors: + - sweet + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi + state: black + - type: Item + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Nutriment + Quantity: 3 + - type: Tag + tags: + - ADTMothFriendlyFood + - ADTCandies + +- type: entity + name: green candies + parent: ADTFoodSnackBlackCandies + id: ADTFoodSnackGreenCandies + description: green candies + suffix: Halloween + components: + - type: FlavorProfile + flavors: + - chocolate + - type: Sprite + state: green + +- type: entity + name: red candies + parent: ADTFoodSnackBlackCandies + id: ADTFoodSnackRedCandies + description: red candies + suffix: Halloween + components: + - type: FlavorProfile + flavors: + - chocolate + - type: Sprite + state: red + +- type: entity + name: violet candies + parent: ADTFoodSnackBlackCandies + id: ADTFoodSnackVioletCandies + description: violet candies + suffix: Halloween + components: + - type: FlavorProfile + flavors: + - chocolate + - type: Sprite + state: violet + +- type: entity + name: yellow candies + parent: ADTFoodSnackBlackCandies + id: ADTFoodSnackYellowCandies + description: yellow candies + suffix: Halloween + components: + - type: FlavorProfile + flavors: + - chocolate + - type: Sprite + state: yellow + +- type: entity + name: chocolate coin + parent: ADTFoodSnackBlackCandies + id: ADTFoodSnackCoinCandies + description: chocolate coin + suffix: Halloween + components: + - type: FlavorProfile + flavors: + - chocolate + - type: Sprite + state: coin + +- type: entity + name: jelly brains + parent: ADTFoodSnackBlackCandies + id: ADTFoodSnackBrains + description: jelly brains + suffix: Halloween + components: + - type: Sprite + state: brains + +- type: entity + name: jelly heart + parent: ADTFoodSnackBlackCandies + id: ADTFoodSnackHeart + description: jelly heart + suffix: Halloween + components: + - type: Sprite + state: heart + +- type: entity + name: jelly worms + parent: ADTFoodSnackBlackCandies + id: ADTFoodSnackWorms + description: jelly worms + suffix: Halloween + components: + - type: Sprite + state: worms + +- type: entity + name: caramel stick + parent: ADTFoodSnackBlackCandies + id: ADTFoodSnackHLCaramel + description: caramel stick + suffix: Halloween + components: + - type: Sprite + state: hl_caramel + +- type: entity + name: caramel stick + parent: ADTFoodSnackBlackCandies + id: ADTFoodSnackMintCaramel + description: caramel stick + suffix: Halloween + components: + - type: Sprite + state: mint_caramel + +- type: entity + name: jelly eyes + parent: ADTFoodSnackBlackCandies + id: ADTFoodSnackCandyEyes + description: jelly eyes + suffix: Halloween + components: + - type: Sprite + state: eyes_3 + +- type: entity + name: candy oneeye + parent: ADTFoodSnackBlackCandies + id: ADTFoodSnackCandyEyes1 + description: candy oneeye + suffix: Halloween + components: + - type: Sprite + state: eyes_1 + +- type: entity + name: candy twoeye + parent: ADTFoodSnackBlackCandies + id: ADTFoodSnackCandyEyes2 + description: candy twoeye + suffix: Halloween + components: + - type: Sprite + state: eyes_2 + +- type: entity + name: candy corn + parent: ADTFoodSnackBlackCandies + id: ADTFoodSnackCandyCorn + description: candy corn + suffix: Halloween + components: + - type: Sprite + state: candy_corn + +- type: entity + name: chocolate bunny + parent: ADTFoodSnackBlackCandies + id: ADTFoodSnackBunny + description: chocolate bunny + suffix: Halloween + components: + - type: FlavorProfile + flavors: + - chocolate + - type: Sprite + state: bunny + +# Леденцы на палочке + +- type: entity + name: candy red + parent: ADTFoodSnackBlackCandies + id: ADTFoodSnackCandyRed + description: candy red + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi + layers: + - state: trach + - state: candy_red + +- type: entity + name: candy mine + parent: ADTFoodSnackCandyRed + id: ADTFoodSnackCandyMine + description: candy mine + suffix: Halloween + components: + - type: Sprite + layers: + - state: trach + - state: candy_creeper + +- type: entity + name: candy blue + parent: ADTFoodSnackCandyRed + id: ADTFoodSnackCandyBlue + description: candy blue + suffix: Halloween + components: + - type: Sprite + layers: + - state: trach + - state: candy_blue + +- type: entity + name: candy gow + parent: ADTFoodSnackCandyRed + id: ADTFoodSnackCandyGoW + description: candy gow + suffix: Halloween + components: + - type: Sprite + layers: + - state: trach + - state: candy_kratos + +- type: entity + name: candy green + parent: ADTFoodSnackCandyRed + id: ADTFoodSnackCandyGreen + description: candy green + suffix: Halloween + components: + - type: Sprite + layers: + - state: trach + - state: candy_green + +- type: entity + name: candy green + parent: ADTFoodSnackCandyRed + id: ADTFoodSnackCandyApple + description: candy green + suffix: Halloween + components: + - type: Sprite + layers: + - state: trach + - state: candy_apple + +- type: entity + name: candy green + parent: ADTFoodSnackCandyRed + id: ADTFoodSnackCandyKinito + description: candy green + suffix: Halloween + components: + - type: Sprite + layers: + - state: trach + - state: candy_kinito + +- type: entity + name: candy green + parent: ADTFoodSnackCandyRed + id: ADTFoodSnackCandyPumpkin + description: candy green + suffix: Halloween + components: + - type: Sprite + layers: + - state: trach + - state: candy_pumpkin + +- type: entity + name: candy green + parent: ADTFoodSnackCandyRed + id: ADTFoodSnackCandyPurple + description: candy green + suffix: Halloween + components: + - type: Sprite + layers: + - state: trach + - state: candy_purple + +- type: entity + name: candy green + parent: ADTFoodSnackCandyRed + id: ADTFoodSnackCandyYellow + description: candy green + suffix: Halloween + components: + - type: Sprite + layers: + - state: trach + - state: candy_yellow + +- type: entity + name: bat gingerbread + parent: ADTFoodSnackCandyRed + id: ADTFoodSnackCandyBat + description: bat candy + suffix: Halloween + components: + - type: Sprite + layers: + - state: trach + - state: candy_bat + +- type: entity + name: hypoallergen chocolate bar + parent: FoodSnackBase + id: ADTHypoAllergenChocolateBar + description: It tastes like cardboard, but harmless to unaths and vulpes. + components: + - type: FlavorProfile + flavors: + - chocolate + - type: Sprite + sprite: ADT/Objects/Consumable/Food/hypoallergen_chocolate.rsi + state: hypoallergen_chocolate + - type: Item + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: CocoaPowder + Quantity: 1 + - type: Extractable + grindableSolutionName: food + # - type: Tag + # tags: + # - ADTCarnivoreFriendlyFood + # - ADTMothFriendlyFood + + #Закуски ко Дню Святого Валентина +- type: entity + name: candy + parent: BaseItem + id: ADTFoodSnackMinichoco1Bar + description: For you! + components: + - type: Sprite + sprite: ADT/Objects/Specific/Service/loveday_candy.rsi + state: minichoco1 + - type: Item + size: Tiny + - type: Tag + tags: + - FoodSnack + - type: SpawnItemsOnUse + items: + - id: ADTFoodSnackMinichoco1 + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + name: candy + parent: BaseItem + id: ADTFoodSnackMinichoco2Bar + description: For you! + components: + - type: Sprite + sprite: ADT/Objects/Specific/Service/loveday_candy.rsi + state: minichoco2 + - type: Item + size: Tiny + - type: Tag + tags: + - FoodSnack + - type: SpawnItemsOnUse + items: + - id: ADTFoodSnackMinichoco2 + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + name: candy + parent: BaseItem + id: ADTFoodSnackMinichoco3Bar + description: For you! + components: + - type: Sprite + sprite: ADT/Objects/Specific/Service/loveday_candy.rsi + state: minichoco3 + - type: Item + size: Tiny + - type: Tag + tags: + - FoodSnack + - type: SpawnItemsOnUse + items: + - id: ADTFoodSnackMinichoco3 + sound: + path: /Audio/Effects/unwrap.ogg + +- type: entity + name: a lollipop in the shape of a heart + parent: FoodSnackBase + id: ADTFoodSnackCandyLove + description: Love is as sweet as ever! + components: + - type: FlavorProfile + flavors: + - chocolate + - type: Sprite + sprite: ADT/Objects/Specific/Service/loveday_candy.rsi + state: candy_love + - type: Item + size: Tiny + - type: Tag + tags: + - FoodSnack + - type: SolutionContainerManager + solutions: + food: + maxVol: 30 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Theobromine + Quantity: 3 + - ReagentId: CocoaPowder + Quantity: 1 + +- type: entity + name: a lollipop in the shape of a heart + parent: ADTFoodSnackCandyLove + id: ADTFoodSnackMinichoco1 + description: Love is as sweet as ever! + components: + - type: Sprite + sprite: ADT/Objects/Specific/Service/loveday_candy.rsi + state: minichoco1-open + +- type: entity + name: a lollipop in the shape of a heart + parent: ADTFoodSnackCandyLove + id: ADTFoodSnackMinichoco2 + description: Love is as sweet as ever! + components: + - type: Sprite + sprite: ADT/Objects/Specific/Service/loveday_candy.rsi + state: minichoco2-open + +- type: entity + name: a lollipop in the shape of a heart + parent: ADTFoodSnackCandyLove + id: ADTFoodSnackMinichoco3 + description: Love is as sweet as ever! + components: + - type: Sprite + sprite: ADT/Objects/Specific/Service/loveday_candy.rsi + state: minichoco3-open + +- type: entity + name: a lollipop in the shape of a heart + parent: ADTFoodSnackCandyLove + id: ADTFoodSnackMinichoco4 + description: Love is as sweet as ever! + components: + - type: Sprite + sprite: ADT/Objects/Specific/Service/loveday_candy.rsi + state: minichoco4-open + +- type: entity + name: a lollipop in the shape of a heart + parent: ADTFoodSnackCandyLove + id: ADTFoodSnackMinichoco5 + description: Love is as sweet as ever! + components: + - type: Sprite + sprite: ADT/Objects/Specific/Service/loveday_candy.rsi + state: minichoco5-open + +- type: entity + name: banana in chocolate + parent: FoodDonutBase + id: ADTFoodBananChocolate + description: Goes great with a mason jar of hippie's delight. + components: + - type: FlavorProfile + flavors: + - sweet + - banana + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Snacks/banana_in_choco.rsi + state: in-dark-choco + +- type: entity + name: banana in pink chocolate + parent: FoodDonutBase + id: ADTFoodBananChocolatePink + description: Goes great with a mason jar of hippie's delight. + components: + - type: FlavorProfile + flavors: + - sweet + - banana + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Snacks/banana_in_choco.rsi + state: in-pink-choco + +- type: entity + name: brown eclair + parent: FoodDonutBase + id: ADTFoodEclairBrown + description: Goes great with a mason jar of hippie's delight. + components: + - type: FlavorProfile + flavors: + - sweet + - creamy + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Snacks/eclairs.rsi + state: eclairs_brown + +- type: entity + name: chocolate eclair + parent: FoodDonutBase + id: ADTFoodEclairChocolate + description: Goes great with a mason jar of hippie's delight. + components: + - type: FlavorProfile + flavors: + - sweet + - creamy + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Snacks/eclairs.rsi + state: eclairs_chocolate + +- type: entity + name: pink eclair + parent: FoodDonutBase + id: ADTFoodEclairPink + description: Goes great with a mason jar of hippie's delight. + components: + - type: FlavorProfile + flavors: + - sweet + - creamy + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Snacks/eclairs.rsi + state: eclairs_pink + +- type: entity + name: white eclair + parent: FoodDonutBase + id: ADTFoodEclairWhite + description: Goes great with a mason jar of hippie's delight. + components: + - type: FlavorProfile + flavors: + - sweet + - creamy + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Snacks/eclairs.rsi + state: eclairs_white + +- type: entity + parent: FoodEggBoiled + id: ADTFoodEggBoiledEaster + name: easter egg + description: easter egg + components: + - type: Sprite + layers: + - state: red + map: [ "enum.DamageStateVisualLayers.Base" ] + - type: SolutionContainerManager + solutions: + food: + maxVol: 6 + reagents: + - ReagentId: EggCooked + Quantity: 6 + - type: Temperature + # preserve temperature from the boiling step + currentTemperature: 344 + - type: RandomSprite + available: + - enum.DamageStateVisualLayers.Base: + blue: "" + green: "" + orange: "" + purple: "" + rainbow: "" + red: "" + yellow: "" - type: entity name: chocolate bar chunk parent: FoodSnackBase diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/soup.yml index eb893139ae5..7fe6ae4b0f9 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/soup.yml @@ -85,6 +85,31 @@ - ReagentId: Water Quantity: 15 + +- type: entity + name: pumpkin soup + parent: FoodBowlBase + id: ADTFoodSoupPumpkin + description: A humble split pumpkin soup. + components: + - type: FlavorProfile + flavors: + - creamy + - adt_pumpkin + - type: Sprite + sprite: ADT/Objects/Consumable/Food/Baked/pumpkin_soup.rsi + state: icon + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 8 + - ReagentId: Vitamin + Quantity: 5 + + - type: entity name: uzbek pilaf parent: ADTFoodBowlBase diff --git a/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/strawberry_mousse.yml b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/strawberry_mousse.yml new file mode 100644 index 00000000000..9fead6a551d --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Consumable/Food/strawberry_mousse.yml @@ -0,0 +1,27 @@ +- type: entity + name: strawberry mousse + parent: FoodInjectableBase + id: ADTStrawberryMousse + description: It helps to improve blood circulation. + components: + - type: Food + trash: + - DrinkGlass + utensil: Fork + - type: FlavorProfile + flavors: + - sweet + - type: Sprite + sprite: ADT/Objects/Consumable/Food/strawberry_mousse.rsi + state: strawberry_mousse + - type: SolutionContainerManager + solutions: + food: + maxVol: 26 + reagents: + - ReagentId: Nutriment + Quantity: 10 + - ReagentId: Theobromine + Quantity: 5 + - ReagentId: Vitamin + Quantity: 5 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/lethal_company_air_horn.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/lethal_company_air_horn.yml new file mode 100644 index 00000000000..eb85c6a66db --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/lethal_company_air_horn.yml @@ -0,0 +1,38 @@ +- type: entity + parent: BaseItem + id: ADTLethalCompanyAirHorn + name: bike horn + description: A horn off of a bicycle. + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Fun/lethal_company_air_horn.rsi + state: icon + - type: Item + sprite: ADT/Objects/Fun/lethal_company_air_horn.rsi + size: Tiny + - type: EmitSoundOnUse + sound: + collection: LethalCompanyAirHorn + params: + variation: 0.125 + volume: -13 + maxDistance: 10 + - type: UseDelay + delay: 300 + - type: EmitSoundOnTrigger + sound: + collection: LethalCompanyAirHorn + params: + variation: 0.125 + volume: -13 + maxDistance: 10 + - type: Tag + tags: + - Payload # yes, you can make re-usable prank grenades + - BikeHorn + - type: Tool + qualities: + - Honking + useSound: + collection: LethalCompanyAirHorn diff --git a/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml b/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml new file mode 100644 index 00000000000..5e7d11f74fe --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Fun/misc.yml @@ -0,0 +1,102 @@ +# halloween +- type: entity + parent: [BaseBallBat, ClothingHandsBase] + id: ADTHalloweenBroom + name: witch broom + description: time to fly + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Fun/broom.rsi + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 2 + Structural: 5 + - type: StaticPrice + price: 25 + #- type: ClothingSpeedModifier + # walkModifier: 0.9 + # sprintModifier: 1.2 + +#New Year + +- type: entity + parent: BaseItem + id: ADTSnowball + name: Snowball + description: yeayea. Snow? Balls! I love balls!! + suffix: New Year + components: + - type: Sprite + sprite: ADT/Objects/Fun/snowball.rsi + state: snowball + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Glass + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 5 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: FootstepSnow + params: + variation: 0.125 + volume: 6 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: DamageOnLand + ignoreResistances: true + damage: + types: + Blunt: 5 + - type: StaminaDamageOnCollide + damage: 5 + + +- type: entity + name: Slime Happines + parent: BaseItem + id: ADTSlimeHappines + description: Slimyy.. + components: + - type: Sprite + sprite: ADT/Objects/Misc/slimehappines.rsi + state: icon + + + +- type: entity + name: New Year gurney + id: ADTNewYearKatalka + parent: BaseStructure + description: Yea. + placement: + mode: PlaceFree + components: + - type: Sprite + sprite: ADT/Structures/Specific/newyearkatalki.rsi + state: newyearkatalka + - type: Anchorable + - type: Rotatable + - type: Physics # ADT CHANGE START sleep + bodyType: Static + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + density: 10 + mask: + - TableMask + - type: HealOnBuckle + damage: + types: + Poison: -0.1 + Blunt: -0.1 + - type: Strap + position: Down + rotation: 0 # ADT CHANGE END sleep diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/bowl.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/bowl.yml new file mode 100644 index 00000000000..5413e40a092 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/bowl.yml @@ -0,0 +1,76 @@ +- type: entity + name: halloween candy bowl + id: ADTHalloweenCandyBowl + parent: ADTBoxHalloweenCandy + description: Trick or treats! + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Misc/halloween_candy_bowl.rsi + layers: + - state: icon-0 + map: ["enum.StorageFillLayers.Fill"] + - type: Storage + maxItemSize: Huge + whitelist: + components: + - Pill + tags: + - FoodSnack + - ADTCandies + - type: Appearance + - type: StorageFillVisualizer + maxFillLevels: 4 + fillBaseName: icon + - type: Item + size: Huge + +- type: entity + name: halloween candy bowl + id: ADTHalloweenSmileCandyBowl + parent: ADTHalloweenCandyBowl + description: Trick or treats! + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Misc/halloween_smilecandy_bowl.rsi + +- type: entity + name: halloween NT candy bowl + id: ADTHalloweenNTCandyBowl + parent: ADTHalloweenCandyBowl + description: Trick or treats! + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Misc/halloween_NTcandy_bowl.rsi + +- type: entity + name: halloween syndie candy bowl + id: ADTHalloweenSyndieCandyBowl + parent: ADTHalloweenCandyBowl + description: Trick or treats! + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Misc/halloween_syndiecandy_bowl.rsi + +- type: entity + name: halloween zombie candy bowl + id: ADTHalloweenZombieCandyBowl + parent: ADTHalloweenCandyBowl + description: Trick or treats! + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Misc/halloween_zombiecandy_bowl.rsi + +- type: entity + name: halloween seal candy bowl + id: ADTHalloweenSealCandyBowl + parent: ADTHalloweenCandyBowl + description: Trick or treats! + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Misc/halloween_sealcandy_bowl.rsi diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/human_cube_box.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/human_cube_box.yml index 5c1cade2e5f..67864b27a70 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Misc/human_cube_box.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/human_cube_box.yml @@ -10,4 +10,32 @@ amount: 8 - type: Sprite sprite: ADT/Objects/Misc/humancube.rsi - state: box \ No newline at end of file + state: box + +- type: entity + parent: BoxCardboard + name: ADTReindeerCubeBox + id: ADTReindeerCubeBox + description: ADTReindeerCubeBox + components: + - type: StorageFill + contents: + - id: ADTReindeerCube + amount: 8 + - type: Sprite + sprite: ADT/Objects/Misc/humancube.rsi + state: box + +- type: entity + parent: BoxCardboard + name: ADTCubeBox + id: ADTGingerbreadCubeBox + description: ADTGingerbreadCubeBox + components: + - type: StorageFill + contents: + - id: ADTGingerbreadCube + amount: 8 + - type: Sprite + sprite: ADT/Objects/Misc/humancube.rsi + state: box diff --git a/Resources/Prototypes/ADT/Entities/Objects/Misc/valentine_cards.yml b/Resources/Prototypes/ADT/Entities/Objects/Misc/valentine_cards.yml new file mode 100644 index 00000000000..a80f718dc7a --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Misc/valentine_cards.yml @@ -0,0 +1,209 @@ +- type: entity + parent: BaseItem + id: ValentineCardsBase + abstract: true + components: + - type: Tag + tags: + - Paper + - type: Appearance + - type: Flammable + fireSpread: true + alwaysCombustible: true + damage: + types: + Heat: 1 + - type: FireVisuals + sprite: Effects/fire.rsi + normalState: fire + - type: Damageable + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: # Excess damage, don't spawn entities + !type:DamageTrigger + damage: 100 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + Ash: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Food + solution: food + delay: 7 + forceFeedDelay: 7 + - type: FlavorProfile + flavors: + - paper + - type: BadFood + - type: SolutionContainerManager + solutions: + food: + maxVol: 1 + reagents: + - ReagentId: Fiber + Quantity: 1 + - type: Item + size: Tiny + - type: PhysicalComposition + +- type: entity + name: valentine card + parent: ValentineCardsBase + id: ADTValentineCard1 + description: A valentine's card where you can write words of love to your significant other + components: + - type: Sprite + sprite: ADT/Objects/Misc/valentine_cards.rsi + layers: + - state: val1 + - type: Paper + - type: PaperLabelType + - type: ActivatableUI + key: enum.PaperUiKey.Key + requiresComplex: false + - type: UserInterface + interfaces: + enum.PaperUiKey.Key: + type: PaperBoundUserInterface + - type: FaxableObject + - type: PaperVisuals + backgroundModulate: "#cccccc" # ADT CHANGES START ---> + contentImageModulate: "#cccccc" + backgroundPatchMargin: 16.0, 16.0, 16.0, 16.0 #Уголки бумаги + contentMargin: 16.0, 16.0, 16.0, 16.0 # ADT CHANGES END <-- + - type: Flammable + fireSpread: true + alwaysCombustible: true + damage: + types: + Heat: 1 + - type: FireVisuals + sprite: Effects/fire.rsi + normalState: fire + - type: Damageable + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + Ash: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Food + solution: food + delay: 7 + forceFeedDelay: 7 + - type: FlavorProfile + flavors: + - paper + - type: BadFood + - type: SolutionContainerManager + solutions: + food: + maxVol: 1 + reagents: + - ReagentId: Fiber + Quantity: 1 +# Corvax-Printer-Start + - type: Material + - type: PhysicalComposition + materialComposition: + PrinterPaper: 100 + - type: Stack + stackType: ADTPaper + count: 1 +# Corvax-Printer-End + # ADT Start + - type: EmitSoundOnPickup + sound: + path: /Audio/ADT/Entities/paper_pickup.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/ADT/Entities/paper_drop.ogg + # ADT End + +- type: entity + name: valentine card + parent: ADTValentineCard1 + id: ADTValentineCard2 + description: A valentine's card where you can write words of love to your significant other + components: + - type: Sprite + layers: + - state: val2 + +- type: entity + name: valentine card + parent: ADTValentineCard1 + id: ADTValentineCard3 + description: A valentine's card where you can write words of love to your significant other + components: + - type: Sprite + layers: + - state: val3 + +- type: entity + name: valentine card + parent: ADTValentineCard1 + id: ADTValentineCard4 + description: A valentine's card where you can write words of love to your significant other + components: + - type: Sprite + layers: + - state: val4 + +- type: entity + name: valentine card + parent: ADTValentineCard1 + id: ADTValentineCard5 + description: A valentine's card where you can write words of love to your significant other + components: + - type: Sprite + layers: + - state: val5 + +- type: entity + name: valentine card + parent: ADTValentineCard1 + id: ADTValentineCard6 + description: A valentine's card where you can write words of love to your significant other + components: + - type: Sprite + layers: + - state: val6 + +- type: entity + name: valentine card + parent: ADTValentineCard1 + id: ADTValentineCard7 + description: A valentine's card where you can write words of love to your significant other + components: + - type: Sprite + layers: + - state: val7 + +- type: entity + name: valentine card + parent: ADTValentineCard1 + id: ADTValentineCard8 + description: A valentine's card where you can write words of love to your significant other + components: + - type: Sprite + layers: + - state: val8 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Hydroponics/seeds.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Hydroponics/seeds.yml index 2f30dcfc240..80751fbfbec 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Hydroponics/seeds.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Hydroponics/seeds.yml @@ -19,6 +19,18 @@ - type: Sprite sprite: ADT/Objects/Specific/Hydroponics/cannabiswhite.rsi +# пакет семян +- type: entity + parent: SeedBase + name: packet of mandarin seeds + id: ADTMandarinSeeds + suffix: NewYear + components: + - type: Seed + seedId: ADTmandarin + - type: Sprite + sprite: ADT/Objects/Specific/Hydroponics/mandarin.rsi + # Пакет семян кофе - type: entity parent: SeedBase diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Rehydrateable/rehydrateable.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Rehydrateable/rehydrateable.yml index 5d36abe95c3..0abacfd5040 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Rehydrateable/rehydrateable.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Rehydrateable/rehydrateable.yml @@ -6,6 +6,32 @@ - type: Rehydratable possibleSpawns: - MobArtificialHuman + - type: Tag + tags: + - Meat + - MonkeyCube + +- type: entity + parent: RehydratableAnimalCube + id: ADTReindeerCube + name: ADTReindeerCube + components: + - type: Rehydratable + possibleSpawns: + - ADTReindeer + - type: Tag + tags: + - Meat + - MonkeyCube + +- type: entity + parent: RehydratableAnimalCube + id: ADTGingerbreadCube + name: ADTGingerbreadCube + components: + - type: Rehydratable + possibleSpawns: + - MobGingerbreadAI - type: Tag tags: - Meat diff --git a/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/bouquets.yml b/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/bouquets.yml index 261fc6a7191..63554249e91 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/bouquets.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Specific/Service/bouquets.yml @@ -128,7 +128,94 @@ - type: Item size: Normal sprite: ADT/Objects/Specific/Service/liliac_bouquet.rsi - - type: DisarmMalus + +#Букеты ко Дню Святого Валентина +- type: entity + parent: BaseItem + id: ADTObjectBouquetDarkRose + name: bouquet of black roses + description: The flowers of black roses grow exclusively on corpses, however, despite their vile origin, they are very beautiful. + components: + - type: Sprite + sprite: ADT/Objects/Specific/Service/blackrose_bouquet.rsi + state: icon + - type: MeleeWeapon + attackRate: 1.0 + damage: + types: + Slash: 1 + - type: Item + size: Normal + sprite: ADT/Objects/Specific/Service/blackrose_bouquet.rsi + - type: StaticPrice + price: 40 + +- type: entity + parent: ADTObjectBouquetDarkRose + id: ADTObjectBouquetGalakto + name: bouquet of galactocherthistle + description: Give a gift to your favorite chemist at the station! + components: + - type: Sprite + sprite: ADT/Objects/Specific/Service/galakto_bouquet.rsi - type: Construction - graph: ADTObjectLiliacBouquet - node: done + graph: ADTObjectBouquetGalaktoGraph + node: bouquetgalakto + - type: Item + size: Normal + sprite: ADT/Objects/Specific/Service/galakto_bouquet.rsi + +- type: entity + parent: ADTObjectBouquetDarkRose + id: ADTObjectBouquetMac + name: bouquet of poppies + description: A long thin stalk, with a scarlet light on top. Not a plant, but a lighthouse — it's a bright red poppy! + components: + - type: Sprite + sprite: ADT/Objects/Specific/Service/mac_bouquet.rsi + - type: Construction + graph: ADTObjectBouquetMacGraph + node: bouquetmac + - type: Item + size: Normal + sprite: ADT/Objects/Specific/Service/mac_bouquet.rsi + +- type: entity + parent: ADTObjectBouquetDarkRose + id: ADTObjectBouquetMix + name: bouquet of flowers + description: A bouquet of different flowers, bright and colorful, just like you! + components: + - type: Sprite + sprite: ADT/Objects/Specific/Service/mix_bouquet.rsi + - type: Construction + graph: ADTObjectBouquetMixGraph + node: bouquetmix + - type: Item + size: Normal + sprite: ADT/Objects/Specific/Service/mix_bouquet.rsi + +- type: entity + parent: ADTObjectBouquetDarkRose + id: ADTObjectBouquetRose + name: bouquet of flowers + description: These roses are for you. + components: + - type: Sprite + sprite: ADT/Objects/Specific/Service/love_rose_bouquet.rsi + - type: StaticPrice + price: 30 + - type: Item + size: Normal + sprite: ADT/Objects/Specific/Service/love_rose_bouquet.rsi + +- type: entity + parent: ADTObjectBouquetDarkRose + id: ADTObjectBouquetYellow + name: bouquet of dandelions + description: It looks cheap and simple, but the important thing is attention! + components: + - type: Sprite + sprite: ADT/Objects/Specific/Service/love_yellow_bouquet.rsi + - type: StaticPrice + price: 10 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/ADT/Entities/Objects/Tools/gas_tanks.yml new file mode 100644 index 00000000000..656dcd630b4 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Objects/Tools/gas_tanks.yml @@ -0,0 +1,42 @@ +- type: entity + parent: DoubleEmergencyOxygenTank + id: ADTDoubleLethalCompanyOxygenTank + name: lethal company double emergency oxygen tank + description: A high-grade dual-tank emergency life support container. It holds a decent amount of oxygen for its small size. It can hold 2.5 L of gas. + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Tanks/lethal_company_tanks.rsi + - type: Item + sprite: ADT/Objects/Tanks/lethal_company_tanks.rsi + - type: GasTank + air: + volume: 2.5 + temperature: 293.15 + - type: Clothing + sprite: ADT/Objects/Tanks/lethal_company_tanks.rsi + quickEquip: false + slots: + - back + - type: MeleeWeapon + attackRate: 0.9 + damage: + types: + Blunt: 7.5 + +- type: entity + parent: DoubleEmergencyOxygenTank + id: ADTDoubleLethalCompanyNitrogenTank + name: lethal company double emergency nitrogen tank + description: A high-grade dual-tank emergency life support container. It holds a decent amount of nitrogen for its small size. It can hold 2.5 L of gas. + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Tanks/lethal_company_tanks.rsi + - type: Item + sprite: ADT/Objects/Tanks/lethal_company_tanks.rsi + - type: Clothing + sprite: ADT/Objects/Tanks/lethal_company_tanks.rsi + quickEquip: false + slots: + - back diff --git a/Resources/Prototypes/ADT/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/ADT/Entities/Objects/Tools/tools.yml index 2433d607852..84e38a40243 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Tools/tools.yml @@ -94,7 +94,141 @@ maxCharges: 100 lastCharges: 100 - type: AutoRecharge - rechargeDuration: 2 + rechargeDuration: 10 + +# halloween + +- type: entity + name: golden candlestick + parent: BaseItem + id: ADTGoldenCandleStick + description: A light emitting device that would look like from ancient castle. + suffix: Halloween + components: + - type: Tag + tags: + - Flashlight + - WhitelistChameleon + - type: HandheldLight + addPrefix: false + blinkingBehaviourId: blinking + radiatingBehaviourId: radiating + - type: LightBehaviour + behaviours: + - !type:FadeBehaviour + id: radiating + maxDuration: 2.0 + startValue: 3.0 + endValue: 2.0 + isLooped: true + reverseWhenFinished: true + - !type:PulseBehaviour + id: blinking + interpolate: Nearest + maxDuration: 1.0 + isLooped: true + - type: ToggleableLightVisuals + spriteLayer: light + inhandVisuals: + left: + - state: inhand-left-light + shader: unshaded + right: + - state: inhand-right-light + shader: unshaded + - type: PowerCellSlot + cellSlotId: cell_slot + - type: ContainerContainer + containers: + cell_slot: !type:ContainerSlot + - type: ItemSlots + slots: + cell_slot: + name: power-cell-slot-component-slot-name-default + startingItem: PowerCellMedium + - type: Sprite + sprite: ADT/Objects/Misc/golden_candlestick.rsi + layers: + - state: lamp + - state: lamp-on + shader: unshaded + visible: false + map: [ "light" ] + - type: Item + sprite: ADT/Objects/Misc/golden_candlestick.rsi + size: Normal + #- type: PointLight + # enabled: false + # mask: /Textures/Effects/LightMasks/cone.png + # autoRot: true + # radius: 6 + # netsync: false + - type: PointLight + netsync: false + enabled: false + radius: 3 + energy: 0.75 + color: "#f6d33b" + - type: Appearance + - type: StaticPrice + price: 40 + +- type: entity + name: silver candlestick + parent: ADTGoldenCandleStick + id: ADTSilverCandleStick + description: A light emitting device that would look like from ancient castle. + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Misc/silver_candlestick.rsi + layers: + - state: lamp + - state: lamp-on + shader: unshaded + visible: false + map: [ "light" ] + - type: Item + sprite: ADT/Objects/Misc/silver_candlestick.rsi + size: Normal + - type: PointLight + netsync: false + enabled: false + radius: 3 + energy: 0.75 + color: "#6fa5da" + - type: Appearance + - type: StaticPrice + price: 40 + +- type: entity + name: scull lamp + parent: ADTGoldenCandleStick + id: ADTScullLamp + description: A light emitting device that would look like scull. Or its a reall scull with the lamp inside? + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Misc/scull_lamp.rsi + layers: + - state: lamp + - state: lamp-on + shader: unshaded + visible: false + map: [ "light" ] + - type: Item + sprite: ADT/Objects/Misc/scull_lamp.rsi + size: Normal + - type: PointLight + netsync: false + enabled: false + radius: 3 + energy: 0.75 + color: "#56e1d8" + - type: Appearance + - type: StaticPrice + price: 40 + - type: entity name: scalpel id: ADTSupermatterScalpel diff --git a/Resources/Prototypes/ADT/Entities/Objects/Tools/web_weaver.yml b/Resources/Prototypes/ADT/Entities/Objects/Tools/web_weaver.yml index c68aea226e1..3d04ad9986d 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Tools/web_weaver.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Tools/web_weaver.yml @@ -74,4 +74,4 @@ prototype: ADTPosterHalloweenSpiderWeb2 collisionMask: FullTileMask cost: 5 - delay: 5 + delay: 5 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Objects/Vehicles/buckleable.yml b/Resources/Prototypes/ADT/Entities/Objects/Vehicles/buckleable.yml index e0cd0743b67..579089c2799 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Vehicles/buckleable.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Vehicles/buckleable.yml @@ -480,3 +480,32 @@ components: - type: Foldable folded: true + +- type: entity + parent: [ ADTVehicleATV, FlyingMobBase ] + id: ADTReindeer + name: ADTReindeer + description: ADTReindeer + components: + - type: Vehicle + hasKey: true + southOver: true + northOver: true + northOverride: -0.1 + southOverride: 0.1 + - type: CanMoveInAir + - type: Sprite + sprite: ADT/Objects/Vehicles/reindeer.rsi + drawdepth: HighFloorObjects + layers: + - state: deer2 + map: ["enum.VehicleVisualLayers.AutoAnimate"] + noRot: true + - type: Strap + buckleOffset: "0.2, 0" + #maxBuckleDistance: 1 + - type: MovementSpeedModifier + acceleration: 2 + friction: 1.5 + baseWalkSpeed: 4.5 + baseSprintSpeed: 7 diff --git a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml index fe4040672b5..598034d3401 100644 --- a/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml +++ b/Resources/Prototypes/ADT/Entities/Objects/Weapons/Melee/swords.yml @@ -1,3 +1,86 @@ +# halloween + +- type: entity + name: Jason's machete + parent: Machete + id: ADTJasonMachette + description: The machete of one of the most terrifying maniacs. There is a small inscription "polyurethane" on the side. + components: + - type: MeleeWeapon + attackRate: 1.2 + angle: 75 + damage: + types: + Blunt: 0.5 + soundHit: + collection: BoxingHit + - type: StaminaDamageOnHit + damage: 8 + +- type: entity + name: Tagilla 's sledgehammer + parent: BaseItem + id: ADTTagillaSledgehammerReal + description: The hammer is coated with urethane, which provides a "thud" using steel balls to dampen the impact and reduce the vibration of the recoil in the handle. + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Objects/Weapons/Melee/tagilla_sledge.rsi + state: icon + - type: MeleeWeapon + attackRate: 0.4 + angle: 75 + damage: + types: + Blunt: 25 + Structural: 15 + - type: StaminaDamageOnHit + damage: 25 + - type: Wieldable + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 10 + Structural: 35 + - type: Item + size: Huge + - type: DisarmMalus + - type: Clothing + quickEquip: false + slots: + - back + +- type: entity + name: Tagilla 's sledgehammer + parent: ADTTagillaSledgehammerReal + id: ADTTagillaSledgehammerToy + description: The hammer is coated with urethane, which provides a "thud" using steel balls to dampen the impact and reduce the vibration of the recoil in the handle. + suffix: Halloween + components: + - type: StaminaDamageOnHit + damage: 5 + - type: Appearance + - type: DisarmMalus + malus: 0 + - type: MeleeWeapon + soundHit: + collection: RubberHammer + params: + variation: 0.03 + volume: 3 + soundNoDamage: + collection: RubberHammer + params: + variation: 0.03 + volume: 3 + damage: + types: + Blunt: 0.01 + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 0.1 + - type: entity name: Cursed katana parent: BaseItem diff --git a/Resources/Prototypes/ADT/Entities/Structures/Decorations/plants.yml b/Resources/Prototypes/ADT/Entities/Structures/Decorations/plants.yml new file mode 100644 index 00000000000..a3130e87cc0 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Structures/Decorations/plants.yml @@ -0,0 +1,22 @@ + # halloween + +- type: entity + id: ADTHalloweenPottedPlant1 + parent: PottedPlantBase + name: halloween potted plant + description: halloween potted plant + suffix: Halloween + components: + - type: Sprite + drawdepth: Overdoors + offset: "0.0,0.3" + sprite: ADT/Structures/Decoration/Plants/potted_plant_helloween.rsi + state: plant1 + noRot: true + +- type: entity + id: ADTHalloweenPottedPlant2 + parent: ADTHalloweenPottedPlant1 + components: + - type: Sprite + state: plant2 diff --git a/Resources/Prototypes/ADT/Entities/Structures/Decorations/statues.yml b/Resources/Prototypes/ADT/Entities/Structures/Decorations/statues.yml index 011e7a87b2c..efe42412c92 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Decorations/statues.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Decorations/statues.yml @@ -1,3 +1,31 @@ +- type: entity + id: ADTStatueBeerMessiahLeft + parent: BaseStructure + name: statue of a beer messiah + suffix: Октоберфест, Левая + description: statue of a beer messiah + components: + - type: Sprite + noRot: true + sprite: ADT/Structures/Decoration/Statues/beer_messiah.rsi + state: beer_messiah_left + drawdepth: Mobs + offset: "0.0,0.5" + +- type: entity + id: ADTStatueBeerMessiahRight + parent: BaseStructure + name: statue of a beer messiah + suffix: Октоберфест, Правая + description: statue of a beer messiah + components: + - type: Sprite + noRot: true + sprite: ADT/Structures/Decoration/Statues/beer_messiah.rsi + state: beer_messiah_right + drawdepth: Mobs + offset: "0.0,0.5" + - type: entity id: ADTStatueCryingAngel parent: BaseStructureDynamic diff --git a/Resources/Prototypes/ADT/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/ADT/Entities/Structures/Furniture/chairs.yml index 80242722870..a330cd22188 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Furniture/chairs.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Furniture/chairs.yml @@ -66,6 +66,21 @@ graph: ADTSeat node: adtchairwhite +# OctoberFest + +- type: entity + name: oktoberfest chair + id: ADTChairOktoberfest + parent: ADTChairBase + suffix: Oktoberfest + components: + - type: Sprite + sprite: ADT/Structures/Furniture/Chairs/oktoberfest_chair.rsi + state: oct_chair_orange + - type: Construction + graph: ADTSeat + node: adtchairoktoberfest + - type: entity name: rusty chair id: ADTChairRusty @@ -218,6 +233,24 @@ - type: Construction graph: ADTSeat node: adtarmchairblue2 + +- type: entity + name: spider stool + id: ADTSpiderStool + parent: ADTChairBase + description: It looks spooky. + suffix: Halloween + components: + - type: Transform + anchored: true + - type: Physics + bodyType: Static + - type: Anchorable + - type: Rotatable + - type: Sprite + sprite: ADT/Structures/Furniture/Chairs/spider_stool.rsi #спрайт от Умы + state: icon + - type: entity name: barber chair id: ADTBarberChair diff --git a/Resources/Prototypes/ADT/Entities/Structures/Furniture/misc.yml b/Resources/Prototypes/ADT/Entities/Structures/Furniture/misc.yml index 80bc4c7c0f4..17d59f9de4e 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Furniture/misc.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Furniture/misc.yml @@ -47,3 +47,114 @@ - type: Construction graph: ADTDiscoBallGraph node: adtdiscoball + + + # halloween + +- type: entity + id: ADTHalloweenPumpkinLight1 + parent: PottedPlantBase + name: pumpkin light + description: pumpkin light + suffix: Halloween + components: + - type: Sprite + drawdepth: Overdoors + offset: "0.0,0.3" + sprite: ADT/Structures/Furniture/pumpkin_light.rsi + state: pumpkin_light1 + noRot: true + - type: PointLight + netsync: false + enabled: true + radius: 3 + energy: 0.5 + color: "#fbffb8" + #- type: Construction + # graph: pumpkin_light1 + # node: pumpkinlight1 + +- type: entity + id: ADTHalloweenPumpkinLight2 + parent: ADTHalloweenPumpkinLight1 + name: pumpkin light + description: pumpkin light + suffix: Halloween + components: + - type: Sprite + state: pumpkin_light2 + #- type: Construction + # graph: pumpkin_light2 + # node: pumpkinlight2 + +- type: entity + id: ADTHalloweenPumpkinLight3 + parent: ADTHalloweenPumpkinLight1 + name: pumpkin light + description: pumpkin light + suffix: Halloween + components: + - type: Sprite + state: pumpkin_light3 + #- type: Construction + # graph: pumpkin_light3 + # node: pumpkinlight3 + +- type: entity + id: ADTHalloweenPumpkinLight4 + parent: ADTHalloweenPumpkinLight1 + name: pumpkin light + description: pumpkin light + suffix: Halloween + components: + - type: Sprite + state: pumpkin_light4 + #- type: Construction + # graph: pumpkin_light4 + # node: pumpkinlight4 + +- type: entity + id: ADTHalloweenPumpkinLight5 + parent: ADTHalloweenPumpkinLight1 + name: pumpkin light + description: pumpkin light + suffix: Halloween + components: + - type: Sprite + state: pumpkin_light5 + +# carved + +- type: entity + id: ADTHalloweenCarvedPumpkinCube + parent: PottedPlantBase + name: pumpkin + description: pumpkin + suffix: Halloween + components: + - type: Sprite + drawdepth: Overdoors + offset: "0.0,0.3" + sprite: ADT/Structures/Furniture/pumpkin_carved.rsi + state: carved_cube + noRot: true + +- type: entity + id: ADTHalloweenCarvedPumpkinSmile + parent: ADTHalloweenCarvedPumpkinCube + name: pumpkin + description: pumpkin + suffix: Halloween + components: + - type: Sprite + state: carved_smile + +- type: entity + id: ADTHalloweenCarvedPumpkinWily + parent: ADTHalloweenCarvedPumpkinCube + name: pumpkin + description: pumpkin + suffix: Halloween + components: + - type: Sprite + state: carved_wily diff --git a/Resources/Prototypes/ADT/Entities/Structures/Furniture/tables.yml b/Resources/Prototypes/ADT/Entities/Structures/Furniture/tables.yml index 86270523158..13b0c33bbe9 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Furniture/tables.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Furniture/tables.yml @@ -243,6 +243,90 @@ graph: ADTTable node: adttableroundglass +# OctoberFest + +- type: entity + id: ADTTableOktoberfest + parent: ADTTableBase + name: wood oktoberfest table + description: Do not apply fire to this. Rumour says it burns easily. + components: + - type: Sprite + sprite: ADT/Structures/Furniture/Tables/oktoberfest_table.rsi + - type: Icon + sprite: ADT/Structures/Furniture/Tables/oktoberfest_table.rsi + - type: Damageable + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: #excess damage (nuke?). avoid computational cost of spawning entities. + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:SpawnEntitiesBehavior + spawn: + MaterialWoodPlank: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Tag + tags: + - Wooden + - type: Construction + graph: ADTTable + node: adttableoktoberfest + +- type: entity + id: ADTTableOktoberfestOrange + parent: ADTTableBase + name: wood oktoberfest orange table + description: Do not apply fire to this. Rumour says it burns easily. + components: + - type: Sprite + sprite: ADT/Structures/Furniture/Tables/oktoberfest_table_orange.rsi + - type: Icon + sprite: ADT/Structures/Furniture/Tables/oktoberfest_table_orange.rsi + - type: Damageable + damageModifierSet: Wood + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: #excess damage (nuke?). avoid computational cost of spawning entities. + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 15 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WoodDestroy + - !type:SpawnEntitiesBehavior + spawn: + MaterialWoodPlank: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Tag + tags: + - Wooden + - type: Construction + graph: ADTTable + node: adttableoktoberfestorange + - type: entity id: ADTTableRusty parent: ADTTableBase diff --git a/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml index 6af20177058..f002ce6f3c5 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Machines/vending_machines.yml @@ -91,6 +91,42 @@ - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] + + # halloween + +- type: entity + parent: VendingMachine + id: ADTVendingMachineHalloween + name: HalloMate + description: A vending machine for Halloween things. + components: + - type: VendingMachine + pack: ADTHalloweenMateInventory + offState: off + brokenState: broken + normalState: normal-unshaded + denyState: deny-unshaded + #- type: Advertise + # pack: ClothesMateAds + - type: Speech + - type: Tag + tags: + - WhitelistChameleon + - type: Sprite + sprite: ADT/Structures/Machines/VendingMachines/halloweenmat.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 1.8 + energy: 1.6 + color: "#c2adff" + # Таблеткомат - type: entity @@ -158,6 +194,9 @@ radius: 1.8 energy: 1.6 color: "#1ca9d4" + - type: StaticPrice + price: 2600 + # ГраждоМед @@ -289,6 +328,40 @@ initialStockQuality: 0.33 allForFree: true # ADT-Economy +- type: entity + parent: VendingMachine + id: ADTVendingMachineLoveVend + name: LoveVend + description: Happy Valentine's Day! + components: + - type: VendingMachine + priceMultiplier: 0.8 + pack: ADTLoveLandInventory + offState: off + brokenState: broken + normalState: normal-unshaded + denyState: deny-unshaded + - type: Speech + - type: Tag + tags: + - WhitelistChameleon + - type: Sprite + sprite: ADT/Structures/Machines/VendingMachines/lovevend.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 1.8 + energy: 1.6 + color: "#c2adff" + - type: StaticPrice + price: -4000 + - type: entity parent: VendingMachine id: ADTVendingMachineBarberDrobe diff --git a/Resources/Prototypes/ADT/Entities/Structures/Power/Generation/Supermatter/SupermatterCrystal.yml b/Resources/Prototypes/ADT/Entities/Structures/Power/Generation/Supermatter/SupermatterCrystal.yml index 19547a4f4d7..3c731053a81 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Power/Generation/Supermatter/SupermatterCrystal.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Power/Generation/Supermatter/SupermatterCrystal.yml @@ -83,6 +83,7 @@ layers: - state: supermatter map: ["enum.SupermatterVisuals.Crystal"] + - state: newyearhat - type: SupermatterVisuals crystal: Normal: { state: supermatter } diff --git a/Resources/Prototypes/ADT/Entities/Structures/Specific/witch_cauldron.yml b/Resources/Prototypes/ADT/Entities/Structures/Specific/witch_cauldron.yml new file mode 100644 index 00000000000..6980219ab04 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Structures/Specific/witch_cauldron.yml @@ -0,0 +1,64 @@ +# ADT ADD FOR HALLOWEEN +# ВЕДЬМИН КОТЁЛ + +- type: entity + name: the witch's cauldron + id: ADTWitchCauldron + parent: [BaseStructureDynamic, StructureWheeled] + description: I wanna cook something... Magical... + suffix: Хеллоуин + components: + - type: Sprite + noRot: true + sprite: ADT/Structures/dispensers.rsi + state: industrial-working + - type: InteractionOutline + - type: Spillable + solution: bucket + spillDelay: 3.0 + spillWhenThrown: false + - type: SolutionContainerManager + solutions: + bucket: + maxVol: 800 + reagents: + - ReagentId: Water + Quantity: 600 # 3 quarters full at roundstart to make it more appealing + - type: DrainableSolution + solution: bucket + - type: RefillableSolution + solution: bucket + - type: ExaminableSolution + solution: bucket + - type: Tag + tags: + - Wringer + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Metallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 400 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:EmptyAllContainersBehaviour + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - type: Appearance + - type: UserInterface + interfaces: + enum.StorageUiKey.Key: + type: StorageBoundUserInterface + - type: Drink + solution: bucket + - type: DnaSubstanceTrace diff --git a/Resources/Prototypes/ADT/Entities/Structures/Storage/Crates/snowballcrate.yml b/Resources/Prototypes/ADT/Entities/Structures/Storage/Crates/snowballcrate.yml new file mode 100644 index 00000000000..11cf63d02ab --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Structures/Storage/Crates/snowballcrate.yml @@ -0,0 +1,517 @@ +- type: entity + name: Snowballs crate + parent: BaseStructure + id: ADTSnowballsCrate + description: Mmm.. Crate full of BALLS!!! + suffix: New Year + components: + - type: Sprite + sprite: ADT/Objects/Specific/snowdispenser.rsi + state: icon + - type: Appearance + - type: ContainerContainer + containers: + bin-container: !type:Container + - type: Bin + maxItems: 500 + initialContents: + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball + - ADTSnowball \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/ADT/Entities/Structures/Storage/Tanks/tanks.yml new file mode 100644 index 00000000000..51e6765ed65 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Structures/Storage/Tanks/tanks.yml @@ -0,0 +1,187 @@ +#Пивные бочки +- type: entity + parent: StorageTank + id: ADTBeerTankCargo + name: golden ale tank + description: golden ale tank + suffix: Oktoberfest + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: ADTGoldenAle + Quantity: 1500 + - type: Sprite + sprite: ADT/Structures/Storage/beertank.rsi + state: cargobeer + +- type: entity + parent: StorageTank + id: ADTBeerTankLeaflover + name: leaflover beer tank + description: leaflover beer tank + suffix: Oktoberfest + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: ADTLeafloverBeer + Quantity: 1500 + - type: Sprite + sprite: ADT/Structures/Storage/beertank.rsi + state: leafloverbeer + +- type: entity + parent: StorageTank + id: ADTBeerTankScientificAle + name: scientific ale tank + description: scientific ale tank + suffix: Oktoberfest + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: ADTScientificAle + Quantity: 1500 + - type: Sprite + sprite: ADT/Structures/Storage/beertank.rsi + state: scientificale + +- type: entity + parent: StorageTank + id: ADTBeerTankGoldenAle + name: golden ale tank + description: golden ale tank + suffix: Oktoberfest + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: ADTGoldenAle + Quantity: 1500 + - type: Sprite + sprite: ADT/Structures/Storage/beertank.rsi + state: goldenale + +- type: entity + parent: StorageTank + id: ADTBeerTankSausage + name: sausage beer tank + description: sausage beer tank + suffix: Oktoberfest + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: ADTSausageBeer + Quantity: 1500 + - type: Sprite + sprite: ADT/Structures/Storage/beertank.rsi + state: sausagebeer + +- type: entity + parent: StorageTank + id: ADTBeerTankTechno + name: techno beer tank + description: techno beer tank + suffix: Oktoberfest + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: ADTTechnoBeer + Quantity: 1500 + - type: Sprite + sprite: ADT/Structures/Storage/beertank.rsi + state: technobeer + +- type: entity + parent: StorageTank + id: ADTBeerTankClassicPaulaner + name: paulaner beer tank + description: paulaner beer tank + suffix: Oktoberfest + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: ADTClassicPaulanerBeer + Quantity: 1500 + - type: Sprite + sprite: ADT/Structures/Storage/beertank.rsi + state: paulanerbeer + +- type: entity + parent: StorageTank + id: ADTBeerTankLivsey + name: livsey beer tank + description: livsey beer tank + suffix: Oktoberfest + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: ADTLivseyBeer + Quantity: 1500 + - type: Sprite + sprite: ADT/Structures/Storage/beertank.rsi + state: livseybeer + +- type: entity + parent: StorageTank + id: ADTBeerTankLuckyJonny + name: lucky jonny beer tank + description: lucky jonny beer tank + suffix: Oktoberfest + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: ADTLuckyJonnyBeer + Quantity: 1500 + - type: Sprite + sprite: ADT/Structures/Storage/beertank.rsi + state: luckyjonnybeer + +- type: entity + parent: StorageTank + id: ADTBeerTankSecUnfiltered + name: sec unfiltered beer tank + description: sec unfiltered beer tank + suffix: Oktoberfest + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: ADTSecUnfilteredBeer + Quantity: 1500 + - type: Sprite + sprite: ADT/Structures/Storage/beertank.rsi + state: secunfilteredbeer + +- type: entity + parent: StorageTank + id: ADTBeerTankGlyphidStout + name: glyphid stout tank + description: glyphid stout tank + suffix: Oktoberfest + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: ADTGlyphidStoutBeer + Quantity: 1500 + - type: Sprite + sprite: ADT/Structures/Storage/beertank.rsi + state: glyphidstout diff --git a/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml b/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml index 71ba35af294..4b5932fdb28 100644 --- a/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml +++ b/Resources/Prototypes/ADT/Entities/Structures/Wallmount/Signs/posters.yml @@ -6,7 +6,7 @@ - type: WallMount arc: 360 - type: Sprite - drawdepth: WallTops + drawdepth: Mobs sprite: ADT/Structures/Wallmounts/posters.rsi snapCardinals: true - type: Destructible @@ -56,6 +56,26 @@ - type: Sprite state: poster_adtturnonsensors_legit #Спрайт от Празата +- type: entity + parent: ADTPosterBase + id: ADTPosterLegitOktoberfest + name: Oktoberfest! + description: "A poster with a tayaran advertising the traditional October beer festival." + suffix: Oktoberfest + components: + - type: Sprite + state: poster_adtoktoberfest_legit #Спрайт от Празата + +- type: entity + parent: ADTPosterBase + id: ADTPosterLegitOktoberfest2 + name: Oktoberfest! + description: "A poster with a beer mug advertising the traditional October beer festival." + suffix: Oktoberfest + components: + - type: Sprite + state: poster_adtoktoberfest2_legit #Спрайт от Празата + #контрабандные постеры - type: entity @@ -356,6 +376,256 @@ - type: Sprite state: poster_efficiencydiagram_legit #Спрайт от Иллюми + +#Хеллоуинский декор + +- type: entity + parent: ADTPosterBase + id: ADTPosterHalloweenSpooky + name: spooky poster + description: spooky poster + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/poster_helloween.rsi + state: spooky + +- type: entity + parent: ADTPosterBase + id: ADTPosterHalloweenYummy + name: yummy poster + description: yummy poster + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/poster_helloween.rsi + state: yummy + +- type: entity + parent: ADTPosterBase + id: ADTPosterHalloweenSpider + name: spider poster + description: spider poster + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/poster_helloween.rsi + state: spider + +- type: entity + parent: ADTPosterBase + id: ADTPosterHalloweenSpiderWeb1 + name: spider web + description: spider web + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/poster_helloween.rsi + state: spiderweb1 + +- type: entity + parent: ADTPosterBase + id: ADTPosterHalloweenSpiderWeb2 + name: spider web + description: spider web + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/poster_helloween.rsi + state: spiderweb2 + +- type: entity + parent: ADTPosterBase + id: ADTPosterHappyHalloween + name: happy halloween + description: happy halloween + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/poster_helloween.rsi + state: happyhalloween + +- type: entity + parent: ADTPosterBase + id: ADTPosterHappyHalloween2 + name: happy halloween + description: happy halloween + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/poster_helloween.rsi + state: happyhalloween-2 + +- type: entity + parent: ADTPosterBase + id: ADTPosterHappyHalloween3 + name: happy halloween + description: happy halloween2 + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/poster_helloween.rsi + state: happyhalloween-3 + +- type: entity + parent: ADTPosterBase + id: ADTPosterTayarHalloween + name: happy halloween + description: happy halloween3 + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/poster_helloween.rsi + state: tayarhalloween + +#Флажки к хеллоуину +#черно-оранжевые +- type: entity + parent: ADTPosterBase + id: ADTPosterHalloweenTrianglesBlackOrange1 + name: black-orange triangles + description: black-orange triangles + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/triangles_halloween.rsi + state: blackorange1 + +- type: entity + parent: ADTPosterBase + id: ADTPosterHalloweenTrianglesBlackOrange2 + name: black-orange triangles + description: black-orange triangles + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/triangles_halloween.rsi + state: blackorange2 + +- type: entity + parent: ADTPosterBase + id: ADTPosterHalloweenTrianglesBlackOrange3 + name: black-orange triangles + description: black-orange triangles + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/triangles_halloween.rsi + state: blackorange3 + +#черно-белые +- type: entity + parent: ADTPosterBase + id: ADTPosterHalloweenTrianglesBlackWhite1 + name: black-white triangles + description: black-white triangles + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/triangles_halloween.rsi + state: blackwhite1 + +- type: entity + parent: ADTPosterBase + id: ADTPosterHalloweenTrianglesBlackWhite2 + name: black-white triangles + description: black-white triangles + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/triangles_halloween.rsi + state: blackwhite2 + +- type: entity + parent: ADTPosterBase + id: ADTPosterHalloweenTrianglesBlackWhite3 + name: black-white triangles + description: black-white triangles + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/triangles_halloween.rsi + state: blackwhite3 + +#оранжево-желтые +- type: entity + parent: ADTPosterBase + id: ADTPosterHalloweenTrianglesOrangeYellow1 + name: orange-yellow triangles + description: orange-yellow triangles + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/triangles_halloween.rsi + state: orangeyellow1 + +- type: entity + parent: ADTPosterBase + id: ADTPosterHalloweenTrianglesOrangeYellow2 + name: orange-yellow triangles + description: orange-yellow triangles + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/triangles_halloween.rsi + state: orangeyellow2 + +- type: entity + parent: ADTPosterBase + id: ADTPosterHalloweenTrianglesOrangeYellow3 + name: orange-yellow triangles + description: orange-yellow triangles + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/triangles_halloween.rsi + state: orangeyellow3 + +#Счастливого хеллоуина +- type: entity + parent: ADTPosterBase + id: ADTPosterHalloweenTrianglesHappy1 + name: happy halloween triangles + description: happy halloween triangles + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/triangles_halloween.rsi + state: HPHW1 + +- type: entity + parent: ADTPosterBase + id: ADTPosterHalloweenTrianglesHappy2 + name: happy halloween triangles + description: happy halloween triangles + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/triangles_halloween.rsi + state: HPHW2 + +- type: entity + parent: ADTPosterBase + id: ADTPosterHalloweenTrianglesHappy3 + name: happy halloween triangles + description: happy halloween triangles + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/triangles_halloween.rsi + state: HPHW3 + +- type: entity + parent: ADTPosterBase + id: ADTPosterHalloweenTrianglesHappy4 + name: happy halloween triangles + description: happy halloween triangles + suffix: Halloween + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/triangles_halloween.rsi + state: HPHW4 + #Флаги и плакаты СССП - type: entity @@ -599,6 +869,142 @@ - type: Sprite state: poster_unclepraz_legit #Спрайт от Празата +#постеры на день святого Валентина + +- type: entity + parent: ADTPosterBase + id: ADTDVLoveContraband + suffix: Valentine's day + name: Sharp love + description: Buy a sawblade for yourself and your beloved, and you'll get a third one as a gift! + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/posters_valentines_day.rsi + state: dv_love_contraband + +- type: entity + parent: ADTPosterBase + id: ADTSpaceLoveContraband + name: Share it together! + description: An advertising poster celebrating Valentine's Day. + suffix: Valentine's day + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/posters_valentines_day.rsi + state: space_love_contraband + +- type: entity + parent: ADTPosterBase + id: ADTValentinaLegit + name: Love it... + description: To fly together in a hot air balloon. + suffix: Valentine's day + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/posters_valentines_day.rsi + state: valentina_legit + +- type: entity + parent: ADTPosterBase + id: ADTValentina2Legit + name: Love it... + description: A piercing feeling in my heart. + suffix: Valentine's day + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/posters_valentines_day.rsi + state: valentina2_legit + +- type: entity + parent: ADTPosterBase + id: ADTValentina3Legit + name: Love it... + description: Giving treats to your loved one. + suffix: Valentine's day + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/posters_valentines_day.rsi + state: valentina3_legit + +- type: entity + parent: ADTPosterBase + id: ADTValentina4Legit + name: Love it... + description: Happiness is not just for two people. + suffix: Valentine's day + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/posters_valentines_day.rsi + state: valentina4_legit + +- type: entity + parent: ADTPosterBase + id: ADTValentina5Legit + name: Love it... + description: Just to be together. + suffix: Valentine's day + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/posters_valentines_day.rsi + state: valentina5_legit + +- type: entity + parent: ADTPosterBase + id: ADTValentina6Legit + name: Love it... + description: Loyalty to your lover. + suffix: Valentine's day + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/posters_valentines_day.rsi + state: valentina6_legit + +#Сердечки ко дню святого Валентина + +- type: entity + parent: ADTPosterBase + id: ADTHangingHearts + name: Hanging hearts + description: Decorative hearts hanging from a rope. At least they're not real. + suffix: Valentine's day + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/hanging_hearts_valentines_day.rsi + state: love + +- type: entity + parent: ADTPosterBase + id: ADTHangingHearts2 + name: Hanging hearts + description: Decorative hearts hanging from a rope. At least they're not real. + suffix: Valentine's day + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/hanging_hearts_valentines_day.rsi + state: love2 + +- type: entity + parent: ADTPosterBase + id: ADTHangingHearts3 + name: Hanging hearts + description: Decorative hearts hanging from a rope. At least they're not real. + suffix: Valentine's day + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/hanging_hearts_valentines_day.rsi + state: love3 + +- type: entity + parent: ADTPosterBase + id: ADTHangingHearts4 + name: Hanging hearts + description: Decorative hearts hanging from a rope. At least they're not real. + suffix: Valentine's day + components: + - type: Sprite + sprite: ADT/Structures/Wallmounts/hanging_hearts_valentines_day.rsi + state: love4 + - type: entity parent: ADTPosterBase id: ADTPosterNoLRP diff --git a/Resources/Prototypes/ADT/Entities/Structures/celtic_spike.yml b/Resources/Prototypes/ADT/Entities/Structures/celtic_spike.yml new file mode 100644 index 00000000000..defb8c50c59 --- /dev/null +++ b/Resources/Prototypes/ADT/Entities/Structures/celtic_spike.yml @@ -0,0 +1,49 @@ +- type: entity + id: ADTCelticSpike + parent: BaseStructure + name: celtic spike + description: A spike for impaling prisoners. + components: + - type: InteractionOutline + - type: Sprite + # temp to make clickmask work + sprite: ADT/Structures/celtic_spike.rsi + state: spike + layers: + - state: spike + map: ["base"] + billboardMode: Full + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: Metallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 600 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 300 + behaviors: + - !type:DoActsBehavior + acts: ["Destruction"] + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + params: + volume: -4 + - !type:SpawnEntitiesBehavior + spawn: + SheetSteel1: + min: 1 + max: 1 + - type: Transform + noRot: true + - type: Spike + - type: Strap + - type: Anchorable + - type: Pullable + - type: Appearance diff --git a/Resources/Prototypes/ADT/Flavors/flavors.yml b/Resources/Prototypes/ADT/Flavors/flavors.yml index dd40fbf2694..9d1d114239d 100644 --- a/Resources/Prototypes/ADT/Flavors/flavors.yml +++ b/Resources/Prototypes/ADT/Flavors/flavors.yml @@ -124,6 +124,73 @@ flavorType: Complex description: flavor-complex-ADTSawdust +#Пиво Октоберфеста + +- type: flavor + id: adt_glyphidstoutbeer + flavorType: Complex + description: flavor-complex-glyphidstoutbeer + +- type: flavor + id: adt_secunfilteredbeer + flavorType: Complex + description: flavor-complex-secunfilteredbeer + +- type: flavor + id: adt_luckyjonnybeer + flavorType: Complex + description: flavor-complex-luckyjonnybeer + +- type: flavor + id: adt_livseybeer + flavorType: Complex + description: flavor-complex-livseybeer + +- type: flavor + id: adt_classicpaulaner + flavorType: Complex + description: flavor-complex-classicpaulaner + +- type: flavor + id: adt_technobeer + flavorType: Complex + description: flavor-complex-technobeer + +- type: flavor + id: adt_sausagebeer + flavorType: Complex + description: flavor-complex-sausagebeer + +- type: flavor + id: adt_cargobeer + flavorType: Complex + description: flavor-complex-cargobeer + +- type: flavor + id: adt_leafloverbeer + flavorType: Complex + description: flavor-complex-leafloverbeer + +- type: flavor + id: adt_scientificale + flavorType: Complex + description: flavor-complex-scientificale + +- type: flavor + id: adt_uraniumale + flavorType: Complex + description: flavor-complex-uraniumale + +- type: flavor + id: adt_goldenale + flavorType: Complex + description: flavor-complex-goldenale + +- type: flavor + id: adt_poppy + flavorType: Base + description: flavor-base-adtpoppy + - type: flavor id: ADTRelax flavorType: Complex @@ -134,6 +201,37 @@ flavorType: base description: flavor-base-adtsindipizza +- type: flavor + id: adt_vanilla + flavorType: Base + description: flavor-base-adtvanilla + +- type: flavor + id: adt_superscoutbeer + flavorType: Base + description: flavor-base-adtsuperscout + +- type: flavor + id: adt_funnyclownbeer + flavorType: Base + description: flavor-base-adtfunnyclown + +#на вкус как.. Отсутствие сортировки +- type: flavor + id: ADTmandarin + flavorType: Base + description: flavor-base-mandarin + +- type: flavor + id: ADTChocolateDrinkFlavor + flavorType: Complex + description: flavor-complex-ADTChocolateDrinkFlavor + +- type: flavor + id: ADTCocoaDrinkFlavor + flavorType: Complex + description: flavor-complex-ADTCocoaDrink + # CHIPPIN' IN!!! Алкогольные Коктейли от QWERTY - type: flavor id: ADTteqilaoldfashion diff --git a/Resources/Prototypes/ADT/GameRules/events.yml b/Resources/Prototypes/ADT/GameRules/events.yml index 93f626866c1..746ac48ceb1 100644 --- a/Resources/Prototypes/ADT/GameRules/events.yml +++ b/Resources/Prototypes/ADT/GameRules/events.yml @@ -144,5 +144,23 @@ min: 1 max: 1 pickPlayer: false + +- type: entity + parent: BaseGameRule + id: SantaSpawn + components: + - type: StationEvent + weight: 2 + earliestStart: 10 + reoccurrenceDelay: 75 + duration: null + - type: SpaceSpawnRule + spawnDistance: 0 + - type: AntagSelection + definitions: + - spawnerPrototype: ADTSanta + min: 1 + max: 1 + pickPlayer: false - type: DragonRule #чтобы отдельный рул не писать - type: GhostRoleAntagSpawner diff --git a/Resources/Prototypes/ADT/Hydroponics/seeds.yml b/Resources/Prototypes/ADT/Hydroponics/seeds.yml index ac578e48160..e2d3758264d 100644 --- a/Resources/Prototypes/ADT/Hydroponics/seeds.yml +++ b/Resources/Prototypes/ADT/Hydroponics/seeds.yml @@ -57,6 +57,32 @@ Max: 8 PotencyDivisor: 15 +- type: seed + id: ADTmandarin + name: seeds-mandarin-name + noun: seeds-noun-seeds + displayName: seeds-mandarin-display-name + plantRsi: ADT/Objects/Specific/Hydroponics/mandarin.rsi + packetPrototype: ADTMandarinSeeds + productPrototypes: + - ADTFoodMandarin + harvestRepeat: Repeat + lifespan: 55 + maturation: 6 + production: 6 + yield: 3 + potency: 10 + idealLight: 8 + chemicals: + Nutriment: + Min: 1 + Max: 5 + PotencyDivisor: 20 + Vitamin: + Min: 1 + Max: 4 + PotencyDivisor: 25 + - type: seed id: ADTCoffeeTree name: seeds-coffeetree-name diff --git a/Resources/Prototypes/ADT/Loadouts/Miscellaneous/underwear.yml b/Resources/Prototypes/ADT/Loadouts/Miscellaneous/underwear.yml index 21e511150ec..a25c031cd10 100644 --- a/Resources/Prototypes/ADT/Loadouts/Miscellaneous/underwear.yml +++ b/Resources/Prototypes/ADT/Loadouts/Miscellaneous/underwear.yml @@ -489,6 +489,14 @@ equipment: socks: ADTClothingUnderwearSocksComfyViolet +- type: loadout + id: ADTUnderwearSocksHeart + effects: + - !type:GroupLoadoutEffect + proto: ADTUnderwearSpeciesRestrictions + equipment: + socks: ADTClothingUnderwearSocksHeart + - type: loadout id: ADTUnderwearSocksBee effects: @@ -529,6 +537,14 @@ equipment: socks: ADTClothingUnderwearSocksLaceThigh +- type: loadout + id: ADTUnderwearStockingsHeart + effects: + - !type:GroupLoadoutEffect + proto: ADTUnderwearSpeciesRestrictions + equipment: + socks: ADTClothingUnderwearSocksStockingsHeart + - type: loadout id: ADTUnderwearStockingsBlack effects: diff --git a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml index 6a05274d417..ed758567c3c 100644 --- a/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/ADT/Loadouts/loadout_groups.yml @@ -154,7 +154,7 @@ - CommonSatchel - CommonDuffel - ADTClothingBackpackSatchelLeather - + # PATHOLOGIST - type: loadoutGroup @@ -386,7 +386,7 @@ minLimit: 0 loadouts: - SeniorResearcherLabCoat - - ADTOuterClothingCoatsCrazySci + - ADTOuterClothingCoatsCrazySci # BLUESHIELD @@ -1341,10 +1341,12 @@ - ADTUnderwearSocksComfyGrey - ADTUnderwearSocksComfyRed - ADTUnderwearSocksComfyViolet + - ADTUnderwearSocksHeart - ADTUnderwearSocksBee - ADTUnderwearSocksBeeThigh - ADTUnderwearSocksCoder - ADTUnderwearStockingsLace + - ADTUnderwearStockingsHeart - ADTUnderwearStockingsBlack - ADTUnderwearStockingsComfyBlue - ADTUnderwearStockingsComfyGrey @@ -1410,10 +1412,12 @@ - ADTUnderwearSocksComfyGrey - ADTUnderwearSocksComfyRed - ADTUnderwearSocksComfyViolet + - ADTUnderwearSocksHeart - ADTUnderwearSocksBee - ADTUnderwearSocksBeeThigh - ADTUnderwearSocksCoder - ADTUnderwearStockingsLace + - ADTUnderwearStockingsHeart - ADTUnderwearStockingsBlack - ADTUnderwearStockingsComfyBlue - ADTUnderwearStockingsComfyGrey @@ -1476,10 +1480,12 @@ - ADTUnderwearSocksComfyGrey - ADTUnderwearSocksComfyRed - ADTUnderwearSocksComfyViolet + - ADTUnderwearSocksHeart - ADTUnderwearSocksBee - ADTUnderwearSocksBeeThigh - ADTUnderwearSocksCoder - ADTUnderwearStockingsLace + - ADTUnderwearStockingsHeart - ADTUnderwearStockingsBlack - ADTUnderwearStockingsComfyBlue - ADTUnderwearStockingsComfyGrey @@ -1854,10 +1860,12 @@ - ADTUnderwearSocksComfyGrey - ADTUnderwearSocksComfyRed - ADTUnderwearSocksComfyViolet + - ADTUnderwearSocksHeart - ADTUnderwearSocksBee - ADTUnderwearSocksBeeThigh - ADTUnderwearSocksCoder - ADTUnderwearStockingsLace + - ADTUnderwearStockingsHeart - ADTUnderwearStockingsBlack - ADTUnderwearStockingsComfyBlue - ADTUnderwearStockingsComfyGrey @@ -1923,10 +1931,12 @@ - ADTUnderwearSocksComfyGrey - ADTUnderwearSocksComfyRed - ADTUnderwearSocksComfyViolet + - ADTUnderwearSocksHeart - ADTUnderwearSocksBee - ADTUnderwearSocksBeeThigh - ADTUnderwearSocksCoder - ADTUnderwearStockingsLace + - ADTUnderwearStockingsHeart - ADTUnderwearStockingsBlack - ADTUnderwearStockingsComfyBlue - ADTUnderwearStockingsComfyGrey @@ -1991,10 +2001,12 @@ - ADTUnderwearSocksComfyGrey - ADTUnderwearSocksComfyRed - ADTUnderwearSocksComfyViolet + - ADTUnderwearSocksHeart - ADTUnderwearSocksBee - ADTUnderwearSocksBeeThigh - ADTUnderwearSocksCoder - ADTUnderwearStockingsLace + - ADTUnderwearStockingsHeart - ADTUnderwearStockingsBlack - ADTUnderwearStockingsComfyBlue - ADTUnderwearStockingsComfyGrey @@ -2059,10 +2071,12 @@ - ADTUnderwearSocksComfyGrey - ADTUnderwearSocksComfyRed - ADTUnderwearSocksComfyViolet + - ADTUnderwearSocksHeart - ADTUnderwearSocksBee - ADTUnderwearSocksBeeThigh - ADTUnderwearSocksCoder - ADTUnderwearStockingsLace + - ADTUnderwearStockingsHeart - ADTUnderwearStockingsBlack - ADTUnderwearStockingsComfyBlue - ADTUnderwearStockingsComfyGrey diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/alcohol.yml index c13b44ccb49..b3cfd915b63 100644 --- a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/alcohol.yml @@ -400,6 +400,369 @@ - !type:ReagentThreshold min: 20 +#Пиво октоберфеста +- type: reagent + id: ADTCargoBeer + name: cargo-beer-name + parent: BaseAlcohol + desc: cargo-beer-desc + physicalDesc: reagent-physical-desc-bubbly + flavor: adt_cargobeer + color: "#663100" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 + - !type:AdjustReagent + reagent: Nutriment + amount: 0.2 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/cargobeer.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + +- type: reagent + id: ADTLeafloverBeer + name: leaflover-beer-name + parent: BaseAlcohol + desc: leaflover-beer-desc + physicalDesc: reagent-physical-desc-bubbly + flavor: adt_leafloverbeer + color: "#defa92" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:PopupMessage + type: Local + visualType: Small + messages: [ "medicine-effect-hungover" ] + probability: 0.04 + - !type:GenericStatusEffect + key: Drunk + time: 3.0 + type: Remove + - !type:AdjustReagent + reagent: Nutriment + amount: 0.2 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/leafloverbeer.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + +- type: reagent + id: ADTScientificAle + name: scientific-ale-name + parent: BaseAlcohol + desc: scientific-ale-desc + physicalDesc: reagent-physical-desc-bubbly + flavor: adt_scientificale + color: "#ff9de2" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 + - !type:AdjustReagent + reagent: Nutriment + amount: 0.2 + - !type:HealthChange + conditions: + - !type:OrganType + type: Novakid + shouldHave: false + damage: + types: + Poison: 0.3 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/scientificale.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + +- type: reagent + id: ADTUraniumAle + name: uranium-ale-name + parent: BaseAlcohol + desc: uranium-ale-desc + physicalDesc: reagent-physical-desc-bubbly + flavor: adt_uraniumale + color: "#b9c73b" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 + - !type:AdjustReagent + reagent: Nutriment + amount: 0.2 + - !type:HealthChange + damage: + types: + Radiation: 0.3 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/uraniumale.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + + +- type: reagent + id: ADTGoldenAle + name: golden-ale-name + parent: BaseAlcohol + desc: golden-ale-desc + physicalDesc: reagent-physical-desc-bubbly + flavor: adt_goldenale + color: "#663100" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 + - !type:HealthChange + damage: + groups: + Brute: -1.5 + types: + Poison: -0.7 ##Should be about what it was when it healed the toxin group + Heat: -0.7 + Shock: -0.7 + Cold: -0.7 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/goldenale.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + + +- type: reagent + id: ADTSausageBeer + name: sausage-beer-name + parent: BaseAlcohol + desc: sausage-beer-desc + physicalDesc: reagent-physical-desc-bubbly + flavor: adt_sausagebeer + color: "#cfa85f" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.2 + - !type:AdjustReagent + reagent: Nutriment + amount: 0.2 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/sausagebeer.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + +- type: reagent + id: ADTTechnoBeer + name: techo-beer-name + parent: BaseAlcohol + desc: techo-beer-desc + physicalDesc: reagent-physical-desc-bubbly + flavor: adt_technobeer + color: "#cfa85f" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.25 + - !type:AdjustTemperature + conditions: + - !type:Temperature + max: 360 #очень греет + amount: 5000 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/technarbeer.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + +- type: reagent + id: ADTClassicPaulanerBeer + name: classic-paulaner-name + parent: BaseAlcohol + desc: classic-paulaner-desc + physicalDesc: reagent-physical-desc-bubbly + flavor: adt_classicpaulaner + color: "#cfa85f" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.15 + - !type:AdjustReagent + reagent: Nutriment + amount: 0.1 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/classicalpaulaner.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + +- type: reagent + id: ADTLivseyBeer + name: livsey-beer-name + parent: BaseAlcohol + desc: livsey-beer-desc + physicalDesc: reagent-physical-desc-bubbly + flavor: adt_livseybeer + color: "#cfa85f" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.25 + - !type:AdjustTemperature + conditions: + - !type:Temperature + min: 263.15 + amount: -10000 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/doctorlivsey.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + +- type: reagent + id: ADTLuckyJonnyBeer + name: lucky-jonny-name + parent: BaseAlcohol + desc: lucky-jonny-desc + physicalDesc: reagent-physical-desc-bubbly + flavor: adt_luckyjonnybeer + color: "#cfa85f" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.25 + - !type:MovespeedModifier + walkSpeedModifier: 1.1 + sprintSpeedModifier: 1.1 + - !type:GenericStatusEffect + key: SeeingRainbows + component: SeeingRainbows + type: Add + time: 5 + refresh: false + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/luckyjonny.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + +- type: reagent + id: ADTSecUnfilteredBeer + name: sec-unfiltered-name + parent: BaseAlcohol + desc: sec-unfiltered-desc + physicalDesc: reagent-physical-desc-bubbly + flavor: adt_secunfilteredbeer + color: "#cfa85f" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.3 + - !type:MovespeedModifier + walkSpeedModifier: 0.85 + sprintSpeedModifier: 0.85 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/secbeer.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + +- type: reagent + id: ADTGlyphidStoutBeer + name: glyphid-stout-name + parent: BaseAlcohol + desc: glyphid-stout-desc + physicalDesc: reagent-physical-desc-bubbly + flavor: adt_glyphidstoutbeer + color: "#cfa85f" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.35 + - !type:HealthChange + damage: + types: + Poison: -0.9 ##Should be about what it was when it healed the toxin group + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/glyfidstout.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + + - type: reagent id: ADTTeqilaOldFashion name: teqila-oldfashioned-name @@ -513,3 +876,56 @@ visualType: Medium messages: ["generic-reagent-effect-silverhand-terrorist"] probability: 0.1 + +- type: reagent + id: ADTSuperScoutBeer + name: super-scout-name + parent: BaseAlcohol + desc: super-scout-desc + physicalDesc: reagent-physical-desc-bubbly + flavor: adt_superscoutbeer # tastes much more like a radioactive burn and stomach ulcer + color: "#fce303" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.25 + - !type:AdjustTemperature + conditions: + - !type:Temperature + max: 320 + amount: 2500 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/superbeer.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + +- type: reagent + id: ADTFunnyClownBeer + name: funny-clown-name + parent: BaseAlcohol + desc: funny-clown-desc + physicalDesc: reagent-physical-desc-bubbly + flavor: adt_funnyclownbeer # tastes like an bear and burning car + color: "#fc0390" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.25 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/clownbeer.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false diff --git a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml index 3c008aa55dd..ae97240851f 100644 --- a/Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/ADT/Reagents/Consumable/Drink/drinks.yml @@ -281,6 +281,27 @@ - !type:SatiateThirst factor: 0.1 +- type: reagent + id: ADTCocoaDrink + name: cocoa-drink-name + parent: BaseDrink + desc: cocoa-drink-desc + physicalDesc: reagent-physical-desc-aromatic + flavor: ADTCocoaDrinkFlavor + color: "#664300" + recognizable: true + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + metamorphicSprite: + sprite: ADT/Objects/Consumable/Drinks/cocoa_drink.rsi + state: icon_empty + metamorphicMaxFillLevels: 5 + metamorphicFillBaseName: fill- + metamorphicChangeColor: false + - type: reagent id: ADTCoffeeBonBon name: coffee-bon-bon-name diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/furniture/seats.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/furniture/seats.yml index 981e4338dfb..a476319ee06 100644 --- a/Resources/Prototypes/ADT/Recipes/Construction/Graph/furniture/seats.yml +++ b/Resources/Prototypes/ADT/Recipes/Construction/Graph/furniture/seats.yml @@ -286,6 +286,11 @@ - material: WoodPlank amount: 2 doAfter: 1 + - to: adtchairoktoberfest + steps: + - material: WoodPlank + amount: 2 + doAfter: 1 - to: adtbenchchurchleft steps: - material: WoodPlank @@ -1024,3 +1029,15 @@ steps: - tool: Screwing doAfter: 2 + + - node: adtchairoktoberfest + entity: ADTChairOktoberfest + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetSteel1 + amount: 2 + steps: + - tool: Screwing + doAfter: 2 diff --git a/Resources/Prototypes/ADT/Recipes/Construction/Graph/furniture/tables.yml b/Resources/Prototypes/ADT/Recipes/Construction/Graph/furniture/tables.yml index a4900abeae3..b29a18efc70 100644 --- a/Resources/Prototypes/ADT/Recipes/Construction/Graph/furniture/tables.yml +++ b/Resources/Prototypes/ADT/Recipes/Construction/Graph/furniture/tables.yml @@ -69,6 +69,24 @@ amount: 1 doAfter: 1 + - to: adttableoktoberfest + steps: + - tool: Screwing + doAfter: 1 + - material: WoodPlank + amount: 1 + doAfter: 1 + + - to: adttableoktoberfestorange + steps: + - tool: Screwing + doAfter: 1 + - tool: Cutting + doAfter: 1 + - material: WoodPlank + amount: 1 + doAfter: 1 + - node: adttableroundplastic entity: ADTTableRoundPlastic edges: @@ -131,3 +149,27 @@ steps: - tool: Prying doAfter: 1 + + - node: adttableoktoberfest + entity: ADTTableOktoberfest + edges: + - to: adttableframe + completed: + - !type:SpawnPrototype + prototype: MaterialWoodPlank1 + amount: 1 + steps: + - tool: Prying + doAfter: 1 + + - node: adttableoktoberfestorange + entity: ADTTableOktoberfestOrange + edges: + - to: adttableframe + completed: + - !type:SpawnPrototype + prototype: MaterialWoodPlank1 + amount: 1 + steps: + - tool: Prying + doAfter: 1 diff --git a/Resources/Prototypes/ADT/Recipes/Construction/furniture.yml b/Resources/Prototypes/ADT/Recipes/Construction/furniture.yml index 4f76552e619..691decc6a67 100644 --- a/Resources/Prototypes/ADT/Recipes/Construction/furniture.yml +++ b/Resources/Prototypes/ADT/Recipes/Construction/furniture.yml @@ -923,6 +923,50 @@ conditions: - !type:TileNotBlocked +# OctoberFest + +- type: construction + name: construction-name-oktoberfest-chair + id: ADTChairOktoberfestRecipe + graph: ADTSeat + startNode: start + targetNode: adtchairoktoberfest + category: construction-category-furniture + description: construction-desc-oktoberfest-chair + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: construction-name-oktoberfest-table + id: ADTTableOktoberfestRecipe + graph: ADTTable + startNode: start + targetNode: adttableoktoberfest + category: construction-category-furniture + description: construction-desc-oktoberfest-table + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + name: construction-name-oktoberfest-orange-table + id: ADTTableOktoberfestOrangeRecipe + graph: ADTTable + startNode: start + targetNode: adttableoktoberfestorange + category: construction-category-furniture + description: construction-desc-oktoberfest-orange-table + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + # Other - type: construction @@ -1024,6 +1068,7 @@ conditions: - !type:TileNotBlocked + # Баннеры - type: construction id: BannerRedRecipe diff --git a/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml index 22e3f96b376..28ba64995cd 100644 --- a/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/ADT/Recipes/Cooking/meal_recipes.yml @@ -88,6 +88,62 @@ recipeType: - Assembler +# курятинка + +- type: microwaveMealRecipe + id: ADTRecipeBakedChicken + name: baked chicken + result: ADTFoodMeatChickenBaked + time: 25 + group: Savory + solids: + ADTChickenBody: 1 + reagents: + BbqSauce: 5 + recipeType: + - Oven + +- type: microwaveMealRecipe + id: ADTRecipeBakedStuffedChicken + name: baked stuffed chicken + result: ADTFoodMeatChickenBakedWithVegetables + time: 30 + group: Savory + solids: + ADTChickenBody: 1 + FoodPlate: 1 + FoodCabbage: 1 + FoodTomato: 1 + FoodPotato: 1 + FoodCorn: 1 + FoodMeatCutlet: 2 + reagents: + BbqSauce: 5 + recipeType: + - Oven + +- type: microwaveMealRecipe + id: ADTRecipeBakedChickenLeg + name: baked chicken leg + result: ADTFoodMeatChickenBakedLeg + time: 5 + group: Savory + solids: + ADTFoodMeatChickenLeg: 1 + recipeType: + - Oven + +- type: microwaveMealRecipe + id: ADTRecipeBakedChickenWing + name: baked chicken wing + result: ADTFoodMeatChickenBakedWing + time: 5 + group: Savory + solids: + ADTFoodMeatChickenWing: 1 + recipeType: + - Oven + # Sh4zik tea packs, Starting below - type: microwaveMealRecipe diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/bouquet.yml b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/bouquet.yml new file mode 100644 index 00000000000..a80a93235b4 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/Graphs/bouquet.yml @@ -0,0 +1,111 @@ +- type: constructionGraph + id: ADTObjectBouquetGalaktoGraph + start: start + graph: + - node: start + edges: + - to: bouquetgalakto + steps: + - tag: Galaxythistle + name: construction-graph-tag-galaxythistle + icon: + sprite: Objects/Specific/Hydroponics/galaxythistle.rsi + state: produce + - tag: Galaxythistle + name: construction-graph-tag-galaxythistle + icon: + sprite: Objects/Specific/Hydroponics/galaxythistle.rsi + state: produce + - tag: Galaxythistle + name: construction-graph-tag-galaxythistle + icon: + sprite: Objects/Specific/Hydroponics/galaxythistle.rsi + state: produce + - tag: Galaxythistle + name: construction-graph-tag-galaxythistle + icon: + sprite: Objects/Specific/Hydroponics/galaxythistle.rsi + state: produce + - tag: Galaxythistle + name: construction-graph-tag-galaxythistle + icon: + sprite: Objects/Specific/Hydroponics/galaxythistle.rsi + state: produce + - tag: Paper + name: construction-graph-tag-paper + doAfter: 5 + - node: bouquetgalakto + entity: ADTObjectBouquetGalakto + +- type: constructionGraph + id: ADTObjectBouquetMacGraph + start: start + graph: + - node: start + edges: + - to: bouquetmac + steps: + - tag: Poppy + name: construction-graph-tag-poppy + icon: + sprite: Objects/Specific/Hydroponics/poppy.rsi + state: produce + - tag: Poppy + name: construction-graph-tag-poppy + icon: + sprite: Objects/Specific/Hydroponics/poppy.rsi + state: produce + - tag: Poppy + name: construction-graph-tag-poppy + icon: + sprite: Objects/Specific/Hydroponics/poppy.rsi + state: produce + - tag: Poppy + name: construction-graph-tag-poppy + icon: + sprite: Objects/Specific/Hydroponics/poppy.rsi + state: produce + - tag: Poppy + name: construction-graph-tag-poppy + icon: + sprite: Objects/Specific/Hydroponics/poppy.rsi + state: produce + - tag: Paper + name: construction-graph-tag-paper + doAfter: 5 + - node: bouquetmac + entity: ADTObjectBouquetMac + +- type: constructionGraph + id: ADTObjectBouquetMixGraph + start: start + graph: + - node: start + edges: + - to: bouquetmix + steps: + - tag: Poppy + name: construction-graph-tag-poppy + icon: + sprite: Objects/Specific/Hydroponics/poppy.rsi + state: produce + - tag: Ambrosia + name: construction-graph-tag-ambrosia + icon: + sprite: Objects/Specific/Hydroponics/ambrosia_vulgaris.rsi + state: produce + - tag: ADTAloe + name: construction-graph-tag-aloe + icon: + sprite: Objects/Specific/Hydroponics/aloe.rsi + state: produce + - tag: Galaxythistle + name: construction-graph-tag-galaxythistle + icon: + sprite: Objects/Specific/Hydroponics/galaxythistle.rsi + state: produce + - tag: Paper + name: construction-graph-tag-paper + doAfter: 5 + - node: bouquetmix + entity: ADTObjectBouquetMix diff --git a/Resources/Prototypes/ADT/Recipes/Crafting/bouquet.yml b/Resources/Prototypes/ADT/Recipes/Crafting/bouquet.yml new file mode 100644 index 00000000000..0710d2c0bf3 --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Crafting/bouquet.yml @@ -0,0 +1,23 @@ +- type: construction + id: ADTObjectBouquetGalakto + graph: ADTObjectBouquetGalaktoGraph + startNode: start + targetNode: bouquetgalakto + category: construction-category-misc + objectType: Item + +- type: construction + id: ADTObjectBouquetMac + graph: ADTObjectBouquetMacGraph + startNode: start + targetNode: bouquetmac + category: construction-category-misc + objectType: Item + +- type: construction + id: ADTObjectBouquetMix + graph: ADTObjectBouquetMixGraph + startNode: start + targetNode: bouquetmix + category: construction-category-misc + objectType: Item diff --git a/Resources/Prototypes/ADT/Recipes/Reactions/drinks.yml b/Resources/Prototypes/ADT/Recipes/Reactions/drinks.yml index 40824bfcd12..9397dfa3cb7 100644 --- a/Resources/Prototypes/ADT/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/ADT/Recipes/Reactions/drinks.yml @@ -537,3 +537,14 @@ amount: 5 products: ADTYupiWatermelon: 6 + +# Prazat Beer (Octoberfest) +- type: reaction + id: ADTUraniumAleReaction + reactants: + ADTTechnoBeer: + amount: 5 + Uranium: + amount: 1 + products: + ADTUraniumAle: 6 \ No newline at end of file diff --git a/Resources/Prototypes/ADT/Recipes/Reactions/food.yml b/Resources/Prototypes/ADT/Recipes/Reactions/food.yml new file mode 100644 index 00000000000..c3f00e7529b --- /dev/null +++ b/Resources/Prototypes/ADT/Recipes/Reactions/food.yml @@ -0,0 +1,27 @@ +#- type: microwaveMealRecipe +# id: ADTRecipeChocolateBar +# name: chocolate bar recipe +# result: FoodSnackChocolateBar +# time: 10 +# reagents: +# CocoaPowder: 5 +# Milk: 5 +# Sugar: 5 + +- type: reaction + id: ADTCreateHypoAllergenChocolate + impact: Low + quantized: true + conserveEnergy: false + reactants: + CocoaPowder: + amount: 3 + Milk: + amount: 2 + Sugar: + amount: 2 + Dylovene: + amount: 1 + effects: + - !type:CreateEntityReactionEffect + entity: ADTHypoAllergenChocolateBar diff --git a/Resources/Prototypes/ADT/StartingGear/HermitEquipment.yml b/Resources/Prototypes/ADT/StartingGear/HermitEquipment.yml new file mode 100644 index 00000000000..ba733a31f52 --- /dev/null +++ b/Resources/Prototypes/ADT/StartingGear/HermitEquipment.yml @@ -0,0 +1,9 @@ +# - type: startingGear +# id: ADTHemritEquipment +# equipment: +# jumpsuit: ClothingUniformJumpsuitTacticool +# back: ClothingBackpack +# shoes: ClothingShoesBootsCombat +# id: ADTNocardClearPDA +# gloves: ADTClothingHandsFingerlessCombat +# pocket2: RadioHandheld diff --git a/Resources/Prototypes/ADT/tags.yml b/Resources/Prototypes/ADT/tags.yml index ad4e5cff94f..252bc6ecba6 100644 --- a/Resources/Prototypes/ADT/tags.yml +++ b/Resources/Prototypes/ADT/tags.yml @@ -106,6 +106,9 @@ - type: Tag id: ADTBola +- type: Tag + id: ADTAloe + - type: Tag id: Eyes @@ -473,6 +476,49 @@ - type: Tag id: ADTBeerCan + # New Year + +- type: Tag + id: ADTGoldenStarGarland + +- type: Tag + id: ADTSilverStarGarland + +- type: Tag + id: ADTBaseStarGarland + +- type: Tag + id: ADTShinyGarland + +- type: Tag + id: ADTTreeGoldenStar + +- type: Tag + id: ADTTreeRedStar + +- type: Tag + id: ADTTreeSilverStar + +- type: Tag + id: ADTTreeRedBalls + +- type: Tag + id: ADTTreeGoldenBalls + +- type: Tag + id: ADTTreeSilverBalls + +- type: Tag + id: ADTTreeRedMishura + +- type: Tag + id: ADTTreeGoldenMishura + +- type: Tag + id: ADTTreeSilverMishura + + # ADT NEW YEAR END /\/\/\/\/\/\/\/\/\/\/\/\ + - type: Tag id: ADTPillExperimental diff --git a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml index 58c9145f4db..e613973af5a 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/botany.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/botany.yml @@ -96,6 +96,7 @@ - id: WatermelonSeeds - id: PeaSeeds - id: CherrySeeds + - id: ADTMandarinSeeds # ADT Tweak - type: entity id: CrateHydroponicsTray diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index ac45aa65f55..6e1fa5b3a90 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -48,6 +48,10 @@ DrinkWineBottleFull: 5 DrinkChampagneBottleFull: 2 #because the premium drink ADTDrinkAppleLiqueurBottleFull: 2 #ADT_Tweak + # ADT Start Tweak New Years + ADTCarnationPack: 10 + ADTCinnamonPack: 5 + # ADT End Tweak New Years DrinkSakeBottleFull: 3 DrinkBeerCan: 5 DrinkWineCan: 5 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index ec047335651..24bdfe3303c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -12,6 +12,7 @@ #ADTClothingUniformWhiteSweaterHeart: 2 # TODO: Добавить вещи святого валентина #ADTClothingOuterRedCardigan: 2 #ADTClothingOuterBlackCardigan: 2 + #ADTClothingUnderwearSocksHeart: 2 #ADTClothingUnderwearStockingsHeart: 2 # Конец одежда на 14 февраля ClothingBackpack: 3 #ADT-tweak 5>3 @@ -177,13 +178,13 @@ ClothingUnderSocksBee: 2 ClothingUnderSocksCoder: 1 ADTClothingUnderwearSocksAzure: 2 - ADTClothingUnderwearSocksKneeAzure: 2 + ADTClothingUnderwearSocksKneeAzure: 2 ADTClothingUnderwearSocksThighAzure: 2 ADTClothingUnderwearSocksBlack: 2 ADTClothingUnderwearSocksKneeBlack: 2 ADTClothingUnderwearSocksThighBlack: 2 ADTClothingUnderwearSocksCyan: 2 - ADTClothingUnderwearSocksKneeCyan: 2 + ADTClothingUnderwearSocksKneeCyan: 2 ADTClothingUnderwearSocksThighCyan: 2 ADTClothingUnderwearSocksFurr: 2 ADTClothingUnderwearSocksKneeFurr: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml index 5b616f8f789..80b22872cb3 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/seeds.yml @@ -1,6 +1,7 @@ - type: vendingMachineInventory id: MegaSeedServitorInventory startingInventory: + ADTMandarinSeeds: 5 # ADT Tweak ADTStrawberrySeeds: 5 # ADT Tweak AloeSeeds: 3 AmbrosiaVulgarisSeeds: 3 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml index 57f9fac4611..7f1386bb4db 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml @@ -103,6 +103,7 @@ # - ADTPosterContrabandLustUma - ADTPosterContrabandLustArDeco - ADTPosterDontSitDown + - ADTPosterTayarHalloween - ADTPosterLustyMoth - ADTPosterWatchOutChem - ADTPosterPanem @@ -183,6 +184,8 @@ - ADTPosterLegitEfficiency - ADTPosterLegitGreatFood #спрайт от Празата - ADTPosterLegitTurnOnSensors #спрайт от Празата + - ADTPosterLegitOktoberfest #спрайт от Празата + - ADTPosterLegitOktoberfest2 #спрайт от Празата - ADTPosterPassTheBanana #спрайт от Уолтера - ADTPosterSingoPizza - ADTPosterPapersPlease diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 48aebc76860..91577c7f4e6 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -259,6 +259,12 @@ Base: dead-0 Dead: Base: dead-0 + - type: Butcherable + spawned: + # - id: FoodMeatChicken # ADT CHANGES START + # amount: 1 + - id: ADTChickenBody + amount: 1 # ADT CHANGES END - type: InteractionPopup successChance: 0.8 interactSuccessString: petting-success-bird @@ -283,10 +289,10 @@ - type: HTN rootTask: task: RuminantCompound - - type: Butcherable - spawned: - - id: FoodMeatChicken - amount: 2 + # - type: Butcherable + # spawned: + # - id: FoodMeatChicken + # amount: 2 # ADT-Tweak End - type: entity diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml index 9c6864e6ef9..01644ade877 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/carp.yml @@ -95,6 +95,7 @@ GalacticCommon: Speak CarpCollectiveMind: Speak - type: GrabProtection + - type: StandingState # Фикс костылём # ADT-tweak-start - type: entity diff --git a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml index cf74666650d..7d454809d9a 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/skeleton.yml @@ -118,11 +118,11 @@ - CanPilot - DoorBumpOpener - FootstepSound - - type: SpeechBarks - data: - proto: SkeletonBarkOne - sound: - collection: ADTSkeletonBark + # - type: SpeechBarks + # data: + # proto: SkeletonBarkOne + # sound: + # collection: ADTSkeletonBark # ADT-Tweak-end - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 172157f4d50..555ffc5e690 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -282,7 +282,7 @@ - type: Extractable grindableSolutionName: food - type: DamageOnInteract - damage: + damage: types: Heat: 4 Caustic: 4 @@ -309,7 +309,7 @@ volume: -5 - !type:DoActsBehavior acts: [ "Destruction" ] - - type: DamageOnHit + - type: DamageOnHit damage: types: Blunt: 5 # The nettle will "wilt" after 5 hits. @@ -1542,6 +1542,7 @@ - type: Tag tags: - Vegetable + - ADTAloe # ADT-Tweak - ADTMedicalAssemblerStuff # ADT-Tweak: Medical Assembler recipe stuff - type: FoodSequenceElement entries: diff --git a/Resources/Prototypes/Entities/Objects/Decoration/present.yml b/Resources/Prototypes/Entities/Objects/Decoration/present.yml index cfb7125e705..0c7aaa6518a 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/present.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/present.yml @@ -386,6 +386,28 @@ orGroup: GiftPool sound: path: /Audio/Effects/unwrap.ogg + - type: Delivery + baseSpesoReward: 500 + baseSpesoPenalty: 125 # So low due to dept economy splitting all the earnings, but not splitting the penalty. + - type: Speech + speechVerb: Robotic + - type: EntityTableContainerFill + containers: + delivery: !type:NestedSelector + tableId: LetterDeliveryRewards + +# ADT-Tweak start +- type: entity + id: ADTPresentSelected + parent: [PresentBase, BaseItem] + suffix: Filled Selected + components: + - type: SpawnItemsOnUse + items: + - id: PresentTrash + - type: SpawnItemSelector + selectedItemId: Coal1 +# ADT-Tweak end - type: entity id: PresentRandomCoal diff --git a/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml b/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml index 19613dd494b..31ea3831b96 100644 --- a/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml +++ b/Resources/Prototypes/Entities/Objects/Deliveries/deliveries_tables.yml @@ -16,7 +16,7 @@ id: RandomDeliveryLetterBasic table: !type:GroupSelector children: - - id: LetterDelivery + - id: PresentRandom # Packages @@ -24,7 +24,7 @@ id: RandomDeliveryPackageBasic table: !type:GroupSelector children: - - id: PackageDelivery + - id: PresentRandom ### Reward Tables diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/wands.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/wands.yml index d3745288f62..d11d7a15d5f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/wands.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/wands.yml @@ -152,3 +152,28 @@ proto: ProjectilePolyboltBread capacity: 10 count: 10 + +#ADT-Tweak-Start +- type: entity + name: ADTWeaponWandSanta + parent: WeaponWandPolymorphBase + id: ADTWeaponWandSanta + description: ADTWeaponWandSanta + components: + - type: BasicEntityAmmoProvider + proto: ImmovableVoidRod + capacity: 3 + count: 3 + - type: Sprite + sprite: ADT/Objects/Specific/santa_wand.rsi + layers: + - state: santa-wand + map: ["base"] + - type: Item + size: Normal + inhandVisuals: + left: + - state: inhand-left + right: + - state: inhand-right +#ADT-Tweak-End diff --git a/Resources/Prototypes/Entities/Structures/Furniture/altar.yml b/Resources/Prototypes/Entities/Structures/Furniture/altar.yml index 37b9ac7ff66..c55770d44d6 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/altar.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/altar.yml @@ -476,6 +476,16 @@ effectProto: EffectRCDConstruct0 soundPath: /Audio/Items/Mining/fultext_launch.ogg powerCost: 3 + - requiredTag: ADTSilverCandle + resultProto: ADTSilverCandleStick + effectProto: EffectRCDConstruct0 + powerCost: 1 + soundPath: /Audio/Items/Mining/fultext_launch.ogg + - requiredTag: ADTGoldCandle + resultProto: ADTGoldenCandleStick + effectProto: EffectRCDConstruct0 + powerCost: 1 + soundPath: /Audio/Items/Mining/fultext_launch.ogg - requiredTag: Bucket resultProto: PlushieRatvar effectProto: EffectRCDConstruct0 diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index 8b2a51aea2e..0dd64ec4976 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -28,6 +28,7 @@ - id: VentClog - id: WormholesSpawn # ADT-Tweak Wormholes Spawns now correctly without admin abuse - id: SpaceEmperorSpawn # ADT Tweak + - id: SantaSpawn # ADT Tweak New Year - type: entityTable id: BasicAntagEventsTable diff --git a/Resources/ServerInfo/ADT/NewCocktails.xml b/Resources/ServerInfo/ADT/NewCocktails.xml index 865b1f7af0a..f213ce7d386 100644 --- a/Resources/ServerInfo/ADT/NewCocktails.xml +++ b/Resources/ServerInfo/ADT/NewCocktails.xml @@ -3,6 +3,68 @@ В этом блокноте собраны рецепты более полутора десятков уникальных коктейлей от одного хорошего бармена-слаймолюда. +## Новогодние напитки + + + + + +[bold]Новогодний милкшейк:[/bold] новогоднего в нём мало, но вкуса, как говорят клиенты, достаточно. + +Рецепт: +- Молоко, 3 части +- Мороженое, 1 часть +- Какао порошок, 2 части + +[bold]Горячее какао:[/bold] название не лжёт, надо пить осторожно. + +Рецепт: +- Какао, 2 части +- Сливки, 1 часть +- Разогреть на плите в кухне или у химиков до кипячения. + +Альтернативный рецепт: +- Какао, 30 единиц +- В микроволновку на 10 секунд + +[bold]Горячий шоколад:[/bold] такой напиток очень любят на Земле. Если клиент унатх, таяр или вульпканин - подавать гипоаллергенный вариант. + +Рецепт: +- Перемолоть 2 плитки шоколада +- Подогреть на плите кухни или химиков до кипячения + +Альтернативный рецепт: +- Положить 2 плитки шоколада и стакан в микроволновку +- Греть секунд 10 + +[bullet]Второй рецепт:[/bullet] +- Перемолоть 2 плитки гипоаллергенного шоколада +- Подогреть на плите кухни или химиков до кипячения + +[bullet]Второй альтернативный рецепт:[/bullet] +- Положить 2 плитки гипоаллергенного шоколада и стакан в микроволновку +- Подогреть на 10 секунд + + + + + +[bold]Чай с корицей и лимоном:[/bold] простой, но праздничный чай. + +Рецепт: +- Чай чёрный, 3 части +- Сок лимона, 2 части +- Корица, 1 палочка + +[bold]Сбитень с корицей и лимоном:[/bold] чуть более крепкий, но такой же праздничный напиток. + +Рецепт: +- Вода, 2 части +- Медовуха, 1 часть +- Сок лимона, 1 часть +- Корица, 1 палочка +- Гвоздика, 1 гвоздь + ## Безалкогольные коктейли [bold]Летняя тень:[/bold] очень освежает, предлагать страдающим от жажды. diff --git a/Resources/ServerInfo/ADT/NewRecipes.xml b/Resources/ServerInfo/ADT/NewRecipes.xml index 4911d3ab803..b8d900c6f2c 100644 --- a/Resources/ServerInfo/ADT/NewRecipes.xml +++ b/Resources/ServerInfo/ADT/NewRecipes.xml @@ -1,4 +1,112 @@ +# Новогодние блюда + +Близится традиционный праздник смены года на Земле, родине всех людей. Потому NanoTrasen предлагает персоналу станций несколько рецептов +для новогодних блюд и закусок. С ними вы можете ознакомиться в этой книге. + +## Запеченая курица, крылышки и ножки + +Начнем с разделки курицы. Первое, что вам следует сделать со свежезарезанной курицой - вооружившись ножом, ощипать её и снять кожу. +Так вы получите целую куриную тушку. Её можно либо еще раз разделать, уже на грудку, крылья и ножки, либо запечь целицом. + + + + + + +Самым простой рецепт запеченой курицы таков: + - 1 целая куриная тушка + - 5 единиц соуса барбекю + - 25 секунд готовки + + + + +При наличии ингредиентов тушку можно нафаршировать мясом и овощами запечь вместе с ними. В результате получится крайне вкусное и сытное блюдо, +которое заслуженно будет центром любого праздничного стола. Рецепт фаршированной курицы таков: + + - 1 целая куриная тушка + - 1 большая тарелка + - 1 капуста + - 1 помидор + - 1 картошка + - 1 початок кукурузы + - 2 сырых мясных котлеты + - 30 секунд готовки + + + + +Если же вы решите разделать тушку на отдельные части - из филе можно сделать стейк или использовать как ингредиент в других блюдах. +А крылышки и ножки - поджарить в микроволновке на 5 секунд и получить небольшую и аппетитную закуску к основному обеду. + + + + + + +## Новогодние салаты и закуски + +Начнем с классики, знакомой многим на станции - салата оливье, селёдки под шубой и холодца! Рецепт оливье таков: + - Миска + - 2 картошки + - Сырое яйцо + - Морковь + - Мясо + - 5 единиц майонеза + - 15 секунд в микроволновке + +Холодец готовится таким образом: + + - Маленькая тарелка + - Мясо + - 15 воды + - 5 соли + - 10 непрожаренных животных протеинов + - 20 секунд в микроволновке + +И, наконец, селёдка под шубой: + + - 2 морковки + - Сырое яйцо + - Филе карпа + - Маленькая тарелка + - 5 единиц майонеза + - 15 секунд в микроволновке + + + + + + +Заменой запеченой курочке может стать ветчина с медом и специями. Для её приготовления вам понадобятся: + - Большая тарелка + - 2 куска мяса + - 5 единиц черного перца + - 5 единиц соли + - 25 секунд в микроволновке + + + + + +## Пудинги + +Для поклонников британской кухни на выбор есть два десерта - обычный пудинг и новогодний. Рецепт такой: + - Маленькая тарелка + - 15 воды + - 10 молока + - 10 муки + - 15 сахара + - 6 яйца + - 10 секунд в микроволновке + +Чтобы сделать новогодний пудинг - добавьте к ингредиентам две карамельных трости, которые можно найти в новогодних сладких подарках. + + + + + # Новые рецепты для объектов NanoTrasen Приветствуем поваров, работников сервиса и всех тех, кто может прочитать эту книгу. @@ -370,3 +478,4 @@ + diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_red.rsi/equipped-HAND.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_red.rsi/equipped-HAND.png new file mode 100644 index 00000000000..e13096cbfb0 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_red.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_red.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_red.rsi/icon.png new file mode 100644 index 00000000000..84cb9fd0629 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_red.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_red.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_red.rsi/meta.json new file mode 100644 index 00000000000..658ba64d9f7 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_red.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: prazat911 for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_red2.rsi/equipped-HAND.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_red2.rsi/equipped-HAND.png new file mode 100644 index 00000000000..0162e53c6c8 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_red2.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_red2.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_red2.rsi/icon.png new file mode 100644 index 00000000000..049e63f5b0a Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_red2.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_red2.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_red2.rsi/meta.json new file mode 100644 index 00000000000..658ba64d9f7 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_red2.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: prazat911 for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_snow_maiden.rsi/equipped-HAND.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_snow_maiden.rsi/equipped-HAND.png new file mode 100644 index 00000000000..aad8ce31767 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_snow_maiden.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_snow_maiden.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_snow_maiden.rsi/icon.png new file mode 100644 index 00000000000..e8f07b8c0b6 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_snow_maiden.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_snow_maiden.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_snow_maiden.rsi/meta.json new file mode 100644 index 00000000000..658ba64d9f7 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/gloves_snow_maiden.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: prazat911 for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_blue.rsi/equipped-HAND.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_blue.rsi/equipped-HAND.png new file mode 100644 index 00000000000..874f8d0b50e Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_blue.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_blue.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_blue.rsi/icon.png new file mode 100644 index 00000000000..565f7a6c1b6 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_blue.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_blue.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_blue.rsi/meta.json new file mode 100644 index 00000000000..cfdfa7bad3d --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_blue.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: dion_clawed for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_green.rsi/equipped-HAND.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_green.rsi/equipped-HAND.png new file mode 100644 index 00000000000..3bbe6fc80b8 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_green.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_green.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_green.rsi/icon.png new file mode 100644 index 00000000000..bf13be60ac3 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_green.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_green.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_green.rsi/meta.json new file mode 100644 index 00000000000..cfdfa7bad3d --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_green.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: dion_clawed for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_red.rsi/equipped-HAND.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_red.rsi/equipped-HAND.png new file mode 100644 index 00000000000..b951ac1c54c Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_red.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_red.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_red.rsi/icon.png new file mode 100644 index 00000000000..312c5a2b1e2 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_red.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_red.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_red.rsi/meta.json new file mode 100644 index 00000000000..cfdfa7bad3d --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_red.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: dion_clawed for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_red_green.rsi/equipped-HAND.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_red_green.rsi/equipped-HAND.png new file mode 100644 index 00000000000..4b4cf879d31 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_red_green.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_red_green.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_red_green.rsi/icon.png new file mode 100644 index 00000000000..5d1bd54109c Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_red_green.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_red_green.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_red_green.rsi/meta.json new file mode 100644 index 00000000000..658ba64d9f7 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Hands/Gloves/mittens_red_green.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: prazat911 for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/antennas.rsi/equipped-HELMET.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/antennas.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..78df851b650 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/antennas.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/antennas.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/antennas.rsi/icon.png new file mode 100644 index 00000000000..f650e3ff081 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/antennas.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/antennas.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/antennas.rsi/meta.json new file mode 100644 index 00000000000..ad50c58eaf5 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/antennas.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: cherreshnia for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/ded_morozhat.rsi/equipped-HELMET.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/ded_morozhat.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..7ed2afc1b09 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/ded_morozhat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/ded_morozhat.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/ded_morozhat.rsi/icon.png new file mode 100644 index 00000000000..9c007065b0b Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/ded_morozhat.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/ded_morozhat.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/ded_morozhat.rsi/meta.json new file mode 100644 index 00000000000..1cd4d16ba5c --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/ded_morozhat.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/deer_horns.rsi/equipped-HELMET-linght.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/deer_horns.rsi/equipped-HELMET-linght.png new file mode 100644 index 00000000000..03b12e7e08c Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/deer_horns.rsi/equipped-HELMET-linght.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/deer_horns.rsi/equipped-HELMET.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/deer_horns.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..e68727a1c9f Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/deer_horns.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/deer_horns.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/deer_horns.rsi/icon.png new file mode 100644 index 00000000000..b02939033ee Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/deer_horns.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/deer_horns.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/deer_horns.rsi/meta.json new file mode 100644 index 00000000000..0184207f37f --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/deer_horns.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: prazat911 for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "equipped-HELMET-linght", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/elf_hat.rsi/equipped-HELMET.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/elf_hat.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..dd79479b14a Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/elf_hat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/elf_hat.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/elf_hat.rsi/icon.png new file mode 100644 index 00000000000..eee9d1465e1 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/elf_hat.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/elf_hat.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/elf_hat.rsi/meta.json new file mode 100644 index 00000000000..9ecb176d612 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/elf_hat.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: dion_clawed for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_cat_holiday.rsi/equipped-HELMET.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_cat_holiday.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..87bea174521 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_cat_holiday.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_cat_holiday.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_cat_holiday.rsi/icon.png new file mode 100644 index 00000000000..98e5b5cecd5 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_cat_holiday.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_cat_holiday.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_cat_holiday.rsi/meta.json new file mode 100644 index 00000000000..ad50c58eaf5 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_cat_holiday.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: cherreshnia for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_christmas.rsi/equipped-HELMET.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_christmas.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..8cb283fb826 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_christmas.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_christmas.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_christmas.rsi/icon.png new file mode 100644 index 00000000000..346830f7579 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_christmas.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_christmas.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_christmas.rsi/meta.json new file mode 100644 index 00000000000..d5451f0fcfb --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_christmas.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: prazat911 for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_flower.rsi/equipped-HELMET.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_flower.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..50aaa174eee Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_flower.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_flower.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_flower.rsi/icon.png new file mode 100644 index 00000000000..91df6dfcf9d Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_flower.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_flower.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_flower.rsi/meta.json new file mode 100644 index 00000000000..d5451f0fcfb --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_flower.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: prazat911 for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_monkey_holiday.rsi/equipped-HELMET.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_monkey_holiday.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..28b6a4bbcfb Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_monkey_holiday.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_monkey_holiday.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_monkey_holiday.rsi/icon.png new file mode 100644 index 00000000000..98e5b5cecd5 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_monkey_holiday.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_monkey_holiday.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_monkey_holiday.rsi/meta.json new file mode 100644 index 00000000000..ad50c58eaf5 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_monkey_holiday.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: cherreshnia for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_snow_maiden.rsi/equipped-HELMET.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_snow_maiden.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..bddba5651b9 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_snow_maiden.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_snow_maiden.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_snow_maiden.rsi/icon.png new file mode 100644 index 00000000000..548466ce6e9 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_snow_maiden.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_snow_maiden.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_snow_maiden.rsi/meta.json new file mode 100644 index 00000000000..d5451f0fcfb --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/hat_snow_maiden.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: prazat911 for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/head_flower.rsi/equipped-HELMET.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/head_flower.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..50aaa174eee Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/head_flower.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/head_flower.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/head_flower.rsi/icon.png new file mode 100644 index 00000000000..91df6dfcf9d Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/head_flower.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/head_flower.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/head_flower.rsi/meta.json new file mode 100644 index 00000000000..d5451f0fcfb --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Head/Hats/head_flower.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: prazat911 for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Masks/ded_morozsetboroda.rsi/equipped-MASK.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Masks/ded_morozsetboroda.rsi/equipped-MASK.png new file mode 100644 index 00000000000..f8a0e887076 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Masks/ded_morozsetboroda.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Masks/ded_morozsetboroda.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Masks/ded_morozsetboroda.rsi/icon.png new file mode 100644 index 00000000000..ca797479bba Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Masks/ded_morozsetboroda.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_fingerless_stripped.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Masks/ded_morozsetboroda.rsi/meta.json similarity index 87% rename from Resources/Textures/ADT/Clothing/Underwear/Socks/socks_fingerless_stripped.rsi/meta.json rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Masks/ded_morozsetboroda.rsi/meta.json index 6eb8279c0e6..00614f1f89e 100644 --- a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_fingerless_stripped.rsi/meta.json +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Masks/ded_morozsetboroda.rsi/meta.json @@ -11,7 +11,7 @@ "name": "icon" }, { - "name": "equipped-SOCKS", + "name": "equipped-MASK", "directions": 4 } ] diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Masks/ded_morozsetboroda_big.rsi/equipped-MASK.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Masks/ded_morozsetboroda_big.rsi/equipped-MASK.png new file mode 100644 index 00000000000..8f06486bb38 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Masks/ded_morozsetboroda_big.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Masks/ded_morozsetboroda_big.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Masks/ded_morozsetboroda_big.rsi/icon.png new file mode 100644 index 00000000000..aa851ce0d00 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Masks/ded_morozsetboroda_big.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_redwhite.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Masks/ded_morozsetboroda_big.rsi/meta.json similarity index 87% rename from Resources/Textures/ADT/Clothing/Underwear/Socks/socks_redwhite.rsi/meta.json rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Masks/ded_morozsetboroda_big.rsi/meta.json index 6eb8279c0e6..00614f1f89e 100644 --- a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_redwhite.rsi/meta.json +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Masks/ded_morozsetboroda_big.rsi/meta.json @@ -11,7 +11,7 @@ "name": "icon" }, { - "name": "equipped-SOCKS", + "name": "equipped-MASK", "directions": 4 } ] diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..b263aad9caa Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter.rsi/icon.png new file mode 100644 index 00000000000..df4b05180a1 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter.rsi/meta.json new file mode 100644 index 00000000000..47f701952b5 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter_darkred.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter_darkred.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..9a93783b031 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter_darkred.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter_darkred.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter_darkred.rsi/icon.png new file mode 100644 index 00000000000..d43572642b8 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter_darkred.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter_darkred.rsi/inhand-left.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter_darkred.rsi/inhand-left.png new file mode 100644 index 00000000000..a7e910d182c Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter_darkred.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter_darkred.rsi/inhand-right.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter_darkred.rsi/inhand-right.png new file mode 100644 index 00000000000..2b9c312ce6f Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter_darkred.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter_darkred.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter_darkred.rsi/meta.json new file mode 100644 index 00000000000..8b856c2aaf4 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/OuterClothing/Fun/ded_morozsuitouter_darkred.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:nimf0374 Kasey for ADT", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/elf_boots.rsi/equipped-FEET.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/elf_boots.rsi/equipped-FEET.png new file mode 100644 index 00000000000..bd9b2286835 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/elf_boots.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/elf_boots.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/elf_boots.rsi/icon.png new file mode 100644 index 00000000000..dff9f5f6304 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/elf_boots.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/elf_boots.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/elf_boots.rsi/meta.json new file mode 100644 index 00000000000..552ff1874be --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/elf_boots.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: dion_clawed for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/moroz_winterboots.rsi/equipped-FEET.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/moroz_winterboots.rsi/equipped-FEET.png new file mode 100644 index 00000000000..e9a42dc34ae Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/moroz_winterboots.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/moroz_winterboots.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/moroz_winterboots.rsi/icon.png new file mode 100644 index 00000000000..c708ef042a2 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/moroz_winterboots.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/moroz_winterboots.rsi/inhand-left.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/moroz_winterboots.rsi/inhand-left.png new file mode 100644 index 00000000000..3d57d94a78c Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/moroz_winterboots.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/moroz_winterboots.rsi/inhand-right.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/moroz_winterboots.rsi/inhand-right.png new file mode 100644 index 00000000000..35a5e8ed982 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/moroz_winterboots.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/moroz_winterboots.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/moroz_winterboots.rsi/meta.json new file mode 100644 index 00000000000..60bc183fb26 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/moroz_winterboots.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "drawn by discord:nimf0374 Kasey for ADT", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/snow_maiden.rsi/equipped-FEET.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/snow_maiden.rsi/equipped-FEET.png new file mode 100644 index 00000000000..9bb1a2468e6 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/snow_maiden.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/snow_maiden.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/snow_maiden.rsi/icon.png new file mode 100644 index 00000000000..769e733453e Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/snow_maiden.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/snow_maiden.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/snow_maiden.rsi/meta.json new file mode 100644 index 00000000000..a4ff0b124da --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Shoes/Boots/snow_maiden.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: prazat911 for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_beige.rsi/equipped-SOCKS.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_beige.rsi/equipped-SOCKS.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Underwear/Socks/socks_beige.rsi/equipped-SOCKS.png rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_beige.rsi/equipped-SOCKS.png diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_beige.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_beige.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Underwear/Socks/socks_beige.rsi/icon.png rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_beige.rsi/icon.png diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_beige.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_beige.rsi/meta.json new file mode 100644 index 00000000000..cbc1d2809cf --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_beige.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: dion_clawed for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SOCKS", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_blue.rsi/equipped-SOCKS.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_blue.rsi/equipped-SOCKS.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Underwear/Socks/socks_blue.rsi/equipped-SOCKS.png rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_blue.rsi/equipped-SOCKS.png diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_blue.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_blue.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Underwear/Socks/socks_blue.rsi/icon.png rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_blue.rsi/icon.png diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_blue.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_blue.rsi/meta.json new file mode 100644 index 00000000000..cbc1d2809cf --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_blue.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: dion_clawed for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SOCKS", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_fingerless.rsi/equipped-SOCKS.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_fingerless.rsi/equipped-SOCKS.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Underwear/Socks/socks_fingerless.rsi/equipped-SOCKS.png rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_fingerless.rsi/equipped-SOCKS.png diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_fingerless.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_fingerless.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Underwear/Socks/socks_fingerless.rsi/icon.png rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_fingerless.rsi/icon.png diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_fingerless.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_fingerless.rsi/meta.json new file mode 100644 index 00000000000..cbc1d2809cf --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_fingerless.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: dion_clawed for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SOCKS", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_fingerless_stripped.rsi/equipped-SOCKS.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_fingerless_stripped.rsi/equipped-SOCKS.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Underwear/Socks/socks_fingerless_stripped.rsi/equipped-SOCKS.png rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_fingerless_stripped.rsi/equipped-SOCKS.png diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_fingerless_stripped.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_fingerless_stripped.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Underwear/Socks/socks_fingerless_stripped.rsi/icon.png rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_fingerless_stripped.rsi/icon.png diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_beige.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_fingerless_stripped.rsi/meta.json similarity index 79% rename from Resources/Textures/ADT/Clothing/Underwear/Socks/socks_beige.rsi/meta.json rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_fingerless_stripped.rsi/meta.json index 4d1063c16c7..95928324bd5 100644 --- a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_beige.rsi/meta.json +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_fingerless_stripped.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:dion_clawed", + "copyright": "Created by discord: prazat911 for Adventure Time", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_gnome.rsi/equipped-SOCKS.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_gnome.rsi/equipped-SOCKS.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Underwear/Socks/socks_gnome.rsi/equipped-SOCKS.png rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_gnome.rsi/equipped-SOCKS.png diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_gnome.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_gnome.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Underwear/Socks/socks_gnome.rsi/icon.png rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_gnome.rsi/icon.png diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_gnome.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_gnome.rsi/meta.json new file mode 100644 index 00000000000..cbc1d2809cf --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_gnome.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: dion_clawed for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SOCKS", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_green.rsi/equipped-SOCKS.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_green.rsi/equipped-SOCKS.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Underwear/Socks/socks_green.rsi/equipped-SOCKS.png rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_green.rsi/equipped-SOCKS.png diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_green.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_green.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Underwear/Socks/socks_green.rsi/icon.png rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_green.rsi/icon.png diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_green.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_green.rsi/meta.json new file mode 100644 index 00000000000..cbc1d2809cf --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_green.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: dion_clawed for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SOCKS", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_heart.rsi/equipped-SOCKS.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_heart.rsi/equipped-SOCKS.png new file mode 100644 index 00000000000..9fdc4100238 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_heart.rsi/equipped-SOCKS.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_heart.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_heart.rsi/icon.png new file mode 100644 index 00000000000..d3a9208f91b Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_heart.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_heart.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_heart.rsi/meta.json new file mode 100644 index 00000000000..cbc1d2809cf --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_heart.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: dion_clawed for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SOCKS", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_red.rsi/equipped-SOCKS.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_red.rsi/equipped-SOCKS.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Underwear/Socks/socks_red.rsi/equipped-SOCKS.png rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_red.rsi/equipped-SOCKS.png diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_red.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_red.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Underwear/Socks/socks_red.rsi/icon.png rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_red.rsi/icon.png diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_red.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_red.rsi/meta.json new file mode 100644 index 00000000000..cbc1d2809cf --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_red.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: dion_clawed for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-SOCKS", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_redwhite.rsi/equipped-SOCKS.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_redwhite.rsi/equipped-SOCKS.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Underwear/Socks/socks_redwhite.rsi/equipped-SOCKS.png rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_redwhite.rsi/equipped-SOCKS.png diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_redwhite.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_redwhite.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Underwear/Socks/socks_redwhite.rsi/icon.png rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_redwhite.rsi/icon.png diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_blue.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_redwhite.rsi/meta.json similarity index 79% rename from Resources/Textures/ADT/Clothing/Underwear/Socks/socks_blue.rsi/meta.json rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_redwhite.rsi/meta.json index 4d1063c16c7..95928324bd5 100644 --- a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_blue.rsi/meta.json +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_redwhite.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:dion_clawed", + "copyright": "Created by discord: prazat911 for Adventure Time", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_stripped.rsi/equipped-SOCKS.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_stripped.rsi/equipped-SOCKS.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Underwear/Socks/socks_stripped.rsi/equipped-SOCKS.png rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_stripped.rsi/equipped-SOCKS.png diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_stripped.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_stripped.rsi/icon.png similarity index 100% rename from Resources/Textures/ADT/Clothing/Underwear/Socks/socks_stripped.rsi/icon.png rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_stripped.rsi/icon.png diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_fingerless.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_stripped.rsi/meta.json similarity index 79% rename from Resources/Textures/ADT/Clothing/Underwear/Socks/socks_fingerless.rsi/meta.json rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_stripped.rsi/meta.json index 4d1063c16c7..95928324bd5 100644 --- a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_fingerless.rsi/meta.json +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Socks/socks_stripped.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:dion_clawed", + "copyright": "Created by discord: prazat911 for Adventure Time", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Top/christmas_bra.rsi/equipped-UNDERWEART.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Top/christmas_bra.rsi/equipped-UNDERWEART.png new file mode 100644 index 00000000000..5ba88dea614 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Top/christmas_bra.rsi/equipped-UNDERWEART.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Top/christmas_bra.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Top/christmas_bra.rsi/icon.png new file mode 100644 index 00000000000..db30ef13b9a Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Top/christmas_bra.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Top/christmas_bra.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Top/christmas_bra.rsi/meta.json new file mode 100644 index 00000000000..3f5f1e690ef --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/Top/christmas_bra.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: prazat911 for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-UNDERWEART", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/panties_christmas.rsi/equipped-UNDERWEARB.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/panties_christmas.rsi/equipped-UNDERWEARB.png new file mode 100644 index 00000000000..36092fffd2e Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/panties_christmas.rsi/equipped-UNDERWEARB.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/panties_christmas.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/panties_christmas.rsi/icon.png new file mode 100644 index 00000000000..e849519cdc4 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/panties_christmas.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/panties_christmas.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/panties_christmas.rsi/meta.json new file mode 100644 index 00000000000..32767a902b1 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Underwear/panties_christmas.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: prazat911 for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-UNDERWEARB", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpskirt/snow_maiden.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpskirt/snow_maiden.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..845f3b7fb2c Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpskirt/snow_maiden.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpskirt/snow_maiden.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpskirt/snow_maiden.rsi/icon.png new file mode 100644 index 00000000000..46abff2c414 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpskirt/snow_maiden.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpskirt/snow_maiden.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpskirt/snow_maiden.rsi/meta.json new file mode 100644 index 00000000000..53b53333e55 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpskirt/snow_maiden.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpskirt/uniform_school.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpskirt/uniform_school.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..e06fdf72793 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpskirt/uniform_school.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpskirt/uniform_school.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpskirt/uniform_school.rsi/icon.png new file mode 100644 index 00000000000..638c3ba4711 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpskirt/uniform_school.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpskirt/uniform_school.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpskirt/uniform_school.rsi/meta.json new file mode 100644 index 00000000000..00ff1a9ebca --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpskirt/uniform_school.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Создано Умой для Времени Приключений МРП сервер", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/elf_costume.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/elf_costume.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..36dc8c3c235 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/elf_costume.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/elf_costume.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/elf_costume.rsi/icon.png new file mode 100644 index 00000000000..3b59d177b9f Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/elf_costume.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/elf_costume.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/elf_costume.rsi/meta.json new file mode 100644 index 00000000000..d49da9a8534 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/elf_costume.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: dion_clawed for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/monkey_holiday_suit.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/monkey_holiday_suit.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000..d27184c4395 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/monkey_holiday_suit.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/monkey_holiday_suit.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/monkey_holiday_suit.rsi/icon.png new file mode 100644 index 00000000000..3eeef4c16e1 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/monkey_holiday_suit.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/monkey_holiday_suit.rsi/inhand-left.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/monkey_holiday_suit.rsi/inhand-left.png new file mode 100644 index 00000000000..3a89b278f62 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/monkey_holiday_suit.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/monkey_holiday_suit.rsi/inhand-right.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/monkey_holiday_suit.rsi/inhand-right.png new file mode 100644 index 00000000000..b900628cfc2 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/monkey_holiday_suit.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/monkey_holiday_suit.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/monkey_holiday_suit.rsi/meta.json new file mode 100644 index 00000000000..ff4e219ba2e --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/monkey_holiday_suit.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: cherreshnia for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/roll-neck_snowman.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/roll-neck_snowman.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..dda254a49f7 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/roll-neck_snowman.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/roll-neck_snowman.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/roll-neck_snowman.rsi/icon.png new file mode 100644 index 00000000000..7034527e927 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/roll-neck_snowman.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/roll-neck_snowman.rsi/inhand-left.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/roll-neck_snowman.rsi/inhand-left.png new file mode 100644 index 00000000000..b51f5345005 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/roll-neck_snowman.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/roll-neck_snowman.rsi/inhand-right.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/roll-neck_snowman.rsi/inhand-right.png new file mode 100644 index 00000000000..8be0a3b7702 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/roll-neck_snowman.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/roll-neck_snowman.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/roll-neck_snowman.rsi/meta.json new file mode 100644 index 00000000000..6917d7b836d --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/roll-neck_snowman.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: prazat911 for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_deer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_deer.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..d8e1201db54 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_deer.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_deer.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_deer.rsi/icon.png new file mode 100644 index 00000000000..f06235ab211 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_deer.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_deer.rsi/inhand-left.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_deer.rsi/inhand-left.png new file mode 100644 index 00000000000..637a7a82782 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_deer.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_deer.rsi/inhand-right.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_deer.rsi/inhand-right.png new file mode 100644 index 00000000000..f99e1147aee Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_deer.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_deer.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_deer.rsi/meta.json new file mode 100644 index 00000000000..6917d7b836d --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_deer.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: prazat911 for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowflake.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowflake.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..2509e8b3e25 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowflake.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowflake.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowflake.rsi/icon.png new file mode 100644 index 00000000000..a931cc93011 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowflake.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowflake.rsi/inhand-left.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowflake.rsi/inhand-left.png new file mode 100644 index 00000000000..16c22e6f1ae Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowflake.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowflake.rsi/inhand-right.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowflake.rsi/inhand-right.png new file mode 100644 index 00000000000..b5e37613dff Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowflake.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowflake.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowflake.rsi/meta.json new file mode 100644 index 00000000000..6917d7b836d --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowflake.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: prazat911 for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowman.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowman.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..3931e1d9c63 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowman.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowman.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowman.rsi/icon.png new file mode 100644 index 00000000000..35f00827ba3 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowman.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowman.rsi/inhand-left.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowman.rsi/inhand-left.png new file mode 100644 index 00000000000..343d048d906 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowman.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowman.rsi/inhand-right.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowman.rsi/inhand-right.png new file mode 100644 index 00000000000..184dd243aed Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowman.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowman.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowman.rsi/meta.json new file mode 100644 index 00000000000..6917d7b836d --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_snowman.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: prazat911 for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_spruce.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_spruce.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..4e008cc4ca9 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_spruce.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_spruce.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_spruce.rsi/icon.png new file mode 100644 index 00000000000..4bce6105479 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_spruce.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_spruce.rsi/inhand-left.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_spruce.rsi/inhand-left.png new file mode 100644 index 00000000000..fa8ae15f12b Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_spruce.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_spruce.rsi/inhand-right.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_spruce.rsi/inhand-right.png new file mode 100644 index 00000000000..71ea919ff01 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_spruce.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_spruce.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_spruce.rsi/meta.json new file mode 100644 index 00000000000..6917d7b836d --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/shirt_spruce.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: prazat911 for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_beige.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_beige.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..6fb2154ce59 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_beige.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_beige.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_beige.rsi/icon.png new file mode 100644 index 00000000000..1eb25eb07ff Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_beige.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_beige.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_beige.rsi/meta.json new file mode 100644 index 00000000000..d49da9a8534 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_beige.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: dion_clawed for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_blue.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..2ac513cf2d5 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_blue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_blue.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_blue.rsi/icon.png new file mode 100644 index 00000000000..d11e5330a55 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_blue.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_blue.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_blue.rsi/meta.json new file mode 100644 index 00000000000..d49da9a8534 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_blue.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: dion_clawed for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_holiday.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_holiday.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..91578d1795e Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_holiday.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_holiday.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_holiday.rsi/icon.png new file mode 100644 index 00000000000..8185e90feed Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_holiday.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_holiday.rsi/inhand-left.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_holiday.rsi/inhand-left.png new file mode 100644 index 00000000000..ab2ea959ee5 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_holiday.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_holiday.rsi/inhand-right.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_holiday.rsi/inhand-right.png new file mode 100644 index 00000000000..c613f23cef6 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_holiday.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_holiday.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_holiday.rsi/meta.json new file mode 100644 index 00000000000..6917d7b836d --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_holiday.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: prazat911 for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_red_dark.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_red_dark.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..b2018c718ba Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_red_dark.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_red_dark.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_red_dark.rsi/icon.png new file mode 100644 index 00000000000..627a62b4e89 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_red_dark.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_red_dark.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_red_dark.rsi/meta.json new file mode 100644 index 00000000000..d49da9a8534 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_red_dark.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: dion_clawed for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_red_white.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_red_white.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..a982d272df0 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_red_white.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_red_white.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_red_white.rsi/icon.png new file mode 100644 index 00000000000..0705fe07b8c Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_red_white.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_red_white.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_red_white.rsi/meta.json new file mode 100644 index 00000000000..d49da9a8534 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/Jumpsuit/sweater_red_white.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: dion_clawed for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/uniform_school.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/uniform_school.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..e06fdf72793 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/uniform_school.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/uniform_school.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/uniform_school.rsi/icon.png new file mode 100644 index 00000000000..638c3ba4711 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/uniform_school.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/uniform_school.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/uniform_school.rsi/meta.json new file mode 100644 index 00000000000..ed804cddf3d --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Clothing/Uniforms/uniform_school.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: cherreshnia for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/champagne_mandarin.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/champagne_mandarin.png new file mode 100644 index 00000000000..8c07bbbafea Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/champagne_mandarin.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/christmas_milkshake.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/christmas_milkshake.png new file mode 100644 index 00000000000..e0d3914ba6d Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/christmas_milkshake.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/hot_chocolate.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/hot_chocolate.png new file mode 100644 index 00000000000..66131c444d6 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/hot_chocolate.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/hot_cocoa.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/hot_cocoa.png new file mode 100644 index 00000000000..20905e7f806 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/hot_cocoa.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/meta.json new file mode 100644 index 00000000000..9698327c4ea --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/meta.json @@ -0,0 +1,39 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Создано Умой и @prazat911 для Времени Приключений МРП сервер", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "mulled_wine_cold" + }, + { + "name": "mulled_wine", + "delays": + [[0.4, 0.4, 0.4, 0.4]] + }, + { + "name": "champagne_mandarin", + "delays": + [[0.4, 0.4, 0.4, 0.4]] + }, + { + "name": "christmas_milkshake" + }, + { + "name": "hot_chocolate" + }, + { + "name": "hot_cocoa" + }, + { + "name": "sbiten_cinnamon_lemon" + }, + { + "name": "warm_tea_cinnamon_lemon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/mulled_wine.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/mulled_wine.png new file mode 100644 index 00000000000..669a94da2e2 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/mulled_wine.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/mulled_wine_cold.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/mulled_wine_cold.png new file mode 100644 index 00000000000..571fc6baae7 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/mulled_wine_cold.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/sbiten_cinnamon_lemon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/sbiten_cinnamon_lemon.png new file mode 100644 index 00000000000..5a57c239d71 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/sbiten_cinnamon_lemon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/warm_tea_cinnamon_lemon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/warm_tea_cinnamon_lemon.png new file mode 100644 index 00000000000..5e336921f86 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Drinks/new_year.rsi/warm_tea_cinnamon_lemon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/carnation.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/carnation.rsi/meta.json new file mode 100644 index 00000000000..0d988b0d7fa --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/carnation.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: cherreshnia for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "produce" + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/carnation.rsi/produce.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/carnation.rsi/produce.png new file mode 100644 index 00000000000..d7f0ea8e3b8 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/carnation.rsi/produce.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/chocogorilla.rsi/chocogorilla.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/chocogorilla.rsi/chocogorilla.png new file mode 100644 index 00000000000..ba02c98843e Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/chocogorilla.rsi/chocogorilla.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/chocogorilla.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/chocogorilla.rsi/meta.json new file mode 100644 index 00000000000..b75402882f0 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/chocogorilla.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Создано yamato_no_orochi8 для Времени Приключений МРП сервер", + "size": { + "x": 32, + "y": 64 + }, + "states": [ + { + "name": "chocogorilla", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/cinnamon.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/cinnamon.rsi/meta.json new file mode 100644 index 00000000000..0d988b0d7fa --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/cinnamon.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: cherreshnia for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "produce" + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/cinnamon.rsi/produce.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/cinnamon.rsi/produce.png new file mode 100644 index 00000000000..1d9da9911a5 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/cinnamon.rsi/produce.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/bowl.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/bowl.png new file mode 100644 index 00000000000..9f91f21ff45 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/bowl.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/christmaspudding.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/christmaspudding.png new file mode 100644 index 00000000000..07575d31b1a Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/christmaspudding.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/ham.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/ham.png new file mode 100644 index 00000000000..8be25f18d20 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/ham.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/hampiece.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/hampiece.png new file mode 100644 index 00000000000..3ea76225ea2 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/hampiece.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/herring.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/herring.png new file mode 100644 index 00000000000..ce0b038b7f9 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/herring.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/jellymeat.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/jellymeat.png new file mode 100644 index 00000000000..c55b184a26a Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/jellymeat.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/meta.json new file mode 100644 index 00000000000..71a2364b3e9 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: prazat911 for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bowl" + }, + { + "name": "olivier" + }, + { + "name": "plate_small" + }, + { + "name": "jellymeat" + }, + { + "name": "herring" + }, + { + "name": "plate" + }, + { + "name": "ham" + }, + { + "name": "hampiece" + }, + { + "name": "pudding" + }, + { + "name": "christmaspudding" + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/olivier.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/olivier.png new file mode 100644 index 00000000000..d9d398ef214 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/olivier.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/plate.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/plate.png new file mode 100644 index 00000000000..9fa2b33db3f Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/plate.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/plate_small.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/plate_small.png new file mode 100644 index 00000000000..3afc00ebb42 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/plate_small.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/pudding.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/pudding.png new file mode 100644 index 00000000000..8b64dbbd698 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearfood.rsi/pudding.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/atmos.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/atmos.png new file mode 100644 index 00000000000..ce98334f332 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/atmos.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/botanic.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/botanic.png new file mode 100644 index 00000000000..4ae9587a810 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/botanic.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/box1.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/box1.png new file mode 100644 index 00000000000..9fe5c143107 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/box1.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/box2.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/box2.png new file mode 100644 index 00000000000..0b909b75196 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/box2.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/box3.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/box3.png new file mode 100644 index 00000000000..49f9f0ca1a1 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/box3.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/cargo.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/cargo.png new file mode 100644 index 00000000000..b44206ec87f Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/cargo.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/chef.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/chef.png new file mode 100644 index 00000000000..62c6345e982 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/chef.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/clown.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/clown.png new file mode 100644 index 00000000000..c5b06f7f079 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/clown.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/cookieman.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/cookieman.png new file mode 100644 index 00000000000..4aab726e133 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/cookieman.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/doctor.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/doctor.png new file mode 100644 index 00000000000..29417925c20 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/doctor.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/gift.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/gift.png new file mode 100644 index 00000000000..ecba8b042d1 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/gift.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/glove.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/glove.png new file mode 100644 index 00000000000..d03e627d3ec Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/glove.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/greytide.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/greytide.png new file mode 100644 index 00000000000..13f788617fc Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/greytide.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/janitory.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/janitory.png new file mode 100644 index 00000000000..196f654500a Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/janitory.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/meta.json new file mode 100644 index 00000000000..fae1bb06442 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/meta.json @@ -0,0 +1,80 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: prazat911 for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "atmos" + }, + { + "name": "botanic" + }, + { + "name": "stick" + }, + { + "name": "cargo" + }, + { + "name": "cookieman" + }, + { + "name": "chef" + }, + { + "name": "doctor" + }, + { + "name": "gift" + }, + { + "name": "glove" + }, + { + "name": "janitory" + }, + { + "name": "mime" + }, + { + "name": "nukie" + }, + { + "name": "clown" + }, + { + "name": "greytide" + }, + { + "name": "scientist" + }, + { + "name": "security" + }, + { + "name": "snowflake" + }, + { + "name": "snowman" + }, + { + "name": "socks" + }, + { + "name": "tree" + }, + { + "name": "box1" + }, + { + "name": "box2" + }, + { + "name": "box3" + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/mime.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/mime.png new file mode 100644 index 00000000000..bf02db7bd54 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/mime.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/nukie.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/nukie.png new file mode 100644 index 00000000000..99bd104ce75 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/nukie.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/scientist.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/scientist.png new file mode 100644 index 00000000000..47df1d8f9a6 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/scientist.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/security.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/security.png new file mode 100644 index 00000000000..22771ee06f8 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/security.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/snowflake.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/snowflake.png new file mode 100644 index 00000000000..91e395e3128 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/snowflake.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/snowman.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/snowman.png new file mode 100644 index 00000000000..29690041462 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/snowman.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/socks.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/socks.png new file mode 100644 index 00000000000..0c43a35dd88 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/socks.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/stick.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/stick.png new file mode 100644 index 00000000000..93bc5440008 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/stick.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/tree.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/tree.png new file mode 100644 index 00000000000..6de1e5e982d Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Consumable/Food/new-years/newyearsnack.rsi/tree.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/cristmas_wreaths.rsi/christmasmistletoe_01.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/cristmas_wreaths.rsi/christmasmistletoe_01.png new file mode 100644 index 00000000000..ae53a5bfa6b Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/cristmas_wreaths.rsi/christmasmistletoe_01.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/cristmas_wreaths.rsi/christmasmistletoe_02.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/cristmas_wreaths.rsi/christmasmistletoe_02.png new file mode 100644 index 00000000000..9cea2da8987 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/cristmas_wreaths.rsi/christmasmistletoe_02.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/cristmas_wreaths.rsi/christmaswreath_01.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/cristmas_wreaths.rsi/christmaswreath_01.png new file mode 100644 index 00000000000..7dc9fd20e27 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/cristmas_wreaths.rsi/christmaswreath_01.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/cristmas_wreaths.rsi/christmaswreath_02.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/cristmas_wreaths.rsi/christmaswreath_02.png new file mode 100644 index 00000000000..f669d9870ef Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/cristmas_wreaths.rsi/christmaswreath_02.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/cristmas_wreaths.rsi/christmaswreath_03.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/cristmas_wreaths.rsi/christmaswreath_03.png new file mode 100644 index 00000000000..002caf3b39a Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/cristmas_wreaths.rsi/christmaswreath_03.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/cristmas_wreaths.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/cristmas_wreaths.rsi/meta.json new file mode 100644 index 00000000000..dc4bbd3bc68 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/cristmas_wreaths.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: lunalita for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "christmasmistletoe_01" + }, + { + "name": "christmasmistletoe_02" + }, + { + "name": "christmaswreath_01" + }, + { + "name": "christmaswreath_02" + }, + { + "name": "christmaswreath_03" + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/poster_new_year.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/poster_new_year.rsi/meta.json new file mode 100644 index 00000000000..e70530dc009 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/poster_new_year.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: yamato_no_orochi8 and prazat911 for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "new_year", + "delays": [ [ 0.4, 0.4, 0.4, 0.4, 0.4, 0.4 ] ] + }, + { + "name": "new_year2" + }, + { + "name": "new_year3" + } + ] +} diff --git a/Resources/Textures/ADT/Structures/Wallmounts/poster_new_year.rsi/new_year.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/poster_new_year.rsi/new_year.png similarity index 100% rename from Resources/Textures/ADT/Structures/Wallmounts/poster_new_year.rsi/new_year.png rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/poster_new_year.rsi/new_year.png diff --git a/Resources/Textures/ADT/Structures/Wallmounts/poster_new_year.rsi/new_year2.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/poster_new_year.rsi/new_year2.png similarity index 100% rename from Resources/Textures/ADT/Structures/Wallmounts/poster_new_year.rsi/new_year2.png rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/poster_new_year.rsi/new_year2.png diff --git a/Resources/Textures/ADT/Structures/Wallmounts/poster_new_year.rsi/new_year3.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/poster_new_year.rsi/new_year3.png similarity index 100% rename from Resources/Textures/ADT/Structures/Wallmounts/poster_new_year.rsi/new_year3.png rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/poster_new_year.rsi/new_year3.png diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/tinsel.rsi/goldtinsel.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/tinsel.rsi/goldtinsel.png new file mode 100644 index 00000000000..36461570270 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/tinsel.rsi/goldtinsel.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/tinsel.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/tinsel.rsi/meta.json new file mode 100644 index 00000000000..c7edd722e01 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/tinsel.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by discord: auriss093 for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "redtinsel" + }, + { + "name": "goldtinsel" + }, + { + "name": "silvertinsel" + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/tinsel.rsi/redtinsel.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/tinsel.rsi/redtinsel.png new file mode 100644 index 00000000000..88796f53064 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/tinsel.rsi/redtinsel.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/tinsel.rsi/silvertinsel.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/tinsel.rsi/silvertinsel.png new file mode 100644 index 00000000000..08804e51ea8 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Decoration/tinsel.rsi/silvertinsel.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toy.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toy.rsi/icon.png new file mode 100644 index 00000000000..c4ca5718b7f Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toy.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toy.rsi/inhand-left.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toy.rsi/inhand-left.png new file mode 100644 index 00000000000..00c39784f8d Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toy.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toy.rsi/inhand-right.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toy.rsi/inhand-right.png new file mode 100644 index 00000000000..a61609842b5 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toy.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toy.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toy.rsi/meta.json new file mode 100644 index 00000000000..35e4bf8fcf7 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toy.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made for Adventure Time project. Art by discord:auriss093", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toyPackage.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toyPackage.rsi/icon.png new file mode 100644 index 00000000000..dfc80faa65c Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toyPackage.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toyPackage.rsi/inhand-left.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toyPackage.rsi/inhand-left.png new file mode 100644 index 00000000000..b2b0494e07e Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toyPackage.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toyPackage.rsi/inhand-right.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toyPackage.rsi/inhand-right.png new file mode 100644 index 00000000000..b5225326f3e Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toyPackage.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toyPackage.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toyPackage.rsi/meta.json new file mode 100644 index 00000000000..a9e672f6868 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/c4toyPackage.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made for Adventure Time project. Art by discord:auriss093", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/coal.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/coal.rsi/icon.png new file mode 100644 index 00000000000..77dde283d66 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/coal.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/coal.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/coal.rsi/meta.json new file mode 100644 index 00000000000..26bf9f20e05 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/coal.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made for Adventure Time project. Art by discord:auriss093", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/new_year_present.rsi/blue.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/new_year_present.rsi/blue.png new file mode 100644 index 00000000000..e4f8fdead16 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/new_year_present.rsi/blue.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/new_year_present.rsi/green.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/new_year_present.rsi/green.png new file mode 100644 index 00000000000..bbaea0031dd Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/new_year_present.rsi/green.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/new_year_present.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/new_year_present.rsi/meta.json new file mode 100644 index 00000000000..1aa2410f00f --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/new_year_present.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911 для Времени Приключений МРП сервер", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "blue" + }, + { + "name": "green" + }, + { + "name": "purple" + }, + { + "name": "red" + }, + { + "name": "syndicate" + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/new_year_present.rsi/purple.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/new_year_present.rsi/purple.png new file mode 100644 index 00000000000..5a47a955afd Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/new_year_present.rsi/purple.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/new_year_present.rsi/red.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/new_year_present.rsi/red.png new file mode 100644 index 00000000000..727b36fa7e3 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/new_year_present.rsi/red.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/new_year_present.rsi/syndicate.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/new_year_present.rsi/syndicate.png new file mode 100644 index 00000000000..fbd0f4042b0 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Fun/new_year_present.rsi/syndicate.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/basestar_garland.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/basestar_garland.png new file mode 100644 index 00000000000..00e96d96fa4 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/basestar_garland.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/golden_balls.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/golden_balls.png new file mode 100644 index 00000000000..0aa93f3252c Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/golden_balls.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/golden_mishura.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/golden_mishura.png new file mode 100644 index 00000000000..851e6da0140 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/golden_mishura.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/golden_star.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/golden_star.png new file mode 100644 index 00000000000..707e6bb128f Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/golden_star.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/goldenstar_garland.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/goldenstar_garland.png new file mode 100644 index 00000000000..c5f56188537 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/goldenstar_garland.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/meta.json new file mode 100644 index 00000000000..17d97a4d5c0 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/meta.json @@ -0,0 +1,51 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:LunaLita#0840", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "red_balls" + }, + { + "name": "silver_balls" + }, + { + "name": "golden_balls" + }, + { + "name": "silver_star" + }, + { + "name": "golden_star" + }, + { + "name": "red_star" + }, + { + "name": "silver_mishura" + }, + { + "name": "golden_mishura" + }, + { + "name": "red_mishura" + }, + { + "name": "goldenstar_garland" + }, + { + "name": "silverstar_garland" + }, + { + "name": "basestar_garland" + }, + { + "name": "shiny_garland" + } + ] +} + diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/red_balls.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/red_balls.png new file mode 100644 index 00000000000..89bd44cb6c1 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/red_balls.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/red_mishura.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/red_mishura.png new file mode 100644 index 00000000000..f1f4378dd22 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/red_mishura.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/red_star.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/red_star.png new file mode 100644 index 00000000000..191f2a594c2 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/red_star.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/shiny_garland.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/shiny_garland.png new file mode 100644 index 00000000000..76f9c66c94a Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/shiny_garland.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/silver_balls.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/silver_balls.png new file mode 100644 index 00000000000..c2046321d49 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/silver_balls.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/silver_mishura.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/silver_mishura.png new file mode 100644 index 00000000000..0398370347c Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/silver_mishura.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/silver_star.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/silver_star.png new file mode 100644 index 00000000000..c712fc7ce6a Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/silver_star.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/silverstar_garland.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/silverstar_garland.png new file mode 100644 index 00000000000..8e5f73dff01 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/newyeartreetoys.rsi/silverstar_garland.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/burnt-icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/burnt-icon.png new file mode 100644 index 00000000000..a0ea477d438 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/burnt-icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/burnt-inhand-left.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/burnt-inhand-left.png new file mode 100644 index 00000000000..d78028f8dd6 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/burnt-inhand-left.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/burnt-inhand-right.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/burnt-inhand-right.png new file mode 100644 index 00000000000..7a65baa9c55 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/burnt-inhand-right.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/lit-icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/lit-icon.png new file mode 100644 index 00000000000..42f06f1423b Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/lit-icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/lit-inhand-left.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/lit-inhand-left.png new file mode 100644 index 00000000000..37774a77005 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/lit-inhand-left.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/lit-inhand-right.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/lit-inhand-right.png new file mode 100644 index 00000000000..2a47c321501 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/lit-inhand-right.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/meta.json new file mode 100644 index 00000000000..c7de8b4b621 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/meta.json @@ -0,0 +1,66 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: lunalita for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "unlit-icon" + }, + { + "name": "unlit-inhand-left", + "directions": 4 + }, + { + "name": "unlit-inhand-right", + "directions": 4 + }, + { + "name": "burnt-icon" + }, + { + "name": "burnt-inhand-left", + "directions": 4 + }, + { + "name": "burnt-inhand-right", + "directions": 4 + }, + { + "name": "lit-icon", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "lit-inhand-left", + "directions": 4, + "delays": [ + [0.1, 0.1, 0.1, 0.1, 0.1, 0.1], + [0.1, 0.1, 0.1, 0.1, 0.1, 0.1], + [0.1, 0.1, 0.1, 0.1, 0.1, 0.1], + [0.1, 0.1, 0.1, 0.1, 0.1, 0.1] + ] + }, + { + "name": "lit-inhand-right", + "directions": 4, + "delays": [ + [0.1, 0.1, 0.1, 0.1, 0.1, 0.1], + [0.1, 0.1, 0.1, 0.1, 0.1, 0.1], + [0.1, 0.1, 0.1, 0.1, 0.1, 0.1], + [0.1, 0.1, 0.1, 0.1, 0.1, 0.1] + ] + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/unlit-icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/unlit-icon.png new file mode 100644 index 00000000000..8376c1d51b4 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/unlit-icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/unlit-inhand-left.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/unlit-inhand-left.png new file mode 100644 index 00000000000..5fbcf10d727 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/unlit-inhand-left.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/unlit-inhand-right.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/unlit-inhand-right.png new file mode 100644 index 00000000000..b2b2d67e8c5 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Misc/sparkler.rsi/unlit-inhand-right.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/carnation_pack.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/carnation_pack.rsi/icon.png new file mode 100644 index 00000000000..cb485cd3e74 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/carnation_pack.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/carnation_pack.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/carnation_pack.rsi/meta.json new file mode 100644 index 00000000000..8fc9e00e647 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/carnation_pack.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: cherreshnia for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/cinnamon_pack.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/cinnamon_pack.rsi/icon.png new file mode 100644 index 00000000000..07039869e6a Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/cinnamon_pack.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/cinnamon_pack.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/cinnamon_pack.rsi/meta.json new file mode 100644 index 00000000000..65248ea56f6 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/cinnamon_pack.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: JustKekc for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/gift.rsi/icon.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/gift.rsi/icon.png new file mode 100644 index 00000000000..2a47afaf242 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/gift.rsi/icon.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/gift.rsi/inhand-left.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/gift.rsi/inhand-left.png new file mode 100644 index 00000000000..294e9482f85 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/gift.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/gift.rsi/inhand-right.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/gift.rsi/inhand-right.png new file mode 100644 index 00000000000..5a1dc07c98b Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/gift.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/gift.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/gift.rsi/meta.json new file mode 100644 index 00000000000..88345be70d6 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/gift.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made for Adventure Time project. Art by discord:auriss093", + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/closed.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/closed.png new file mode 100644 index 00000000000..d6afaddec9b Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/closed.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/inhand-left.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/inhand-left.png new file mode 100644 index 00000000000..3f64e667df7 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/inhand-right.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/inhand-right.png new file mode 100644 index 00000000000..ff4ff1c0f11 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/meta.json new file mode 100644 index 00000000000..2f5873d876b --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: lunalita for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "closed" + }, + { + "name": "open" + }, + { + "name": "stick0" + }, + { + "name": "stick1" + }, + { + "name": "stick2" + }, + { + "name": "stick3" + }, + { + "name": "stick4" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/open.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/open.png new file mode 100644 index 00000000000..9dd3b087a9f Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/open.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/stick0.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/stick0.png new file mode 100644 index 00000000000..016d8ba5a76 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/stick0.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/stick1.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/stick1.png new file mode 100644 index 00000000000..911b399e577 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/stick1.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/stick2.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/stick2.png new file mode 100644 index 00000000000..ceb00d8341d Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/stick2.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/stick3.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/stick3.png new file mode 100644 index 00000000000..3be3058e830 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/stick3.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/stick4.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/stick4.png new file mode 100644 index 00000000000..1e786ebf107 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Objects/Storage/sparkler_pack.rsi/stick4.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Decoration/christmas_fireplase.rsi/christmas_fireplace_01.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Decoration/christmas_fireplase.rsi/christmas_fireplace_01.png new file mode 100644 index 00000000000..3434446a130 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Decoration/christmas_fireplase.rsi/christmas_fireplace_01.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Decoration/christmas_fireplase.rsi/christmas_fireplace_02.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Decoration/christmas_fireplase.rsi/christmas_fireplace_02.png new file mode 100644 index 00000000000..bf6a7e2cde9 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Decoration/christmas_fireplase.rsi/christmas_fireplace_02.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Decoration/christmas_fireplase.rsi/fireplace_fire4.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Decoration/christmas_fireplase.rsi/fireplace_fire4.png new file mode 100644 index 00000000000..b681f7e94dc Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Decoration/christmas_fireplase.rsi/fireplace_fire4.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Decoration/christmas_fireplase.rsi/fireplace_glow.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Decoration/christmas_fireplase.rsi/fireplace_glow.png new file mode 100644 index 00000000000..8b4741b7e7b Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Decoration/christmas_fireplase.rsi/fireplace_glow.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Decoration/christmas_fireplase.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Decoration/christmas_fireplase.rsi/meta.json new file mode 100644 index 00000000000..ca17e8d51c4 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Decoration/christmas_fireplase.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: lunalita for Adventure Time", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "christmas_fireplace_01", + "directions": 1 + }, + { + "name": "christmas_fireplace_02", + "directions": 1 + }, + { + "name": "fireplace_fire4", + "directions": 4, + "delays": + [ + [0.1, 0.1, 0.1], + [0.1, 0.1, 0.1], + [0.1, 0.1, 0.1], + [0.1, 0.1, 0.1] + ] + }, + { + "name": "fireplace_glow", + "directions": 4, + "delays": + [ + [0.4, 0.1], + [0.4, 0.1], + [0.4, 0.1], + [0.4, 0.1] + ] + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_blue.rsi/bluearmchair.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_blue.rsi/bluearmchair.png new file mode 100644 index 00000000000..dfda36e7251 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_blue.rsi/bluearmchair.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_blue.rsi/bluearmchair_02.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_blue.rsi/bluearmchair_02.png new file mode 100644 index 00000000000..c0a2be74e87 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_blue.rsi/bluearmchair_02.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_blue.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_blue.rsi/meta.json new file mode 100644 index 00000000000..37892c905e5 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_blue.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: lunalita for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bluearmchair", + "directions": 4 + }, + { + "name": "bluearmchair_02", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_brown.rsi/brownarmchair.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_brown.rsi/brownarmchair.png new file mode 100644 index 00000000000..fc65fcaaa98 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_brown.rsi/brownarmchair.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_brown.rsi/brownarmchair_02.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_brown.rsi/brownarmchair_02.png new file mode 100644 index 00000000000..2181d3fe7f3 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_brown.rsi/brownarmchair_02.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_brown.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_brown.rsi/meta.json new file mode 100644 index 00000000000..eb886163a5a --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_brown.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: lunalita for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "brownarmchair", + "directions": 4 + }, + { + "name": "brownarmchair_02", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_white.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_white.rsi/meta.json new file mode 100644 index 00000000000..06017618f7f --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_white.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: lunalita for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "whitearmchair", + "directions": 4 + }, + { + "name": "whitearmchair_02", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_white.rsi/whitearmchair.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_white.rsi/whitearmchair.png new file mode 100644 index 00000000000..e21d9e37e0e Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_white.rsi/whitearmchair.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_white.rsi/whitearmchair_02.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_white.rsi/whitearmchair_02.png new file mode 100644 index 00000000000..2449091880e Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Armchair/armchair_white.rsi/whitearmchair_02.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/basestar_garland.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/basestar_garland.png new file mode 100644 index 00000000000..7a546fed982 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/basestar_garland.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/christmas_tree.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/christmas_tree.png new file mode 100644 index 00000000000..ae745612ace Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/christmas_tree.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/golden_balls.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/golden_balls.png new file mode 100644 index 00000000000..180c7499844 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/golden_balls.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/golden_mishura.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/golden_mishura.png new file mode 100644 index 00000000000..e2cc0d21085 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/golden_mishura.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/golden_star.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/golden_star.png new file mode 100644 index 00000000000..0e6b8a12894 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/golden_star.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/goldenstar_garland.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/goldenstar_garland.png new file mode 100644 index 00000000000..079a3ed563b Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/goldenstar_garland.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/meta.json new file mode 100644 index 00000000000..bb0d48d1240 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/meta.json @@ -0,0 +1,122 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:LunaLita#0840", + "size": { + "x": 64, + "y": 96 + }, + "states": [ + { + "name": "christmas_tree" + }, + { + "name": "red_balls" + }, + { + "name": "silver_balls" + }, + { + "name": "golden_balls" + }, + { + "name": "silver_star" + }, + { + "name": "golden_star" + }, + { + "name": "red_star" + }, + { + "name": "silver_mishura" + }, + { + "name": "golden_mishura" + }, + { + "name": "red_mishura" + }, + { + "name": "goldenstar_garland", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "silverstar_garland", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "basestar_garland", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "shiny_garland", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + } + ] +} + diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/red_balls.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/red_balls.png new file mode 100644 index 00000000000..d8f0bcd85fb Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/red_balls.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/red_mishura.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/red_mishura.png new file mode 100644 index 00000000000..194c96ae796 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/red_mishura.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/red_star.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/red_star.png new file mode 100644 index 00000000000..6bfd315a783 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/red_star.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/shiny_garland.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/shiny_garland.png new file mode 100644 index 00000000000..f95ebca0caa Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/shiny_garland.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/silver_balls.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/silver_balls.png new file mode 100644 index 00000000000..d496bdbbe9d Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/silver_balls.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/silver_mishura.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/silver_mishura.png new file mode 100644 index 00000000000..16bb1fe98e2 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/silver_mishura.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/silver_star.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/silver_star.png new file mode 100644 index 00000000000..75d604ef867 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/silver_star.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/silverstar_garland.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/silverstar_garland.png new file mode 100644 index 00000000000..a45ee56c8d7 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Furniture/Tree/christmas_tree.rsi/silverstar_garland.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Machines/VendingMachines/newyearmate.rsi/broken.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Machines/VendingMachines/newyearmate.rsi/broken.png new file mode 100644 index 00000000000..d8750b74b8f Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Machines/VendingMachines/newyearmate.rsi/broken.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Machines/VendingMachines/newyearmate.rsi/deny-unshaded.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Machines/VendingMachines/newyearmate.rsi/deny-unshaded.png new file mode 100644 index 00000000000..c9ccb81beb6 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Machines/VendingMachines/newyearmate.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Machines/VendingMachines/newyearmate.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Machines/VendingMachines/newyearmate.rsi/meta.json new file mode 100644 index 00000000000..7c4d18c4d51 --- /dev/null +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Machines/VendingMachines/newyearmate.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: prazat911 for Adventure Time", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded", + "delays": [ + [ + 1.5, + 0.2, + 1.5, + 0.2, + 1.5, + 0.2, + 1.5, + 0.2 + ] + ] + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "broken" + }, + { + "name": "panel" + } + ] +} diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Machines/VendingMachines/newyearmate.rsi/normal-unshaded.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Machines/VendingMachines/newyearmate.rsi/normal-unshaded.png new file mode 100644 index 00000000000..a9d82a5bc60 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Machines/VendingMachines/newyearmate.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Machines/VendingMachines/newyearmate.rsi/off.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Machines/VendingMachines/newyearmate.rsi/off.png new file mode 100644 index 00000000000..9623129fc04 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Machines/VendingMachines/newyearmate.rsi/off.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Machines/VendingMachines/newyearmate.rsi/panel.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Machines/VendingMachines/newyearmate.rsi/panel.png new file mode 100644 index 00000000000..0032751ff4f Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Machines/VendingMachines/newyearmate.rsi/panel.png differ diff --git a/Resources/Textures/ADT/Structures/Wallmounts/poster_new_year.rsi/meta.json b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Wallmounts/poster_new_year.rsi/meta.json similarity index 85% rename from Resources/Textures/ADT/Structures/Wallmounts/poster_new_year.rsi/meta.json rename to Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Wallmounts/poster_new_year.rsi/meta.json index 9410058d3bf..94da0c0ce65 100644 --- a/Resources/Textures/ADT/Structures/Wallmounts/poster_new_year.rsi/meta.json +++ b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Wallmounts/poster_new_year.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:yamato_no_orochi8 and prazat911 для Времени Приключений МРП сервер", + "copyright": "Created by discord:yamato_no_orochi8 and prazat911 for Adventure Time", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Wallmounts/poster_new_year.rsi/new_year.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Wallmounts/poster_new_year.rsi/new_year.png new file mode 100644 index 00000000000..ef4bfd3bc59 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Wallmounts/poster_new_year.rsi/new_year.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Wallmounts/poster_new_year.rsi/new_year2.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Wallmounts/poster_new_year.rsi/new_year2.png new file mode 100644 index 00000000000..96a7fd7d271 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Wallmounts/poster_new_year.rsi/new_year2.png differ diff --git a/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Wallmounts/poster_new_year.rsi/new_year3.png b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Wallmounts/poster_new_year.rsi/new_year3.png new file mode 100644 index 00000000000..9dcc5e09150 Binary files /dev/null and b/Resources/Textures/ADT/ADTGlobalEvents/NewYears/Structures/Wallmounts/poster_new_year.rsi/new_year3.png differ diff --git a/Resources/Textures/ADT/Clothing/Back/santa_backpack.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Clothing/Back/santa_backpack.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..a5e49ed746e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/santa_backpack.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Clothing/Back/santa_backpack.rsi/icon.png b/Resources/Textures/ADT/Clothing/Back/santa_backpack.rsi/icon.png new file mode 100644 index 00000000000..ee9d07a52ea Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/santa_backpack.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Back/santa_backpack.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Back/santa_backpack.rsi/inhand-left.png new file mode 100644 index 00000000000..81a8dc5a4e1 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/santa_backpack.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Back/santa_backpack.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Back/santa_backpack.rsi/inhand-right.png new file mode 100644 index 00000000000..f7be0b8abae Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Back/santa_backpack.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Back/santa_backpack.rsi/meta.json b/Resources/Textures/ADT/Clothing/Back/santa_backpack.rsi/meta.json new file mode 100644 index 00000000000..84bb9e9bde6 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Back/santa_backpack.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Belt/cupidon_quiver.rsi/equipped-BELT.png b/Resources/Textures/ADT/Clothing/Belt/cupidon_quiver.rsi/equipped-BELT.png new file mode 100644 index 00000000000..2543a2307ae Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Belt/cupidon_quiver.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/ADT/Clothing/Belt/cupidon_quiver.rsi/fill-1.png b/Resources/Textures/ADT/Clothing/Belt/cupidon_quiver.rsi/fill-1.png new file mode 100644 index 00000000000..3b46a22c61d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Belt/cupidon_quiver.rsi/fill-1.png differ diff --git a/Resources/Textures/ADT/Clothing/Belt/cupidon_quiver.rsi/fill-2.png b/Resources/Textures/ADT/Clothing/Belt/cupidon_quiver.rsi/fill-2.png new file mode 100644 index 00000000000..3fcf6fa9195 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Belt/cupidon_quiver.rsi/fill-2.png differ diff --git a/Resources/Textures/ADT/Clothing/Belt/cupidon_quiver.rsi/fill-3.png b/Resources/Textures/ADT/Clothing/Belt/cupidon_quiver.rsi/fill-3.png new file mode 100644 index 00000000000..8870c8892fe Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Belt/cupidon_quiver.rsi/fill-3.png differ diff --git a/Resources/Textures/ADT/Clothing/Belt/cupidon_quiver.rsi/icon.png b/Resources/Textures/ADT/Clothing/Belt/cupidon_quiver.rsi/icon.png new file mode 100644 index 00000000000..f86bda68f4b Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Belt/cupidon_quiver.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Belt/cupidon_quiver.rsi/meta.json b/Resources/Textures/ADT/Clothing/Belt/cupidon_quiver.rsi/meta.json new file mode 100644 index 00000000000..002b4d12bc1 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Belt/cupidon_quiver.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "tgstation at a373b4cb08298523d40acc14f9c390a0c403fc31, modified by mirrorcult and by discord:lunalita", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Belt/killa_webbing.rsi/equipped-BELT.png b/Resources/Textures/ADT/Clothing/Belt/killa_webbing.rsi/equipped-BELT.png new file mode 100644 index 00000000000..bef52fc7712 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Belt/killa_webbing.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/ADT/Clothing/Belt/killa_webbing.rsi/icon.png b/Resources/Textures/ADT/Clothing/Belt/killa_webbing.rsi/icon.png new file mode 100644 index 00000000000..2e99b3afc20 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Belt/killa_webbing.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Belt/killa_webbing.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Belt/killa_webbing.rsi/inhand-left.png new file mode 100644 index 00000000000..903adaf9240 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Belt/killa_webbing.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Belt/killa_webbing.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Belt/killa_webbing.rsi/inhand-right.png new file mode 100644 index 00000000000..f6768b9e839 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Belt/killa_webbing.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Belt/killa_webbing.rsi/meta.json b/Resources/Textures/ADT/Clothing/Belt/killa_webbing.rsi/meta.json new file mode 100644 index 00000000000..421cfade03e --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Belt/killa_webbing.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/neontactical.rsi/equipped-EYES.png b/Resources/Textures/ADT/Clothing/Eyes/Glasses/neontactical.rsi/equipped-EYES.png new file mode 100644 index 00000000000..8d981ab8628 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Eyes/Glasses/neontactical.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/neontactical.rsi/icon.png b/Resources/Textures/ADT/Clothing/Eyes/Glasses/neontactical.rsi/icon.png new file mode 100644 index 00000000000..b8ec190151f Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Eyes/Glasses/neontactical.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_stripped.rsi/meta.json b/Resources/Textures/ADT/Clothing/Eyes/Glasses/neontactical.rsi/meta.json similarity index 87% rename from Resources/Textures/ADT/Clothing/Underwear/Socks/socks_stripped.rsi/meta.json rename to Resources/Textures/ADT/Clothing/Eyes/Glasses/neontactical.rsi/meta.json index 6eb8279c0e6..a27d15fd037 100644 --- a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_stripped.rsi/meta.json +++ b/Resources/Textures/ADT/Clothing/Eyes/Glasses/neontactical.rsi/meta.json @@ -11,7 +11,7 @@ "name": "icon" }, { - "name": "equipped-SOCKS", + "name": "equipped-EYES", "directions": 4 } ] diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/servant_of_evil.rsi/equipped-EYES.png b/Resources/Textures/ADT/Clothing/Eyes/Glasses/servant_of_evil.rsi/equipped-EYES.png new file mode 100644 index 00000000000..ec59638c371 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Eyes/Glasses/servant_of_evil.rsi/equipped-EYES.png differ diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/servant_of_evil.rsi/icon.png b/Resources/Textures/ADT/Clothing/Eyes/Glasses/servant_of_evil.rsi/icon.png new file mode 100644 index 00000000000..68132454df1 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Eyes/Glasses/servant_of_evil.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Eyes/Glasses/servant_of_evil.rsi/meta.json b/Resources/Textures/ADT/Clothing/Eyes/Glasses/servant_of_evil.rsi/meta.json new file mode 100644 index 00000000000..a27d15fd037 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Eyes/Glasses/servant_of_evil.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/biomerc_gloves.rsi/equipped-HAND.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/biomerc_gloves.rsi/equipped-HAND.png new file mode 100644 index 00000000000..f180d7fae36 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Hands/Gloves/biomerc_gloves.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/biomerc_gloves.rsi/icon.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/biomerc_gloves.rsi/icon.png new file mode 100644 index 00000000000..630fa0c9bb1 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Hands/Gloves/biomerc_gloves.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/biomerc_gloves.rsi/meta.json b/Resources/Textures/ADT/Clothing/Hands/Gloves/biomerc_gloves.rsi/meta.json new file mode 100644 index 00000000000..ce83a40e6a4 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Hands/Gloves/biomerc_gloves.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/fingerless_combat.rsi/equipped-HAND.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/fingerless_combat.rsi/equipped-HAND.png new file mode 100644 index 00000000000..26bd662e58a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Hands/Gloves/fingerless_combat.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/fingerless_combat.rsi/icon.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/fingerless_combat.rsi/icon.png new file mode 100644 index 00000000000..861e003d2f1 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Hands/Gloves/fingerless_combat.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/fingerless_combat.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/fingerless_combat.rsi/inhand-left.png new file mode 100644 index 00000000000..8f8953d6350 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Hands/Gloves/fingerless_combat.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/fingerless_combat.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/fingerless_combat.rsi/inhand-right.png new file mode 100644 index 00000000000..dec3a7db6d6 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Hands/Gloves/fingerless_combat.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/fingerless_combat.rsi/meta.json b/Resources/Textures/ADT/Clothing/Hands/Gloves/fingerless_combat.rsi/meta.json new file mode 100644 index 00000000000..d210e9fa2df --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Hands/Gloves/fingerless_combat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/rabbit_gloves.rsi/equipped-HAND.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/rabbit_gloves.rsi/equipped-HAND.png new file mode 100644 index 00000000000..feb7e6ae9c5 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Hands/Gloves/rabbit_gloves.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/rabbit_gloves.rsi/icon.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/rabbit_gloves.rsi/icon.png new file mode 100644 index 00000000000..4a151012e40 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Hands/Gloves/rabbit_gloves.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/rabbit_gloves.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/rabbit_gloves.rsi/inhand-left.png new file mode 100644 index 00000000000..015efe2bd37 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Hands/Gloves/rabbit_gloves.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/rabbit_gloves.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/rabbit_gloves.rsi/inhand-right.png new file mode 100644 index 00000000000..9cdc7f9f653 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Hands/Gloves/rabbit_gloves.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/rabbit_gloves.rsi/meta.json b/Resources/Textures/ADT/Clothing/Hands/Gloves/rabbit_gloves.rsi/meta.json new file mode 100644 index 00000000000..e12f5e2a550 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Hands/Gloves/rabbit_gloves.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Prasat", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/red_martial_gloves.rsi/equipped-HAND.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/red_martial_gloves.rsi/equipped-HAND.png new file mode 100644 index 00000000000..914197c33c9 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Hands/Gloves/red_martial_gloves.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/red_martial_gloves.rsi/icon.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/red_martial_gloves.rsi/icon.png new file mode 100644 index 00000000000..502c6f35454 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Hands/Gloves/red_martial_gloves.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/red_martial_gloves.rsi/meta.json b/Resources/Textures/ADT/Clothing/Hands/Gloves/red_martial_gloves.rsi/meta.json new file mode 100644 index 00000000000..ce83a40e6a4 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Hands/Gloves/red_martial_gloves.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/vyazov_gloves.rsi/equipped-HAND.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/vyazov_gloves.rsi/equipped-HAND.png new file mode 100644 index 00000000000..662564e4211 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Hands/Gloves/vyazov_gloves.rsi/equipped-HAND.png differ diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/vyazov_gloves.rsi/icon.png b/Resources/Textures/ADT/Clothing/Hands/Gloves/vyazov_gloves.rsi/icon.png new file mode 100644 index 00000000000..436eddd1b05 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Hands/Gloves/vyazov_gloves.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Hands/Gloves/vyazov_gloves.rsi/meta.json b/Resources/Textures/ADT/Clothing/Hands/Gloves/vyazov_gloves.rsi/meta.json new file mode 100644 index 00000000000..ce83a40e6a4 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Hands/Gloves/vyazov_gloves.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HAND", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_med_helmet.rsi/icon-flash.png b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_med_helmet.rsi/icon-flash.png new file mode 100644 index 00000000000..7ab9ac7b9d4 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_med_helmet.rsi/icon-flash.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_med_helmet.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_med_helmet.rsi/icon.png new file mode 100644 index 00000000000..7ab9ac7b9d4 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_med_helmet.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_med_helmet.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_med_helmet.rsi/meta.json new file mode 100644 index 00000000000..dca6629a643 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_med_helmet.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite made by ihaveaeye (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_med_helmet.rsi/off-equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_med_helmet.rsi/off-equipped-HELMET.png new file mode 100644 index 00000000000..d857f540847 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_med_helmet.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_med_helmet.rsi/on-equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_med_helmet.rsi/on-equipped-HELMET.png new file mode 100644 index 00000000000..d857f540847 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_med_helmet.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_servant_helmet.rsi/icon-flash.png b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_servant_helmet.rsi/icon-flash.png new file mode 100644 index 00000000000..6bf62d867b8 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_servant_helmet.rsi/icon-flash.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_servant_helmet.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_servant_helmet.rsi/icon.png new file mode 100644 index 00000000000..6bf62d867b8 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_servant_helmet.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_servant_helmet.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_servant_helmet.rsi/meta.json new file mode 100644 index 00000000000..dca6629a643 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_servant_helmet.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite made by ihaveaeye (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_servant_helmet.rsi/off-equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_servant_helmet.rsi/off-equipped-HELMET.png new file mode 100644 index 00000000000..691d56fe10a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_servant_helmet.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_servant_helmet.rsi/on-equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_servant_helmet.rsi/on-equipped-HELMET.png new file mode 100644 index 00000000000..691d56fe10a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_servant_helmet.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_sunshine_helmet.rsi/icon-flash.png b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_sunshine_helmet.rsi/icon-flash.png new file mode 100644 index 00000000000..ab397e370c6 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_sunshine_helmet.rsi/icon-flash.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_sunshine_helmet.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_sunshine_helmet.rsi/icon.png new file mode 100644 index 00000000000..ab397e370c6 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_sunshine_helmet.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_sunshine_helmet.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_sunshine_helmet.rsi/meta.json new file mode 100644 index 00000000000..dca6629a643 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_sunshine_helmet.rsi/meta.json @@ -0,0 +1,25 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite made by ihaveaeye (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon-flash" + }, + { + "name": "off-equipped-HELMET", + "directions": 4 + }, + { + "name": "on-equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_sunshine_helmet.rsi/off-equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_sunshine_helmet.rsi/off-equipped-HELMET.png new file mode 100644 index 00000000000..5f9df1b6799 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_sunshine_helmet.rsi/off-equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_sunshine_helmet.rsi/on-equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_sunshine_helmet.rsi/on-equipped-HELMET.png new file mode 100644 index 00000000000..5f9df1b6799 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hardsuits/event_sunshine_helmet.rsi/on-equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hat.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hat.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..3d1af8aeeb2 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hat.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hat.rsi/icon.png new file mode 100644 index 00000000000..8424f886863 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hat.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hat.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hat.rsi/inhand-left.png new file mode 100644 index 00000000000..491164d7e8c Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hat.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hat.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hat.rsi/inhand-right.png new file mode 100644 index 00000000000..934603be880 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hat.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hat.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hat.rsi/meta.json new file mode 100644 index 00000000000..bbd4469cb36 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hat.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by SHIONE (discord: shi106) for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left" + }, + { + "name": "inhand-right" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatblue.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatblue.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..9bc3ebf639e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatblue.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatblue.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatblue.rsi/icon.png new file mode 100644 index 00000000000..9bc7a1be260 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatblue.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatblue.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatblue.rsi/inhand-left.png new file mode 100644 index 00000000000..746dcb5c2a3 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatblue.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatblue.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatblue.rsi/inhand-right.png new file mode 100644 index 00000000000..1e0cd526488 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatblue.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatblue.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatblue.rsi/meta.json new file mode 100644 index 00000000000..bbd4469cb36 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatblue.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by SHIONE (discord: shi106) for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left" + }, + { + "name": "inhand-right" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderblue.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderblue.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..6e11e885ddd Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderblue.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderblue.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderblue.rsi/icon.png new file mode 100644 index 00000000000..3474d71276e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderblue.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderblue.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderblue.rsi/inhand-left.png new file mode 100644 index 00000000000..a3cc172adf3 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderblue.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderblue.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderblue.rsi/inhand-right.png new file mode 100644 index 00000000000..be3c20373f7 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderblue.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderblue.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderblue.rsi/meta.json new file mode 100644 index 00000000000..bbd4469cb36 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderblue.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by SHIONE (discord: shi106) for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left" + }, + { + "name": "inhand-right" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatbordergreen.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatbordergreen.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..6b5ac94580d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatbordergreen.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatbordergreen.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatbordergreen.rsi/icon.png new file mode 100644 index 00000000000..0d70996c62a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatbordergreen.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatbordergreen.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatbordergreen.rsi/inhand-left.png new file mode 100644 index 00000000000..95fa375a88f Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatbordergreen.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatbordergreen.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatbordergreen.rsi/inhand-right.png new file mode 100644 index 00000000000..41cf9145f29 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatbordergreen.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatbordergreen.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatbordergreen.rsi/meta.json new file mode 100644 index 00000000000..bbd4469cb36 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatbordergreen.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by SHIONE (discord: shi106) for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left" + }, + { + "name": "inhand-right" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderred.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderred.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..abc5c001e34 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderred.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderred.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderred.rsi/icon.png new file mode 100644 index 00000000000..cec66818e7d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderred.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderred.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderred.rsi/inhand-left.png new file mode 100644 index 00000000000..b018833059a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderred.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderred.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderred.rsi/inhand-right.png new file mode 100644 index 00000000000..1bb73581d06 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderred.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderred.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderred.rsi/meta.json new file mode 100644 index 00000000000..bbd4469cb36 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatborderred.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by SHIONE (discord: shi106) for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left" + }, + { + "name": "inhand-right" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatgreen.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatgreen.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..70724030968 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatgreen.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatgreen.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatgreen.rsi/icon.png new file mode 100644 index 00000000000..f1c8531ec69 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatgreen.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatgreen.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatgreen.rsi/inhand-left.png new file mode 100644 index 00000000000..ef189478e71 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatgreen.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatgreen.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatgreen.rsi/inhand-right.png new file mode 100644 index 00000000000..067e176f0ba Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatgreen.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatgreen.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatgreen.rsi/meta.json new file mode 100644 index 00000000000..bbd4469cb36 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatgreen.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by SHIONE (discord: shi106) for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left" + }, + { + "name": "inhand-right" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatred.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatred.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..852c9f7d26f Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatred.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatred.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatred.rsi/icon.png new file mode 100644 index 00000000000..b70fc2a66b4 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatred.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatred.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatred.rsi/inhand-left.png new file mode 100644 index 00000000000..8086a6ac5f9 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatred.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatred.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatred.rsi/inhand-right.png new file mode 100644 index 00000000000..6b1a2f17217 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatred.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatred.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatred.rsi/meta.json new file mode 100644 index 00000000000..bbd4469cb36 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/bavarian_hatred.rsi/meta.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by SHIONE (discord: shi106) for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left" + }, + { + "name": "inhand-right" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/killahelmet.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/killahelmet.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..b20a85af0e3 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/killahelmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/killahelmet.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/killahelmet.rsi/icon.png new file mode 100644 index 00000000000..b9c459f3148 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/killahelmet.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/killahelmet.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/killahelmet.rsi/meta.json new file mode 100644 index 00000000000..1cd4d16ba5c --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/killahelmet.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/romantic_hat.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/romantic_hat.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..2ce0e54191c Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/romantic_hat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/romantic_hat.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/romantic_hat.rsi/icon.png new file mode 100644 index 00000000000..23b72fcb4e5 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/romantic_hat.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/romantic_hat.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/romantic_hat.rsi/meta.json new file mode 100644 index 00000000000..1cd4d16ba5c --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/romantic_hat.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/ussphelmet.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/ussphelmet.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..59df9175502 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/ussphelmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/ussphelmet.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/ussphelmet.rsi/icon.png new file mode 100644 index 00000000000..967b9336363 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/ussphelmet.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/ussphelmet.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Head/Hats/ussphelmet.rsi/inhand-left.png new file mode 100644 index 00000000000..973c2d091b2 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/ussphelmet.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/ussphelmet.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Head/Hats/ussphelmet.rsi/inhand-right.png new file mode 100644 index 00000000000..db3be2bf8ff Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/ussphelmet.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/ussphelmet.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/ussphelmet.rsi/meta.json new file mode 100644 index 00000000000..42217b11282 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/ussphelmet.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "created by to discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/vyazovhat.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/vyazovhat.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..97519eee25b Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/vyazovhat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/vyazovhat.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/vyazovhat.rsi/icon.png new file mode 100644 index 00000000000..ef937b94da9 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/vyazovhat.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/vyazovhat.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/vyazovhat.rsi/meta.json new file mode 100644 index 00000000000..1cd4d16ba5c --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/vyazovhat.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/xeno_head.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/xeno_head.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..3e01f8c3000 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/xeno_head.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/xeno_head.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/xeno_head.rsi/icon.png new file mode 100644 index 00000000000..921fd8c60be Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/xeno_head.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/xeno_head.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/xeno_head.rsi/meta.json new file mode 100644 index 00000000000..1cd4d16ba5c --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/xeno_head.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/zombie_head.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Hats/zombie_head.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..ead1145f035 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/zombie_head.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/zombie_head.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Hats/zombie_head.rsi/icon.png new file mode 100644 index 00000000000..ae8cce131cb Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Hats/zombie_head.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Hats/zombie_head.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Hats/zombie_head.rsi/meta.json new file mode 100644 index 00000000000..4a4f483baf4 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Hats/zombie_head.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:m1and1b", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Head/Misc/hatchainsaw.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Head/Misc/hatchainsaw.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..2e6fe7cbb41 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Misc/hatchainsaw.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Misc/hatchainsaw.rsi/icon.png b/Resources/Textures/ADT/Clothing/Head/Misc/hatchainsaw.rsi/icon.png new file mode 100644 index 00000000000..71f37780c87 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Head/Misc/hatchainsaw.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Head/Misc/hatchainsaw.rsi/meta.json b/Resources/Textures/ADT/Clothing/Head/Misc/hatchainsaw.rsi/meta.json new file mode 100644 index 00000000000..1cd4d16ba5c --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Head/Misc/hatchainsaw.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Mask/clownballistic_mask.rsi/equipped-MASK.png b/Resources/Textures/ADT/Clothing/Mask/clownballistic_mask.rsi/equipped-MASK.png new file mode 100644 index 00000000000..05056412f3c Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Mask/clownballistic_mask.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/ADT/Clothing/Mask/clownballistic_mask.rsi/icon.png b/Resources/Textures/ADT/Clothing/Mask/clownballistic_mask.rsi/icon.png new file mode 100644 index 00000000000..0432b5564e2 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Mask/clownballistic_mask.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Mask/clownballistic_mask.rsi/meta.json b/Resources/Textures/ADT/Clothing/Mask/clownballistic_mask.rsi/meta.json new file mode 100644 index 00000000000..00614f1f89e --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Mask/clownballistic_mask.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Mask/jason.rsi/equipped-MASK.png b/Resources/Textures/ADT/Clothing/Mask/jason.rsi/equipped-MASK.png new file mode 100644 index 00000000000..f3f72b1fa6a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Mask/jason.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/ADT/Clothing/Mask/jason.rsi/icon.png b/Resources/Textures/ADT/Clothing/Mask/jason.rsi/icon.png new file mode 100644 index 00000000000..32cfa2785d6 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Mask/jason.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Mask/jason.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Mask/jason.rsi/inhand-left.png new file mode 100644 index 00000000000..0722cac186f Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Mask/jason.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Mask/jason.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Mask/jason.rsi/inhand-right.png new file mode 100644 index 00000000000..282b1ef3b8a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Mask/jason.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Mask/jason.rsi/meta.json b/Resources/Textures/ADT/Clothing/Mask/jason.rsi/meta.json new file mode 100644 index 00000000000..0963a01133c --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Mask/jason.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Mask/michael_myersmask.rsi/equipped-MASK.png b/Resources/Textures/ADT/Clothing/Mask/michael_myersmask.rsi/equipped-MASK.png new file mode 100644 index 00000000000..788b7876b85 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Mask/michael_myersmask.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/ADT/Clothing/Mask/michael_myersmask.rsi/icon.png b/Resources/Textures/ADT/Clothing/Mask/michael_myersmask.rsi/icon.png new file mode 100644 index 00000000000..2d5cefea139 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Mask/michael_myersmask.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Mask/michael_myersmask.rsi/meta.json b/Resources/Textures/ADT/Clothing/Mask/michael_myersmask.rsi/meta.json new file mode 100644 index 00000000000..00614f1f89e --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Mask/michael_myersmask.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Mask/payday_chains.rsi/equipped-MASK.png b/Resources/Textures/ADT/Clothing/Mask/payday_chains.rsi/equipped-MASK.png new file mode 100644 index 00000000000..4ac55343d44 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Mask/payday_chains.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/ADT/Clothing/Mask/payday_chains.rsi/icon.png b/Resources/Textures/ADT/Clothing/Mask/payday_chains.rsi/icon.png new file mode 100644 index 00000000000..fc7401cf29d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Mask/payday_chains.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Mask/payday_chains.rsi/meta.json b/Resources/Textures/ADT/Clothing/Mask/payday_chains.rsi/meta.json new file mode 100644 index 00000000000..00614f1f89e --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Mask/payday_chains.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Mask/payday_dallas.rsi/equipped-MASK.png b/Resources/Textures/ADT/Clothing/Mask/payday_dallas.rsi/equipped-MASK.png new file mode 100644 index 00000000000..e4ad0e40eda Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Mask/payday_dallas.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/ADT/Clothing/Mask/payday_dallas.rsi/icon.png b/Resources/Textures/ADT/Clothing/Mask/payday_dallas.rsi/icon.png new file mode 100644 index 00000000000..cb7b2429c05 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Mask/payday_dallas.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Mask/payday_dallas.rsi/meta.json b/Resources/Textures/ADT/Clothing/Mask/payday_dallas.rsi/meta.json new file mode 100644 index 00000000000..00614f1f89e --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Mask/payday_dallas.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Mask/payday_houston.rsi/equipped-MASK.png b/Resources/Textures/ADT/Clothing/Mask/payday_houston.rsi/equipped-MASK.png new file mode 100644 index 00000000000..1450b19ddc6 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Mask/payday_houston.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/ADT/Clothing/Mask/payday_houston.rsi/icon.png b/Resources/Textures/ADT/Clothing/Mask/payday_houston.rsi/icon.png new file mode 100644 index 00000000000..d7705e2dd51 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Mask/payday_houston.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Mask/payday_houston.rsi/meta.json b/Resources/Textures/ADT/Clothing/Mask/payday_houston.rsi/meta.json new file mode 100644 index 00000000000..00614f1f89e --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Mask/payday_houston.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Mask/payday_wolf.rsi/equipped-MASK.png b/Resources/Textures/ADT/Clothing/Mask/payday_wolf.rsi/equipped-MASK.png new file mode 100644 index 00000000000..fd606238abf Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Mask/payday_wolf.rsi/equipped-MASK.png differ diff --git a/Resources/Textures/ADT/Clothing/Mask/payday_wolf.rsi/icon.png b/Resources/Textures/ADT/Clothing/Mask/payday_wolf.rsi/icon.png new file mode 100644 index 00000000000..428567d7e3f Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Mask/payday_wolf.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Mask/payday_wolf.rsi/meta.json b/Resources/Textures/ADT/Clothing/Mask/payday_wolf.rsi/meta.json new file mode 100644 index 00000000000..00614f1f89e --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Mask/payday_wolf.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-MASK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Mask/tagilla_mask.rsi/equipped-HELMET.png b/Resources/Textures/ADT/Clothing/Mask/tagilla_mask.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..673fb1459c0 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Mask/tagilla_mask.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/ADT/Clothing/Mask/tagilla_mask.rsi/icon.png b/Resources/Textures/ADT/Clothing/Mask/tagilla_mask.rsi/icon.png new file mode 100644 index 00000000000..3eab86b4bd8 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Mask/tagilla_mask.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Mask/tagilla_mask.rsi/meta.json b/Resources/Textures/ADT/Clothing/Mask/tagilla_mask.rsi/meta.json new file mode 100644 index 00000000000..1cd4d16ba5c --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Mask/tagilla_mask.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Neck/Misc/clowncollar.rsi/equipped-NECK.png b/Resources/Textures/ADT/Clothing/Neck/Misc/clowncollar.rsi/equipped-NECK.png new file mode 100644 index 00000000000..32d8e05ac8b Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Neck/Misc/clowncollar.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/ADT/Clothing/Neck/Misc/clowncollar.rsi/icon.png b/Resources/Textures/ADT/Clothing/Neck/Misc/clowncollar.rsi/icon.png new file mode 100644 index 00000000000..4347b2093a5 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Neck/Misc/clowncollar.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Neck/Misc/clowncollar.rsi/meta.json b/Resources/Textures/ADT/Clothing/Neck/Misc/clowncollar.rsi/meta.json new file mode 100644 index 00000000000..cb08957df85 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Neck/Misc/clowncollar.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Neck/Misc/vampire_cloak.rsi/equipped-NECK.png b/Resources/Textures/ADT/Clothing/Neck/Misc/vampire_cloak.rsi/equipped-NECK.png new file mode 100644 index 00000000000..6a4ae4ddfd1 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Neck/Misc/vampire_cloak.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/ADT/Clothing/Neck/Misc/vampire_cloak.rsi/icon.png b/Resources/Textures/ADT/Clothing/Neck/Misc/vampire_cloak.rsi/icon.png new file mode 100644 index 00000000000..dbbc4a54454 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Neck/Misc/vampire_cloak.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Neck/Misc/vampire_cloak.rsi/meta.json b/Resources/Textures/ADT/Clothing/Neck/Misc/vampire_cloak.rsi/meta.json new file mode 100644 index 00000000000..cb08957df85 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Neck/Misc/vampire_cloak.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/CSIJ_armor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/CSIJ_armor.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..f0add39aa5e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/CSIJ_armor.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/CSIJ_armor.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/CSIJ_armor.rsi/icon.png new file mode 100644 index 00000000000..fbf6822587b Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/CSIJ_armor.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/CSIJ_armor.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/CSIJ_armor.rsi/meta.json new file mode 100644 index 00000000000..47f701952b5 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/CSIJ_armor.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/killa_armor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/killa_armor.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..d29bc5a083e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/killa_armor.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/killa_armor.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/killa_armor.rsi/icon.png new file mode 100644 index 00000000000..482cc7b7957 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/killa_armor.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/killa_armor.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/killa_armor.rsi/inhand-left.png new file mode 100644 index 00000000000..7f508fbe1c2 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/killa_armor.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/killa_armor.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/killa_armor.rsi/inhand-right.png new file mode 100644 index 00000000000..c315eccf5e8 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/killa_armor.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/killa_armor.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/killa_armor.rsi/meta.json new file mode 100644 index 00000000000..6624d79f7cb --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/killa_armor.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/tagilla_armor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/tagilla_armor.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..36cae1734d3 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/tagilla_armor.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/tagilla_armor.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/tagilla_armor.rsi/icon.png new file mode 100644 index 00000000000..fa25ecdef0e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/tagilla_armor.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/tagilla_armor.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/tagilla_armor.rsi/inhand-left.png new file mode 100644 index 00000000000..21324576b2c Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/tagilla_armor.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/tagilla_armor.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/tagilla_armor.rsi/inhand-right.png new file mode 100644 index 00000000000..ed6d6581c58 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/tagilla_armor.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Armor/tagilla_armor.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/tagilla_armor.rsi/meta.json new file mode 100644 index 00000000000..6624d79f7cb --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Armor/tagilla_armor.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hotline_student.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hotline_student.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..d11a8332249 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hotline_student.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hotline_student.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hotline_student.rsi/icon.png new file mode 100644 index 00000000000..41cbbc5abab Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hotline_student.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hotline_student.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hotline_student.rsi/inhand-left.png new file mode 100644 index 00000000000..f23dff94742 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hotline_student.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hotline_student.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hotline_student.rsi/inhand-right.png new file mode 100644 index 00000000000..42ce302d50e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hotline_student.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hotline_student.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hotline_student.rsi/meta.json new file mode 100644 index 00000000000..6624d79f7cb --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/hotline_student.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/jason.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/jason.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..e68b1d1ba18 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/jason.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/jason.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/jason.rsi/icon.png new file mode 100644 index 00000000000..3db9863026b Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/jason.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/jason.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/jason.rsi/inhand-left.png new file mode 100644 index 00000000000..74d414624fe Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/jason.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/jason.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/jason.rsi/inhand-right.png new file mode 100644 index 00000000000..9aabe3160d9 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/jason.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Coats/jason.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/jason.rsi/meta.json new file mode 100644 index 00000000000..6624d79f7cb --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Coats/jason.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_med_hardsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_med_hardsuit.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..f4f17aa08f0 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_med_hardsuit.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_med_hardsuit.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_med_hardsuit.rsi/icon.png new file mode 100644 index 00000000000..212c3e55f12 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_med_hardsuit.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_med_hardsuit.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_med_hardsuit.rsi/meta.json new file mode 100644 index 00000000000..be46e0f388a --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_med_hardsuit.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: ihaveaeye", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_servant_hardsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_servant_hardsuit.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..f4f17aa08f0 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_servant_hardsuit.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_servant_hardsuit.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_servant_hardsuit.rsi/icon.png new file mode 100644 index 00000000000..bc916800e2a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_servant_hardsuit.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_servant_hardsuit.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_servant_hardsuit.rsi/meta.json new file mode 100644 index 00000000000..be46e0f388a --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_servant_hardsuit.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: ihaveaeye", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_sunshine_hardsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_sunshine_hardsuit.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..2d76160faab Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_sunshine_hardsuit.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_sunshine_hardsuit.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_sunshine_hardsuit.rsi/icon.png new file mode 100644 index 00000000000..3c75f277b60 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_sunshine_hardsuit.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_sunshine_hardsuit.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_sunshine_hardsuit.rsi/meta.json new file mode 100644 index 00000000000..be46e0f388a --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Hardsuits/event_sunshine_hardsuit.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: ihaveaeye", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/black_cardigan.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/black_cardigan.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..d00fd7aa3c0 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/black_cardigan.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/black_cardigan.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/black_cardigan.rsi/icon.png new file mode 100644 index 00000000000..610ac780fa5 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/black_cardigan.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/black_cardigan.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/black_cardigan.rsi/meta.json new file mode 100644 index 00000000000..7adf5eea272 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/black_cardigan.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:lunalita", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/cupidon_wings.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/cupidon_wings.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..614b78b1f86 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/cupidon_wings.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/cupidon_wings.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/cupidon_wings.rsi/icon.png new file mode 100644 index 00000000000..7dc1382df4e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/cupidon_wings.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/cupidon_wings.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/cupidon_wings.rsi/meta.json new file mode 100644 index 00000000000..7adf5eea272 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/cupidon_wings.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:lunalita", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/red_cardigan.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/red_cardigan.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..24de8378c9c Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/red_cardigan.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/red_cardigan.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/red_cardigan.rsi/icon.png new file mode 100644 index 00000000000..abd3b1c6644 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/red_cardigan.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/red_cardigan.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/red_cardigan.rsi/meta.json new file mode 100644 index 00000000000..7adf5eea272 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/red_cardigan.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:lunalita", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/vergile_cloak.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/vergile_cloak.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..a3ad3bfccf6 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/vergile_cloak.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/vergile_cloak.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/vergile_cloak.rsi/icon.png new file mode 100644 index 00000000000..e1e2f24ad65 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/vergile_cloak.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/Misc/vergile_cloak.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/vergile_cloak.rsi/meta.json new file mode 100644 index 00000000000..47f701952b5 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/Misc/vergile_cloak.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/fur_coat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/fur_coat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..5164925471e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/fur_coat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/fur_coat.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/fur_coat.rsi/icon.png new file mode 100644 index 00000000000..8e7829bfd97 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/fur_coat.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/fur_coat.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/fur_coat.rsi/inhand-left.png new file mode 100644 index 00000000000..cda6275f2c7 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/fur_coat.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/fur_coat.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/fur_coat.rsi/inhand-right.png new file mode 100644 index 00000000000..a4c041bc6a0 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/fur_coat.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/fur_coat.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/fur_coat.rsi/meta.json new file mode 100644 index 00000000000..fd6d3fa29cf --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/fur_coat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "creared by: anvel (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/lower_fur_coat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/lower_fur_coat.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..89752c7aeac Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/lower_fur_coat.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/lower_fur_coat.rsi/icon.png b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/lower_fur_coat.rsi/icon.png new file mode 100644 index 00000000000..dc740d053dc Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/lower_fur_coat.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/lower_fur_coat.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/lower_fur_coat.rsi/inhand-left.png new file mode 100644 index 00000000000..25a13220307 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/lower_fur_coat.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/lower_fur_coat.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/lower_fur_coat.rsi/inhand-right.png new file mode 100644 index 00000000000..338522ee86d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/lower_fur_coat.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/lower_fur_coat.rsi/meta.json b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/lower_fur_coat.rsi/meta.json new file mode 100644 index 00000000000..c3e948bd233 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/OuterClothing/WinterCoats/lower_fur_coat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "creared by: descente (discord:still_smokin)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Shoes/Misc/clownnightmareshoes.rsi/equipped-FEET.png b/Resources/Textures/ADT/Clothing/Shoes/Misc/clownnightmareshoes.rsi/equipped-FEET.png new file mode 100644 index 00000000000..96755aa4aea Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Shoes/Misc/clownnightmareshoes.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/ADT/Clothing/Shoes/Misc/clownnightmareshoes.rsi/icon.png b/Resources/Textures/ADT/Clothing/Shoes/Misc/clownnightmareshoes.rsi/icon.png new file mode 100644 index 00000000000..e5efdfc99df Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Shoes/Misc/clownnightmareshoes.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Shoes/Misc/clownnightmareshoes.rsi/meta.json b/Resources/Textures/ADT/Clothing/Shoes/Misc/clownnightmareshoes.rsi/meta.json new file mode 100644 index 00000000000..a6bb6d3e254 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Shoes/Misc/clownnightmareshoes.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Shoes/Misc/greyclownshoes.rsi/equipped-FEET.png b/Resources/Textures/ADT/Clothing/Shoes/Misc/greyclownshoes.rsi/equipped-FEET.png new file mode 100644 index 00000000000..c44a4b610d0 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Shoes/Misc/greyclownshoes.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/ADT/Clothing/Shoes/Misc/greyclownshoes.rsi/icon.png b/Resources/Textures/ADT/Clothing/Shoes/Misc/greyclownshoes.rsi/icon.png new file mode 100644 index 00000000000..519deb5f49a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Shoes/Misc/greyclownshoes.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Shoes/Misc/greyclownshoes.rsi/meta.json b/Resources/Textures/ADT/Clothing/Shoes/Misc/greyclownshoes.rsi/meta.json new file mode 100644 index 00000000000..a6bb6d3e254 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Shoes/Misc/greyclownshoes.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_gnome.rsi/meta.json b/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_gnome.rsi/meta.json deleted file mode 100644 index 4d1063c16c7..00000000000 --- a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_gnome.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:dion_clawed", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-SOCKS", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_green.rsi/meta.json b/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_green.rsi/meta.json deleted file mode 100644 index 4d1063c16c7..00000000000 --- a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_green.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:dion_clawed", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-SOCKS", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_heart.rsi/meta.json b/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_heart.rsi/meta.json index 4d1063c16c7..cbc1d2809cf 100644 --- a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_heart.rsi/meta.json +++ b/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_heart.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:dion_clawed", + "copyright": "Created by discord: dion_clawed for Adventure Time", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_red.rsi/meta.json b/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_red.rsi/meta.json deleted file mode 100644 index 4d1063c16c7..00000000000 --- a/Resources/Textures/ADT/Clothing/Underwear/Socks/socks_red.rsi/meta.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:dion_clawed", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-SOCKS", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/ADT/Clothing/Underwear/Socks/stockings_heart.rsi/meta.json b/Resources/Textures/ADT/Clothing/Underwear/Socks/stockings_heart.rsi/meta.json index 5c54942eb90..d63379ecf6a 100644 --- a/Resources/Textures/ADT/Clothing/Underwear/Socks/stockings_heart.rsi/meta.json +++ b/Resources/Textures/ADT/Clothing/Underwear/Socks/stockings_heart.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:lunalita", + "copyright": "Created by discord: lunalita for Adventure Time", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..164db671164 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress.rsi/icon.png new file mode 100644 index 00000000000..40a472a54ca Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress.rsi/inhand-left.png new file mode 100644 index 00000000000..f5e9049cd24 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress.rsi/inhand-right.png new file mode 100644 index 00000000000..2584b8a4817 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress.rsi/meta.json new file mode 100644 index 00000000000..ee8fad9baf7 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "creared by: descente (discord:still_smokin)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress_alt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress_alt.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..bab52c48624 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress_alt.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress_alt.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress_alt.rsi/icon.png new file mode 100644 index 00000000000..4d6628a0a8b Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress_alt.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress_alt.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress_alt.rsi/inhand-left.png new file mode 100644 index 00000000000..5e54a72329a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress_alt.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress_alt.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress_alt.rsi/inhand-right.png new file mode 100644 index 00000000000..8d09f70b02d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress_alt.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress_alt.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress_alt.rsi/meta.json new file mode 100644 index 00000000000..ee8fad9baf7 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/burgundy_dress_alt.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "creared by: descente (discord:still_smokin)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/cocktail_dress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/cocktail_dress.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..0dbdada0cd2 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/cocktail_dress.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/cocktail_dress.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/cocktail_dress.rsi/icon.png new file mode 100644 index 00000000000..70e71211f35 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/cocktail_dress.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/cocktail_dress.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/cocktail_dress.rsi/inhand-left.png new file mode 100644 index 00000000000..f23c2b1eb9a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/cocktail_dress.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/cocktail_dress.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/cocktail_dress.rsi/inhand-right.png new file mode 100644 index 00000000000..e2aeb4be85b Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/cocktail_dress.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/cocktail_dress.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/cocktail_dress.rsi/meta.json new file mode 100644 index 00000000000..6b308b2f4fe --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/cocktail_dress.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "creared by: anvel (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/evening_dress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/evening_dress.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..4fd7e176a73 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/evening_dress.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/evening_dress.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/evening_dress.rsi/icon.png new file mode 100644 index 00000000000..99e47cab57d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/evening_dress.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/evening_dress.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/evening_dress.rsi/inhand-left.png new file mode 100644 index 00000000000..2a80403aae9 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/evening_dress.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/evening_dress.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/evening_dress.rsi/inhand-right.png new file mode 100644 index 00000000000..67ef1bcd324 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/evening_dress.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/evening_dress.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/evening_dress.rsi/meta.json new file mode 100644 index 00000000000..ee8fad9baf7 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/evening_dress.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "creared by: descente (discord:still_smokin)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/goth_dress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/goth_dress.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..ff6a992969d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/goth_dress.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/goth_dress.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/goth_dress.rsi/icon.png new file mode 100644 index 00000000000..a79578b0eff Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/goth_dress.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/goth_dress.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/goth_dress.rsi/inhand-left.png new file mode 100644 index 00000000000..77bbe9ba5f4 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/goth_dress.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/goth_dress.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/goth_dress.rsi/inhand-right.png new file mode 100644 index 00000000000..d33c619cffa Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/goth_dress.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/goth_dress.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/goth_dress.rsi/meta.json new file mode 100644 index 00000000000..ee8fad9baf7 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/goth_dress.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "creared by: descente (discord:still_smokin)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlblue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlblue.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..34220381350 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlblue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlblue.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlblue.rsi/icon.png new file mode 100644 index 00000000000..ba211584479 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlblue.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlblue.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlblue.rsi/inhand-left.png new file mode 100644 index 00000000000..b523a553f65 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlblue.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlblue.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlblue.rsi/inhand-right.png new file mode 100644 index 00000000000..ef6f4684f19 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlblue.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlblue.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlblue.rsi/meta.json new file mode 100644 index 00000000000..dbb0c153a43 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlblue.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by SHIONE (discord: shi106) for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlgreen.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlgreen.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..c71ab3541a7 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlgreen.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlgreen.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlgreen.rsi/icon.png new file mode 100644 index 00000000000..3c4bfbabce9 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlgreen.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlgreen.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlgreen.rsi/inhand-left.png new file mode 100644 index 00000000000..f294ffae121 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlgreen.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlgreen.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlgreen.rsi/inhand-right.png new file mode 100644 index 00000000000..3307e5b3ae4 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlgreen.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlgreen.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlgreen.rsi/meta.json new file mode 100644 index 00000000000..dbb0c153a43 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlgreen.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by SHIONE (discord: shi106) for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlred.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlred.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..72911c8446b Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlred.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlred.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlred.rsi/icon.png new file mode 100644 index 00000000000..5c3239aa478 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlred.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlred.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlred.rsi/inhand-left.png new file mode 100644 index 00000000000..0c446288616 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlred.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlred.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlred.rsi/inhand-right.png new file mode 100644 index 00000000000..6d976164b07 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlred.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlred.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlred.rsi/meta.json new file mode 100644 index 00000000000..dbb0c153a43 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlred.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by SHIONE (discord: shi106) for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshort.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshort.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..47a4506698a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshort.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshort.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshort.rsi/icon.png new file mode 100644 index 00000000000..7928ce3c48e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshort.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshort.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshort.rsi/inhand-left.png new file mode 100644 index 00000000000..a5414a220ab Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshort.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshort.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshort.rsi/inhand-right.png new file mode 100644 index 00000000000..648c7da3054 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshort.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshort.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshort.rsi/meta.json new file mode 100644 index 00000000000..dbb0c153a43 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshort.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by SHIONE (discord: shi106) for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortblue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortblue.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..713d4200451 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortblue.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortblue.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortblue.rsi/icon.png new file mode 100644 index 00000000000..9991ae02383 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortblue.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortblue.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortblue.rsi/inhand-left.png new file mode 100644 index 00000000000..35e66f7a565 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortblue.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortblue.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortblue.rsi/inhand-right.png new file mode 100644 index 00000000000..518ca739ba8 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortblue.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortblue.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortblue.rsi/meta.json new file mode 100644 index 00000000000..dbb0c153a43 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortblue.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by SHIONE (discord: shi106) for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortgreen.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortgreen.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..ce83538933e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortgreen.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortgreen.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortgreen.rsi/icon.png new file mode 100644 index 00000000000..677e4ee0adf Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortgreen.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortgreen.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortgreen.rsi/inhand-left.png new file mode 100644 index 00000000000..29331409589 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortgreen.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortgreen.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortgreen.rsi/inhand-right.png new file mode 100644 index 00000000000..f577702f989 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortgreen.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortgreen.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortgreen.rsi/meta.json new file mode 100644 index 00000000000..dbb0c153a43 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortgreen.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by SHIONE (discord: shi106) for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortred.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortred.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..00c4ecc06eb Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortred.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortred.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortred.rsi/icon.png new file mode 100644 index 00000000000..c6a338881f4 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortred.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortred.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortred.rsi/inhand-left.png new file mode 100644 index 00000000000..a4ddf3150a9 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortred.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortred.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortred.rsi/inhand-right.png new file mode 100644 index 00000000000..0b6873e7d36 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortred.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortred.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortred.rsi/meta.json new file mode 100644 index 00000000000..dbb0c153a43 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/oktoberfest_dirndlshortred.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by SHIONE (discord: shi106) for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/rabbit_dress.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/rabbit_dress.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..18bbfa479b8 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/rabbit_dress.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/rabbit_dress.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/rabbit_dress.rsi/icon.png new file mode 100644 index 00000000000..f26536184c4 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/rabbit_dress.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/rabbit_dress.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/rabbit_dress.rsi/inhand-left.png new file mode 100644 index 00000000000..51686989876 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/rabbit_dress.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/rabbit_dress.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/rabbit_dress.rsi/inhand-right.png new file mode 100644 index 00000000000..507921ceba7 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/rabbit_dress.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/rabbit_dress.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/rabbit_dress.rsi/meta.json new file mode 100644 index 00000000000..ec6c45aeede --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpskirt/rabbit_dress.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "ADT Team", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/bio_merc.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/bio_merc.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..656476c570b Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/bio_merc.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/bio_merc.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/bio_merc.rsi/icon.png new file mode 100644 index 00000000000..39c78a645e6 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/bio_merc.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/bio_merc.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/bio_merc.rsi/inhand-left.png new file mode 100644 index 00000000000..44685c7650b Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/bio_merc.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/bio_merc.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/bio_merc.rsi/inhand-right.png new file mode 100644 index 00000000000..6bbfb2449f6 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/bio_merc.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/bio_merc.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/bio_merc.rsi/meta.json new file mode 100644 index 00000000000..faa6f974e5a --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/bio_merc.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_abibas.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_abibas.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..9eed85c6eba Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_abibas.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_abibas.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_abibas.rsi/icon.png new file mode 100644 index 00000000000..17f66126b0e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_abibas.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_abibas.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_abibas.rsi/inhand-left.png new file mode 100644 index 00000000000..dca9cee94e3 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_abibas.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_abibas.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_abibas.rsi/inhand-right.png new file mode 100644 index 00000000000..3a192434e06 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_abibas.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_abibas.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_abibas.rsi/meta.json new file mode 100644 index 00000000000..72278c92219 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/black_abibas.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "ADT Team", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/bright_man_suit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/bright_man_suit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..a7b7b6f3b59 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/bright_man_suit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/bright_man_suit.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/bright_man_suit.rsi/icon.png new file mode 100644 index 00000000000..7a768814892 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/bright_man_suit.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/bright_man_suit.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/bright_man_suit.rsi/meta.json new file mode 100644 index 00000000000..6f16acc25fc --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/bright_man_suit.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:lunalita", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/cupidon_suit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/cupidon_suit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..dbc34d05007 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/cupidon_suit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/cupidon_suit.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/cupidon_suit.rsi/icon.png new file mode 100644 index 00000000000..a624818da36 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/cupidon_suit.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/cupidon_suit.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/cupidon_suit.rsi/meta.json new file mode 100644 index 00000000000..6f16acc25fc --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/cupidon_suit.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:lunalita", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/dark_man_suit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/dark_man_suit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..00f0c9621b5 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/dark_man_suit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/dark_man_suit.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/dark_man_suit.rsi/icon.png new file mode 100644 index 00000000000..996233b452b Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/dark_man_suit.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/dark_man_suit.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/dark_man_suit.rsi/meta.json new file mode 100644 index 00000000000..6f16acc25fc --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/dark_man_suit.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:lunalita", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/djclown.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/djclown.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..fb9d470a06e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/djclown.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/djclown.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/djclown.rsi/icon.png new file mode 100644 index 00000000000..318d940472a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/djclown.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/djclown.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/djclown.rsi/inhand-left.png new file mode 100644 index 00000000000..25d024f124b Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/djclown.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/djclown.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/djclown.rsi/inhand-right.png new file mode 100644 index 00000000000..8c3dc1c01b0 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/djclown.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/djclown.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/djclown.rsi/meta.json new file mode 100644 index 00000000000..faa6f974e5a --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/djclown.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/dude_shirt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/dude_shirt.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..85eeec65077 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/dude_shirt.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/dude_shirt.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/dude_shirt.rsi/icon.png new file mode 100644 index 00000000000..d12bb502c31 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/dude_shirt.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/dude_shirt.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/dude_shirt.rsi/inhand-left.png new file mode 100644 index 00000000000..580f1ff674d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/dude_shirt.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/dude_shirt.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/dude_shirt.rsi/inhand-right.png new file mode 100644 index 00000000000..107a0197a09 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/dude_shirt.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/dude_shirt.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/dude_shirt.rsi/meta.json new file mode 100644 index 00000000000..faa6f974e5a --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/dude_shirt.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hotlinemiami.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hotlinemiami.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..024692d10a3 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hotlinemiami.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hotlinemiami.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hotlinemiami.rsi/icon.png new file mode 100644 index 00000000000..21658363836 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hotlinemiami.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hotlinemiami.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hotlinemiami.rsi/inhand-left.png new file mode 100644 index 00000000000..b042b5cb6b3 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hotlinemiami.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hotlinemiami.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hotlinemiami.rsi/inhand-right.png new file mode 100644 index 00000000000..53a7a3d3d02 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hotlinemiami.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hotlinemiami.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hotlinemiami.rsi/meta.json new file mode 100644 index 00000000000..faa6f974e5a --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/hotlinemiami.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jason.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jason.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..60ac9b3ba26 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jason.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jason.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jason.rsi/icon.png new file mode 100644 index 00000000000..466b366c500 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jason.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jason.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jason.rsi/inhand-left.png new file mode 100644 index 00000000000..31600c17d78 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jason.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jason.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jason.rsi/inhand-right.png new file mode 100644 index 00000000000..8fa716b7c2b Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jason.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jason.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jason.rsi/meta.json new file mode 100644 index 00000000000..faa6f974e5a --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/jason.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/michael_suit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/michael_suit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..5111c7a26af Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/michael_suit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/michael_suit.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/michael_suit.rsi/icon.png new file mode 100644 index 00000000000..0e0c91ba714 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/michael_suit.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/michael_suit.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/michael_suit.rsi/meta.json new file mode 100644 index 00000000000..440ab189f0b --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/michael_suit.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluecheck.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluecheck.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..f3e78960678 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluecheck.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluecheck.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluecheck.rsi/icon.png new file mode 100644 index 00000000000..bf47b4ee541 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluecheck.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluecheck.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluecheck.rsi/inhand-left.png new file mode 100644 index 00000000000..160bda686ea Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluecheck.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluecheck.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluecheck.rsi/inhand-right.png new file mode 100644 index 00000000000..c68acc84cf9 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluecheck.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluecheck.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluecheck.rsi/meta.json new file mode 100644 index 00000000000..dbb0c153a43 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluecheck.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by SHIONE (discord: shi106) for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluevest.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluevest.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..ca9750774d5 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluevest.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluevest.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluevest.rsi/icon.png new file mode 100644 index 00000000000..28d5ae80958 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluevest.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluevest.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluevest.rsi/inhand-left.png new file mode 100644 index 00000000000..635b6321d55 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluevest.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluevest.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluevest.rsi/inhand-right.png new file mode 100644 index 00000000000..9cf9fec976d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluevest.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluevest.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluevest.rsi/meta.json new file mode 100644 index 00000000000..dbb0c153a43 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_bluevest.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by SHIONE (discord: shi106) for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greencheck.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greencheck.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..5b8a609c967 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greencheck.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greencheck.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greencheck.rsi/icon.png new file mode 100644 index 00000000000..2a25488f5fe Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greencheck.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greencheck.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greencheck.rsi/inhand-left.png new file mode 100644 index 00000000000..ff8e256458c Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greencheck.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greencheck.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greencheck.rsi/inhand-right.png new file mode 100644 index 00000000000..16eeb5e5f5e Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greencheck.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greencheck.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greencheck.rsi/meta.json new file mode 100644 index 00000000000..dbb0c153a43 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greencheck.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by SHIONE (discord: shi106) for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greenvest.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greenvest.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..2b9c83070ee Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greenvest.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greenvest.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greenvest.rsi/icon.png new file mode 100644 index 00000000000..c8f1f40910c Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greenvest.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greenvest.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greenvest.rsi/inhand-left.png new file mode 100644 index 00000000000..ec6d8c5d17d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greenvest.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greenvest.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greenvest.rsi/inhand-right.png new file mode 100644 index 00000000000..e9419a7f877 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greenvest.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greenvest.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greenvest.rsi/meta.json new file mode 100644 index 00000000000..dbb0c153a43 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_greenvest.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by SHIONE (discord: shi106) for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redcheck.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redcheck.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..1b872d90938 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redcheck.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redcheck.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redcheck.rsi/icon.png new file mode 100644 index 00000000000..e8ba1ef0ecc Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redcheck.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redcheck.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redcheck.rsi/inhand-left.png new file mode 100644 index 00000000000..f10759b4121 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redcheck.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redcheck.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redcheck.rsi/inhand-right.png new file mode 100644 index 00000000000..2634165747a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redcheck.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redcheck.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redcheck.rsi/meta.json new file mode 100644 index 00000000000..dbb0c153a43 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redcheck.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by SHIONE (discord: shi106) for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redvest.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redvest.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..7bec87c72b8 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redvest.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redvest.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redvest.rsi/icon.png new file mode 100644 index 00000000000..076b7ff98c4 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redvest.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redvest.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redvest.rsi/inhand-left.png new file mode 100644 index 00000000000..467d968eaea Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redvest.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redvest.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redvest.rsi/inhand-right.png new file mode 100644 index 00000000000..d12c407597d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redvest.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redvest.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redvest.rsi/meta.json new file mode 100644 index 00000000000..dbb0c153a43 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_redvest.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by SHIONE (discord: shi106) for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_white.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_white.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..9d6d81cdc71 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_white.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_white.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_white.rsi/icon.png new file mode 100644 index 00000000000..feba89a0c5d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_white.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_white.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_white.rsi/inhand-left.png new file mode 100644 index 00000000000..eaebf597e4f Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_white.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_white.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_white.rsi/inhand-right.png new file mode 100644 index 00000000000..2c2cba8d19c Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_white.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_white.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_white.rsi/meta.json new file mode 100644 index 00000000000..dbb0c153a43 --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/oktoberfest_male_white.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by SHIONE (discord: shi106) for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/otherworld_clown.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/otherworld_clown.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..c613d4c76b4 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/otherworld_clown.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/otherworld_clown.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/otherworld_clown.rsi/icon.png new file mode 100644 index 00000000000..d9ab66df9e3 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/otherworld_clown.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/otherworld_clown.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/otherworld_clown.rsi/inhand-left.png new file mode 100644 index 00000000000..af3d1e62fc5 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/otherworld_clown.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/otherworld_clown.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/otherworld_clown.rsi/inhand-right.png new file mode 100644 index 00000000000..464c1fc7466 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/otherworld_clown.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/otherworld_clown.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/otherworld_clown.rsi/meta.json new file mode 100644 index 00000000000..faa6f974e5a --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/otherworld_clown.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redsweaterheart_suit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redsweaterheart_suit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..31319989279 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redsweaterheart_suit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redsweaterheart_suit.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redsweaterheart_suit.rsi/icon.png new file mode 100644 index 00000000000..b458d91d58f Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redsweaterheart_suit.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redsweaterheart_suit.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redsweaterheart_suit.rsi/meta.json new file mode 100644 index 00000000000..6f16acc25fc --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/redsweaterheart_suit.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:lunalita", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/romantic_suit.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/romantic_suit.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000..a3eefe86a8b Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/romantic_suit.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/romantic_suit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/romantic_suit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..f41cb31a0c4 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/romantic_suit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/romantic_suit.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/romantic_suit.rsi/icon.png new file mode 100644 index 00000000000..7e3755d58fa Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/romantic_suit.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/romantic_suit.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/romantic_suit.rsi/inhand-left.png new file mode 100644 index 00000000000..c5c5296a6cb Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/romantic_suit.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/romantic_suit.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/romantic_suit.rsi/inhand-right.png new file mode 100644 index 00000000000..5dcd4bb625d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/romantic_suit.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/romantic_suit.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/romantic_suit.rsi/meta.json new file mode 100644 index 00000000000..61c5dd5d72e --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/romantic_suit.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/servant_evil.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/servant_evil.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..ce99886254a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/servant_evil.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/servant_evil.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/servant_evil.rsi/icon.png new file mode 100644 index 00000000000..b1890b50fbd Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/servant_evil.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/servant_evil.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/servant_evil.rsi/inhand-left.png new file mode 100644 index 00000000000..e041e9d3afa Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/servant_evil.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/servant_evil.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/servant_evil.rsi/inhand-right.png new file mode 100644 index 00000000000..84b0dfc03a8 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/servant_evil.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/servant_evil.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/servant_evil.rsi/meta.json new file mode 100644 index 00000000000..faa6f974e5a --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/servant_evil.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/suit_hunterdemon.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/suit_hunterdemon.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..09f1ea58728 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/suit_hunterdemon.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/suit_hunterdemon.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/suit_hunterdemon.rsi/icon.png new file mode 100644 index 00000000000..4daded4cd83 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/suit_hunterdemon.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/suit_hunterdemon.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/suit_hunterdemon.rsi/meta.json new file mode 100644 index 00000000000..440ab189f0b --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/suit_hunterdemon.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/tagilla_pants.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/tagilla_pants.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..dfd6f51a140 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/tagilla_pants.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/tagilla_pants.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/tagilla_pants.rsi/icon.png new file mode 100644 index 00000000000..a2d884d447b Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/tagilla_pants.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/tagilla_pants.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/tagilla_pants.rsi/inhand-left.png new file mode 100644 index 00000000000..caeaaf536f7 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/tagilla_pants.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/tagilla_pants.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/tagilla_pants.rsi/inhand-right.png new file mode 100644 index 00000000000..204c3219832 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/tagilla_pants.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/tagilla_pants.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/tagilla_pants.rsi/meta.json new file mode 100644 index 00000000000..faa6f974e5a --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/tagilla_pants.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtle_heart.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtle_heart.rsi/equipped-INNERCLOTHING-monkey.png new file mode 100644 index 00000000000..e40b5a276de Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtle_heart.rsi/equipped-INNERCLOTHING-monkey.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtle_heart.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtle_heart.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..007665ededb Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtle_heart.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtle_heart.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtle_heart.rsi/icon.png new file mode 100644 index 00000000000..aaa1491cbda Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtle_heart.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtle_heart.rsi/inhand-left.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtle_heart.rsi/inhand-left.png new file mode 100644 index 00000000000..c3431797284 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtle_heart.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtle_heart.rsi/inhand-right.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtle_heart.rsi/inhand-right.png new file mode 100644 index 00000000000..696b7cdc20a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtle_heart.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtle_heart.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtle_heart.rsi/meta.json new file mode 100644 index 00000000000..61c5dd5d72e --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/turtle_heart.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "equipped-INNERCLOTHING-monkey", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vampire_suit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vampire_suit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..9687e2e0155 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vampire_suit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vampire_suit.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vampire_suit.rsi/icon.png new file mode 100644 index 00000000000..c81805ac86c Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vampire_suit.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vampire_suit.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vampire_suit.rsi/meta.json new file mode 100644 index 00000000000..440ab189f0b --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vampire_suit.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vergile_suit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vergile_suit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..51ace2c7b0d Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vergile_suit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vergile_suit.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vergile_suit.rsi/icon.png new file mode 100644 index 00000000000..d8356db4a92 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vergile_suit.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vergile_suit.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vergile_suit.rsi/meta.json new file mode 100644 index 00000000000..440ab189f0b --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vergile_suit.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vyasov.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vyasov.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..492d6d38273 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vyasov.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vyasov.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vyasov.rsi/icon.png new file mode 100644 index 00000000000..5b655461181 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vyasov.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vyasov.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vyasov.rsi/meta.json new file mode 100644 index 00000000000..440ab189f0b --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/vyasov.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/whitesweaterheart_suit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/whitesweaterheart_suit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..f8c0d9c4d96 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/whitesweaterheart_suit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/whitesweaterheart_suit.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/whitesweaterheart_suit.rsi/icon.png new file mode 100644 index 00000000000..e85aea4a209 Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/whitesweaterheart_suit.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/whitesweaterheart_suit.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/whitesweaterheart_suit.rsi/meta.json new file mode 100644 index 00000000000..6f16acc25fc --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/whitesweaterheart_suit.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:lunalita", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/xenomorph_suit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/xenomorph_suit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..95459ff2b9a Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/xenomorph_suit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/xenomorph_suit.rsi/icon.png b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/xenomorph_suit.rsi/icon.png new file mode 100644 index 00000000000..b5c0fb18b1f Binary files /dev/null and b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/xenomorph_suit.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/xenomorph_suit.rsi/meta.json b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/xenomorph_suit.rsi/meta.json new file mode 100644 index 00000000000..440ab189f0b --- /dev/null +++ b/Resources/Textures/ADT/Clothing/Uniforms/Jumpsuit/xenomorph_suit.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Decals/petals.rsi/flowow.png b/Resources/Textures/ADT/Decals/petals.rsi/flowow.png new file mode 100644 index 00000000000..6e6eee45cfa Binary files /dev/null and b/Resources/Textures/ADT/Decals/petals.rsi/flowow.png differ diff --git a/Resources/Textures/ADT/Decals/petals.rsi/meta.json b/Resources/Textures/ADT/Decals/petals.rsi/meta.json new file mode 100644 index 00000000000..d5e6653d9f5 --- /dev/null +++ b/Resources/Textures/ADT/Decals/petals.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "creared by: descente (discord:still_smokin)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "flowow" + } + ] +} diff --git a/Resources/Textures/ADT/Mobs/Animals/chicken_parts.rsi/l_hand.png b/Resources/Textures/ADT/Mobs/Animals/chicken_parts.rsi/l_hand.png new file mode 100644 index 00000000000..6229a62310a Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Animals/chicken_parts.rsi/l_hand.png differ diff --git a/Resources/Textures/ADT/Mobs/Animals/chicken_parts.rsi/l_leg.png b/Resources/Textures/ADT/Mobs/Animals/chicken_parts.rsi/l_leg.png new file mode 100644 index 00000000000..f3071074fd7 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Animals/chicken_parts.rsi/l_leg.png differ diff --git a/Resources/Textures/ADT/Mobs/Animals/chicken_parts.rsi/meta.json b/Resources/Textures/ADT/Mobs/Animals/chicken_parts.rsi/meta.json new file mode 100644 index 00000000000..7f7d8ad85ff --- /dev/null +++ b/Resources/Textures/ADT/Mobs/Animals/chicken_parts.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911 для Времени Приключений MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "torso_m" + }, + { + "name": "r_leg" + }, + { + "name": "l_leg" + }, + { + "name": "l_hand" + }, + { + "name": "r_hand" + } + ] +} diff --git a/Resources/Textures/ADT/Mobs/Animals/chicken_parts.rsi/r_hand.png b/Resources/Textures/ADT/Mobs/Animals/chicken_parts.rsi/r_hand.png new file mode 100644 index 00000000000..6229a62310a Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Animals/chicken_parts.rsi/r_hand.png differ diff --git a/Resources/Textures/ADT/Mobs/Animals/chicken_parts.rsi/r_leg.png b/Resources/Textures/ADT/Mobs/Animals/chicken_parts.rsi/r_leg.png new file mode 100644 index 00000000000..f3071074fd7 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Animals/chicken_parts.rsi/r_leg.png differ diff --git a/Resources/Textures/ADT/Mobs/Animals/chicken_parts.rsi/torso_m.png b/Resources/Textures/ADT/Mobs/Animals/chicken_parts.rsi/torso_m.png new file mode 100644 index 00000000000..9e1d93f155f Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Animals/chicken_parts.rsi/torso_m.png differ diff --git a/Resources/Textures/ADT/Mobs/Animals/value.rsi/dead.png b/Resources/Textures/ADT/Mobs/Animals/value.rsi/dead.png new file mode 100644 index 00000000000..1654aa40e0a Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Animals/value.rsi/dead.png differ diff --git a/Resources/Textures/ADT/Mobs/Animals/value.rsi/icon.png b/Resources/Textures/ADT/Mobs/Animals/value.rsi/icon.png new file mode 100644 index 00000000000..48b671ed707 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Animals/value.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Mobs/Animals/value.rsi/meta.json b/Resources/Textures/ADT/Mobs/Animals/value.rsi/meta.json new file mode 100644 index 00000000000..5fdc8715087 --- /dev/null +++ b/Resources/Textures/ADT/Mobs/Animals/value.rsi/meta.json @@ -0,0 +1,21 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprite made by ihaveaeye (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "dead" + }, + { + "name": "value", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Mobs/Animals/value.rsi/value.png b/Resources/Textures/ADT/Mobs/Animals/value.rsi/value.png new file mode 100644 index 00000000000..2df0928a5e7 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/Animals/value.rsi/value.png differ diff --git a/Resources/Textures/ADT/Mobs/halloween_slime.rsi/green_adult_slime.png b/Resources/Textures/ADT/Mobs/halloween_slime.rsi/green_adult_slime.png new file mode 100644 index 00000000000..78104d92fae Binary files /dev/null and b/Resources/Textures/ADT/Mobs/halloween_slime.rsi/green_adult_slime.png differ diff --git a/Resources/Textures/ADT/Mobs/halloween_slime.rsi/green_adult_slime_dead.png b/Resources/Textures/ADT/Mobs/halloween_slime.rsi/green_adult_slime_dead.png new file mode 100644 index 00000000000..b62d15e8c79 Binary files /dev/null and b/Resources/Textures/ADT/Mobs/halloween_slime.rsi/green_adult_slime_dead.png differ diff --git a/Resources/Textures/ADT/Mobs/halloween_slime.rsi/meta.json b/Resources/Textures/ADT/Mobs/halloween_slime.rsi/meta.json new file mode 100644 index 00000000000..cc301b7bc49 --- /dev/null +++ b/Resources/Textures/ADT/Mobs/halloween_slime.rsi/meta.json @@ -0,0 +1,72 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:LunaLita#0840", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "green_adult_slime", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "green_adult_slime_dead" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/clownbeer.rsi/fill-1.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/clownbeer.rsi/fill-1.png new file mode 100644 index 00000000000..13388742c3f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/clownbeer.rsi/fill-1.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/clownbeer.rsi/fill-2.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/clownbeer.rsi/fill-2.png new file mode 100644 index 00000000000..6dc61894a7a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/clownbeer.rsi/fill-2.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/clownbeer.rsi/fill-3.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/clownbeer.rsi/fill-3.png new file mode 100644 index 00000000000..13cfaef314b Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/clownbeer.rsi/fill-3.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/clownbeer.rsi/fill-4.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/clownbeer.rsi/fill-4.png new file mode 100644 index 00000000000..9b0ae7e0bb3 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/clownbeer.rsi/fill-4.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/clownbeer.rsi/fill-5.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/clownbeer.rsi/fill-5.png new file mode 100644 index 00000000000..e685cf02d83 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/clownbeer.rsi/fill-5.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/clownbeer.rsi/icon.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/clownbeer.rsi/icon.png new file mode 100644 index 00000000000..3caf435e109 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/clownbeer.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/clownbeer.rsi/icon_empty.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/clownbeer.rsi/icon_empty.png new file mode 100644 index 00000000000..32355f98378 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/clownbeer.rsi/icon_empty.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/clownbeer.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Drinks/clownbeer.rsi/meta.json new file mode 100644 index 00000000000..1311b7f2da5 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Drinks/clownbeer.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by prazat911", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/superbeer.rsi/fill-1.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/superbeer.rsi/fill-1.png new file mode 100644 index 00000000000..76d530bd5a2 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/superbeer.rsi/fill-1.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/superbeer.rsi/fill-2.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/superbeer.rsi/fill-2.png new file mode 100644 index 00000000000..b4581e14bc1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/superbeer.rsi/fill-2.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/superbeer.rsi/fill-3.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/superbeer.rsi/fill-3.png new file mode 100644 index 00000000000..7a051e72db8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/superbeer.rsi/fill-3.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/superbeer.rsi/fill-4.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/superbeer.rsi/fill-4.png new file mode 100644 index 00000000000..04120a94ae2 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/superbeer.rsi/fill-4.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/superbeer.rsi/fill-5.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/superbeer.rsi/fill-5.png new file mode 100644 index 00000000000..36d27fa317f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/superbeer.rsi/fill-5.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/superbeer.rsi/icon.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/superbeer.rsi/icon.png new file mode 100644 index 00000000000..6da27da651a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/superbeer.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/superbeer.rsi/icon_empty.png b/Resources/Textures/ADT/Objects/Consumable/Drinks/superbeer.rsi/icon_empty.png new file mode 100644 index 00000000000..1219418cfeb Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Drinks/superbeer.rsi/icon_empty.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Drinks/superbeer.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Drinks/superbeer.rsi/meta.json new file mode 100644 index 00000000000..1311b7f2da5 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Drinks/superbeer.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Made by prazat911", + "states": [ + { + "name": "icon" + }, + { + "name": "icon_empty" + }, + { + "name": "fill-1" + }, + { + "name": "fill-2" + }, + { + "name": "fill-3" + }, + { + "name": "fill-4" + }, + { + "name": "fill-5" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/cookies.rsi/caramel_ear.png b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/cookies.rsi/caramel_ear.png new file mode 100644 index 00000000000..e882eafd0a9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/cookies.rsi/caramel_ear.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/cookies.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/cookies.rsi/meta.json index 4033d9abf3a..1d1be49d951 100644 --- a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/cookies.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/cookies.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Created by discord:Празат Д.В. aka [767Sikon] (prazat911)", + "copyright": "Created by discord:Празат Д.В. aka [767Sikon] (prazat911), and strawberry_heart, caramel_ear made by: anvel (discord)", "size": { "x": 32, "y": 32 @@ -24,6 +24,12 @@ }, { "name": "cookie_skull" + }, + { + "name": "caramel_ear" + }, + { + "name": "strawberry_heart" } ] } diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/cookies.rsi/strawberry_heart.png b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/cookies.rsi/strawberry_heart.png new file mode 100644 index 00000000000..05f74e5afd2 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/cookies.rsi/strawberry_heart.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/easter.rsi/big.png b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/easter.rsi/big.png new file mode 100644 index 00000000000..847b81462c8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/easter.rsi/big.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/easter.rsi/cheesy.png b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/easter.rsi/cheesy.png new file mode 100644 index 00000000000..664d63a65a8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/easter.rsi/cheesy.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/easter.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/easter.rsi/meta.json new file mode 100644 index 00000000000..9213bcad4ed --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/easter.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by prazat911, berserker18878, leepm for Adventure Times MRP", + "states": [ + { + "name": "sweetroll" + }, + { + "name": "small" + }, + { + "name": "big" + }, + { + "name": "cheesy" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/easter.rsi/small.png b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/easter.rsi/small.png new file mode 100644 index 00000000000..8d141c22118 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/easter.rsi/small.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/easter.rsi/sweetroll.png b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/easter.rsi/sweetroll.png new file mode 100644 index 00000000000..35b8a15a6ae Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/easter.rsi/sweetroll.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/misc.rsi/brezel.png b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/misc.rsi/brezel.png new file mode 100644 index 00000000000..e594f3b9ac7 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/misc.rsi/brezel.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/misc.rsi/brezel_chocolate.png b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/misc.rsi/brezel_chocolate.png new file mode 100644 index 00000000000..7528f484d62 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/misc.rsi/brezel_chocolate.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/misc.rsi/brezel_poppy.png b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/misc.rsi/brezel_poppy.png new file mode 100644 index 00000000000..b714b7ce4c7 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/misc.rsi/brezel_poppy.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/misc.rsi/brezel_pumpkin.png b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/misc.rsi/brezel_pumpkin.png new file mode 100644 index 00000000000..46614967a0d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/misc.rsi/brezel_pumpkin.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/misc.rsi/brezel_salt.png b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/misc.rsi/brezel_salt.png new file mode 100644 index 00000000000..9bb61d63a84 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/misc.rsi/brezel_salt.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/misc.rsi/brezel_vanilla.png b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/misc.rsi/brezel_vanilla.png new file mode 100644 index 00000000000..3da7d7672e0 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/misc.rsi/brezel_vanilla.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/misc.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/misc.rsi/meta.json new file mode 100644 index 00000000000..33c8775c73f --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/misc.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:Празат Д.В. aka [767Sikon] (prazat911)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "brezel" + }, + { + "name": "brezel_poppy" + }, + { + "name": "brezel_salt" + }, + { + "name": "brezel_chocolate" + }, + { + "name": "brezel_vanilla" + }, + { + "name": "brezel_pumpkin" + }, + { + "name": "muffin_pumpkin" + } + ] +} + diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/misc.rsi/muffin_pumpkin.png b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/misc.rsi/muffin_pumpkin.png new file mode 100644 index 00000000000..5bf64181b79 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/misc.rsi/muffin_pumpkin.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pumpkin_pie.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pumpkin_pie.rsi/meta.json new file mode 100644 index 00000000000..158557fa947 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pumpkin_pie.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911 и shi_zzy для Времени Приключений MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "pumpkin_pie" + }, + { + "name": "slice" + } + ] +} + diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pumpkin_pie.rsi/pumpkin_pie.png b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pumpkin_pie.rsi/pumpkin_pie.png new file mode 100644 index 00000000000..e509f18d130 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pumpkin_pie.rsi/pumpkin_pie.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pumpkin_pie.rsi/slice.png b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pumpkin_pie.rsi/slice.png new file mode 100644 index 00000000000..bfaaa48a331 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pumpkin_pie.rsi/slice.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pumpkin_soup.rsi/icon.png b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pumpkin_soup.rsi/icon.png new file mode 100644 index 00000000000..1062ea55c37 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pumpkin_soup.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pumpkin_soup.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pumpkin_soup.rsi/meta.json new file mode 100644 index 00000000000..30a0d6242d8 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Food/Baked/pumpkin_soup.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:yunachka для Времени Приключений MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + } + ] +} + diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/black.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/black.png new file mode 100644 index 00000000000..ef82b95adbc Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/black.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/brains.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/brains.png new file mode 100644 index 00000000000..926f833bd38 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/brains.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/bunny.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/bunny.png new file mode 100644 index 00000000000..cfb68193412 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/bunny.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/candy_corn.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/candy_corn.png new file mode 100644 index 00000000000..68d5fbda726 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/candy_corn.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/coin-packed.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/coin-packed.png new file mode 100644 index 00000000000..823e86774d2 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/coin-packed.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/coin.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/coin.png new file mode 100644 index 00000000000..b705e92d05b Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/coin.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/eyes_1.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/eyes_1.png new file mode 100644 index 00000000000..e1c0d051763 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/eyes_1.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/eyes_2.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/eyes_2.png new file mode 100644 index 00000000000..7ab3ad58a5a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/eyes_2.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/eyes_3.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/eyes_3.png new file mode 100644 index 00000000000..8dda4a8eefa Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/eyes_3.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/green.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/green.png new file mode 100644 index 00000000000..970405da017 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/green.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/heart.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/heart.png new file mode 100644 index 00000000000..a40c49a2e20 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/heart.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/hl_caramel.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/hl_caramel.png new file mode 100644 index 00000000000..64f0a1e69ff Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/hl_caramel.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/meta.json new file mode 100644 index 00000000000..e4f2b4bd10a --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/meta.json @@ -0,0 +1,63 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911 and uma_eso_stabler для Времени Приключений MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "black" + }, + { + "name": "brains" + }, + { + "name": "candy_corn" + }, + { + "name": "coin" + }, + { + "name": "coin-packed" + }, + { + "name": "eyes_1" + }, + { + "name": "eyes_2" + }, + { + "name": "eyes_3" + }, + { + "name": "green" + }, + { + "name": "heart" + }, + { + "name": "hl_caramel" + }, + { + "name": "mint_caramel" + }, + { + "name": "red" + }, + { + "name": "violet" + }, + { + "name": "worms" + }, + { + "name": "yellow" + }, + { + "name": "bunny" + } + ] +} + diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/mint_caramel.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/mint_caramel.png new file mode 100644 index 00000000000..423b42deeed Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/mint_caramel.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/red.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/red.png new file mode 100644 index 00000000000..17bc01063b5 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/red.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/violet.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/violet.png new file mode 100644 index 00000000000..8d810c7250d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/violet.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/worms.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/worms.png new file mode 100644 index 00000000000..fa96efb98d5 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/worms.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/yellow.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/yellow.png new file mode 100644 index 00000000000..393c1a84289 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candy.rsi/yellow.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_apple.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_apple.png new file mode 100644 index 00000000000..66cc41212dd Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_apple.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_bat.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_bat.png new file mode 100644 index 00000000000..8baf2c9e8cf Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_bat.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_blue.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_blue.png new file mode 100644 index 00000000000..3e14142f252 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_blue.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_creeper.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_creeper.png new file mode 100644 index 00000000000..cc5f17d4e0c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_creeper.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_green.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_green.png new file mode 100644 index 00000000000..45b171a3be6 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_green.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_kinito.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_kinito.png new file mode 100644 index 00000000000..763b00f5bc1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_kinito.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_kratos.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_kratos.png new file mode 100644 index 00000000000..7c405c0f357 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_kratos.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_pumpkin.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_pumpkin.png new file mode 100644 index 00000000000..1401ee0303c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_pumpkin.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_purple.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_purple.png new file mode 100644 index 00000000000..572ed09c2e8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_purple.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_red.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_red.png new file mode 100644 index 00000000000..626a8d7a78e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_red.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_yellow.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_yellow.png new file mode 100644 index 00000000000..40743cddd9c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/candy_yellow.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/meta.json new file mode 100644 index 00000000000..ed9f58ca496 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/meta.json @@ -0,0 +1,48 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911 and uma_eso_stabler для Времени Приключений MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "candy_apple" + }, + { + "name": "candy_blue" + }, + { + "name": "candy_creeper" + }, + { + "name": "candy_green" + }, + { + "name": "candy_kinito" + }, + { + "name": "candy_kratos" + }, + { + "name": "candy_pumpkin" + }, + { + "name": "candy_purple" + }, + { + "name": "candy_red" + }, + { + "name": "candy_yellow" + }, + { + "name": "candy_bat" + }, + { + "name": "trach" + } + ] +} + diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/trach.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/trach.png new file mode 100644 index 00000000000..34daa6ab558 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/Candies/candysticks.rsi/trach.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/banana_in_choco.rsi/in-dark-choco.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/banana_in_choco.rsi/in-dark-choco.png new file mode 100644 index 00000000000..46de2ef6205 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/banana_in_choco.rsi/in-dark-choco.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/banana_in_choco.rsi/in-pink-choco.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/banana_in_choco.rsi/in-pink-choco.png new file mode 100644 index 00000000000..e8035ee8593 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/banana_in_choco.rsi/in-pink-choco.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/banana_in_choco.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/banana_in_choco.rsi/meta.json new file mode 100644 index 00000000000..a1af5af7572 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/banana_in_choco.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: cy_u for Adventure Times MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "in-dark-choco" + }, + { + "name": "in-pink-choco" + } + ] +} + diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/box-open.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/box-open.png new file mode 100644 index 00000000000..e2c96d9eb38 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/box-open.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/box.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/box.png new file mode 100644 index 00000000000..cc70837a5b9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/box.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/eclairs_1.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/eclairs_1.png new file mode 100644 index 00000000000..f935e3c0bfe Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/eclairs_1.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/eclairs_2.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/eclairs_2.png new file mode 100644 index 00000000000..f1a3b6849cb Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/eclairs_2.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/eclairs_3.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/eclairs_3.png new file mode 100644 index 00000000000..6cc53afe836 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/eclairs_3.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/eclairs_4.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/eclairs_4.png new file mode 100644 index 00000000000..04b308bb69b Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/eclairs_4.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/eclairs_brown.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/eclairs_brown.png new file mode 100644 index 00000000000..bc065245e84 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/eclairs_brown.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/eclairs_chocolate.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/eclairs_chocolate.png new file mode 100644 index 00000000000..0bd290042de Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/eclairs_chocolate.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/eclairs_pink.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/eclairs_pink.png new file mode 100644 index 00000000000..0edf1df2842 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/eclairs_pink.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/eclairs_white.png b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/eclairs_white.png new file mode 100644 index 00000000000..f6c892792bf Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/eclairs_white.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/meta.json new file mode 100644 index 00000000000..3193f910868 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Food/Snacks/eclairs.rsi/meta.json @@ -0,0 +1,42 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: cy_u for Adventure Times MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "box" + }, + { + "name": "box-open" + }, + { + "name": "eclairs_1" + }, + { + "name": "eclairs_2" + }, + { + "name": "eclairs_3" + }, + { + "name": "eclairs_4" + }, + { + "name": "eclairs_brown" + }, + { + "name": "eclairs_chocolate" + }, + { + "name": "eclairs_pink" + }, + { + "name": "eclairs_white" + } + ] +} + diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/cake.rsi/chocolate-heart.png b/Resources/Textures/ADT/Objects/Consumable/Food/cake.rsi/chocolate-heart.png new file mode 100644 index 00000000000..901646881f2 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/cake.rsi/chocolate-heart.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/cake.rsi/chocolate-slice-heart.png b/Resources/Textures/ADT/Objects/Consumable/Food/cake.rsi/chocolate-slice-heart.png new file mode 100644 index 00000000000..600e0d15fb2 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/cake.rsi/chocolate-slice-heart.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/cake.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/cake.rsi/meta.json index 2c22b2f8ec3..e0eaeeb2bc0 100644 --- a/Resources/Textures/ADT/Objects/Consumable/Food/cake.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Consumable/Food/cake.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, resprited by orange6775 (discord)", + "copyright": "Taken from tgstation and modified by Swept at https://github.com/tgstation/tgstation/commit/40d75cc340c63582fb66ce15bf75a36115f6bdaa, resprited by orange6775 (discord) and chocolate-slice-heart, chocolate-heart, strawberry-slice-heart, strawberry-heart made by: anvel (discord)", "size": { "x": 32, "y": 32 @@ -48,6 +48,10 @@ {"name": "slime-inhand-right", "directions": 4}, {"name": "spaceman"}, {"name": "spaceman-inhand-left", "directions": 4}, - {"name": "spaceman-inhand-right", "directions": 4} + {"name": "spaceman-inhand-right", "directions": 4}, + {"name": "chocolate-heart"}, + {"name": "chocolate-slice-heart"}, + {"name": "strawberry-heart"}, + {"name": "strawberry-slice-heart"} ] } diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/cake.rsi/strawberry-heart.png b/Resources/Textures/ADT/Objects/Consumable/Food/cake.rsi/strawberry-heart.png new file mode 100644 index 00000000000..2a80f826ae8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/cake.rsi/strawberry-heart.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/cake.rsi/strawberry-slice-heart.png b/Resources/Textures/ADT/Objects/Consumable/Food/cake.rsi/strawberry-slice-heart.png new file mode 100644 index 00000000000..b9ff41cf481 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/cake.rsi/strawberry-slice-heart.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/baked_slice.png b/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/baked_slice.png new file mode 100644 index 00000000000..906f746ba72 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/baked_slice.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/baked_stuffed_slice.png b/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/baked_stuffed_slice.png new file mode 100644 index 00000000000..a675aee073b Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/baked_stuffed_slice.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/chicken_baked.png b/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/chicken_baked.png new file mode 100644 index 00000000000..68387ec955d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/chicken_baked.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/chicken_baked_wvegs.png b/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/chicken_baked_wvegs.png new file mode 100644 index 00000000000..364b5758520 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/chicken_baked_wvegs.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/leg_cooked.png b/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/leg_cooked.png new file mode 100644 index 00000000000..fe84d175827 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/leg_cooked.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/meta.json new file mode 100644 index 00000000000..b53fde50624 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/meta.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911 для Времени Приключений MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "raw_wing" + }, + { + "name": "raw_leg" + }, + { + "name": "chicken_baked" + }, + { + "name": "chicken_baked_wvegs" + }, + { + "name": "leg_cooked" + }, + { + "name": "wing_cooked" + }, + { + "name": "plate" + }, + { + "name": "baked_slice" + }, + { + "name": "baked_stuffed_slice" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/plate.png b/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/plate.png new file mode 100644 index 00000000000..9fa2b33db3f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/plate.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/raw_leg.png b/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/raw_leg.png new file mode 100644 index 00000000000..f3071074fd7 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/raw_leg.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/raw_wing.png b/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/raw_wing.png new file mode 100644 index 00000000000..6229a62310a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/raw_wing.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/wing_cooked.png b/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/wing_cooked.png new file mode 100644 index 00000000000..ea27e176f47 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/chicken_meat.rsi/wing_cooked.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/creme_brulee.rsi/broulet_torched.png b/Resources/Textures/ADT/Objects/Consumable/Food/creme_brulee.rsi/broulet_torched.png new file mode 100644 index 00000000000..75aa342d3e2 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/creme_brulee.rsi/broulet_torched.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/creme_brulee.rsi/creme_broulet.png b/Resources/Textures/ADT/Objects/Consumable/Food/creme_brulee.rsi/creme_broulet.png new file mode 100644 index 00000000000..9c31907b2b7 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/creme_brulee.rsi/creme_broulet.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/creme_brulee.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/creme_brulee.rsi/meta.json new file mode 100644 index 00000000000..ac514f22213 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Food/creme_brulee.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "creared by: anvel (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broulet_torched" + }, + { + "name": "creme_broulet" + } + ] + } \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/hypoallergen_chocolate.rsi/hypoallergen_chocolate.png b/Resources/Textures/ADT/Objects/Consumable/Food/hypoallergen_chocolate.rsi/hypoallergen_chocolate.png new file mode 100644 index 00000000000..1129a536924 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/hypoallergen_chocolate.rsi/hypoallergen_chocolate.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/hypoallergen_chocolate.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/hypoallergen_chocolate.rsi/meta.json new file mode 100644 index 00000000000..de185b2f2fd --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Food/hypoallergen_chocolate.rsi/meta.json @@ -0,0 +1,10 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Created by Adventure Times MRP", + "states": [ { "name": "hypoallergen_chocolate" } ] +} diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/meat.rsi/bratwurst.png b/Resources/Textures/ADT/Objects/Consumable/Food/meat.rsi/bratwurst.png new file mode 100644 index 00000000000..684135bed01 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/meat.rsi/bratwurst.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/meat.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/meat.rsi/meta.json index 38e03045392..71c8d16317e 100644 --- a/Resources/Textures/ADT/Objects/Consumable/Food/meat.rsi/meta.json +++ b/Resources/Textures/ADT/Objects/Consumable/Food/meat.rsi/meta.json @@ -19,6 +19,12 @@ { "name": "shadekincutlet-cooked" }, + { + "name": "weisswurst" + }, + { + "name": "bratwurst" + }, { "name": "smoked-sausage" }, diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/meat.rsi/weisswurst.png b/Resources/Textures/ADT/Objects/Consumable/Food/meat.rsi/weisswurst.png new file mode 100644 index 00000000000..1851cfad1e8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/meat.rsi/weisswurst.png differ diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/strawberry_mousse.rsi/meta.json b/Resources/Textures/ADT/Objects/Consumable/Food/strawberry_mousse.rsi/meta.json new file mode 100644 index 00000000000..4e0b6a97750 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Consumable/Food/strawberry_mousse.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "creared by: anvel (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "strawberry_mousse" + } + ] + } \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Consumable/Food/strawberry_mousse.rsi/strawberry_mousse.png b/Resources/Textures/ADT/Objects/Consumable/Food/strawberry_mousse.rsi/strawberry_mousse.png new file mode 100644 index 00000000000..b6580c94f06 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Consumable/Food/strawberry_mousse.rsi/strawberry_mousse.png differ diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/happyhalloween.png b/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/happyhalloween.png new file mode 100644 index 00000000000..6f804371748 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/happyhalloween.png differ diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/meta.json b/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/meta.json new file mode 100644 index 00000000000..f0295974c89 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/meta.json @@ -0,0 +1,32 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:m1and1b и prazat911 для Время Приключений MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "spooky" + }, + { + "name": "yummy" + }, + { + "name": "spider" + }, + { + "name": "spiderweb1" + }, + { + "name": "spiderweb2" + }, + { + "name": "happyhalloween" + }, + { + "name": "tayarhalloween" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/spider.png b/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/spider.png new file mode 100644 index 00000000000..ecfd57ab541 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/spider.png differ diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/spiderweb1.png b/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/spiderweb1.png new file mode 100644 index 00000000000..00a3e91a280 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/spiderweb1.png differ diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/spiderweb2.png b/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/spiderweb2.png new file mode 100644 index 00000000000..1cb93661717 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/spiderweb2.png differ diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/spooky.png b/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/spooky.png new file mode 100644 index 00000000000..48a4cd3950c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/spooky.png differ diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/tayarhalloween.png b/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/tayarhalloween.png new file mode 100644 index 00000000000..b6faecfed02 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/tayarhalloween.png differ diff --git a/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/yummy.png b/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/yummy.png new file mode 100644 index 00000000000..61217874334 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Decoration/poster_helloween.rsi/yummy.png differ diff --git a/Resources/Textures/ADT/Objects/Fun/broom.rsi/icon.png b/Resources/Textures/ADT/Objects/Fun/broom.rsi/icon.png new file mode 100644 index 00000000000..519fd93fc2d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Fun/broom.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Fun/broom.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Fun/broom.rsi/inhand-left.png new file mode 100644 index 00000000000..99adbf94164 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Fun/broom.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Fun/broom.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Fun/broom.rsi/inhand-right.png new file mode 100644 index 00000000000..4c96dfaf090 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Fun/broom.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Fun/broom.rsi/meta.json b/Resources/Textures/ADT/Objects/Fun/broom.rsi/meta.json new file mode 100644 index 00000000000..71830664456 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Fun/broom.rsi/meta.json @@ -0,0 +1,30 @@ +{ + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:m1and1b для Время Приключений MRP", + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Fun/broom.rsi/wielded-inhand-left.png b/Resources/Textures/ADT/Objects/Fun/broom.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..b531b0e46bc Binary files /dev/null and b/Resources/Textures/ADT/Objects/Fun/broom.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Fun/broom.rsi/wielded-inhand-right.png b/Resources/Textures/ADT/Objects/Fun/broom.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..b531b0e46bc Binary files /dev/null and b/Resources/Textures/ADT/Objects/Fun/broom.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/golden_candlestick.rsi/inhand-left-light.png b/Resources/Textures/ADT/Objects/Misc/golden_candlestick.rsi/inhand-left-light.png new file mode 100644 index 00000000000..6fc0da04a58 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/golden_candlestick.rsi/inhand-left-light.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/golden_candlestick.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Misc/golden_candlestick.rsi/inhand-left.png new file mode 100644 index 00000000000..718e1c2a5f9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/golden_candlestick.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/golden_candlestick.rsi/inhand-right-light.png b/Resources/Textures/ADT/Objects/Misc/golden_candlestick.rsi/inhand-right-light.png new file mode 100644 index 00000000000..00c6d9f9304 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/golden_candlestick.rsi/inhand-right-light.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/golden_candlestick.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Misc/golden_candlestick.rsi/inhand-right.png new file mode 100644 index 00000000000..f74593c2ed7 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/golden_candlestick.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/golden_candlestick.rsi/lamp-on.png b/Resources/Textures/ADT/Objects/Misc/golden_candlestick.rsi/lamp-on.png new file mode 100644 index 00000000000..4665078f31e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/golden_candlestick.rsi/lamp-on.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/golden_candlestick.rsi/lamp.png b/Resources/Textures/ADT/Objects/Misc/golden_candlestick.rsi/lamp.png new file mode 100644 index 00000000000..3a8ac69e017 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/golden_candlestick.rsi/lamp.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/golden_candlestick.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/golden_candlestick.rsi/meta.json new file mode 100644 index 00000000000..af9bf320a03 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/golden_candlestick.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:sugoma093 для Время Приключений MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "lamp" + }, + { + "name": "lamp-on" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left-light", + "directions": 4 + }, + { + "name": "inhand-right-light", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_NTcandy_bowl.rsi/icon-0.png b/Resources/Textures/ADT/Objects/Misc/halloween_NTcandy_bowl.rsi/icon-0.png new file mode 100644 index 00000000000..0eaed1d1cf6 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_NTcandy_bowl.rsi/icon-0.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_NTcandy_bowl.rsi/icon-1.png b/Resources/Textures/ADT/Objects/Misc/halloween_NTcandy_bowl.rsi/icon-1.png new file mode 100644 index 00000000000..54f8663c25c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_NTcandy_bowl.rsi/icon-1.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_NTcandy_bowl.rsi/icon-2.png b/Resources/Textures/ADT/Objects/Misc/halloween_NTcandy_bowl.rsi/icon-2.png new file mode 100644 index 00000000000..b4f7aa37baa Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_NTcandy_bowl.rsi/icon-2.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_NTcandy_bowl.rsi/icon-3.png b/Resources/Textures/ADT/Objects/Misc/halloween_NTcandy_bowl.rsi/icon-3.png new file mode 100644 index 00000000000..66559ec0f6d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_NTcandy_bowl.rsi/icon-3.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_NTcandy_bowl.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Misc/halloween_NTcandy_bowl.rsi/inhand-left.png new file mode 100644 index 00000000000..51f9b8d530a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_NTcandy_bowl.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_NTcandy_bowl.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Misc/halloween_NTcandy_bowl.rsi/inhand-right.png new file mode 100644 index 00000000000..6c8d57082e8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_NTcandy_bowl.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_NTcandy_bowl.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/halloween_NTcandy_bowl.rsi/meta.json new file mode 100644 index 00000000000..b2934960816 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/halloween_NTcandy_bowl.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by discord: prazat911 для Времени Приключений MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon-0" + }, + { + "name": "icon-1" + }, + { + "name": "icon-2" + }, + { + "name": "icon-3" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_candy_bowl.rsi/icon-0.png b/Resources/Textures/ADT/Objects/Misc/halloween_candy_bowl.rsi/icon-0.png new file mode 100644 index 00000000000..84f4df25c04 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_candy_bowl.rsi/icon-0.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_candy_bowl.rsi/icon-1.png b/Resources/Textures/ADT/Objects/Misc/halloween_candy_bowl.rsi/icon-1.png new file mode 100644 index 00000000000..a0d06d6effb Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_candy_bowl.rsi/icon-1.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_candy_bowl.rsi/icon-2.png b/Resources/Textures/ADT/Objects/Misc/halloween_candy_bowl.rsi/icon-2.png new file mode 100644 index 00000000000..49070479bb2 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_candy_bowl.rsi/icon-2.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_candy_bowl.rsi/icon-3.png b/Resources/Textures/ADT/Objects/Misc/halloween_candy_bowl.rsi/icon-3.png new file mode 100644 index 00000000000..c79bf0c7836 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_candy_bowl.rsi/icon-3.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_candy_bowl.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Misc/halloween_candy_bowl.rsi/inhand-left.png new file mode 100644 index 00000000000..8333925b536 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_candy_bowl.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_candy_bowl.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Misc/halloween_candy_bowl.rsi/inhand-right.png new file mode 100644 index 00000000000..d250c0db38a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_candy_bowl.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_candy_bowl.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/halloween_candy_bowl.rsi/meta.json new file mode 100644 index 00000000000..b2934960816 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/halloween_candy_bowl.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by discord: prazat911 для Времени Приключений MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon-0" + }, + { + "name": "icon-1" + }, + { + "name": "icon-2" + }, + { + "name": "icon-3" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_sealcandy_bowl.rsi/icon-0.png b/Resources/Textures/ADT/Objects/Misc/halloween_sealcandy_bowl.rsi/icon-0.png new file mode 100644 index 00000000000..ed5bfa95532 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_sealcandy_bowl.rsi/icon-0.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_sealcandy_bowl.rsi/icon-1.png b/Resources/Textures/ADT/Objects/Misc/halloween_sealcandy_bowl.rsi/icon-1.png new file mode 100644 index 00000000000..f651c4822b8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_sealcandy_bowl.rsi/icon-1.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_sealcandy_bowl.rsi/icon-2.png b/Resources/Textures/ADT/Objects/Misc/halloween_sealcandy_bowl.rsi/icon-2.png new file mode 100644 index 00000000000..b5e8c58c851 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_sealcandy_bowl.rsi/icon-2.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_sealcandy_bowl.rsi/icon-3.png b/Resources/Textures/ADT/Objects/Misc/halloween_sealcandy_bowl.rsi/icon-3.png new file mode 100644 index 00000000000..ea3971a7873 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_sealcandy_bowl.rsi/icon-3.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_sealcandy_bowl.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Misc/halloween_sealcandy_bowl.rsi/inhand-left.png new file mode 100644 index 00000000000..40413aba54d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_sealcandy_bowl.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_sealcandy_bowl.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Misc/halloween_sealcandy_bowl.rsi/inhand-right.png new file mode 100644 index 00000000000..fee7e503660 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_sealcandy_bowl.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_sealcandy_bowl.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/halloween_sealcandy_bowl.rsi/meta.json new file mode 100644 index 00000000000..b2934960816 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/halloween_sealcandy_bowl.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by discord: prazat911 для Времени Приключений MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon-0" + }, + { + "name": "icon-1" + }, + { + "name": "icon-2" + }, + { + "name": "icon-3" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_smilecandy_bowl.rsi/icon-0.png b/Resources/Textures/ADT/Objects/Misc/halloween_smilecandy_bowl.rsi/icon-0.png new file mode 100644 index 00000000000..36edcdd31c9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_smilecandy_bowl.rsi/icon-0.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_smilecandy_bowl.rsi/icon-1.png b/Resources/Textures/ADT/Objects/Misc/halloween_smilecandy_bowl.rsi/icon-1.png new file mode 100644 index 00000000000..460c8179008 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_smilecandy_bowl.rsi/icon-1.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_smilecandy_bowl.rsi/icon-2.png b/Resources/Textures/ADT/Objects/Misc/halloween_smilecandy_bowl.rsi/icon-2.png new file mode 100644 index 00000000000..c142fc508f2 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_smilecandy_bowl.rsi/icon-2.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_smilecandy_bowl.rsi/icon-3.png b/Resources/Textures/ADT/Objects/Misc/halloween_smilecandy_bowl.rsi/icon-3.png new file mode 100644 index 00000000000..ed902bcc793 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_smilecandy_bowl.rsi/icon-3.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_smilecandy_bowl.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Misc/halloween_smilecandy_bowl.rsi/inhand-left.png new file mode 100644 index 00000000000..8333925b536 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_smilecandy_bowl.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_smilecandy_bowl.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Misc/halloween_smilecandy_bowl.rsi/inhand-right.png new file mode 100644 index 00000000000..d250c0db38a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_smilecandy_bowl.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_smilecandy_bowl.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/halloween_smilecandy_bowl.rsi/meta.json new file mode 100644 index 00000000000..b2934960816 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/halloween_smilecandy_bowl.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by discord: prazat911 для Времени Приключений MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon-0" + }, + { + "name": "icon-1" + }, + { + "name": "icon-2" + }, + { + "name": "icon-3" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_syndiecandy_bowl.rsi/icon-0.png b/Resources/Textures/ADT/Objects/Misc/halloween_syndiecandy_bowl.rsi/icon-0.png new file mode 100644 index 00000000000..e708049805c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_syndiecandy_bowl.rsi/icon-0.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_syndiecandy_bowl.rsi/icon-1.png b/Resources/Textures/ADT/Objects/Misc/halloween_syndiecandy_bowl.rsi/icon-1.png new file mode 100644 index 00000000000..2fbf6909168 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_syndiecandy_bowl.rsi/icon-1.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_syndiecandy_bowl.rsi/icon-2.png b/Resources/Textures/ADT/Objects/Misc/halloween_syndiecandy_bowl.rsi/icon-2.png new file mode 100644 index 00000000000..249ac4118ad Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_syndiecandy_bowl.rsi/icon-2.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_syndiecandy_bowl.rsi/icon-3.png b/Resources/Textures/ADT/Objects/Misc/halloween_syndiecandy_bowl.rsi/icon-3.png new file mode 100644 index 00000000000..df8744de2b8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_syndiecandy_bowl.rsi/icon-3.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_syndiecandy_bowl.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Misc/halloween_syndiecandy_bowl.rsi/inhand-left.png new file mode 100644 index 00000000000..f9dba9727c7 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_syndiecandy_bowl.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_syndiecandy_bowl.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Misc/halloween_syndiecandy_bowl.rsi/inhand-right.png new file mode 100644 index 00000000000..6d1f997673c Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_syndiecandy_bowl.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_syndiecandy_bowl.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/halloween_syndiecandy_bowl.rsi/meta.json new file mode 100644 index 00000000000..b2934960816 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/halloween_syndiecandy_bowl.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by discord: prazat911 для Времени Приключений MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon-0" + }, + { + "name": "icon-1" + }, + { + "name": "icon-2" + }, + { + "name": "icon-3" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_zombiecandy_bowl.rsi/icon-0.png b/Resources/Textures/ADT/Objects/Misc/halloween_zombiecandy_bowl.rsi/icon-0.png new file mode 100644 index 00000000000..73cee73a4ca Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_zombiecandy_bowl.rsi/icon-0.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_zombiecandy_bowl.rsi/icon-1.png b/Resources/Textures/ADT/Objects/Misc/halloween_zombiecandy_bowl.rsi/icon-1.png new file mode 100644 index 00000000000..10c4f75d01f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_zombiecandy_bowl.rsi/icon-1.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_zombiecandy_bowl.rsi/icon-2.png b/Resources/Textures/ADT/Objects/Misc/halloween_zombiecandy_bowl.rsi/icon-2.png new file mode 100644 index 00000000000..330e39d74ae Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_zombiecandy_bowl.rsi/icon-2.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_zombiecandy_bowl.rsi/icon-3.png b/Resources/Textures/ADT/Objects/Misc/halloween_zombiecandy_bowl.rsi/icon-3.png new file mode 100644 index 00000000000..29df8289298 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_zombiecandy_bowl.rsi/icon-3.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_zombiecandy_bowl.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Misc/halloween_zombiecandy_bowl.rsi/inhand-left.png new file mode 100644 index 00000000000..01f68576cb1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_zombiecandy_bowl.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_zombiecandy_bowl.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Misc/halloween_zombiecandy_bowl.rsi/inhand-right.png new file mode 100644 index 00000000000..ce4ebdffc00 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/halloween_zombiecandy_bowl.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/halloween_zombiecandy_bowl.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/halloween_zombiecandy_bowl.rsi/meta.json new file mode 100644 index 00000000000..b2934960816 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/halloween_zombiecandy_bowl.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by discord: prazat911 для Времени Приключений MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon-0" + }, + { + "name": "icon-1" + }, + { + "name": "icon-2" + }, + { + "name": "icon-3" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Misc/scull_lamp.rsi/inhand-left-light.png b/Resources/Textures/ADT/Objects/Misc/scull_lamp.rsi/inhand-left-light.png new file mode 100644 index 00000000000..1f09056cf1d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/scull_lamp.rsi/inhand-left-light.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/scull_lamp.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Misc/scull_lamp.rsi/inhand-left.png new file mode 100644 index 00000000000..51f77f87beb Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/scull_lamp.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/scull_lamp.rsi/inhand-right-light.png b/Resources/Textures/ADT/Objects/Misc/scull_lamp.rsi/inhand-right-light.png new file mode 100644 index 00000000000..82d26890d9e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/scull_lamp.rsi/inhand-right-light.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/scull_lamp.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Misc/scull_lamp.rsi/inhand-right.png new file mode 100644 index 00000000000..6bc56bfc263 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/scull_lamp.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/scull_lamp.rsi/lamp-on.png b/Resources/Textures/ADT/Objects/Misc/scull_lamp.rsi/lamp-on.png new file mode 100644 index 00000000000..61364e7a488 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/scull_lamp.rsi/lamp-on.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/scull_lamp.rsi/lamp.png b/Resources/Textures/ADT/Objects/Misc/scull_lamp.rsi/lamp.png new file mode 100644 index 00000000000..b55e9ac3de4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/scull_lamp.rsi/lamp.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/scull_lamp.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/scull_lamp.rsi/meta.json new file mode 100644 index 00000000000..5b379f897d0 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/scull_lamp.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:unlumy для Время Приключений MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "lamp" + }, + { + "name": "lamp-on" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left-light", + "directions": 4 + }, + { + "name": "inhand-right-light", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Misc/silver_candlestick.rsi/inhand-left-light.png b/Resources/Textures/ADT/Objects/Misc/silver_candlestick.rsi/inhand-left-light.png new file mode 100644 index 00000000000..8337df38ca5 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/silver_candlestick.rsi/inhand-left-light.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/silver_candlestick.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Misc/silver_candlestick.rsi/inhand-left.png new file mode 100644 index 00000000000..1386ff3b33f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/silver_candlestick.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/silver_candlestick.rsi/inhand-right-light.png b/Resources/Textures/ADT/Objects/Misc/silver_candlestick.rsi/inhand-right-light.png new file mode 100644 index 00000000000..642f764f47f Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/silver_candlestick.rsi/inhand-right-light.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/silver_candlestick.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Misc/silver_candlestick.rsi/inhand-right.png new file mode 100644 index 00000000000..c0710dd2e2b Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/silver_candlestick.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/silver_candlestick.rsi/lamp-on.png b/Resources/Textures/ADT/Objects/Misc/silver_candlestick.rsi/lamp-on.png new file mode 100644 index 00000000000..e654739cbc5 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/silver_candlestick.rsi/lamp-on.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/silver_candlestick.rsi/lamp.png b/Resources/Textures/ADT/Objects/Misc/silver_candlestick.rsi/lamp.png new file mode 100644 index 00000000000..4695ef88763 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/silver_candlestick.rsi/lamp.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/silver_candlestick.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/silver_candlestick.rsi/meta.json new file mode 100644 index 00000000000..af9bf320a03 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/silver_candlestick.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:sugoma093 для Время Приключений MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "lamp" + }, + { + "name": "lamp-on" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left-light", + "directions": 4 + }, + { + "name": "inhand-right-light", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/meta.json b/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/meta.json new file mode 100644 index 00000000000..2784691c795 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "creared by: descente (discord:still_smokin)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "val1" + }, + { + "name": "val2" + }, + { + "name": "val3" + }, + { + "name": "val4" + }, + { + "name": "val5" + }, + { + "name": "val6" + }, + { + "name": "val7" + }, + { + "name": "val8" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/val1.png b/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/val1.png new file mode 100644 index 00000000000..6349b43e404 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/val1.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/val2.png b/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/val2.png new file mode 100644 index 00000000000..9e8cde4da09 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/val2.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/val3.png b/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/val3.png new file mode 100644 index 00000000000..218e5cdf0ca Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/val3.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/val4.png b/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/val4.png new file mode 100644 index 00000000000..f1879c0dc2d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/val4.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/val5.png b/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/val5.png new file mode 100644 index 00000000000..b7be5a3abbd Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/val5.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/val6.png b/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/val6.png new file mode 100644 index 00000000000..7470202d1b1 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/val6.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/val7.png b/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/val7.png new file mode 100644 index 00000000000..4a43cbb8644 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/val7.png differ diff --git a/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/val8.png b/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/val8.png new file mode 100644 index 00000000000..b8bcdd47672 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Misc/valentine_cards.rsi/val8.png differ diff --git a/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/candy_love.png b/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/candy_love.png new file mode 100644 index 00000000000..ff86dbfb9a9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/candy_love.png differ diff --git a/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/chocobox.png b/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/chocobox.png new file mode 100644 index 00000000000..6827c91282d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/chocobox.png differ diff --git a/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/meta.json new file mode 100644 index 00000000000..ddce351fc72 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/meta.json @@ -0,0 +1,41 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "candy_love" + }, + { + "name": "minichoco1-open" + }, + { + "name": "minichoco1" + }, + { + "name": "minichoco2-open" + }, + { + "name": "minichoco2" + }, + { + "name": "minichoco3-open" + }, + { + "name": "minichoco3" + }, + { + "name": "minichoco4-open" + }, + { + "name": "chocobox" + }, + { + "name": "minichoco5-open" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/minichoco1-open.png b/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/minichoco1-open.png new file mode 100644 index 00000000000..3918fe0b6d3 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/minichoco1-open.png differ diff --git a/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/minichoco1.png b/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/minichoco1.png new file mode 100644 index 00000000000..a20662b112a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/minichoco1.png differ diff --git a/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/minichoco2-open.png b/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/minichoco2-open.png new file mode 100644 index 00000000000..cc11f86a2eb Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/minichoco2-open.png differ diff --git a/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/minichoco2.png b/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/minichoco2.png new file mode 100644 index 00000000000..012ff71d547 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/minichoco2.png differ diff --git a/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/minichoco3-open.png b/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/minichoco3-open.png new file mode 100644 index 00000000000..daf97ccb48d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/minichoco3-open.png differ diff --git a/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/minichoco3.png b/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/minichoco3.png new file mode 100644 index 00000000000..8a7a8a95721 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/minichoco3.png differ diff --git a/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/minichoco4-open.png b/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/minichoco4-open.png new file mode 100644 index 00000000000..8e74fd3923b Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/minichoco4-open.png differ diff --git a/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/minichoco5-open.png b/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/minichoco5-open.png new file mode 100644 index 00000000000..026ed206b04 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/Service/loveday_candy.rsi/minichoco5-open.png differ diff --git a/Resources/Textures/ADT/Objects/Specific/santa_wand.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Specific/santa_wand.rsi/inhand-left.png new file mode 100644 index 00000000000..bd3a775e747 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/santa_wand.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Specific/santa_wand.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Specific/santa_wand.rsi/inhand-right.png new file mode 100644 index 00000000000..95d9c63c6dc Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/santa_wand.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Specific/santa_wand.rsi/meta.json b/Resources/Textures/ADT/Objects/Specific/santa_wand.rsi/meta.json new file mode 100644 index 00000000000..b0e28716082 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Specific/santa_wand.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "sprite by boctonskuitea", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "santa-wand" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Specific/santa_wand.rsi/santa-wand.png b/Resources/Textures/ADT/Objects/Specific/santa_wand.rsi/santa-wand.png new file mode 100644 index 00000000000..087d1a27aae Binary files /dev/null and b/Resources/Textures/ADT/Objects/Specific/santa_wand.rsi/santa-wand.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/alastor.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/alastor.png new file mode 100644 index 00000000000..0f6e8093b61 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/alastor.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/bad_police.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/bad_police.png new file mode 100644 index 00000000000..33232a69d5e Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/bad_police.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/base.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/base.png new file mode 100644 index 00000000000..72d4307e825 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/base.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/chainsaw.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/chainsaw.png new file mode 100644 index 00000000000..fadb1e42e38 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/chainsaw.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/empress_of_light.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/empress_of_light.png new file mode 100644 index 00000000000..7351212087a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/empress_of_light.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/freddy.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/freddy.png new file mode 100644 index 00000000000..04318099fea Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/freddy.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/harry.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/harry.png new file mode 100644 index 00000000000..58a01d97b0d Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/harry.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/jasonvoorhees.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/jasonvoorhees.png new file mode 100644 index 00000000000..048286e9d79 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/jasonvoorhees.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/jecket.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/jecket.png new file mode 100644 index 00000000000..01d4535fb5a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/jecket.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/killa.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/killa.png new file mode 100644 index 00000000000..e7a3df69d60 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/killa.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/kim.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/kim.png new file mode 100644 index 00000000000..e8baacc99fb Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/kim.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/lethal_company.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/lethal_company.png new file mode 100644 index 00000000000..e059434d371 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/lethal_company.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/meta.json b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/meta.json new file mode 100644 index 00000000000..686f8fc7936 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/meta.json @@ -0,0 +1,95 @@ +{ + "version": 2, + "license": "CC-BY-SA-3.0", + "copyright": "Made by discord: prazat911 для Времени Приключений MRP", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "freddy" + }, + { + "name": "harry" + }, + { + "name": "alastor" + }, + { + "name": "jasonvoorhees" + }, + { + "name": "jecket" + }, + { + "name": "killa" + }, + { + "name": "kim" + }, + { + "name": "minion" + }, + { + "name": "pennywise" + }, + { + "name": "postal2" + }, + { + "name": "rabbit" + }, + { + "name": "tagilla" + }, + { + "name": "tricky" + }, + { + "name": "vampire" + }, + { + "name": "vergil" + }, + { + "name": "xeno" + }, + { + "name": "сrueltysquad" + }, + { + "name": "chainsaw" + }, + { + "name": "payday" + }, + { + "name": "squid_org" + }, + { + "name": "squid_player" + }, + { + "name": "lethal_company" + }, + { + "name": "bad_police" + }, + { + "name": "empress_of_light" + }, + { + "name": "redhat" + }, + { + "name": "sollux" + }, + { + "name": "michael" + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/michael.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/michael.png new file mode 100644 index 00000000000..c3dbe6c1ecf Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/michael.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/minion.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/minion.png new file mode 100644 index 00000000000..d8a9db628e4 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/minion.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/payday.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/payday.png new file mode 100644 index 00000000000..02ac56152a7 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/payday.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/pennywise.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/pennywise.png new file mode 100644 index 00000000000..132a89728ef Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/pennywise.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/postal2.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/postal2.png new file mode 100644 index 00000000000..26b7b40d555 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/postal2.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/rabbit.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/rabbit.png new file mode 100644 index 00000000000..a4540a83ee2 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/rabbit.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/redhat.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/redhat.png new file mode 100644 index 00000000000..75a172064f9 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/redhat.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/sollux.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/sollux.png new file mode 100644 index 00000000000..1d953ad49b8 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/sollux.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/squid_org.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/squid_org.png new file mode 100644 index 00000000000..0d7a50ff07b Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/squid_org.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/squid_player.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/squid_player.png new file mode 100644 index 00000000000..2ba096cd59a Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/squid_player.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/tagilla.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/tagilla.png new file mode 100644 index 00000000000..21ee02c8487 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/tagilla.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/tricky.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/tricky.png new file mode 100644 index 00000000000..cb79350dfb3 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/tricky.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/vampire.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/vampire.png new file mode 100644 index 00000000000..1d65a364179 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/vampire.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/vergil.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/vergil.png new file mode 100644 index 00000000000..dce97b34325 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/vergil.png differ diff --git a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/xeno.png b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/xeno.png new file mode 100644 index 00000000000..88b8dd3b6e3 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/xeno.png differ diff --git "a/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/\321\201rueltysquad.png" "b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/\321\201rueltysquad.png" new file mode 100644 index 00000000000..7332b1a3040 Binary files /dev/null and "b/Resources/Textures/ADT/Objects/Storage/Boxes/halloween_box.rsi/\321\201rueltysquad.png" differ diff --git a/Resources/Textures/ADT/Objects/Vehicles/reindeer.rsi/deer2.png b/Resources/Textures/ADT/Objects/Vehicles/reindeer.rsi/deer2.png new file mode 100644 index 00000000000..afe4fa88d76 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Vehicles/reindeer.rsi/deer2.png differ diff --git a/Resources/Textures/ADT/Objects/Vehicles/reindeer.rsi/meta.json b/Resources/Textures/ADT/Objects/Vehicles/reindeer.rsi/meta.json new file mode 100644 index 00000000000..f7ff77af839 --- /dev/null +++ b/Resources/Textures/ADT/Objects/Vehicles/reindeer.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "size": { + "x": 96, + "y": 96 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from TerraGov-Marine-Corps at commit https://github.com/tgstation/TerraGov-Marine-Corps/blob/ded67dce88183b6dbca13d324370801d0fd976a0/icons/obj/vehicles.dmi, modified by EmoGarbage404", + "states": [ + { + "name": "deer2", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/tagilla_sledge.rsi/equipped-BACKPACK.png b/Resources/Textures/ADT/Objects/Weapons/Melee/tagilla_sledge.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..78083afa9e0 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/tagilla_sledge.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/tagilla_sledge.rsi/icon.png b/Resources/Textures/ADT/Objects/Weapons/Melee/tagilla_sledge.rsi/icon.png new file mode 100644 index 00000000000..8bc87767071 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/tagilla_sledge.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/tagilla_sledge.rsi/inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/tagilla_sledge.rsi/inhand-left.png new file mode 100644 index 00000000000..33072ba6119 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/tagilla_sledge.rsi/inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/tagilla_sledge.rsi/inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/tagilla_sledge.rsi/inhand-right.png new file mode 100644 index 00000000000..3a8f926f117 Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/tagilla_sledge.rsi/inhand-right.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/tagilla_sledge.rsi/meta.json b/Resources/Textures/ADT/Objects/Weapons/Melee/tagilla_sledge.rsi/meta.json new file mode 100644 index 00000000000..bd5a9f9c82d --- /dev/null +++ b/Resources/Textures/ADT/Objects/Weapons/Melee/tagilla_sledge.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911 for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/tagilla_sledge.rsi/wielded-inhand-left.png b/Resources/Textures/ADT/Objects/Weapons/Melee/tagilla_sledge.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..53af26d47bd Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/tagilla_sledge.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/ADT/Objects/Weapons/Melee/tagilla_sledge.rsi/wielded-inhand-right.png b/Resources/Textures/ADT/Objects/Weapons/Melee/tagilla_sledge.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..3136e27e1dc Binary files /dev/null and b/Resources/Textures/ADT/Objects/Weapons/Melee/tagilla_sledge.rsi/wielded-inhand-right.png differ diff --git a/Resources/Textures/ADT/Structures/Decoration/Plants/potted_plant_helloween.rsi/meta.json b/Resources/Textures/ADT/Structures/Decoration/Plants/potted_plant_helloween.rsi/meta.json new file mode 100644 index 00000000000..d015970ba83 --- /dev/null +++ b/Resources/Textures/ADT/Structures/Decoration/Plants/potted_plant_helloween.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by m1and1b for Adventure Time MRP Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "plant1" + }, + { + "name": "plant2" + } + ] +} diff --git a/Resources/Textures/ADT/Structures/Decoration/Plants/potted_plant_helloween.rsi/plant1.png b/Resources/Textures/ADT/Structures/Decoration/Plants/potted_plant_helloween.rsi/plant1.png new file mode 100644 index 00000000000..640c0e95856 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Decoration/Plants/potted_plant_helloween.rsi/plant1.png differ diff --git a/Resources/Textures/ADT/Structures/Decoration/Plants/potted_plant_helloween.rsi/plant2.png b/Resources/Textures/ADT/Structures/Decoration/Plants/potted_plant_helloween.rsi/plant2.png new file mode 100644 index 00000000000..31b327aeaad Binary files /dev/null and b/Resources/Textures/ADT/Structures/Decoration/Plants/potted_plant_helloween.rsi/plant2.png differ diff --git a/Resources/Textures/ADT/Structures/Furniture/Chairs/spider_stool.rsi/icon.png b/Resources/Textures/ADT/Structures/Furniture/Chairs/spider_stool.rsi/icon.png new file mode 100644 index 00000000000..37875e59d3e Binary files /dev/null and b/Resources/Textures/ADT/Structures/Furniture/Chairs/spider_stool.rsi/icon.png differ diff --git a/Resources/Textures/ADT/Structures/Furniture/Chairs/spider_stool.rsi/meta.json b/Resources/Textures/ADT/Structures/Furniture/Chairs/spider_stool.rsi/meta.json new file mode 100644 index 00000000000..6857d88c34e --- /dev/null +++ b/Resources/Textures/ADT/Structures/Furniture/Chairs/spider_stool.rsi/meta.json @@ -0,0 +1,16 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:uma_eso_stabler для Время Приключений MRP сервер", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 4 + } + ] +} + diff --git a/Resources/Textures/ADT/Structures/Furniture/pumpkin_light.rsi/meta.json b/Resources/Textures/ADT/Structures/Furniture/pumpkin_light.rsi/meta.json new file mode 100644 index 00000000000..5c8a6d31ece --- /dev/null +++ b/Resources/Textures/ADT/Structures/Furniture/pumpkin_light.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by m1and1b for Adventure Time MRP Server, modified by [767Sikon] or (prazat911)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "pumpkin_light1", + "delays": [ + [0.3,0.3,0.3,0.3,0.3] + ] + }, + { + "name": "pumpkin_light2", + "delays": [ + [0.3,0.3,0.3,0.3,0.3] + ] + }, + { + "name": "pumpkin_light3" + }, + { + "name": "pumpkin_light4", + "delays": [ + [0.3,0.3,0.3,0.3,0.3] + ] + }, + { + "name": "pumpkin_light5" + } + ] +} diff --git a/Resources/Textures/ADT/Structures/Furniture/pumpkin_light.rsi/pumpkin_light1.png b/Resources/Textures/ADT/Structures/Furniture/pumpkin_light.rsi/pumpkin_light1.png new file mode 100644 index 00000000000..165caa13e84 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Furniture/pumpkin_light.rsi/pumpkin_light1.png differ diff --git a/Resources/Textures/ADT/Structures/Furniture/pumpkin_light.rsi/pumpkin_light2.png b/Resources/Textures/ADT/Structures/Furniture/pumpkin_light.rsi/pumpkin_light2.png new file mode 100644 index 00000000000..22e44eb4207 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Furniture/pumpkin_light.rsi/pumpkin_light2.png differ diff --git a/Resources/Textures/ADT/Structures/Furniture/pumpkin_light.rsi/pumpkin_light3.png b/Resources/Textures/ADT/Structures/Furniture/pumpkin_light.rsi/pumpkin_light3.png new file mode 100644 index 00000000000..bf2db6512ca Binary files /dev/null and b/Resources/Textures/ADT/Structures/Furniture/pumpkin_light.rsi/pumpkin_light3.png differ diff --git a/Resources/Textures/ADT/Structures/Furniture/pumpkin_light.rsi/pumpkin_light4.png b/Resources/Textures/ADT/Structures/Furniture/pumpkin_light.rsi/pumpkin_light4.png new file mode 100644 index 00000000000..bc5fe8beaff Binary files /dev/null and b/Resources/Textures/ADT/Structures/Furniture/pumpkin_light.rsi/pumpkin_light4.png differ diff --git a/Resources/Textures/ADT/Structures/Furniture/pumpkin_light.rsi/pumpkin_light5.png b/Resources/Textures/ADT/Structures/Furniture/pumpkin_light.rsi/pumpkin_light5.png new file mode 100644 index 00000000000..0e35ec56229 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Furniture/pumpkin_light.rsi/pumpkin_light5.png differ diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/halloweenmat.rsi/broken.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/halloweenmat.rsi/broken.png new file mode 100644 index 00000000000..629667f8c4b Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/halloweenmat.rsi/broken.png differ diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/halloweenmat.rsi/deny-unshaded.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/halloweenmat.rsi/deny-unshaded.png new file mode 100644 index 00000000000..2aeb30332d9 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/halloweenmat.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/halloweenmat.rsi/meta.json b/Resources/Textures/ADT/Structures/Machines/VendingMachines/halloweenmat.rsi/meta.json new file mode 100644 index 00000000000..1758894b0b6 --- /dev/null +++ b/Resources/Textures/ADT/Structures/Machines/VendingMachines/halloweenmat.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Празат Дер Вахэд (discord: prazat911) для МРП-сервера Время Приключений ", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded", + "delays": [ + [ + 1.5, + 0.1, + 1.5, + 0.1, + 1.5, + 0.1, + 1.5, + 0.1 + ] + ] + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "broken" + }, + { + "name": "panel" + } + ] +} diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/halloweenmat.rsi/normal-unshaded.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/halloweenmat.rsi/normal-unshaded.png new file mode 100644 index 00000000000..42968325ece Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/halloweenmat.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/halloweenmat.rsi/off.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/halloweenmat.rsi/off.png new file mode 100644 index 00000000000..4b0233a770f Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/halloweenmat.rsi/off.png differ diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/halloweenmat.rsi/panel.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/halloweenmat.rsi/panel.png new file mode 100644 index 00000000000..76545e0bac3 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/halloweenmat.rsi/panel.png differ diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/lovevend.rsi/broken.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/lovevend.rsi/broken.png new file mode 100644 index 00000000000..b560d19541f Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/lovevend.rsi/broken.png differ diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/lovevend.rsi/deny-unshaded.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/lovevend.rsi/deny-unshaded.png new file mode 100644 index 00000000000..9e3284bd7fc Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/lovevend.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/lovevend.rsi/meta.json b/Resources/Textures/ADT/Structures/Machines/VendingMachines/lovevend.rsi/meta.json new file mode 100644 index 00000000000..73cd2df14fb --- /dev/null +++ b/Resources/Textures/ADT/Structures/Machines/VendingMachines/lovevend.rsi/meta.json @@ -0,0 +1,40 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord:prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded", + "delays": [ + [ + 1.0, + 0.5, + 1.0, + 0.5 + ] + ] + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "broken" + }, + { + "name": "panel" + } + ] +} diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/lovevend.rsi/normal-unshaded.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/lovevend.rsi/normal-unshaded.png new file mode 100644 index 00000000000..9ea65959d92 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/lovevend.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/lovevend.rsi/off.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/lovevend.rsi/off.png new file mode 100644 index 00000000000..880d0bec9bf Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/lovevend.rsi/off.png differ diff --git a/Resources/Textures/ADT/Structures/Machines/VendingMachines/lovevend.rsi/panel.png b/Resources/Textures/ADT/Structures/Machines/VendingMachines/lovevend.rsi/panel.png new file mode 100644 index 00000000000..0032751ff4f Binary files /dev/null and b/Resources/Textures/ADT/Structures/Machines/VendingMachines/lovevend.rsi/panel.png differ diff --git a/Resources/Textures/ADT/Structures/Power/Supermatter/Basic.rsi/meta.json b/Resources/Textures/ADT/Structures/Power/Supermatter/Basic.rsi/meta.json index 12465033e6f..1bec49a8318 100644 --- a/Resources/Textures/ADT/Structures/Power/Supermatter/Basic.rsi/meta.json +++ b/Resources/Textures/ADT/Structures/Power/Supermatter/Basic.rsi/meta.json @@ -154,6 +154,9 @@ 0.075 ] ] + }, + { + "name": "newyearhat" } ] } diff --git a/Resources/Textures/ADT/Structures/Power/Supermatter/Basic.rsi/newyearhat.png b/Resources/Textures/ADT/Structures/Power/Supermatter/Basic.rsi/newyearhat.png new file mode 100644 index 00000000000..1211ce6c507 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Power/Supermatter/Basic.rsi/newyearhat.png differ diff --git a/Resources/Textures/ADT/Structures/Wallmounts/hanging_hearts_valentines_day.rsi/love.png b/Resources/Textures/ADT/Structures/Wallmounts/hanging_hearts_valentines_day.rsi/love.png new file mode 100644 index 00000000000..7ac861ab258 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Wallmounts/hanging_hearts_valentines_day.rsi/love.png differ diff --git a/Resources/Textures/ADT/Structures/Wallmounts/hanging_hearts_valentines_day.rsi/love2.png b/Resources/Textures/ADT/Structures/Wallmounts/hanging_hearts_valentines_day.rsi/love2.png new file mode 100644 index 00000000000..00244cefc41 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Wallmounts/hanging_hearts_valentines_day.rsi/love2.png differ diff --git a/Resources/Textures/ADT/Structures/Wallmounts/hanging_hearts_valentines_day.rsi/love3.png b/Resources/Textures/ADT/Structures/Wallmounts/hanging_hearts_valentines_day.rsi/love3.png new file mode 100644 index 00000000000..9b1f66e52a6 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Wallmounts/hanging_hearts_valentines_day.rsi/love3.png differ diff --git a/Resources/Textures/ADT/Structures/Wallmounts/hanging_hearts_valentines_day.rsi/love4.png b/Resources/Textures/ADT/Structures/Wallmounts/hanging_hearts_valentines_day.rsi/love4.png new file mode 100644 index 00000000000..4677aefafc2 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Wallmounts/hanging_hearts_valentines_day.rsi/love4.png differ diff --git a/Resources/Textures/ADT/Structures/Wallmounts/hanging_hearts_valentines_day.rsi/meta.json b/Resources/Textures/ADT/Structures/Wallmounts/hanging_hearts_valentines_day.rsi/meta.json new file mode 100644 index 00000000000..a6165948371 --- /dev/null +++ b/Resources/Textures/ADT/Structures/Wallmounts/hanging_hearts_valentines_day.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "love" + }, + { + "name": "love2" + }, + { + "name": "love3" + }, + { + "name": "love4" + } + ] +} diff --git a/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/dv_love_contraband.png b/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/dv_love_contraband.png new file mode 100644 index 00000000000..0f9e5c39ea7 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/dv_love_contraband.png differ diff --git a/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/meta.json b/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/meta.json new file mode 100644 index 00000000000..c6ecae3dabe --- /dev/null +++ b/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/meta.json @@ -0,0 +1,35 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by discord: prazat911", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "dv_love_contraband" + }, + { + "name": "space_love_contraband" + }, + { + "name": "valentina_legit" + }, + { + "name": "valentina2_legit" + }, + { + "name": "valentina3_legit" + }, + { + "name": "valentina4_legit" + }, + { + "name": "valentina5_legit" + }, + { + "name": "valentina6_legit" + } + ] +} diff --git a/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/space_love_contraband.png b/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/space_love_contraband.png new file mode 100644 index 00000000000..e70cb6a1ada Binary files /dev/null and b/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/space_love_contraband.png differ diff --git a/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/valentina2_legit.png b/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/valentina2_legit.png new file mode 100644 index 00000000000..10edf54dac7 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/valentina2_legit.png differ diff --git a/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/valentina3_legit.png b/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/valentina3_legit.png new file mode 100644 index 00000000000..57e7aa97f4b Binary files /dev/null and b/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/valentina3_legit.png differ diff --git a/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/valentina4_legit.png b/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/valentina4_legit.png new file mode 100644 index 00000000000..4c1ed1c89f2 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/valentina4_legit.png differ diff --git a/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/valentina5_legit.png b/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/valentina5_legit.png new file mode 100644 index 00000000000..d7777ed4a67 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/valentina5_legit.png differ diff --git a/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/valentina6_legit.png b/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/valentina6_legit.png new file mode 100644 index 00000000000..62e447ea391 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/valentina6_legit.png differ diff --git a/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/valentina_legit.png b/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/valentina_legit.png new file mode 100644 index 00000000000..4ca5bcee319 Binary files /dev/null and b/Resources/Textures/ADT/Structures/Wallmounts/posters_valentines_day.rsi/valentina_legit.png differ diff --git a/Resources/Textures/ADT/Structures/celtic_spike.rsi/meta.json b/Resources/Textures/ADT/Structures/celtic_spike.rsi/meta.json new file mode 100644 index 00000000000..14fafd318c8 --- /dev/null +++ b/Resources/Textures/ADT/Structures/celtic_spike.rsi/meta.json @@ -0,0 +1,15 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Skyrat-tg at commit https://github.com/Skyrat-SS13/Skyrat-tg/commit/e9f937f52b9f63acb49ffd6ab5e6de68e7b13e73", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "spike", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/ADT/Structures/celtic_spike.rsi/spike.png b/Resources/Textures/ADT/Structures/celtic_spike.rsi/spike.png new file mode 100644 index 00000000000..44c53b63890 Binary files /dev/null and b/Resources/Textures/ADT/Structures/celtic_spike.rsi/spike.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/chocolate-slice-heart.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/chocolate-slice-heart.png new file mode 100644 index 00000000000..4259570832f Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/chocolate-slice-heart.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/chocolate_heart.png b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/chocolate_heart.png new file mode 100644 index 00000000000..4de52e13757 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/chocolate_heart.png differ diff --git a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json index e00bbdeeea1..5e27be14ac5 100644 --- a/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json +++ b/Resources/Textures/Objects/Consumable/Food/Baked/cake.rsi/meta.json @@ -245,6 +245,12 @@ ] ] }, + { + "name": "chocolate_heart" + }, + { + "name": "chocolate-slice-heart" + }, { "name": "lemoon-inhand-left", "directions": 4, diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json index a61f47eeebf..b2a0864421a 100644 --- a/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json @@ -231,8 +231,20 @@ { "name": "paper_stamp-wizard" }, + { + "name": "paper-valentine-red_words" + }, + { + "name": "paper-valentine-white_words" + }, { "name": "paper_stamp-dv" + }, + { + "name": "paper-valentine-white" + }, + { + "name": "paper-valentine-red" } ] } diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper-valentine-red.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper-valentine-red.png new file mode 100644 index 00000000000..c3256aa10c4 Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper-valentine-red.png differ diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper-valentine-red_words.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper-valentine-red_words.png new file mode 100644 index 00000000000..9437e268ec7 Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper-valentine-red_words.png differ diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper-valentine-white.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper-valentine-white.png new file mode 100644 index 00000000000..8fd9beadaec Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper-valentine-white.png differ diff --git a/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper-valentine-white_words.png b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper-valentine-white_words.png new file mode 100644 index 00000000000..4390cb5bae9 Binary files /dev/null and b/Resources/Textures/Objects/Misc/bureaucracy.rsi/paper-valentine-white_words.png differ