diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e6b7bfe36d0..9c990504a04 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,2 +1,2 @@ **/_LostParadise @Flybik @Evgencheg -. @BL02DL +* @BL02DL diff --git a/Content.Server/Body/Components/StomachComponent.cs b/Content.Server/Body/Components/StomachComponent.cs index d541ca4d7c4..cedf56f729e 100644 --- a/Content.Server/Body/Components/StomachComponent.cs +++ b/Content.Server/Body/Components/StomachComponent.cs @@ -47,6 +47,13 @@ public sealed partial class StomachComponent : Component [DataField] public EntityWhitelist? SpecialDigestible = null; + /// + /// Добавлено LostParadise. + /// Data responsible to describe what foods this stomach is incapable of processing efficiently. + /// + [DataField("poorlyDigestibleFood")] + public PoorlyDigestibleFood? LPP_PoorlyDigestibleFood = null; + /// /// Used to track how long each reagent has been in the stomach /// diff --git a/Content.Server/Chat/Managers/ChatSanitizationManager.cs b/Content.Server/Chat/Managers/ChatSanitizationManager.cs index ab1b29f58ff..132dc9731ae 100644 --- a/Content.Server/Chat/Managers/ChatSanitizationManager.cs +++ b/Content.Server/Chat/Managers/ChatSanitizationManager.cs @@ -14,12 +14,12 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager // Corvax-Localization-Start { "хд", "chatsan-laughs" }, { "хд.", "chatsan-laughs" }, - { "о-о", "chatsan-wide-eyed" }, // cyrillic о - { "о.о", "chatsan-wide-eyed" }, // cyrillic о - { "0_о", "chatsan-wide-eyed" }, // cyrillic о + { "о-о", "chatsan-wide-eyed" }, // cyrillic о нет + { "о.о", "chatsan-wide-eyed" }, // cyrillic о нет + { "0_о", "chatsan-wide-eyed" }, // cyrillic о нет { "о/", "chatsan-waves" }, // cyrillic о { "о7", "chatsan-salutes" }, // cyrillic о - { "0_o", "chatsan-wide-eyed" }, + { "0_o", "chatsan-wide-eyed" }, // нет { "лмао", "chatsan-laughs" }, { "лмао.", "chatsan-laughs" }, { "рофл", "chatsan-laughs" }, @@ -27,11 +27,11 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager { "яхз", "chatsan-shrugs" }, { "яхз.", "chatsan-shrugs" }, { ":0", "chatsan-surprised" }, - { ":р", "chatsan-stick-out-tongue" }, // cyrillic р + { ":р", "chatsan-stick-out-tongue" }, // cyrillic р . в канал гарнитуры { "кек", "chatsan-laughs" }, { "кек.", "chatsan-laughs" }, - { "T_T", "chatsan-cries" }, - { "Т_Т", "chatsan-cries" }, // cyrillic T + { "T_T", "chatsan-cries" }, // нет + { "Т_Т", "chatsan-cries" }, // cyrillic T нет { "=_(", "chatsan-cries" }, { "!с", "chatsan-laughs" }, { "!с.", "chatsan-laughs" }, @@ -65,60 +65,60 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager // I could've done this with regex, but felt it wasn't the right idea. { ":)", "chatsan-smiles" }, { ":]", "chatsan-smiles" }, - { "=)", "chatsan-smiles" }, + { "=)", "chatsan-smiles" }, // = + улыбается { "=]", "chatsan-smiles" }, { "(:", "chatsan-smiles" }, - { "[:", "chatsan-smiles" }, + { "[:", "chatsan-smiles" }, // : в ООС { "(=", "chatsan-smiles" }, { "[=", "chatsan-smiles" }, { "^^", "chatsan-smiles" }, { "^-^", "chatsan-smiles" }, { ":(", "chatsan-frowns" }, { ":[", "chatsan-frowns" }, - { "=(", "chatsan-frowns" }, + { "=(", "chatsan-frowns" }, // = + хмурится { "=[", "chatsan-frowns" }, { "):", "chatsan-frowns" }, { ")=", "chatsan-frowns" }, - { "]:", "chatsan-frowns" }, + { "]:", "chatsan-frowns" }, // : в админ { "]=", "chatsan-frowns" }, - { ":D", "chatsan-smiles-widely" }, + { ":D", "chatsan-smiles-widely" }, //нет канала с ключём , . в шёпот { "D:", "chatsan-frowns-deeply" }, - { ":O", "chatsan-surprised" }, + { ":O", "chatsan-surprised" }, // . в безопасность { ":3", "chatsan-smiles" }, //nope - { ":S", "chatsan-uncertain" }, + { ":S", "chatsan-uncertain" }, //нет канала с ключём, . в шёпот { ":>", "chatsan-grins" }, { ":<", "chatsan-pouts" }, - { "xD", "chatsan-laughs" }, + { "xD", "chatsan-laughs" }, // нет { ":'(", "chatsan-cries" }, { ":'[", "chatsan-cries" }, - { "='(", "chatsan-cries" }, + { "='(", "chatsan-cries" }, // =' + хмурится { "='[", "chatsan-cries" }, { ")':", "chatsan-cries" }, - { "]':", "chatsan-cries" }, + { "]':", "chatsan-cries" }, // ': в админ чат { ")'=", "chatsan-cries" }, - { "]'=", "chatsan-cries" }, + { "]'=", "chatsan-cries" }, // '= в админ чат { ";-;", "chatsan-cries" }, { ";_;", "chatsan-cries" }, - { "qwq", "chatsan-cries" }, - { ":u", "chatsan-smiles-smugly" }, - { ":v", "chatsan-smiles-smugly" }, - { ">:i", "chatsan-annoyed" }, - { ":i", "chatsan-sighs" }, + { "qwq", "chatsan-cries" }, // нет + { ":u", "chatsan-smiles-smugly" }, // нет канала с ключём, . в шёпот + { ":v", "chatsan-smiles-smugly" }, // нет канала с ключём, . в шёпот + { ">:i", "chatsan-annoyed" }, // :i в чат + { ":i", "chatsan-sighs" }, // нет канала с ключём, . в шёпот { ":|", "chatsan-sighs" }, - { ":p", "chatsan-stick-out-tongue" }, - { ";p", "chatsan-stick-out-tongue" }, - { ":b", "chatsan-stick-out-tongue" }, - { "0-0", "chatsan-wide-eyed" }, - { "o-o", "chatsan-wide-eyed" }, - { "o.o", "chatsan-wide-eyed" }, - { "._.", "chatsan-surprised" }, + { ":p", "chatsan-stick-out-tongue" }, // нет канала с ключём, . в шёпот + { ";p", "chatsan-stick-out-tongue" }, // Р в общий + { ":b", "chatsan-stick-out-tongue" }, // нет канала с ключём, . в шёпот + { "0-0", "chatsan-wide-eyed" }, // нет + { "o-o", "chatsan-wide-eyed" }, // нет + { "o.o", "chatsan-wide-eyed" }, // нет + { "._.", "chatsan-surprised" }, { ".-.", "chatsan-confused" }, { "-_-", "chatsan-unimpressed" }, - { "smh", "chatsan-unimpressed" }, + { "smh", "chatsan-unimpressed" }, // нет { "o/", "chatsan-waves" }, { "^^/", "chatsan-waves" }, { ":/", "chatsan-uncertain" }, - { ":\\", "chatsan-uncertain" }, + { ":\\", "chatsan-uncertain" }, // нет канала с \ { "lmao", "chatsan-laughs" }, { "lmao.", "chatsan-laughs" }, { "lol", "chatsan-laughs" }, @@ -127,7 +127,7 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager { "lel.", "chatsan-laughs" }, { "kek", "chatsan-laughs" }, { "kek.", "chatsan-laughs" }, - { "rofl", "chatsan-laughs" }, + { "rofl", "chatsan-laughs" }, // нет { "o7", "chatsan-salutes" }, { ";_;7", "chatsan-tearfully-salutes"}, { "idk", "chatsan-shrugs" }, @@ -135,15 +135,15 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager { ";)", "chatsan-winks" }, { ";]", "chatsan-winks" }, { "(;", "chatsan-winks" }, - { "[;", "chatsan-winks" }, + { "[;", "chatsan-winks" }, // ; в OOC { ":')", "chatsan-tearfully-smiles" }, { ":']", "chatsan-tearfully-smiles" }, - { "=')", "chatsan-tearfully-smiles" }, + { "=')", "chatsan-tearfully-smiles" }, // =' + улыбается { "=']", "chatsan-tearfully-smiles" }, { "(':", "chatsan-tearfully-smiles" }, - { "[':", "chatsan-tearfully-smiles" }, + { "[':", "chatsan-tearfully-smiles" }, // ': в OOC { "('=", "chatsan-tearfully-smiles" }, - { "['=", "chatsan-tearfully-smiles" }, + { "['=", "chatsan-tearfully-smiles" }, // '= в админ чат }; private bool _doSanitize; diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs index 84355f03c16..63097dbfbd0 100644 --- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs +++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs @@ -264,6 +264,11 @@ private void OnDoAfter(Entity entity, ref ConsumeDoAfterEvent arg } _reaction.DoEntityReaction(args.Target.Value, solution, ReactionMethod.Ingestion); + + // Добавлено LostParadise. + if (stomachToUse.LPP_PoorlyDigestibleFood?.AffectsFood(entity, EntityManager) == true) + split = stomachToUse.LPP_PoorlyDigestibleFood.ModifySolution(split); + _stomach.TryTransferSolution(stomachToUse.Owner, split, stomachToUse); var flavors = args.FlavorMessage; diff --git a/Content.Server/_LostParadise/CarnivoresDiet/AccumulateReagent.cs b/Content.Server/_LostParadise/CarnivoresDiet/AccumulateReagent.cs new file mode 100644 index 00000000000..95bd6c65bc4 --- /dev/null +++ b/Content.Server/_LostParadise/CarnivoresDiet/AccumulateReagent.cs @@ -0,0 +1,112 @@ +using Content.Server.Body.Components; +using Content.Shared.Chemistry.Components; +using Content.Shared.Chemistry.Reagent; +using Content.Shared.FixedPoint; +using JetBrains.Annotations; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; + +namespace Content.Server.Chemistry.ReagentEffects +{ + // This class is basically copied from the sealed class AdjustReagent, but compensates a reagent's metabolism rates when adjusting its levels. + // Was introduced in order to make theobromine accumulate faster than it metabolises. + // While quite kludgy, it is still much safer and cleaner alternative to actively preventing the metabolism system from processing theobromine while it's still in the system. + + // TL;DR Это костыль, который тупо добавляет столько же реагента, сколько должно впитаться за данный тик. + // Решение сомнительное, но оно гораздо чище, чем лезть в код метаболирования и добавлять туда группу-исключение с проверкой на наличие реагента в кровеносной системе. + + [UsedImplicitly] + public sealed partial class AccumulateReagent : ReagentEffect + { + /// + /// The reagent ID to accumulate. Only one of this and should be active. + /// + [DataField(customTypeSerializer: typeof(PrototypeIdSerializer), required: true)] + public string? Reagent; + + /// + /// Checks if the target has something that already adds the target reagent + /// + public bool ContainsPositiveAdjustEffect(IPrototypeManager prototypeMan, Solution solution, List groups) + { + foreach (var quantity in solution.Contents) + { + var reagent = quantity.Reagent.Prototype; + if (reagent == Reagent) + continue; + + if (!prototypeMan.TryIndex(reagent, out ReagentPrototype? reagentProto)) + continue; + + if (reagentProto?.Metabolisms == null) + continue; + + // Ideally we should iterate over the body's MetabolismGroupEntry list. + // But I have no idea why there's no Drink in its .MetabolismGroups property and how to fetch that. + // So it will stay like this for now, but might cause unintended theobromine accumulation in some *very* unlikely and specific scenarios. + foreach (var reagentEffectsEntry in reagentProto.Metabolisms.Values) + { + foreach (var effect in reagentEffectsEntry.Effects) + { + if (effect is not AdjustReagent adjustReagent) + continue; + + if (adjustReagent.Reagent == Reagent) + return true; + } + } + } + + return false; + } + + public override void Effect(ReagentEffectArgs args) + { + // Source is where Theobromine is currently coming from + if (args.Source == null) + return; + + if (Reagent == null) + return; + + var prototypeMan = IoCManager.Resolve(); + prototypeMan.TryIndex(Reagent, out ReagentPrototype? reagentProto); + + args.EntityManager.TryGetComponent(args.OrganEntity, out MetabolizerComponent? metabolizer); + + if (metabolizer?.MetabolismGroups is not List groups) + return; + + if (!ContainsPositiveAdjustEffect(prototypeMan, args.Source, groups)) + return; + + if (reagentProto?.Metabolisms == null) + return; + + FixedPoint2 totalCompensationRate = 0; + foreach (var group in groups) + { + // Normally, the rate should only be processed once since a reagent usually only has one group. + if (!reagentProto.Metabolisms.TryGetValue(group.Id, out var reagentEffectsEntry)) + continue; + + var groupRate = reagentEffectsEntry.MetabolismRate * group.MetabolismRateModifier; + totalCompensationRate += groupRate; + } + + // amount *= args.Scale; + args.Source.AddReagent(Reagent, totalCompensationRate); + } + + protected override string? ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys) + { + if (Reagent != null && prototype.TryIndex(Reagent, out ReagentPrototype? reagentProto)) + { + return Loc.GetString("reagent-effect-guidebook-accumulate-reagent-reagent", + ("reagent", reagentProto.LocalizedName)); + } + + throw new NotImplementedException(); + } + } +} diff --git a/Content.Server/_LostParadise/CarnivoresDiet/PoorlyDigestible.cs b/Content.Server/_LostParadise/CarnivoresDiet/PoorlyDigestible.cs new file mode 100644 index 00000000000..e542aa8539c --- /dev/null +++ b/Content.Server/_LostParadise/CarnivoresDiet/PoorlyDigestible.cs @@ -0,0 +1,92 @@ +using Content.Server.Nutrition.Components; +using Content.Shared.Chemistry.Components; +using Content.Shared.Chemistry.Reagent; +using Content.Shared.FixedPoint; +using Content.Shared.Tag; +using Content.Shared.Whitelist; +using Robust.Shared.GameObjects; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype.List; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Content.Server.Body.Components +{ + [DataDefinition] + public sealed partial class PoorlyDigestibleFood + { + /// + /// Reagents that get multiplied by the Factor field. + /// + [DataField("reducedReagents")] + public List? ReducedReagents = null; + + /// + /// Food containing at least one of these tags is affected as long as it doesn't hit any BlacklistTags. + /// + [DataField("whitelistTags", customTypeSerializer: typeof(PrototypeIdListSerializer))] + public List? WhitelistTags = null; + + /// + /// Food containing any of these tags is not affected. + /// + [DataField("blacklistTags", customTypeSerializer: typeof(PrototypeIdListSerializer))] + public List? BlacklistTags = null; + + /// + /// Factor that the reagent quantities are multiplied by. + /// + [DataField("factor")] + public FixedPoint2 Factor = 1f; + + /// + /// Reagent that is used to replace the volume taken away by the Factor multiplication. + /// + [DataField("replacementReagent")] + public string? ReplacementReagentID = null; + + public bool AffectsFood(EntityUid foodEnt, IEntityManager entityManager) + { + if (WhitelistTags is null) + return false; + + var tagSys = entityManager.System(); + + if (BlacklistTags is not null && tagSys.HasAnyTag(foodEnt, BlacklistTags)) + return false; + + return tagSys.HasAnyTag(foodEnt, WhitelistTags); + } + + public Solution ModifySolution(Solution solution) + { + // In case someone forgot to set the reagents being replaced, we do nothing. + if (ReducedReagents is null || Factor <= 0f) + return solution; + + // Recreating the list since we can't set quentities in-place. + List newReagents = new(); + FixedPoint2 removedQuantity = 0f; + foreach (var quantity in solution.Contents) + { + if (!ReducedReagents.Contains(quantity.Reagent.Prototype)) + { + newReagents.Add(quantity); + continue; + } + + removedQuantity += quantity.Quantity; + newReagents.Add(new ReagentQuantity(quantity.Reagent, quantity.Quantity * Factor)); + } + removedQuantity *= 1f - Factor; + + if (ReplacementReagentID is string reagentId) + newReagents.Add(new ReagentQuantity(new ReagentId(reagentId, null), removedQuantity)); + + solution.SetContents(newReagents); + return solution; + } + } +} diff --git a/Resources/Audio/Jukebox/Jaya-MalinoviePalmi.ogg b/Resources/Audio/Jukebox/Jaya-MalinoviePalmi.ogg new file mode 100644 index 00000000000..0795e48b1d1 Binary files /dev/null and b/Resources/Audio/Jukebox/Jaya-MalinoviePalmi.ogg differ diff --git a/Resources/Changelog/ChangelogLPP.yml b/Resources/Changelog/ChangelogLPP.yml index 24b4b9292ab..62666b02656 100644 --- a/Resources/Changelog/ChangelogLPP.yml +++ b/Resources/Changelog/ChangelogLPP.yml @@ -2207,3 +2207,163 @@ id: 122 time: '2024-10-21T15:05:58.0000000+00:00' url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/295 +- author: NeLepus + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043C\u0435\u0445\ + \u0430\u043D\u0438\u043A\u0430 \u043F\u043B\u043E\u0445\u043E \u0443\u0441\u0432\ + \u0430\u0438\u0432\u0430\u0435\u043C\u043E\u0439 \u043F\u0438\u0449\u0438 \u0434\ + \u043B\u044F \u0432\u0443\u043B\u044C\u043F\u043A\u0430\u043D\u0438\u043D\u043E\ + \u0432 \u0438 \u0442\u0430\u044F\u0440\u0430\u043D." + type: Add + - message: "\u041F\u0435\u043B\u044C\u043C\u0435\u043D\u0438 \u0438 \u0433\u0430\ + \u0432\u0430\u0439\u0441\u043A\u0430\u044F \u043F\u0438\u0446\u0446\u0430 \u0442\ + \u0435\u043F\u0435\u0440\u044C \u0441\u0447\u0438\u0442\u0430\u044E\u0442\u0441\ + \u044F \u043C\u044F\u0441\u043D\u043E\u0439 \u0435\u0434\u043E\u0439." + type: Add + - message: "\u0423\u0431\u0440\u0430\u043D\u043E \u043E\u0433\u0440\u0430\u043D\u0438\ + \u0447\u0435\u043D\u0438\u0435 \u043D\u0430 \u043C\u044F\u0441\u043D\u0443\u044E\ + \ \u0434\u0438\u0435\u0442\u0443 \u0443 \u0440\u0430\u0441\u044B \u0442\u0430\ + \u044F\u0440\u0430\u043D." + type: Remove + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0431\u0430\u0433\ + \ \u0441 \u043D\u0435\u0440\u0430\u0431\u043E\u0442\u0430\u044E\u0449\u0438\u043C\ + \ \u0442\u0435\u043E\u0431\u0440\u043E\u043C\u0438\u043D\u043E\u043C \u0438\u0437\ + \ \u043D\u0430\u043F\u0438\u0442\u043A\u043E\u0432, \u0441\u043E\u0434\u0435\ + \u0440\u0436\u0430\u0449\u0438\u0445 \u043A\u043E\u0444\u0435/\u0448\u043E\u043A\ + \u043E\u043B\u0430\u0434." + type: Fix + id: 123 + time: '2024-10-21T19:16:56.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/267 +- author: MegaDaimond + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0442\u0435\u043C\ + \u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438\u0435 \u0432\u0435\u0449\u0438\ + \ \u043D\u0430 \u0445\u044D\u043B\u043B\u043E\u0443\u0438\u043D!" + type: Add + id: 124 + time: '2024-10-22T13:29:46.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/297 +- author: Kest + changes: + - message: "\u0417\u0435\u043B\u0451\u043D\u044B\u0439 \u0447\u0430\u0439 \u0442\ + \u0435\u043F\u0435\u0440\u044C \u0432\u043E\u0441\u043F\u043E\u043B\u043D\u044F\ + \u0435\u0442 \u0436\u0430\u0436\u0434\u0443" + type: Fix + id: 125 + time: '2024-10-23T10:55:15.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/298 +- author: Kest + changes: + - message: "\u0423\u0431\u0440\u0430\u043D\u043E \u0432\u0435\u0441\u0435\u043B\u044C\ + \u0435!" + type: Remove + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0441\u0442\u0440\ + \u0430\u0448\u0438\u043B\u043A\u0438!" + type: Add + id: 126 + time: '2024-10-23T18:15:17.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/289 +- author: Farrellka + changes: + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0431\u0430\u0433\ + \ \u0432 \u043E\u0442\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0438\ + \ \u0441\u0432\u044F\u0449\u0435\u043D\u043D\u0438\u043A\u0430 \u0432 \u043C\ + \u043E\u043D\u0438\u0442\u043E\u0440\u0438\u043D\u0433\u0435 \u044D\u043A\u0438\ + \u043F\u0430\u0436\u0430." + type: Fix + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u0434\u043E\ + \u0441\u0442\u0443\u043F\u044B \u0443 \u0448\u043A\u0430\u0444\u0447\u0438\u043A\ + \u0430 \u0441 \u0430\u0439\u0434\u0438 \u043A\u0430\u0440\u0442\u043E\u0439\ + \ \u043A\u0430\u043F\u0438\u0442\u0430\u043D\u0430 \u043D\u0430 \u0434\u043E\ + \u0441\u0442\u0443\u043F \u0434\u043B\u044F \u043A\u043E\u043C\u0430\u043D\u0434\ + \u043E\u0432\u0430\u043D\u0438\u044F." + type: Fix + id: 127 + time: '2024-10-24T11:06:53.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/300 +- author: Kest + changes: + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u0441\u0442\ + \u0440\u0430\u0448\u0438\u043B\u043A\u0438!" + type: Fix + id: 128 + time: '2024-10-25T14:32:39.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/301 +- author: MegaDaimond + changes: + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u0432\u043E\u0437\ + \u043C\u043E\u0436\u043D\u043E\u0441\u0442\u044C \u043D\u043E\u0441\u0438\u0442\ + \u044C \u043A\u0430\u0442\u0430\u043D\u0443 \u043D\u0430 \u0441\u043B\u043E\u0442\ + \u0435 \u0440\u044E\u043A\u0437\u0430\u043A\u0430/\u0441\u043F\u0438\u043D\u044B\ + /\u043F\u043E\u044F\u0441\u0430" + type: Add + - message: "\u041F\u0430\u0442\u0440\u043E\u043D\u044B \u043A\u0430\u043B\u0438\u0431\ + \u0440\u0430 5.56 \u0434\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u044B \u0432\ + \ \u043E\u0445\u0440\u0430\u043D\u043D\u044B\u0439 \u0442\u0435\u0445\u0444\u0430\ + \u0431, \u043A\u0430\u043A \u0438 \u043C\u0430\u0433\u0430\u0437\u0438\u043D\ + \u044B .20 \u0434\u043B\u044F \u043F\u0438\u0441\u0442\u043E\u043B\u0435\u0442\ + \u043E\u0432" + type: Add + - message: "\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0430 \u043D\u043E\u0432\ + \u0430\u044F \u043F\u0435\u0441\u043D\u044F \u0432 \u043C\u0443\u0437\u044B\u043A\ + \u0430\u043B\u044C\u043D\u044B\u0439 \u0430\u0432\u0442\u043E\u043C\u0430\u0442" + type: Add + - message: "\u0423\u0431\u0440\u0430\u043D\u044B \u0446\u0435\u043B\u0438 \u043D\ + \u0430 \u043B\u0435\u043A\u0446\u0438\u0438, \u0432\u044B\u0431\u043E\u0440\u0430\ + \ \u043B\u0443\u0447\u0448\u0435\u0433\u043E \u0441\u043E\u0442\u0440\u0443\u0434\ + \u043D\u0438\u043A\u0430 \u043E\u0442\u0434\u0435\u043B\u0430 \u0438 \u043C\u043E\ + \u0431\u0438\u043B\u0438\u0437\u0430\u0446\u0438\u044E" + type: Remove + - message: "\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u044B \u0445\u0430\u0440\u0430\ + \u043A\u0442\u0435\u0440\u0438\u0441\u0442\u0438\u043A\u0438 \u043A\u0430\u043F\ + \u0438\u0442\u0430\u043D\u0441\u043A\u043E\u0439 \u0441\u0430\u0431\u043B\u0438\ + \ \u0438 \u043A\u0430\u0442\u0430\u043D\u044B (\u0421\u0430\u0431\u043B\u044F\ + \ \u043A\u0430\u043F\u0438\u0442\u0430\u043D\u0430 \u043F\u043E\u043B\u0443\u0447\ + \u0438\u043B\u0430 \u043F\u043E\u0432\u044B\u0448\u0435\u043D\u0438\u0435 \u0443\ + \u0440\u043E\u043D\u0430 \u043D\u0430 1.25 \u043E\u0442 \u0431\u0430\u0437\u043E\ + \u0432\u043E\u0433\u043E \u043F\u0440\u0438 \u0441\u0438\u043B\u043E\u0432\u043E\ + \u0439 \u0430\u0442\u0430\u043A\u0435, \u0443\u0440\u043E\u043D \u043A\u0430\ + \u0442\u0430\u043D\u044B \u0443\u0432\u0435\u043B\u0438\u0447\u0435\u043D \u0441\ + \ 12>14 \u0431\u0435\u0437 \u0441\u0438\u043B\u043E\u0432\u043E\u0439 \u0430\ + \u0442\u0430\u043A\u0438 \u0438 \u0443\u0440\u043E\u043D \u0441\u0438\u043B\u043E\ + \u0432\u043E\u0439 \u043F\u043E\u0432\u044B\u0448\u0430\u0435\u0442\u0441\u044F\ + \ (1.25>1.3); \u0441\u043A\u043E\u0440\u043E\u0441\u0442\u044C \u0430\u0442\u0430\ + \u043A\u0438 \u043A\u0430\u0442\u0430\u043D\u043E\u0439 \u043D\u0435 \u0441\u0438\ + \u043B\u043E\u0432\u044B\u043C \u0443\u0434\u0430\u0440\u043E\u043C \u0443\u0432\ + \u0435\u043B\u0438\u0447\u0435\u043D\u0430 (0.5>0.75), \u0443\u0434\u0430\u0440\ + \ \u0441\u0438\u043B\u043E\u0432\u043E\u0439 \u0430\u0442\u0430\u043A\u043E\u0439\ + \ \u0442\u0440\u0430\u0442\u0438\u0442 \u043D\u0435 15, \u0430 10 \u0441\u0442\ + \u0430\u043C\u0438\u043D\u044B \u0437\u0430 \u0443\u0434\u0430\u0440)" + type: Tweak + - message: "\u0418\u0437\u043C\u0435\u043D\u0451\u043D \u0434\u0435\u043B\u0435\u0439\ + \ \u043F\u0440\u0438 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\ + \u043D\u0438\u0438 \u0440\u0435\u0432\u043E\u043B\u044C\u0432\u0435\u0440\u0430\ + \ \u041E\u0421\u0429" + type: Tweak + - message: "\u0420\u0435\u0432\u043E\u043B\u044C\u0432\u0435\u0440 \"\u0421\u0443\ + \u0434\u044C\u044F\" \u0442\u0435\u043F\u0435\u0440\u044C \u0432\u043E\u0437\ + \u043C\u043E\u0436\u043D\u043E \u043D\u043E\u0441\u0438\u0442\u044C \u043D\u0430\ + \ \u043F\u043E\u044F\u0441\u0435" + type: Tweak + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u0446\u0435\ + \u043D\u0430 \u043D\u0430 \u043F\u0430\u0442\u0440\u043E\u043D\u044B .60 \u0432\ + \ \u043E\u0445\u0440\u0430\u043D\u043D\u043E\u043C \u0442\u0435\u0445\u0444\u0430\ + \u0431\u0435" + type: Fix + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D \u0441\u043F\u0440\ + \u0430\u0439\u0442 \u043A\u0430\u043F\u0441\u0443\u043B\u044B \u043A\u0440\u0438\ + \u043E\u0441\u043D\u0430" + type: Fix + id: 129 + time: '2024-10-25T16:54:53.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/299 +- author: BL02DL + changes: + - message: "\u0418\u0441\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u044B \u043C\u0438\ + \u0433\u0440\u0430\u0446\u0438\u0438 \u0434\u043B\u044F \u043A\u0430\u0440\u0442\ + !" + type: Fix + id: 130 + time: '2024-10-25T17:13:50.0000000+00:00' + url: https://github.com/Lost-Paradise-Project/Lost-Paradise/pull/302 diff --git a/Resources/Locale/en-US/_LostParadise/Guidebook/effects.ftl b/Resources/Locale/en-US/_LostParadise/Guidebook/effects.ftl new file mode 100644 index 00000000000..d84a9de7d25 --- /dev/null +++ b/Resources/Locale/en-US/_LostParadise/Guidebook/effects.ftl @@ -0,0 +1,2 @@ +reagent-effect-guidebook-accumulate-reagent-reagent = + Accumulates as long as there's a {$reagent} source present in the bloodstream \ No newline at end of file diff --git a/Resources/Locale/en-US/_LostParadise/prototypes/reagents/food.ftl b/Resources/Locale/en-US/_LostParadise/prototypes/reagents/food.ftl new file mode 100644 index 00000000000..3bc8e16ea1c --- /dev/null +++ b/Resources/Locale/en-US/_LostParadise/prototypes/reagents/food.ftl @@ -0,0 +1,2 @@ +reagent-name-indigestible-fibre = indigestible dietary fibre +reagent-desc-indigestible-fibre = Residues of a digestive system poorly adapted to plant-derived food. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/misc.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/misc.ftl new file mode 100644 index 00000000000..a88fe8c7b1a --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/clothing/misc.ftl @@ -0,0 +1,20 @@ +ent-LPPClothingJumpsuitMummy = Mummy bandages + .desc = They look like ordinary toilet paper rolls and tea bags. But if you soak the former in the latter, you'll get some great aged bandages! +ent-LPPClothingJumpsuitWerewolf = Werewolf suit + .desc = It looks like the fur and skin of a real vulp. Someone must have done a lot of work to recreate this, or.... Wait... +ent-LPPClothingNeckCloakDracula = Dracula's cloak + .desc = This cape is straight out of Transylvania of the most legendary bloodsucker in the history of mankind. It smells like garlic and aspen. +ent-LPPClothingOuterGhostSheet = Ghost sheet + .desc = A sheet with marker sunglasses in the “head” area. It's really cool. +ent-LPPClothingJumpsuitPumpkin = Pumpkin longsleeve + .desc = A cheap-looking longsleeve that you can buy for a couple dozen credits in some secondhand on Halloween. +ent-LPPClothingJumpsuitWitch = Witch suit + .desc = A complete set of clothes for the most real witches, not heat-resistant, if you are sent to the bonfire - it is recommended to remove the costume for its safety. +ent-LPPBalloonHalloweenBlack = Black balloon + .desc = Spooky balloon! +ent-LPPBalloonHalloweenWhite = White balloon + .desc = Spooky balloon! +ent-LPPBalloonHalloweenOrange = Orange balloon + .desc = Spooky balloon! +ent-LPPBalloonHalloweenBloons = Halloween balloons + .desc = Spooky balloons! diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/food/halloween.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/food/halloween.ftl new file mode 100644 index 00000000000..6510b2570b8 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/food/halloween.ftl @@ -0,0 +1,10 @@ +ent-LPPCandy = candy + .desc = This is my kingdom come, this is my kingdom come... +ent-LPPCandy2 = { ent-LPPCandy } + .desc = { ent-LPPCandy.desc } +ent-LPPCandy3 = { ent-LPPCandy } + .desc = { ent-LPPCandy.desc } +ent-LPPCandy4 = { ent-LPPCandy } + .desc = { ent-LPPCandy.desc } +ent-LPPLolipop = lolipop + .desc = This is my kingdom come, this is my kingdom come... diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/flora/halloween.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/flora/halloween.ftl new file mode 100644 index 00000000000..62b5651b2f7 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/flora/halloween.ftl @@ -0,0 +1,8 @@ +ent-HalloweenTree01 = dead tree + .desc = Dead tree with leaves on it, looks creepy. +ent-HalloweenTree02 = dead tree + .desc = Dead tree with leaves on it, looks creepy. +ent-HalloweenTree03 = dead tree + .desc = Dead tree with leaves on it, looks creepy. +ent-HalloweenTree04 = dead tree + .desc = Dead tree with leaves on it, looks creepy. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/halloween.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/halloween.ftl new file mode 100644 index 00000000000..89abc5fc562 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/halloween.ftl @@ -0,0 +1,2 @@ +ent-LPPPSpiderDeco = spiders + .desc = Fake spiders that look like they're ready to bite you. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/specific/halloween.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/specific/halloween.ftl new file mode 100644 index 00000000000..4931b7a922a --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/objects/specific/halloween.ftl @@ -0,0 +1,4 @@ +ent-LPPPaperBagCandy = paper bag + .desc = A bag for storing chemistry products, such as pills, pill canisters, bottles, and syringes. +ent-LPPPumpkinBagCandy = pumpkin bag + .desc = A bag for storing chemistry products, such as pills, pill canisters, bottles, and syringes. diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/halloween.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/halloween.ftl new file mode 100644 index 00000000000..d22e5a9ba0a --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/halloween.ftl @@ -0,0 +1,8 @@ +ent-LPPPosterHalloweenFamily = ghoast family + .desc = Picture of a family of ghosts, they look happy. +ent-LPPPosterHalloweencounts = count's painting + .desc = Picture of some kind of vampire, the sight of him makes you feel cold. +ent-LPPPCheckboxes = checkboxes + .desc = Black and orange flags, it's got a halloween feel to it. +ent-LPPPLightbulbs = light bulbs + .desc = Hanging garland, not the best source of light diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/consumable/drinks/drinks.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/consumable/drinks/drinks.ftl new file mode 100644 index 00000000000..59813a0da02 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/consumable/drinks/drinks.ftl @@ -0,0 +1,36 @@ +ent-DrinkAlexanderGlass = { ent-DrinkGlass } + .suffix = alexander + .desc = { ent-DrinkGlass.desc } +ent-DrinkBadTouchGlass = { ent-DrinkGlass } + .suffix = bad touch + .desc = { ent-DrinkGlass.desc } +ent-DrinkBoyarskyGlass = { ent-DrinkGlass } + .suffix = boyarsky + .desc = { ent-DrinkGlass.desc } +ent-DrinkBrambleGlass = { ent-DrinkGlass } + .suffix = bramble + .desc = { ent-DrinkGlass.desc } +ent-DrinkDarkAndStormyGlass = { ent-DrinkGlass } + .suffix = dark and stormy + .desc = { ent-DrinkGlass.desc } +ent-DrinkEspressoMartiniGlass = { ent-DrinkGlass } + .suffix = espresso martini + .desc = { ent-DrinkGlass.desc } +ent-DrinkMaiTaiGlass = { ent-DrinkGlass } + .suffix = mai tai + .desc = { ent-DrinkGlass.desc } +ent-DrinkMoscowMuleGlass = { ent-DrinkGlass } + .suffix = moscow mule + .desc = { ent-DrinkGlass.desc } +ent-DrinkNegroniGlass = { ent-DrinkGlass } + .suffix = negroni + .desc = { ent-DrinkGlass.desc } +ent-DrinkOldFashionedGlass = { ent-DrinkGlass } + .suffix = old fashioned + .desc = { ent-DrinkGlass.desc } +ent-DrinkPalomaGlass = { ent-DrinkGlass } + .suffix = paloma + .desc = { ent-DrinkGlass.desc } +ent-DrinkYorshGlass = { ent-DrinkGlass } + .suffix = yorsh + .desc = { ent-DrinkGlass.desc } diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/consumable/drinks/drinks_bottles.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/consumable/drinks/drinks_bottles.ftl new file mode 100644 index 00000000000..822c75e78e4 --- /dev/null +++ b/Resources/Locale/en-US/ss14-ru/prototypes/corvax/entities/objects/consumable/drinks/drinks_bottles.ftl @@ -0,0 +1,2 @@ +ent-DrinkCampariBottleFull = campari bottle + .desc = Tincture based on aromatic herbs and citrus fruits. Non-GMO! diff --git a/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/devices/station_beacon.ftl b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/devices/station_beacon.ftl index 925d4396476..b8c4b533c51 100644 --- a/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/devices/station_beacon.ftl +++ b/Resources/Locale/en-US/ss14-ru/prototypes/deltav/entities/objects/devices/station_beacon.ftl @@ -1,57 +1,57 @@ -ent-DefaultStationBeaconConferenceRoom = { ent-DefaultStationBeaconCommand } +ent-DefaultStationBeaconConferenceRoom = { ent-DefaultStationBeacon } .suffix = Conference Room - .desc = { ent-DefaultStationBeaconCommand.desc } -ent-DefaultStationBeaconVirology = { ent-DefaultStationBeaconMedical } + .desc = { ent-DefaultStationBeacon.desc } +ent-DefaultStationBeaconVirology = { ent-DefaultStationBeacon } .suffix = Virology - .desc = { ent-DefaultStationBeaconMedical.desc } -ent-DefaultStationBeaconMetempsychosis = { ent-DefaultStationBeaconMedical } + .desc = { ent-DefaultStationBeacon.desc } +ent-DefaultStationBeaconMetempsychosis = { ent-DefaultStationBeacon } .suffix = Cloning - .desc = { ent-DefaultStationBeaconMedical.desc } -ent-DefaultStationBeaconExam = { ent-DefaultStationBeaconMedical } + .desc = { ent-DefaultStationBeacon.desc } +ent-DefaultStationBeaconExam = { ent-DefaultStationBeacon } .suffix = Exam - .desc = { ent-DefaultStationBeaconMedical.desc } -ent-DefaultStationBeaconMedicalOutpost = { ent-DefaultStationBeaconMedical } + .desc = { ent-DefaultStationBeacon.desc } +ent-DefaultStationBeaconMedicalOutpost = { ent-DefaultStationBeacon } .suffix = Medical Outpost - .desc = { ent-DefaultStationBeaconMedical.desc } -ent-DefaultStationBeaconPsychologist = { ent-DefaultStationBeaconMedical } + .desc = { ent-DefaultStationBeacon.desc } +ent-DefaultStationBeaconPsychologist = { ent-DefaultStationBeacon } .suffix = Psych - .desc = { ent-DefaultStationBeaconMedical.desc } -ent-DefaultStationBeaconProber = { ent-DefaultStationBeaconScience } + .desc = { ent-DefaultStationBeacon.desc } +ent-DefaultStationBeaconProber = { ent-DefaultStationBeacon } .suffix = Prober - .desc = { ent-DefaultStationBeaconScience.desc } -ent-DefaultStationBeaconMantis = { ent-DefaultStationBeaconScience } + .desc = { ent-DefaultStationBeacon.desc } +ent-DefaultStationBeaconMantis = { ent-DefaultStationBeacon } .suffix = Mantis - .desc = { ent-DefaultStationBeaconScience.desc } -ent-DefaultStationBeaconMailroom = { ent-DefaultStationBeaconSupply } + .desc = { ent-DefaultStationBeacon.desc } +ent-DefaultStationBeaconMailroom = { ent-DefaultStationBeacon } .suffix = Mailroom - .desc = { ent-DefaultStationBeaconSupply.desc } -ent-DefaultStationBeaconEngiOutpost = { ent-DefaultStationBeaconEngineering } + .desc = { ent-DefaultStationBeacon.desc } +ent-DefaultStationBeaconEngiOutpost = { ent-DefaultStationBeacon } .suffix = Engi Outpost - .desc = { ent-DefaultStationBeaconEngineering.desc } -ent-DefaultStationBeaconJanitorsOffice = { ent-DefaultStationBeaconService } + .desc = { ent-DefaultStationBeacon.desc } +ent-DefaultStationBeaconJanitorsOffice = { ent-DefaultStationBeacon } .suffix = Janitor's Office - .desc = { ent-DefaultStationBeaconService.desc } -ent-DefaultStationBeaconReporter = { ent-DefaultStationBeaconService } + .desc = { ent-DefaultStationBeacon.desc } +ent-DefaultStationBeaconReporter = { ent-DefaultStationBeacon } .suffix = Reporter - .desc = { ent-DefaultStationBeaconService.desc } -ent-DefaultStationBeaconCameraServerRoom = { ent-DefaultStationBeaconAI } + .desc = { ent-DefaultStationBeacon.desc } +ent-DefaultStationBeaconCameraServerRoom = { ent-DefaultStationBeacon } .suffix = Camera Servers - .desc = { ent-DefaultStationBeaconAI.desc } + .desc = { ent-DefaultStationBeacon.desc } ent-DefaultStationBeaconBoxing = { ent-DefaultStationBeacon } .suffix = Boxing Ring .desc = { ent-DefaultStationBeacon.desc } ent-DefaultStationBeaconPark = { ent-DefaultStationBeacon } .suffix = Park .desc = { ent-DefaultStationBeacon.desc } -ent-DefaultStationBeaconCorpsman = { ent-DefaultStationBeaconSecurity } +ent-DefaultStationBeaconCorpsman = { ent-DefaultStationBeacon } .suffix = Corpsman - .desc = { ent-DefaultStationBeaconSecurity.desc } + .desc = { ent-DefaultStationBeacon.desc } ent-DefaultStationBeaconJustice = { ent-DefaultStationBeacon } .suffix = Justice .desc = { ent-DefaultStationBeacon.desc } -ent-DefaultStationBeaconChiefJustice = { ent-DefaultStationBeaconJustice } +ent-DefaultStationBeaconChiefJustice = { ent-DefaultStationBeacon } .suffix = Chief Justice - .desc = { ent-DefaultStationBeaconJustice.desc } + .desc = { ent-DefaultStationBeacon.desc } ent-DefaultStationBeaconProsecutor = { ent-DefaultStationBeacon } .suffix = Prosecutor .desc = { ent-DefaultStationBeacon.desc } diff --git a/Resources/Locale/ru-RU/_LostParadise/Guidebook/effects.ftl b/Resources/Locale/ru-RU/_LostParadise/Guidebook/effects.ftl new file mode 100644 index 00000000000..ccf7c413d61 --- /dev/null +++ b/Resources/Locale/ru-RU/_LostParadise/Guidebook/effects.ftl @@ -0,0 +1 @@ +reagent-effect-guidebook-accumulate-reagent-reagent = Накапливается в кровеносной системе, пока в ней имеется вещество, добавляющее { $reagent } diff --git a/Resources/Locale/ru-RU/_LostParadise/prototypes/reagents/food.ftl b/Resources/Locale/ru-RU/_LostParadise/prototypes/reagents/food.ftl new file mode 100644 index 00000000000..b74829b8d92 --- /dev/null +++ b/Resources/Locale/ru-RU/_LostParadise/prototypes/reagents/food.ftl @@ -0,0 +1,2 @@ +reagent-name-indigestible-fibre = неперевариваемые растительные волокна +reagent-desc-indigestible-fibre = Остаточные продукты пищеварительной системы, плохо приспособленной к растительной пище. diff --git a/Resources/Locale/ru-RU/navmap-beacons/station-beacons.ftl b/Resources/Locale/ru-RU/navmap-beacons/station-beacons.ftl index 80a80605353..bbf71b73c2e 100644 --- a/Resources/Locale/ru-RU/navmap-beacons/station-beacons.ftl +++ b/Resources/Locale/ru-RU/navmap-beacons/station-beacons.ftl @@ -65,4 +65,3 @@ station-beacon-tools = Хранилище инструментов station-beacon-disposals = Мусоросброс station-beacon-cryosleep = Криосон station-beacon-escape-pod = Спасательная капсула - diff --git a/Resources/Locale/ru-RU/nyanotrasen/ghost/roles/ghost-role-component.ftl b/Resources/Locale/ru-RU/nyanotrasen/ghost/roles/ghost-role-component.ftl index 1e7ebf680e9..61e6e2d04e6 100644 --- a/Resources/Locale/ru-RU/nyanotrasen/ghost/roles/ghost-role-component.ftl +++ b/Resources/Locale/ru-RU/nyanotrasen/ghost/roles/ghost-role-component.ftl @@ -3,4 +3,4 @@ ghost-role-information-giant-spider-vampire-description = Гнездо. Прим ghost-role-information-cancer-mouse-name = Раковая мышь ghost-role-information-cancer-mouse-description = Делайте цветные комментарии, но не настолько резкие, чтобы они нарушали правила сервера. ghost-role-information-friendlyxeno-name = Нейтральный ксеноморф -ghost-role-information-friendlyxeno-description = Вы — одиночный ксеноморф, оторвавшийся от основного гнезда, решивший первым не нападать на живых существ. \ No newline at end of file +ghost-role-information-friendlyxeno-description = Вы — одиночный ксеноморф, оторвавшийся от основного гнезда, решивший первым не нападать на живых существ. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/misc.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/misc.ftl new file mode 100644 index 00000000000..b2a81b86233 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/clothing/misc.ftl @@ -0,0 +1,20 @@ +ent-LPPClothingJumpsuitMummy = Бинты мумии + .desc = Они выглядят как обычные рулоны туалетной бумаги и чайные пакетики. Но если вы замочите первое во втором, у вас получатся отличные состаренные бинты! +ent-LPPClothingJumpsuitWerewolf = Костюм оборотня + .desc = Он выглядит как мех и кожа настоящей вульпы. Кто-то, должно быть, проделал огромную работу, чтобы воссоздать это, или.... Подождите... +ent-LPPClothingNeckCloakDracula = Плащ дракулы + .desc = Этот плащ прямиком из Трансильвании самого легендарного кровососа в истории человечества. Он пахнет чесноком и осиной. +ent-LPPClothingOuterGhostSheet = Одеяло призрака + .desc = Одеяло с нарисованными маркерном солнечными очками в области «головы». Это очень круто. +ent-LPPClothingJumpsuitPumpkin = Тыквенный лонгслив + .desc = Дешевый лонгслив, который можно купить за пару десятков кредитов в каком-нибудь секонд-хенде на Хэллоуин. +ent-LPPClothingJumpsuitWitch = Костюм ведьмы + .desc = Полный комплект одежды для самых настоящих ведьм, не жаропрочный, если вас отправят на костёр - рекомендуется снять костюм для его сохранности. +ent-LPPBalloonHalloweenBlack = Чёрный воздушный шарик + .desc = Страшный шарик! +ent-LPPBalloonHalloweenWhite = Белый воздушный шарик + .desc = Страшный шарик! +ent-LPPBalloonHalloweenOrange = Оранжевый воздушный шарик + .desc = Страшный шарик! +ent-LPPBalloonHalloweenBloons = Хэллоуиновые надувные шарики + .desc = Страшные шары! diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/food/halloween.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/food/halloween.ftl new file mode 100644 index 00000000000..de2b0e836e6 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/consumable/food/halloween.ftl @@ -0,0 +1,2 @@ +ent-LPPCandy = конфета + .desc = Обычная конфета состоящия из сахара и других вещей \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/flora/halloween.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/flora/halloween.ftl new file mode 100644 index 00000000000..bfd6255ec3b --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/flora/halloween.ftl @@ -0,0 +1,8 @@ +ent-LPPHalloweenTree01 = мёртвое дерево + .desc = Мёртвое дерево с остатками листьев на нём, выглядит жутко. +ent-LPPHalloweenTree02 = мёртвое дерево + .desc = Мёртвое дерево с остатками листьев на нём, выглядит жутко. +ent-LPPHalloweenTree03 = мёртвое дерево + .desc = Мёртвое дерево с остатками листьев на нём, выглядит жутко. +ent-LPPHalloweenTree04 = мёртвое дерево + .desc = Мёртвое дерево с остатками листьев на нём, выглядит жутко. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/halloween.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/halloween.ftl new file mode 100644 index 00000000000..b7d9cb9b1c9 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/decoration/halloween.ftl @@ -0,0 +1,14 @@ +ent-LPPPSpiderDeco = паучки + .desc = Муляжи паучков которые выглядят так, будто готовы вас покусать. +ent-LPPPPumpkinDeco = тыква + .desc = Маленькая декоративная тыква. +ent-LPPPPumpkinBigDeco = тыква + .desc = Декоративные тыквы разных размеров. +ent-LPPPottedPlantHalloween1 = растение в горшке + .desc = Высохшее растение в горшке, выглядит не особо живым. +ent-LPPPottedPlantHalloween2 = { ent-LPPPottedPlantHalloween1 } + .desc = { ent-LPPPottedPlantHalloween1.desc } +ent-LPPPottedPlantHalloween3 = { ent-LPPPottedPlantHalloween1 } + .desc = { ent-LPPPottedPlantHalloween1.desc } +ent-LPPPottedPlantHalloween4 = { ent-LPPPottedPlantHalloween1 } + .desc = { ent-LPPPottedPlantHalloween1.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/specific/halloween.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/specific/halloween.ftl new file mode 100644 index 00000000000..4137a8919bd --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/specific/halloween.ftl @@ -0,0 +1,4 @@ +ent-LPPPaperBagCandy = бумажный пакет + .desc = Пакет из бумаги, украшен в тематике Хэллоиина. +ent-LPPPumpkinBagCandy = корзинка из тыквы + .desc = Корзинка вырезанная из тыквы и приделанной ручкой. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/halloween.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/halloween.ftl new file mode 100644 index 00000000000..942111b1ed7 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/wallmounts/halloween.ftl @@ -0,0 +1,8 @@ +ent-LPPPosterHalloweenFamily = призрачная семья + .desc = Картина семьи призраков, они выглядат счастливыми. +ent-LPPPosterHalloweencounts = картина графа + .desc = Картина с каким-то вампиром, от его взгляда вам становиться холодно. +ent-LPPPCheckboxes = флажки + .desc = Чёрно-оранжевые флажки, навевают чуством Хэллоиина. +ent-LPPPLightbulbs = гирлянда + .desc = подвесная гирлянда, не самый лучший источник освещения. diff --git a/Resources/Migrations/LostParadiseMigrations.yml b/Resources/Migrations/LostParadiseMigrations.yml index b04a05cfcf7..c356a0128da 100644 --- a/Resources/Migrations/LostParadiseMigrations.yml +++ b/Resources/Migrations/LostParadiseMigrations.yml @@ -61,3 +61,8 @@ FluffyMango: LPPFluffyMango FluffyStan: LPPFluffyStan FluffyWatermelon: LPPFluffyWatermelon RingBox: LPPRingBox +LPPCandy2: LPPCandy +LPPCandy3: LPPCandy +LPPCandy4: LPPCandy +HalloweenTree01: LPPHalloweenTree01 +HalloweenTree02: LPPHalloweenTree02 diff --git a/Resources/Prototypes/DeltaV/Body/Organs/vulpkanin.yml b/Resources/Prototypes/DeltaV/Body/Organs/vulpkanin.yml index cd4eeae1900..ea43b8a3cde 100644 --- a/Resources/Prototypes/DeltaV/Body/Organs/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Body/Organs/vulpkanin.yml @@ -4,6 +4,20 @@ noSpawn: true components: - type: Stomach + poorlyDigestibleFood: + reducedReagents: + - Nutriment + - Vitamin + whitelistTags: + - Fruit # LostParadise's lore states the vulpkanin race isn't really adapted to plant food + - Vegetable + - Bread + - Pizza # Basic pizza is also bakery + - Wheat + blacklistTags: + - Meat # Meat-based food is excluded in order not to force the carnivores to be meat-purists + factor: 0.25 + replacementReagent: LPPIndigestibleFiber - type: SolutionContainerManager solutions: stomach: @@ -13,3 +27,9 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 5 + - type: Metabolizer + maxReagents: 3 + metabolizerTypes: [ Animal ] + groups: + - id: Food + - id: Drink diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Command/safe.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Command/safe.yml index 17321ef59e2..e3273bcb89f 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Command/safe.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Command/safe.yml @@ -20,7 +20,7 @@ components: - IdCard - type: AccessReader - access: [["DV-SpareSafe"]] + access: [["Command"]] - type: entity id: SpareIdCabinetFilled diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 743d9a17925..e622314740d 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -2383,3 +2383,6 @@ effects: - !type:SatiateThirst factor: 4 + - !type:AdjustReagent + reagent: Theobromine + amount: 0.04 diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml index b1bbdfb5305..3a6cd2d7a3b 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml @@ -456,6 +456,9 @@ Quantity: 8 - ReagentId: Protein Quantity: 2 + - type: Tag + tags: + - Meat - type: entity name: chèvre chaud diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml index bdce1d44086..121d9d9a3d6 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml @@ -78,6 +78,10 @@ - state: margherita - type: SliceableFood slice: FoodPizzaMargheritaSlice + - type: Tag + tags: + - Pizza + - Vegetable - type: entity name: slice of margherita pizza @@ -93,6 +97,10 @@ - type: Sprite layers: - state: margherita-slice + - type: Tag + tags: + - Pizza + - Vegetable - type: entity name: meat pizza @@ -200,7 +208,11 @@ Quantity: 5 - ReagentId: Vitamin Quantity: 5 - + - type: Tag + tags: + - Pizza + - Vegetable + - type: entity name: slice of vegetable pizza parent: FoodPizzaSliceBase @@ -230,6 +242,10 @@ Quantity: 1 - ReagentId: Vitamin Quantity: 1 + - type: Tag + tags: + - Pizza + - Vegetable # Tastes like crust, tomato, cheese, carrot. @@ -321,6 +337,10 @@ Quantity: 5 - ReagentId: DoctorsDelight Quantity: 6 + - type: Tag + tags: + - Pizza + - Vegetable - type: entity name: slice of dank pizza @@ -348,6 +368,10 @@ Quantity: 0.8 - ReagentId: DoctorsDelight Quantity: 1 + - type: Tag + tags: + - Pizza + - Vegetable # Tastes like crust, tomato, cheese, meat, satisfaction. - type: entity @@ -411,6 +435,10 @@ - state: pineapple - type: SliceableFood slice: FoodPizzaPineappleSlice + - type: Tag + tags: + - Meat + - Pizza - type: entity name: slice of pineapple pizza diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index a326872fb20..7519824df70 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -370,8 +370,8 @@ - state: subdepartment color: "#58C800" - state: chaplain - - type: PresetIdCard - job: Chaplain + - type: PresetIdCard + job: Chaplain - type: entity parent: IDCardStandard diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index 5757f9c7168..45b799cbc2d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -19,7 +19,7 @@ Slash: 17 #cmon, it has to be at least BETTER than the rest. heavyRateModifier: 0.8 heavyRangeModifier: 1 - heavyDamageBaseModifier: 1 + heavyDamageBaseModifier: 1.25 heavyStaminaCost: 5 maxTargets: 7 angle: 80 @@ -48,6 +48,12 @@ - type: Sprite sprite: DeltaV/Objects/Weapons/Melee/katana.rsi #DeltaV state: icon + - type: Clothing + sprite: DeltaV/Objects/Weapons/Melee/katana.rsi #DeltaV and LPP! + slots: + - Back + - Belt + - Suitstorage - type: MeleeWeapon wideAnimationRotation: -135 attackRate: 1.5 @@ -55,11 +61,11 @@ path: /Audio/SimpleStation14/Weapons/Melee/rapierhit.ogg damage: types: - Slash: 12 - heavyRateModifier: 0.5 + Slash: 14 + heavyRateModifier: 0.75 heavyRangeModifier: 2.75 #Superior Japanese folded steel - heavyDamageBaseModifier: 1.25 - heavyStaminaCost: 15 + heavyDamageBaseModifier: 1.3 + heavyStaminaCost: 10 maxTargets: 1 angle: 20 - type: Item diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index e7191a4c825..4dae85b263b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -782,6 +782,16 @@ - LPPCartridgeAntiMaterielCP - LPPCartridgeAntiMaterielNL - LPPWeaponGoliathSniper + - LPPMagazineM4A1Practice + - LPPMagazinePistolPF20Lethal + - LPPMagazinePistolPF20Practice + - LPPCartridgePracticeM4A1 + - LPPCartridgeM4A1Lethal + - LPPMagazineRifleM4A1Lethal + - LPPMagazineBoxM4A1Lethal + - LPPMagazineBoxM4A1BigPractice + - LPPMagazineBoxM4A1Practice + - LPPMagazineBoxM4A1BigLethal # End of modified code dynamicRecipes: - LPPSpaceForgeCircuitBoardCMDAndSec @@ -863,6 +873,16 @@ #LPP - LPPMagazineBoxMinigunPractice - LPPMagazineBoxMinigunRubber + - LPPMagazinePistolPF20Rubber + - LPPMagazinePistolPF20Uranium + - LPPMagazinePistolPF20Incendiary + - LPPMagazineM4A1Rubber + - LPPMagazineM4A1Uranium + - LPPMagazineBoxM4A1Rubber + - LPPMagazineBoxM4A1Uranium + - LPPMagazineBoxM4A1Incendiary + - LPPCartridgeIncendiaryM4A1 + - LPPCartridgeUraniumM4A1 # End of modified code - type: MaterialStorage whitelist: diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/Baked/pizza.yml index 8c96635b06b..fe7292a7dfd 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/Baked/pizza.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Consumable/Food/Baked/pizza.yml @@ -24,6 +24,7 @@ - type: Tag tags: - Pizza + - Vegetable # Yes, I am aware that corn is technically a fruit, but the tagging system is enough of a mess as it is - type: entity name: slice of corncob crust pizza @@ -49,6 +50,7 @@ - type: Tag tags: - Pizza + - Vegetable - type: entity name: firecracker pizza diff --git a/Resources/Prototypes/Objectives/goals.yml b/Resources/Prototypes/Objectives/goals.yml index 59e35ea8a51..afeb1f6c625 100644 --- a/Resources/Prototypes/Objectives/goals.yml +++ b/Resources/Prototypes/Objectives/goals.yml @@ -10,15 +10,6 @@ - type: stationGoal id: BureaucraticError -- type: stationGoal - id: Combat - -- type: stationGoal - id: Labor - -- type: stationGoal - id: Lectures - - type: stationGoal id: Museum @@ -48,13 +39,10 @@ StationGoalPower: 1 StationGoalStation: 1 - - type: weightedRandom id: StationGoalDepartment weights: StationGoalScience: 1 - StationGoalSecurity: 1 - - type: weightedRandom id: StationGoalPower @@ -69,18 +57,11 @@ Artifacts: 1 Xeno: 1 -- type: weightedRandom - id: StationGoalSecurity - weights: - Combat: 1 - - type: weightedRandom id: StationGoalStation weights: Area: 1 BureaucraticError: 1 - Labor: 1 - Lectures: 1 Museum: 1 Shuttle: 1 Storage: 1 diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml index d1a404804a4..fe82e1b04b9 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml @@ -306,6 +306,9 @@ - !type:AdjustReagent reagent: Ethanol amount: 0.20 + - !type:AdjustReagent + reagent: Theobromine + amount: 0.04 - type: reagent @@ -1334,6 +1337,9 @@ - !type:AdjustReagent reagent: Ethanol amount: 0.133 + - !type:AdjustReagent + reagent: Theobromine + amount: 0.04 - type: reagent id: LongIslandIcedTea diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 742857eae4b..02550df7ae8 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -106,6 +106,10 @@ metamorphicFillBaseName: fill- metamorphicChangeColor: false metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 3 Medicine: effects: - !type:HealthChange @@ -146,6 +150,14 @@ metamorphicMaxFillLevels: 5 metamorphicFillBaseName: fill- metamorphicChangeColor: false + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Theobromine + amount: 0.05 - type: reagent id: IcedGreenTea diff --git a/Resources/Prototypes/Reagents/Consumable/Food/food.yml b/Resources/Prototypes/Reagents/Consumable/Food/food.yml index 03ebf7cc321..12603efb82d 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/food.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/food.yml @@ -100,4 +100,4 @@ name: reagent-name-pumpkin-flesh desc: reagent-desc-pumpkin-flesh flavor: pumpkin - color: "#fc9300" \ No newline at end of file + color: "#fc9300" diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index 661e1b7dd16..416cefd9ca6 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -420,6 +420,13 @@ min: 3 - !type:OrganType type: Animal + - !type:AccumulateReagent + conditions: + - !type:ReagentThreshold + max: 5 + - !type:OrganType + type: Animal + reagent: Theobromine - type: reagent id: Amatoxin diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 3397f1ac138..f75d1ca8b3a 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -36,6 +36,10 @@ # DeltaV - .38 special incendiary ammo - Add .38 special incendiary ammo to the research tree - CartridgeSpecialIncendiary - MagazineBoxSpecialIncendiary + #LPP + - LPPMagazinePistolPF20Incendiary + - LPPMagazineBoxM4A1Incendiary + - LPPCartridgeIncendiaryM4A1 # End of modified code - type: technology @@ -72,8 +76,12 @@ # DeltaV - .38 special rubber ammo - Adds .38 special rubber ammo to the research tree - CartridgeSpecialRubber - MagazineBoxSpecialRubber + #LPP - LPPMagazineBoxMinigunPractice - LPPMagazineBoxMinigunRubber + - LPPMagazineBoxM4A1Rubber + - LPPMagazinePistolPF20Rubber + - LPPMagazineM4A1Rubber # End of modified code - type: technology @@ -98,6 +106,11 @@ # DeltaV - .38 special uranium ammo - Adds .38 special uranium ammo to the research tree - CartridgeSpecialUranium - MagazineBoxSpecialUranium + #LPP + - LPPMagazinePistolPF20Uranium + - LPPMagazineBoxM4A1Uranium + - LPPCartridgeUraniumM4A1 + - LPPMagazineM4A1Uranium # End of modified code - type: technology diff --git a/Resources/Prototypes/_LostParadise/Catalog/jukebox.yml b/Resources/Prototypes/_LostParadise/Catalog/jukebox.yml index 7ab7e995053..7b06c9f1010 100644 --- a/Resources/Prototypes/_LostParadise/Catalog/jukebox.yml +++ b/Resources/Prototypes/_LostParadise/Catalog/jukebox.yml @@ -3,3 +3,9 @@ name: Pivo Dance - BL02DL path: path: /Audio/Jukebox/PivoDance.ogg + +- type: jukebox + id: LPPJaya + name: Malinovie Palmi - Jaya + path: + path: /Audio/Jukebox/Jaya-MalinoviePalmi.ogg diff --git a/Resources/Prototypes/_LostParadise/Entities/Clothing/misc.yml b/Resources/Prototypes/_LostParadise/Entities/Clothing/misc.yml new file mode 100644 index 00000000000..896c53fb443 --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Entities/Clothing/misc.yml @@ -0,0 +1,224 @@ +- type: entity + parent: ClothingUniformBase + id: LPPClothingJumpsuitMummy + name: Mummy bandages + description: "They look like ordinary toilet paper rolls and tea bags. But if you soak the former in the latter, you'll get some great aged bandages!" + components: + - type: Sprite + sprite: _LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/mummy.rsi + - type: Clothing + sprite: _LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/mummy.rsi + +- type: entity + parent: ClothingUniformBase + id: LPPClothingJumpsuitWerewolf + name: Werewolf suit + description: "It looks like the fur and skin of a real vulp. Someone must have done a lot of work to recreate this, or.... Wait..." + components: + - type: Sprite + sprite: _LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/werewolf.rsi + - type: Clothing + sprite: _LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/werewolf.rsi + +- type: entity + parent: ClothingNeckBase + id: LPPClothingNeckCloakDracula + name: Dracula's cloak + description: "This cape is straight out of Transylvania of the most legendary bloodsucker in the history of mankind. It smells like garlic and aspen." + components: + - type: Sprite + sprite: _LostParadise/Clothing/HalloweenDecor/Clothing/Neck/Cloaks/dracula.rsi + - type: Clothing + sprite: _LostParadise/Clothing/HalloweenDecor/Clothing/Neck/Cloaks/dracula.rsi + +- type: entity + parent: ClothingOuterBase + id: LPPClothingOuterGhostSheet + name: Ghost sheet + description: "A sheet with marker sunglasses in the “head” area. It's really cool." + components: + - type: Sprite + sprite: _LostParadise/Clothing/HalloweenDecor/Clothing/OuterClothing/Misc/coolerghostsheet.rsi + - type: Clothing + sprite: _LostParadise/Clothing/HalloweenDecor/Clothing/OuterClothing/Misc/coolerghostsheet.rsi + +- type: entity + parent: ClothingUniformBase + id: LPPClothingJumpsuitPumpkin + name: Pumpkin longsleeve + description: "A cheap-looking longsleeve that you can buy for a couple dozen credits in some secondhand on Halloween." + components: + - type: Sprite + sprite: _LostParadise/Clothing/HalloweenDecor/Clothing/pumk.rsi + - type: Clothing + sprite: _LostParadise/Clothing/HalloweenDecor/Clothing/pumk.rsi + +- type: entity + parent: ClothingUniformBase + id: LPPClothingJumpsuitWitch + name: Witch suit + description: "A complete set of clothes for the most real witches, not heat-resistant, if you are sent to the bonfire - it is recommended to remove the costume for its safety." + components: + - type: Sprite + sprite: _LostParadise/Clothing/HalloweenDecor/Clothing/witch.rsi + - type: Clothing + sprite: _LostParadise/Clothing/HalloweenDecor/Clothing/witch.rsi + +- type: decal + id: LPPBat-Bed-Mobile + tags: ["markings"] + snapCardinals: true + defaultSnap: false + sprite: + sprite: _LostParadise/Clothing/HalloweenDecor/lifs.rsi + state: bat-bed-mobile + +- type: decal + id: LPPHallow-Jack + tags: ["markings"] + snapCardinals: true + defaultSnap: false + sprite: + sprite: _LostParadise/Clothing/HalloweenDecor/lifs.rsi + state: hallow-jack + +- type: entity + parent: BaseItem + id: LPPBalloonHalloweenBlack + name: Black balloon + description: "Spooky balloon!" + components: + - type: Sprite + sprite: _LostParadise/Clothing/HalloweenDecor/bloons.rsi + state: icon_black + - type: Item + size: Small + sprite: _LostParadise/Clothing/HalloweenDecor/bloons.rsi + heldPrefix: black + - type: Damageable + damageContainer: Inorganic + - type: Tag + tags: + - Balloon + - Bblloon + - type: Construction + graph: LPPbloons + node: start + +- type: entity + parent: BaseItem + id: LPPBalloonHalloweenWhite + name: White balloon + description: "Spooky balloon!" + components: + - type: Sprite + sprite: _LostParadise/Clothing/HalloweenDecor/bloons.rsi + state: icon_white + - type: Item + size: Small + sprite: _LostParadise/Clothing/HalloweenDecor/bloons.rsi + heldPrefix: white + - type: Damageable + damageContainer: Inorganic + - type: Tag + tags: + - Balloon + - Wblloon + - type: Construction + graph: LPPbloons + node: start + +- type: entity + parent: BaseItem + id: LPPBalloonHalloweenOrange + name: Orange balloon + description: "Spooky balloon!" + components: + - type: Sprite + sprite: _LostParadise/Clothing/HalloweenDecor/bloons.rsi + state: icon_orange + - type: Item + size: Small + sprite: _LostParadise/Clothing/HalloweenDecor/bloons.rsi + heldPrefix: orange + - type: Damageable + damageContainer: Inorganic + - type: Tag + tags: + - Balloon + - Oblloon + - type: Construction + graph: LPPbloons + node: start + +- type: entity + parent: BaseItem + id: LPPBalloonHalloweenBloons + name: Halloween balloons + description: "Spooky balloons!" + components: + - type: Sprite + sprite: _LostParadise/Clothing/HalloweenDecor/bloons.rsi + state: icon_bloons + - type: Item + size: Small + sprite: _LostParadise/Clothing/HalloweenDecor/bloons.rsi + heldPrefix: bloons + - type: Damageable + damageContainer: Inorganic + - type: Tag + tags: + - Balloon + - type: Construction + graph: LPPbloons + node: Blooons + +- type: construction + name: Blooons + id: LPPBloons + graph: LPPbloons + startNode: start + targetNode: Blooons + category: construction-category-utilities + objectType: Item + description: "Spooky balloons!" + icon: + sprite: _LostParadise/Clothing/HalloweenDecor/bloons.rsi + state: icon_bloons + +- type: constructionGraph + id: LPPbloons + start: start + graph: + - node: start + edges: + - to: Blooons + steps: + - tag: Oblloon + icon: + sprite: _LostParadise/Clothing/HalloweenDecor/bloons.rsi + state: icon_orange + name: Orange balloon + - tag: Wblloon + icon: + sprite: _LostParadise/Clothing/HalloweenDecor/bloons.rsi + state: icon_white + name: White balloon + doAfter: 2 + - tag: Bblloon + icon: + sprite: _LostParadise/Clothing/HalloweenDecor/bloons.rsi + state: icon_black + name: Black balloon + doAfter: 2 + - node: Blooons + entity: LPPBalloonHalloweenBloons + +- type: Tag + id: Wblloon + +- type: Tag + id: Bblloon + +- type: Tag + id: Oblloon \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Tajaran/Body/Organs/Tajaran.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Tajaran/Body/Organs/Tajaran.yml index ad4c30fc725..5d633e940b9 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Tajaran/Body/Organs/Tajaran.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Tajaran/Body/Organs/Tajaran.yml @@ -4,10 +4,17 @@ noSpawn: true components: - type: Stomach - specialDigestible: - tags: - - Meat - - Pill + poorlyDigestibleFood: + reducedReagents: + - Nutriment + - Vitamin + whitelistTags: + - Fruit # Bread/Pizza tags aren't included according to the LostParadise's lore + - Vegetable + blacklistTags: + - Meat # Meat-based food is excluded in order not to force the carnivores to be meat-purists + factor: 0.25 + replacementReagent: LPPIndigestibleFiber - type: SolutionContainerManager solutions: stomach: @@ -17,3 +24,9 @@ reagents: - ReagentId: UncookedAnimalProteins Quantity: 5 + - type: Metabolizer + maxReagents: 3 + metabolizerTypes: [ Animal ] + groups: + - id: Food + - id: Drink diff --git a/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Tajaran/Entities/Mobs/Species/Tajaran.yml b/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Tajaran/Entities/Mobs/Species/Tajaran.yml index b4ce2793a03..9fd8ac9c94f 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Tajaran/Entities/Mobs/Species/Tajaran.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Mobs/Species/Tajaran/Entities/Mobs/Species/Tajaran.yml @@ -16,11 +16,7 @@ Female: FemaleFelinid Unsexed: FemaleFelinid #- type: Carriable - - type: Hunger - starvationDamage: - types: - Cold: 0.5 - Bloodloss: 0.5 + - type: Hunger # tajaran are already at a disadvantage against the vulpkanin, so the baseDecayRate is unchanged - type: Thirst - type: Icon sprite: _LostParadise/Mobs/Species/Tajaran/parts.rsi diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/food/halloween.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/food/halloween.yml new file mode 100644 index 00000000000..d002b791f8c --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Consumable/food/halloween.yml @@ -0,0 +1,36 @@ +- type: entity + name: candy + parent: FoodBase + id: LPPCandy + description: This is my kingdom come, this is my kingdom come... + components: + - type: Sprite + sprite: _LostParadise/Objects/Consumable/halloween.rsi + layers: + - state: candy_1 + map: [ "enum.DamageStateVisualLayers.Base" ] + - type: RandomSprite + available: + - enum.DamageStateVisualLayers.Base: + candy_1: Material + candy_2: Material + candy_3: Material + candy_4: Material + - type: Item + size: Tiny + shape: + - 0, 0, 0, 0 + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: Sugar + Quantity: 3 + - ReagentId: Nutriment + Quantity: 1 + - ReagentId: Theobromine + Quantity: 1 + - type: Tag + tags: + - LPPCandy \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Decoration/Flora/halloween.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Decoration/Flora/halloween.yml new file mode 100644 index 00000000000..6d9a44d6026 --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Decoration/Flora/halloween.yml @@ -0,0 +1,40 @@ +- type: entity + parent: BaseTree + id: LPPHalloweenTree01 + name: dead tree + description: Dead tree with leaves on it, looks creepy. + components: + - type: Sprite + sprite: _LostParadise/Objects/Decoration/Flora/flora_halloween.rsi + state: halloweentree01 + +- type: entity + parent: BaseTree + id: LPPHalloweenTree02 + name: dead tree + description: Dead tree with leaves on it, looks creepy. + components: + - type: Sprite + sprite: _LostParadise/Objects/Decoration/Flora/flora_halloween.rsi + state: halloweentree02 + +- type: entity + parent: BaseTree + id: LPPHalloweenTree03 + name: dead tree + description: Dead tree with leaves on it, looks creepy. + components: + - type: Sprite + sprite: _LostParadise/Objects/Decoration/Flora/flora_halloween.rsi + state: halloweentree03 + +- type: entity + parent: BaseTree + id: LPPHalloweenTree04 + name: dead tree + description: Dead tree with leaves on it, looks creepy. + components: + - type: Sprite + sprite: _LostParadise/Objects/Decoration/Flora/flora_halloween.rsi + state: halloweentree04 + diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Decoration/halloween.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Decoration/halloween.yml new file mode 100644 index 00000000000..533df7b8f0f --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Decoration/halloween.yml @@ -0,0 +1,125 @@ +- type: entity + id: LPPPSpiderDeco + name: spiders + description: Fake spiders that look like they're ready to bite you. + placement: + mode: SnapgridCenter + components: + - type: Sprite + sprite: _LostParadise/Objects/Decoration/halloween.rsi + noRot: false + layers: + - state: spider_big + map: [ "enum.DamageStateVisualLayers.Base" ] + - type: InteractionOutline + - type: Clickable + - type: RandomSprite + available: + - enum.DamageStateVisualLayers.Base: + spider_big: "" + spider_big2: "" + spider_mini1: "" + spider_mini2: "" + spider_mini3: "" + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WoodDestroyHeavy + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + id: LPPPumpkinDeco + name: pumpkin + placement: + mode: SnapgridCenter + description: Small decorative pumpkin with brush marks on it + components: + - type: Sprite + sprite: _LostParadise/Objects/Decoration/halloween.rsi + noRot: false + snapCardinals: true + layers: + - state: pumpkin_minis + map: [ "enum.DamageStateVisualLayers.Base" ] + - type: InteractionOutline + - type: Clickable + - type: RandomSprite + available: + - enum.DamageStateVisualLayers.Base: + pumpkin_minis: "" + pumpkin_minis2: "" + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WoodDestroyHeavy + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + id: LPPPumpkinBigDeco + name: pumpkin + parent: BaseSign + description: Decorative pumpkins with brush marks on it + components: + - type: Sprite + sprite: _LostParadise/Objects/Decoration/halloween.rsi + state: pumpkins + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 10 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: WoodDestroyHeavy + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + id: LPPPottedPlantHalloween1 + parent: PottedPlantBase + description: Withered houseplant, looks dead. + components: + - type: Sprite + sprite: _LostParadise/Objects/Decoration/halloween.rsi + state: plant1 + +- type: entity + id: LPPPottedPlantHalloween2 + parent: LPPPottedPlantHalloween1 + components: + - type: Sprite + state: plant2 + +- type: entity + id: LPPPottedPlantHalloween3 + parent: LPPPottedPlantHalloween1 + components: + - type: Sprite + state: plant3 + +- type: entity + id: LPPPottedPlantHalloween4 + parent: LPPPottedPlantHalloween1 + components: + - type: Sprite + state: plant4 + diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Specific/halloween.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Specific/halloween.yml new file mode 100644 index 00000000000..6b869201316 --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Specific/halloween.yml @@ -0,0 +1,35 @@ +- type: entity + name: paper bag + id: LPPPaperBagCandy + parent: CandyBucket + description: A bag for storing chemistry products, such as pills, pill canisters, bottles, and syringes. + components: + - type: Sprite + sprite: _LostParadise/Objects/Specific/halloween/paper_bag.rsi + layers: + - state: empty_icon + map: [ "enum.ToggleVisuals.Layer" ] + - type: Storage + grid: + - 0,0,4,2 + whitelist: + tags: + - LPPCandy + +- type: entity + name: pumpkin bag + id: LPPPumpkinBagCandy + parent: CandyBucket + description: A bag for storing chemistry products, such as pills, pill canisters, bottles, and syringes. + components: + - type: Sprite + sprite: _LostParadise/Objects/Specific/halloween/pumpkin_bag.rsi + layers: + - state: empty_icon + map: [ "enum.ToggleVisuals.Layer" ] + - type: Storage + grid: + - 0,0,4,2 + whitelist: + tags: + - LPPCandy \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/LPPMags.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/LPPMags.yml index cc75124c0ae..23ad4301d07 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/LPPMags.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Ammunition/Magazine/Rifle/LPPMags.yml @@ -76,7 +76,7 @@ color: "#dbdbdb" - type: entity - id: LPPagazineRifleM4A1Uranium + id: LPPMagazineRifleM4A1Uranium name: Magazine (calibre 5,56x45 uranium) parent: LPPBaseMagazineRifle components: diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/laserkomissar.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/laserkomissar.yml index 289612df284..2fac9f65cde 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/laserkomissar.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Battery/laserkomissar.yml @@ -13,7 +13,7 @@ map: ["enum.GunVisualLayers.MagUnshaded"] shader: unshaded - type: Clothing - sprite: Objects/Weapons/Guns/Battery/laserkomissar.rsi + sprite: _LostParadise/Objects/Weapons/Guns/Battery/laserkomissar.rsi quickEquip: false slots: - Back diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Launchers/blueshield_laser.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Launchers/blueshield_laser.yml index 95a4d4b0135..ccc0466b68d 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Launchers/blueshield_laser.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Launchers/blueshield_laser.yml @@ -31,3 +31,5 @@ - type: Battery maxCharge: 3500 startingCharge: 3500 + - type: UseDelay + delay: 0 diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Pistols/PF20Pistol.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Pistols/PF20Pistol.yml index 9d6b47fc65e..5c6924baae4 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Pistols/PF20Pistol.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Pistols/PF20Pistol.yml @@ -36,6 +36,8 @@ - type: ChamberMagazineAmmoProvider soundRack: path: /Audio/Weapons/Guns/Cock/pistol_cock.ogg + - type: UseDelay + delay: 0 - type: ItemSlots slots: gun_magazine: diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index cf0e7c846cc..ee36fcf201f 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -1,4 +1,3 @@ - - type: entity name: desert eagle parent: WeaponPistolUniversal @@ -60,6 +59,8 @@ whitelist: tags: - CartridgeSpecial + - type: UseDelay + delay: 0 - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 468a0f95b07..d1d27151a85 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -99,6 +99,9 @@ sprite: _LostParadise/Objects/Weapons/Guns/Revolvers/defendant-amina.rsi - type: Clothing sprite: _LostParadise/Objects/Weapons/Guns/Revolvers/defendant-amina.rsi + quickEquip: false + slots: + - Belt - type: BallisticAmmoProvider whitelist: tags: @@ -117,6 +120,9 @@ sprite: _LostParadise/Objects/Weapons/Guns/Revolvers/defendant-amina.rsi - type: Clothing sprite: _LostParadise/Objects/Weapons/Guns/Revolvers/defendant-amina.rsi + quickEquip: false + slots: + - Belt - type: BallisticAmmoProvider whitelist: tags: @@ -150,6 +156,9 @@ sprite: _LostParadise/Objects/Weapons/Guns/Revolvers/judge.rsi - type: Clothing sprite: _LostParadise/Objects/Weapons/Guns/Revolvers/judge.rsi + quickEquip: false + slots: + - Belt - type: BallisticAmmoProvider whitelist: tags: @@ -168,6 +177,9 @@ sprite: _LostParadise/Objects/Weapons/Guns/Revolvers/judge.rsi - type: Clothing sprite: _LostParadise/Objects/Weapons/Guns/Revolvers/judge.rsi + quickEquip: false + slots: + - Belt - type: BallisticAmmoProvider whitelist: tags: diff --git a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/knife.yml index 872e0dc8f4c..9ba6c855920 100644 --- a/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/_LostParadise/Entities/Objects/Weapons/Melee/knife.yml @@ -81,7 +81,7 @@ - type: DisarmMalus malus: 0.225 - type: ThrowingAngle - angle: 1 + angle: 350 - type: MeleeChemicalInjector solution: melee - type: RefillableSolution @@ -93,3 +93,4 @@ solution: melee - type: SolutionTransfer maxTransferAmount: 3 + - type: Sharp diff --git a/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/halloween.yml b/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/halloween.yml new file mode 100644 index 00000000000..19dab476a97 --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Entities/Structures/Wallmounts/halloween.yml @@ -0,0 +1,47 @@ +- type: entity + parent: LPPPosterBase + id: LPPPosterHalloweenFamily + name: ghoast family + description: Picture of a family of ghosts, they look happy. + components: + - type: Sprite + sprite: _LostParadise/Structures/Wallmounts/halloween.rsi + state: picture_family + noRot: true + +- type: entity + parent: LPPPosterBase + id: LPPPosterHalloweencounts + name: count's painting + description: Picture of some kind of vampire, the sight of him makes you feel cold. + components: + - type: Sprite + sprite: _LostParadise/Structures/Wallmounts/halloween.rsi + state: сounts_painting + noRot: true + +- type: entity + parent: BaseSign + id: LPPPCheckboxes + name: checkboxes + description: Black and orange flags, it's got a halloween feel to it. + components: + - type: Sprite + sprite: _LostParadise/Structures/Wallmounts/halloween.rsi + state: checkboxes + noRot: false + +- type: entity + parent: BaseSign + id: LPPPLightbulbs + name: light bulbs + description: Hanging garland, not the best source of light + components: + - type: PointLight + radius: 2.0 + energy: 2.5 + color: "#e8b964" + - type: Sprite + sprite: _LostParadise/Structures/Wallmounts/halloween.rsi + state: light_bulbs + noRot: false diff --git a/Resources/Prototypes/_LostParadise/Reagents/food.yml b/Resources/Prototypes/_LostParadise/Reagents/food.yml new file mode 100644 index 00000000000..e55fa8260c1 --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Reagents/food.yml @@ -0,0 +1,16 @@ +- type: reagent + id: LPPIndigestibleFiber + name: reagent-name-indigestible-fibre + group: Foods + desc: reagent-desc-indigestible-fibre + flavor: terrible + color: "#54753d" + physicalDesc: reagent-physical-desc-pungent + metabolisms: + Drink: + effects: + - !type:ChemVomit + conditions: + - !type:ReagentThreshold + min: 5 + probability: 0.02 diff --git a/Resources/Prototypes/_LostParadise/Recipes/Lathes/security.yml b/Resources/Prototypes/_LostParadise/Recipes/Lathes/security.yml index 910c71e2585..e34ae3cad48 100644 --- a/Resources/Prototypes/_LostParadise/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/_LostParadise/Recipes/Lathes/security.yml @@ -150,7 +150,7 @@ category: Ammo completetime: 5 materials: - Plastic: 1950 + Plastic: 2000 - type: latheRecipe id: LPPMagazineBoxAntiMaterielCP @@ -158,7 +158,7 @@ category: Ammo completetime: 5 materials: - Steel: 2500 + Steel: 3000 - type: latheRecipe id: LPPCartridgeAntiMaterielNL @@ -166,7 +166,7 @@ category: Ammo completetime: 1 materials: - Plastic: 500 + Plastic: 200 - type: latheRecipe id: LPPCartridgeAntiMaterielCP @@ -174,7 +174,7 @@ category: Ammo completetime: 1 materials: - Steel: 1200 + Steel: 300 - type: latheRecipe id: LPPWeaponGoliathSniper @@ -183,4 +183,70 @@ materials: Plastic: 2000 Steel: 10000 - Glass: 2500 \ No newline at end of file + Glass: 2500 + +- type: latheRecipe + id: LPPMagazinePistolPF20Lethal + result: LPPMagazinePistolPF20lethal + category: Ammo + completetime: 5 + materials: + Steel: 550 + +- type: latheRecipe + id: LPPMagazinePistolPF20Practice + result: LPPMagazinePistolPF20Practice + category: Ammo + completetime: 5 + materials: + Steel: 350 + +- type: latheRecipe + id: LPPMagazinePistolPF20Rubber + result: LPPMagazinePistolPF20Rubber + category: Ammo + completetime: 5 + materials: + Plastic: 400 + +- type: latheRecipe + id: LPPMagazinePistolPF20Uranium + result: LPPMagazinePistolPF20Uranium + category: Ammo + completetime: 5 + materials: + Plastic: 450 + Uranium: 75 + +- type: latheRecipe + id: LPPMagazinePistolPF20Incendiary + result: LPPMagazinePistolPF20Incendiary + category: Ammo + completetime: 5 + materials: + Plastic: 550 + +- type: latheRecipe + id: LPPMagazineM4A1Practice + result: LPPMagazineRifleM4A1Practice + category: Ammo + completetime: 5 + materials: + Steel: 300 + +- type: latheRecipe + id: LPPMagazineM4A1Rubber + result: LPPMagazineRifleM4A1Rubber + category: Ammo + completetime: 5 + materials: + Plastic: 475 + +- type: latheRecipe + id: LPPMagazineM4A1Uranium + result: LPPMagazineRifleM4A1Uranium + category: Ammo + completetime: 5 + materials: + Steel: 300 + Uranium: 50 diff --git a/Resources/Prototypes/_LostParadise/tags.yml b/Resources/Prototypes/_LostParadise/tags.yml index a0b455d6877..2c6ea036418 100644 --- a/Resources/Prototypes/_LostParadise/tags.yml +++ b/Resources/Prototypes/_LostParadise/tags.yml @@ -163,3 +163,7 @@ - type: Tag id: LPPProcessedDiamond + +- type: Tag + id: LPPCandy #Halloween + diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/equipped-BACKPACK.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..e2d26b1c276 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/equipped-BELT.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/equipped-BELT.png new file mode 100644 index 00000000000..7ab600c897b Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..7110a5ba44d Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/meta.json index 2934026c5eb..b92c1cb262b 100644 --- a/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Weapons/Melee/katana.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken and modified by Taral from tgstation at https://github.com/tgstation/tgstation/pull/20520/commits/47d235721d658027a9effd37177cc8104844e0bf. Further modified by TJohnson.", + "copyright": "Taken and modified by Taral from tgstation at https://github.com/tgstation/tgstation/pull/20520/commits/47d235721d658027a9effd37177cc8104844e0bf. Further modified by TJohnson equipped sprites by MegaDaimond.", "size": { "x": 32, "y": 32 @@ -17,6 +17,18 @@ { "name": "inhand-right", "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "equipped-BELT", + "directions": 4 } ] } diff --git a/Resources/Textures/Structures/cryostorage.rsi/sleeper_1.png b/Resources/Textures/Structures/cryostorage.rsi/sleeper_1.png index 9fc9daf1998..881ab5137c1 100644 Binary files a/Resources/Textures/Structures/cryostorage.rsi/sleeper_1.png and b/Resources/Textures/Structures/cryostorage.rsi/sleeper_1.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/mummy.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/mummy.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..9a2de255c28 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/mummy.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/mummy.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/mummy.rsi/icon.png new file mode 100644 index 00000000000..6d1b853da9f Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/mummy.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/mummy.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/mummy.rsi/meta.json new file mode 100644 index 00000000000..999ead02a91 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/mummy.rsi/meta.json @@ -0,0 +1,19 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by timxx7019 (Discord)", + "size": { + "x": 32, + "y": 32 + }, + + "states": [ + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/werewolf.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/werewolf.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..2e375ecc5da Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/werewolf.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/werewolf.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/werewolf.rsi/icon.png new file mode 100644 index 00000000000..fce6c5247b2 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/werewolf.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/werewolf.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/werewolf.rsi/inhand-left.png new file mode 100644 index 00000000000..c4ad40e967f Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/werewolf.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/werewolf.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/werewolf.rsi/inhand-right.png new file mode 100644 index 00000000000..c011b22da0a Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/werewolf.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/werewolf.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/werewolf.rsi/meta.json new file mode 100644 index 00000000000..708fec887b1 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Jumpsuit/werewolf.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by timxx7019 (Discord)", + "size": { + "x": 32, + "y": 32 + }, + + "states": [ + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Neck/Cloaks/dracula.rsi/equipped-NECK.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Neck/Cloaks/dracula.rsi/equipped-NECK.png new file mode 100644 index 00000000000..bcb25673528 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Neck/Cloaks/dracula.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Neck/Cloaks/dracula.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Neck/Cloaks/dracula.rsi/icon.png new file mode 100644 index 00000000000..13e19c56796 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Neck/Cloaks/dracula.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Neck/Cloaks/dracula.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Neck/Cloaks/dracula.rsi/inhand-left.png new file mode 100644 index 00000000000..a31bdf536bc Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Neck/Cloaks/dracula.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Neck/Cloaks/dracula.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Neck/Cloaks/dracula.rsi/inhand-right.png new file mode 100644 index 00000000000..a9641cd4c61 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Neck/Cloaks/dracula.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Neck/Cloaks/dracula.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Neck/Cloaks/dracula.rsi/meta.json new file mode 100644 index 00000000000..f44ac1cd80c --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/Neck/Cloaks/dracula.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by timxx7019 (Discord)", + "size": { + "x": 32, + "y": 32 + }, + + "states": [ + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/OuterClothing/Misc/coolerghostsheet.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/OuterClothing/Misc/coolerghostsheet.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..4d11edd545c Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/OuterClothing/Misc/coolerghostsheet.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/OuterClothing/Misc/coolerghostsheet.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/OuterClothing/Misc/coolerghostsheet.rsi/icon.png new file mode 100644 index 00000000000..f67f499a30b Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/OuterClothing/Misc/coolerghostsheet.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/OuterClothing/Misc/coolerghostsheet.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/OuterClothing/Misc/coolerghostsheet.rsi/inhand-left.png new file mode 100644 index 00000000000..6df66dc1a8b Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/OuterClothing/Misc/coolerghostsheet.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/OuterClothing/Misc/coolerghostsheet.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/OuterClothing/Misc/coolerghostsheet.rsi/inhand-right.png new file mode 100644 index 00000000000..1def121904a Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/OuterClothing/Misc/coolerghostsheet.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/OuterClothing/Misc/coolerghostsheet.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/OuterClothing/Misc/coolerghostsheet.rsi/meta.json new file mode 100644 index 00000000000..423620debbc --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/OuterClothing/Misc/coolerghostsheet.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Mitsunere mitsunere(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/_LostParadise/Clothing/HalloweenDecor/Clothing/pumk.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/pumk.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..bc40ea15fd3 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/pumk.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/pumk.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/pumk.rsi/icon.png new file mode 100644 index 00000000000..d547cfd525f Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/pumk.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/pumk.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/pumk.rsi/inhand-left.png new file mode 100644 index 00000000000..5f3a3c98cd1 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/pumk.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/pumk.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/pumk.rsi/inhand-right.png new file mode 100644 index 00000000000..9a9919785fd Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/pumk.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/pumk.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/pumk.rsi/meta.json new file mode 100644 index 00000000000..b8b90f5511f --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/pumk.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited Mitsunere mitsunere(Discord)", + "size": { + "x": 32, + "y": 32 + }, + + "states": [ + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/witch.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/witch.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..f53e3fe8678 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/witch.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/witch.rsi/icon.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/witch.rsi/icon.png new file mode 100644 index 00000000000..11a72455829 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/witch.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/witch.rsi/inhand-left.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/witch.rsi/inhand-left.png new file mode 100644 index 00000000000..588cc735bb7 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/witch.rsi/inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/witch.rsi/inhand-right.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/witch.rsi/inhand-right.png new file mode 100644 index 00000000000..11d2c01d870 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/witch.rsi/inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/witch.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/witch.rsi/meta.json new file mode 100644 index 00000000000..b8b90f5511f --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/Clothing/witch.rsi/meta.json @@ -0,0 +1,27 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited Mitsunere mitsunere(Discord)", + "size": { + "x": 32, + "y": 32 + }, + + "states": [ + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/black-inhand-left.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/black-inhand-left.png new file mode 100644 index 00000000000..bff32511ef5 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/black-inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/black-inhand-right.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/black-inhand-right.png new file mode 100644 index 00000000000..ae0090638ee Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/black-inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/bloons-inhand-left.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/bloons-inhand-left.png new file mode 100644 index 00000000000..82438f1da3c Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/bloons-inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/bloons-inhand-right.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/bloons-inhand-right.png new file mode 100644 index 00000000000..82438f1da3c Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/bloons-inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/icon_black.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/icon_black.png new file mode 100644 index 00000000000..bda04a06a43 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/icon_black.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/icon_bloons.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/icon_bloons.png new file mode 100644 index 00000000000..f1c0f0df24b Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/icon_bloons.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/icon_orange.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/icon_orange.png new file mode 100644 index 00000000000..be27135940f Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/icon_orange.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/icon_white.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/icon_white.png new file mode 100644 index 00000000000..45fe57abbbe Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/icon_white.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/meta.json new file mode 100644 index 00000000000..0aba6817875 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/meta.json @@ -0,0 +1,55 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Mitsunere mitsunere(Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon_black" + }, + { + "name": "black-inhand-left", + "directions": 4 + }, + { + "name": "black-inhand-right", + "directions": 4 + }, + { + "name": "icon_white" + }, + { + "name": "white-inhand-left", + "directions": 4 + }, + { + "name": "white-inhand-right", + "directions": 4 + }, + { + "name": "icon_orange" + }, + { + "name": "orange-inhand-left", + "directions": 4 + }, + { + "name": "orange-inhand-right", + "directions": 4 + }, + { + "name": "icon_bloons" + }, + { + "name": "bloons-inhand-left", + "directions": 4 + }, + { + "name": "bloons-inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/orange-inhand-left.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/orange-inhand-left.png new file mode 100644 index 00000000000..df0dc44f4dc Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/orange-inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/orange-inhand-right.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/orange-inhand-right.png new file mode 100644 index 00000000000..4bf8bbc1b59 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/orange-inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/white-inhand-left.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/white-inhand-left.png new file mode 100644 index 00000000000..4e6fe518973 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/white-inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/white-inhand-right.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/white-inhand-right.png new file mode 100644 index 00000000000..b3777bbc28b Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/bloons.rsi/white-inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/lifs.rsi/bat-bed-mobile.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/lifs.rsi/bat-bed-mobile.png new file mode 100644 index 00000000000..0e4e8289247 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/lifs.rsi/bat-bed-mobile.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/lifs.rsi/hallow-jack.png b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/lifs.rsi/hallow-jack.png new file mode 100644 index 00000000000..7d6fc3d25f7 Binary files /dev/null and b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/lifs.rsi/hallow-jack.png differ diff --git a/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/lifs.rsi/meta.json b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/lifs.rsi/meta.json new file mode 100644 index 00000000000..8445fc699a8 --- /dev/null +++ b/Resources/Textures/_LostParadise/Clothing/HalloweenDecor/lifs.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by #timxx7019 (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "bat-bed-mobile" + }, + { + "name": "hallow-jack" + } + ] +} diff --git a/Resources/Textures/_LostParadise/Objects/Consumable/halloween.rsi/candy_1.png b/Resources/Textures/_LostParadise/Objects/Consumable/halloween.rsi/candy_1.png new file mode 100644 index 00000000000..4b55929ccf8 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Consumable/halloween.rsi/candy_1.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Consumable/halloween.rsi/candy_2.png b/Resources/Textures/_LostParadise/Objects/Consumable/halloween.rsi/candy_2.png new file mode 100644 index 00000000000..1a5c3737552 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Consumable/halloween.rsi/candy_2.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Consumable/halloween.rsi/candy_3.png b/Resources/Textures/_LostParadise/Objects/Consumable/halloween.rsi/candy_3.png new file mode 100644 index 00000000000..ac086e1c9a0 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Consumable/halloween.rsi/candy_3.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Consumable/halloween.rsi/candy_4.png b/Resources/Textures/_LostParadise/Objects/Consumable/halloween.rsi/candy_4.png new file mode 100644 index 00000000000..b74efdb13ee Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Consumable/halloween.rsi/candy_4.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Consumable/halloween.rsi/lollipop.png b/Resources/Textures/_LostParadise/Objects/Consumable/halloween.rsi/lollipop.png new file mode 100644 index 00000000000..4e5ff049d58 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Consumable/halloween.rsi/lollipop.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Consumable/halloween.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Consumable/halloween.rsi/meta.json new file mode 100644 index 00000000000..b28f9d7657b --- /dev/null +++ b/Resources/Textures/_LostParadise/Objects/Consumable/halloween.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/e00cae8d065f9cf520688cc0dd0e15ba5bef12a9", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "candy_1" + }, + { + "name": "candy_2" + }, + { + "name": "candy_3" + }, + { + "name": "candy_4" + }, + { + "name": "lollipop" + } + ] +} diff --git a/Resources/Textures/_LostParadise/Objects/Decoration/Flora/flora_halloween.rsi/halloweentree01.png b/Resources/Textures/_LostParadise/Objects/Decoration/Flora/flora_halloween.rsi/halloweentree01.png new file mode 100644 index 00000000000..6c93d8693d6 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Decoration/Flora/flora_halloween.rsi/halloweentree01.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Decoration/Flora/flora_halloween.rsi/halloweentree02.png b/Resources/Textures/_LostParadise/Objects/Decoration/Flora/flora_halloween.rsi/halloweentree02.png new file mode 100644 index 00000000000..4878e16bb5c Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Decoration/Flora/flora_halloween.rsi/halloweentree02.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Decoration/Flora/flora_halloween.rsi/halloweentree03.png b/Resources/Textures/_LostParadise/Objects/Decoration/Flora/flora_halloween.rsi/halloweentree03.png new file mode 100644 index 00000000000..52281378336 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Decoration/Flora/flora_halloween.rsi/halloweentree03.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Decoration/Flora/flora_halloween.rsi/halloweentree04.png b/Resources/Textures/_LostParadise/Objects/Decoration/Flora/flora_halloween.rsi/halloweentree04.png new file mode 100644 index 00000000000..c86b49a2f5d Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Decoration/Flora/flora_halloween.rsi/halloweentree04.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Decoration/Flora/flora_halloween.rsi/icon.png b/Resources/Textures/_LostParadise/Objects/Decoration/Flora/flora_halloween.rsi/icon.png new file mode 100644 index 00000000000..4878e16bb5c Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Decoration/Flora/flora_halloween.rsi/icon.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Decoration/Flora/flora_halloween.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Decoration/Flora/flora_halloween.rsi/meta.json new file mode 100644 index 00000000000..3277a60f809 --- /dev/null +++ b/Resources/Textures/_LostParadise/Objects/Decoration/Flora/flora_halloween.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/e00cae8d065f9cf520688cc0dd0e15ba5bef12a9", + "size": { + "x": 64, + "y": 64 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "halloweentree01" + }, + { + "name": "halloweentree02" + }, + { + "name": "halloweentree03" + }, + { + "name": "halloweentree04" + } + ] +} diff --git a/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/meta.json new file mode 100644 index 00000000000..e695f681e06 --- /dev/null +++ b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/meta.json @@ -0,0 +1,48 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "spider_big" + }, + { + "name": "spider_big2" + }, + { + "name": "spider_mini1" + }, + { + "name": "spider_mini2" + }, + { + "name": "spider_mini3" + }, + { + "name": "pumpkin_minis" + }, + { + "name": "pumpkin_minis2" + }, + { + "name": "pumpkins", + "directions": 4 + }, + { + "name": "plant1" + }, + { + "name": "plant2" + }, + { + "name": "plant3" + }, + { + "name": "plant4" + } + ] +} diff --git a/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/plant1.png b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/plant1.png new file mode 100644 index 00000000000..70b72e4e486 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/plant1.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/plant2.png b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/plant2.png new file mode 100644 index 00000000000..f87f6d29518 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/plant2.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/plant3.png b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/plant3.png new file mode 100644 index 00000000000..fcfd5ee8d7e Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/plant3.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/plant4.png b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/plant4.png new file mode 100644 index 00000000000..a8a28b5ce4b Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/plant4.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/pumpkin_minis.png b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/pumpkin_minis.png new file mode 100644 index 00000000000..d99521c75ee Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/pumpkin_minis.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/pumpkin_minis2.png b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/pumpkin_minis2.png new file mode 100644 index 00000000000..5daf1ad3aa3 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/pumpkin_minis2.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/pumpkins.png b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/pumpkins.png new file mode 100644 index 00000000000..5b1f205a6aa Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/pumpkins.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/spider_big.png b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/spider_big.png new file mode 100644 index 00000000000..4886e92650a Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/spider_big.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/spider_big2.png b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/spider_big2.png new file mode 100644 index 00000000000..54737e350c1 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/spider_big2.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/spider_mini1.png b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/spider_mini1.png new file mode 100644 index 00000000000..048544bae86 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/spider_mini1.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/spider_mini2.png b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/spider_mini2.png new file mode 100644 index 00000000000..f30af058ed5 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/spider_mini2.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/spider_mini3.png b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/spider_mini3.png new file mode 100644 index 00000000000..151eef14301 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Decoration/halloween.rsi/spider_mini3.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Specific/halloween/paper_bag.rsi/empty-inhand-left.png b/Resources/Textures/_LostParadise/Objects/Specific/halloween/paper_bag.rsi/empty-inhand-left.png new file mode 100644 index 00000000000..abdcc2b58d2 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Specific/halloween/paper_bag.rsi/empty-inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Specific/halloween/paper_bag.rsi/empty-inhand-right.png b/Resources/Textures/_LostParadise/Objects/Specific/halloween/paper_bag.rsi/empty-inhand-right.png new file mode 100644 index 00000000000..154813272bc Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Specific/halloween/paper_bag.rsi/empty-inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Specific/halloween/paper_bag.rsi/empty_icon.png b/Resources/Textures/_LostParadise/Objects/Specific/halloween/paper_bag.rsi/empty_icon.png new file mode 100644 index 00000000000..b1ea1181a98 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Specific/halloween/paper_bag.rsi/empty_icon.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Specific/halloween/paper_bag.rsi/full-inhand-left.png b/Resources/Textures/_LostParadise/Objects/Specific/halloween/paper_bag.rsi/full-inhand-left.png new file mode 100644 index 00000000000..2e2efb0aab7 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Specific/halloween/paper_bag.rsi/full-inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Specific/halloween/paper_bag.rsi/full-inhand-right.png b/Resources/Textures/_LostParadise/Objects/Specific/halloween/paper_bag.rsi/full-inhand-right.png new file mode 100644 index 00000000000..30e01b8401f Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Specific/halloween/paper_bag.rsi/full-inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Specific/halloween/paper_bag.rsi/full_icon.png b/Resources/Textures/_LostParadise/Objects/Specific/halloween/paper_bag.rsi/full_icon.png new file mode 100644 index 00000000000..8383ce5e756 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Specific/halloween/paper_bag.rsi/full_icon.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Specific/halloween/paper_bag.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Specific/halloween/paper_bag.rsi/meta.json new file mode 100644 index 00000000000..20b40ff5c62 --- /dev/null +++ b/Resources/Textures/_LostParadise/Objects/Specific/halloween/paper_bag.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "empty_icon" + }, + { + "name": "full_icon" + }, + { + "name": "empty-inhand-right", + "directions": 4 + }, + { + "name": "empty-inhand-left", + "directions": 4 + }, + { + "name": "full-inhand-right", + "directions": 4 + }, + { + "name": "full-inhand-left", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Objects/Specific/halloween/pumpkin_bag.rsi/empty-inhand-left.png b/Resources/Textures/_LostParadise/Objects/Specific/halloween/pumpkin_bag.rsi/empty-inhand-left.png new file mode 100644 index 00000000000..03db9ac0732 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Specific/halloween/pumpkin_bag.rsi/empty-inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Specific/halloween/pumpkin_bag.rsi/empty-inhand-right.png b/Resources/Textures/_LostParadise/Objects/Specific/halloween/pumpkin_bag.rsi/empty-inhand-right.png new file mode 100644 index 00000000000..16cc866f008 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Specific/halloween/pumpkin_bag.rsi/empty-inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Specific/halloween/pumpkin_bag.rsi/empty_icon.png b/Resources/Textures/_LostParadise/Objects/Specific/halloween/pumpkin_bag.rsi/empty_icon.png new file mode 100644 index 00000000000..616e3e3d487 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Specific/halloween/pumpkin_bag.rsi/empty_icon.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Specific/halloween/pumpkin_bag.rsi/full-inhand-left.png b/Resources/Textures/_LostParadise/Objects/Specific/halloween/pumpkin_bag.rsi/full-inhand-left.png new file mode 100644 index 00000000000..6eddadf5d70 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Specific/halloween/pumpkin_bag.rsi/full-inhand-left.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Specific/halloween/pumpkin_bag.rsi/full-inhand-right.png b/Resources/Textures/_LostParadise/Objects/Specific/halloween/pumpkin_bag.rsi/full-inhand-right.png new file mode 100644 index 00000000000..34aad3225ca Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Specific/halloween/pumpkin_bag.rsi/full-inhand-right.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Specific/halloween/pumpkin_bag.rsi/full_icon.png b/Resources/Textures/_LostParadise/Objects/Specific/halloween/pumpkin_bag.rsi/full_icon.png new file mode 100644 index 00000000000..16af4c72746 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Specific/halloween/pumpkin_bag.rsi/full_icon.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Specific/halloween/pumpkin_bag.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Specific/halloween/pumpkin_bag.rsi/meta.json new file mode 100644 index 00000000000..20b40ff5c62 --- /dev/null +++ b/Resources/Textures/_LostParadise/Objects/Specific/halloween/pumpkin_bag.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "empty_icon" + }, + { + "name": "full_icon" + }, + { + "name": "empty-inhand-right", + "directions": 4 + }, + { + "name": "empty-inhand-left", + "directions": 4 + }, + { + "name": "full-inhand-right", + "directions": 4 + }, + { + "name": "full-inhand-left", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/laserkomissar.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/laserkomissar.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..26f3f043268 Binary files /dev/null and b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/laserkomissar.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/laserkomissar.rsi/meta.json b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/laserkomissar.rsi/meta.json index ad0a7d3478c..ad40c02ed80 100644 --- a/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/laserkomissar.rsi/meta.json +++ b/Resources/Textures/_LostParadise/Objects/Weapons/Guns/Battery/laserkomissar.rsi/meta.json @@ -36,6 +36,10 @@ }, { "name": "mag-unshaded-4" + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 } ] } diff --git a/Resources/Textures/_LostParadise/Structures/Wallmounts/halloween.rsi/checkboxes.png b/Resources/Textures/_LostParadise/Structures/Wallmounts/halloween.rsi/checkboxes.png new file mode 100644 index 00000000000..0da1c7ddd83 Binary files /dev/null and b/Resources/Textures/_LostParadise/Structures/Wallmounts/halloween.rsi/checkboxes.png differ diff --git a/Resources/Textures/_LostParadise/Structures/Wallmounts/halloween.rsi/light_bulbs.png b/Resources/Textures/_LostParadise/Structures/Wallmounts/halloween.rsi/light_bulbs.png new file mode 100644 index 00000000000..cdbf1c9d148 Binary files /dev/null and b/Resources/Textures/_LostParadise/Structures/Wallmounts/halloween.rsi/light_bulbs.png differ diff --git a/Resources/Textures/_LostParadise/Structures/Wallmounts/halloween.rsi/meta.json b/Resources/Textures/_LostParadise/Structures/Wallmounts/halloween.rsi/meta.json new file mode 100644 index 00000000000..2fb6608dc95 --- /dev/null +++ b/Resources/Textures/_LostParadise/Structures/Wallmounts/halloween.rsi/meta.json @@ -0,0 +1,23 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/e00cae8d065f9cf520688cc0dd0e15ba5bef12a9", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "checkboxes" + }, + { + "name": "сounts_painting" + }, + { + "name": "light_bulbs" + }, + { + "name": "picture_family" + } + ] +} diff --git a/Resources/Textures/_LostParadise/Structures/Wallmounts/halloween.rsi/picture_family.png b/Resources/Textures/_LostParadise/Structures/Wallmounts/halloween.rsi/picture_family.png new file mode 100644 index 00000000000..a692e9a2430 Binary files /dev/null and b/Resources/Textures/_LostParadise/Structures/Wallmounts/halloween.rsi/picture_family.png differ diff --git "a/Resources/Textures/_LostParadise/Structures/Wallmounts/halloween.rsi/\321\201ounts_painting.png" "b/Resources/Textures/_LostParadise/Structures/Wallmounts/halloween.rsi/\321\201ounts_painting.png" new file mode 100644 index 00000000000..f8218fce880 Binary files /dev/null and "b/Resources/Textures/_LostParadise/Structures/Wallmounts/halloween.rsi/\321\201ounts_painting.png" differ