diff --git a/.github/workflows/labeler-untriaged.yml b/.github/workflows/labeler-untriaged.yml index 4684e26686..b6b383161c 100644 --- a/.github/workflows/labeler-untriaged.yml +++ b/.github/workflows/labeler-untriaged.yml @@ -10,10 +10,17 @@ jobs: add_label: runs-on: ubuntu-latest permissions: - contents: read issues: write + pull-requests: write steps: - - uses: actions-ecosystem/action-add-labels@v1 - if: join(github.event.issue.labels) == '' - with: - labels: "S: Untriaged" + - name: Add label to issue + if: github.event_name == 'issues' && join(github.event.issue.labels.*.name) == '' + uses: actions-ecosystem/action-add-labels@v1 + with: + labels: "S: Untriaged" + + - name: Add label to pull request + if: github.event_name == 'pull_request_target' && join(github.event.pull_request.labels.*.name) == '' + uses: actions-ecosystem/action-add-labels@v1 + with: + labels: "S: Untriaged" diff --git a/Content.Server/_Wega/Pain/PainSystem.cs b/Content.Server/_Wega/Pain/PainSystem.cs index 964bcc715e..625e58a2c6 100644 --- a/Content.Server/_Wega/Pain/PainSystem.cs +++ b/Content.Server/_Wega/Pain/PainSystem.cs @@ -110,7 +110,7 @@ public sealed class PainSystem : EntitySystem break; case PainEffectType.MovementPenalty: - _stun.TrySlowdown(uid, TimeSpan.FromSeconds(3), true, 0.75f, 0.75f); + _stun.TrySlowdown(uid, TimeSpan.FromSeconds(effect.Duration), true, effect.SpeedMultiplier, effect.SpeedMultiplier); break; case PainEffectType.DropItem: @@ -119,7 +119,7 @@ public sealed class PainSystem : EntitySystem break; case PainEffectType.Stun: - _stun.TryKnockdown(uid, TimeSpan.FromSeconds(3), true); + _stun.TryKnockdown(uid, TimeSpan.FromSeconds(effect.Duration), true); break; case PainEffectType.Vomit: @@ -127,7 +127,7 @@ public sealed class PainSystem : EntitySystem break; case PainEffectType.Twitch: - _jittering.DoJitter(uid, TimeSpan.FromSeconds(15), true); + _jittering.DoJitter(uid, TimeSpan.FromSeconds(effect.Duration), true); break; } } diff --git a/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs b/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs index a4c7cd8e90..6418e55539 100644 --- a/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs +++ b/Content.Shared/Humanoid/HumanoidAppearanceComponent.cs @@ -3,6 +3,7 @@ using Content.Shared.DisplacementMap; using Content.Shared.Humanoid.Markings; using Content.Shared.Humanoid.Prototypes; using Content.Shared.Inventory; +using Content.Shared.Speech.Synthesis; // Corvax-Wega-Barks using Robust.Shared.Enums; using Robust.Shared.GameStates; using Robust.Shared.Prototypes; @@ -54,7 +55,7 @@ public sealed partial class HumanoidAppearanceComponent : Component public Status Status = Status.No; [DataField("barkvoice")] - public ProtoId BarkVoice { get; set; } = SharedHumanoidAppearanceSystem.DefaultBarkVoice; + public ProtoId BarkVoice { get; set; } = SharedHumanoidAppearanceSystem.DefaultBarkVoice; // Corvax-Wega-end // Corvax-TTS-Start diff --git a/Content.Shared/_Wega/Pain/PainProfilePrototype.cs b/Content.Shared/_Wega/Pain/PainProfilePrototype.cs index cd89ba8130..902e019c23 100644 --- a/Content.Shared/_Wega/Pain/PainProfilePrototype.cs +++ b/Content.Shared/_Wega/Pain/PainProfilePrototype.cs @@ -39,6 +39,12 @@ public sealed partial class PainEffect [DataField("message")] public string? Message; + + [DataField("duration")] + public float Duration = 1f; + + [DataField("speedMultiplier")] + public float SpeedMultiplier = 1f; } public enum PainEffectType diff --git a/Resources/Locale/ru-RU/_wega/flavors/flavor-profiles.ftl b/Resources/Locale/ru-RU/_wega/flavors/flavor-profiles.ftl index 81cf294d14..92082e1ad2 100644 --- a/Resources/Locale/ru-RU/_wega/flavors/flavor-profiles.ftl +++ b/Resources/Locale/ru-RU/_wega/flavors/flavor-profiles.ftl @@ -45,4 +45,19 @@ flavor-complex-tick-tack = как тиканье часов flavor-complex-uragan-shot = как порывы ветра flavor-complex-new-yorker = как крах flavor-complex-demonic-watermelon = как порченый арбуз +flavor-complex-triple-citrus = как три в одном +flavor-complex-ginsonic = как джин с тоником +flavor-complex-rainbow-sky = как радужное небо +flavor-complex-three-mile-island-iced-tea = как ядерный взрыв во рту +flavor-base-iron = как железо +flavor-base-acrid = как едкий дым +flavor-base-fiery = как огонь +flavor-base-zesty = как пряность +flavor-base-rich = как насыщенность +flavor-base-crisp = как свежесть +flavor-base-smoky = как копчёность +flavor-base-musty = как затхлость +flavor-base-petroleum = как бензин +flavor-base-robust = как сила +flavor-base-chaotic = как хаос flavor-base-money = как ваша зарплата diff --git a/Resources/Locale/ru-RU/_wega/reagents/meta/consumable/drink/alcohol.ftl b/Resources/Locale/ru-RU/_wega/reagents/meta/consumable/drink/alcohol.ftl index 30896d51b4..1bedff1824 100644 --- a/Resources/Locale/ru-RU/_wega/reagents/meta/consumable/drink/alcohol.ftl +++ b/Resources/Locale/ru-RU/_wega/reagents/meta/consumable/drink/alcohol.ftl @@ -20,7 +20,7 @@ reagent-name-light = свет reagent-name-aviation = авиация reagent-name-fizz = физз reagent-name-brandy-crusta = brandy crusta -reagent-name-aperolspritz = апероль спритц +reagent-name-aperol-spritz = апероль спритц reagent-name-tuxedo = смокинг reagent-name-horse-neck = лошадиная шея reagent-name-cuban-sunset = кубинский закат @@ -37,13 +37,18 @@ reagent-name-slime-drink = слаймовый напиток reagent-name-innocent-erp = невинный ужас reagent-name-blue-lagoon = голубая лагуна reagent-name-green-fairy = зеленая фея -reagent-name-home-lebovsky = дом лебовски +reagent-name-home-lebowski = дом лебовски reagent-name-top-billing = лучший счет -reagent-name-trans-siberian-express = транс-сибирский экспресс +reagent-name-trans-siberia-express = транс-сибирский экспресс reagent-name-sun = солнце -reagent-name-tick-tack = тик-ток +reagent-name-tick-tock = тик-ток reagent-name-uragan-shot = урагановый выстрел reagent-name-new-yorker = нью-йоркер +reagent-name-flaming-moe = пылающий мо +reagent-name-gin-sonic = джин-соник +reagent-name-rainbow-sky = радужное небо +reagent-name-three-mile-island-iced-tea = айсед ти три-майл-айленд +reagent-name-box = бокс reagent-desc-aperol = Ох-ох-ох... Похоже, это засада для печени. reagent-desc-jagermeister = Охотник на пьяниц пришел из глубин космоса, и похоже, он нашел жертву. @@ -67,7 +72,7 @@ reagent-desc-light = Любимый напиток Ниан и Дионеи, к reagent-desc-aviation = Трудно делать коктейли, когда над твоим домом летает дирижабль. reagent-desc-fizz = Это как жить с дикой кошкой. reagent-desc-brandy-crusta = Сахарная корочка может быть совсем не сладкой. -reagent-desc-aperolspritz = Многие считают его отдельным алкоголем, но это больше похоже на коня в шахматах. +reagent-desc-aperol-spritz = Многие считают его отдельным алкоголем, но это больше похоже на коня в шахматах. reagent-desc-tuxedo = Я могу пообещать тебе колумбийский галстук. reagent-desc-horse-neck = Будь осторожен с подковами своей лошади. reagent-desc-cuban-sunset = Новый день, новый переворот. @@ -84,10 +89,15 @@ reagent-desc-slime-drink = Не волнуйтесь, это просто жел reagent-desc-innocent-erp = Помните, что Большой Брат видит всё. reagent-desc-blue-lagoon = Что может быть лучше, чем отдых на пляже с хорошим напитком? reagent-desc-green-fairy = Какое-то ненормальное зеленое. -reagent-desc-home-lebovsky = Позвольте мне кое-что объяснить. Эм, я не Домашний Лебовски. Вы — Домашний Лебовски. Я — Чувак. +reagent-desc-home-lebowski = Позвольте мне кое-что объяснить. Эм, я не Домашний Лебовски. Вы — Домашний Лебовски. Я — Чувак. reagent-desc-top-billing = На видном месте наш топовый биллинг! -reagent-desc-trans-siberian-express = От Владивостока до белой горячки за день. +reagent-desc-trans-siberia-express = От Владивостока до белой горячки за день. reagent-desc-sun = Красное солнце над раем! -reagent-desc-tick-tack = Тик-так, тик-так Бзззз... +reagent-desc-tick-tock = Тик-так, тик-так Бзззз... reagent-desc-uragan-shot = Это ураган? Нет, это ураганный алкоголь. reagent-desc-new-yorker = Будь осторожен с биржей, иначе будет "Черный вторник". +reagent-desc-flaming-moe = Экзотический напиток, который горит. +reagent-desc-gin-sonic = Освежающий коктейль на основе джина тоника. +reagent-desc-rainbow-sky = Красочный многослойный коктейль. +reagent-desc-three-mile-island-iced-tea = Очень крепкий и опасный коктейль. +reagent-desc-box = Необычный коктейль с земляным вкусом. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_wega/reagents/meta/elements.ftl b/Resources/Locale/ru-RU/_wega/reagents/meta/elements.ftl new file mode 100644 index 0000000000..6e5c2abd95 --- /dev/null +++ b/Resources/Locale/ru-RU/_wega/reagents/meta/elements.ftl @@ -0,0 +1,2 @@ +reagent-name-bromine = Бром +reagent-desc-bromine = Ядовитый галогеновый элемент, обычно жидкий при комнатной температуре. diff --git a/Resources/Locale/ru-RU/_wega/reagents/meta/medicine.ftl b/Resources/Locale/ru-RU/_wega/reagents/meta/medicine.ftl index 93b82edb4b..a873078cb2 100644 --- a/Resources/Locale/ru-RU/_wega/reagents/meta/medicine.ftl +++ b/Resources/Locale/ru-RU/_wega/reagents/meta/medicine.ftl @@ -1,6 +1,8 @@ reagent-name-spaceacillin = космоцилин reagent-desc-spaceacillin = Тета-лактамный антибиотик, эффективный при космических заболеваниях. Побочные эффекты могут включать рак. Рекомендуется принимать Фалангимин после приема внутрь. -reagent-name-unholywater = Нечестивая вода +reagent-name-unholywater = нечестивая вода reagent-desc-unholywater = Проклятая версия святой воды полезная только для последователей культа. reagent-name-formaldehyde = формальдегид -reagent-desc-formaldehyde = Сильный консервант, замедляющий разложение тканей. Токсичен для живых. \ No newline at end of file +reagent-desc-formaldehyde = Сильный консервант, замедляющий разложение тканей. Токсичен для живых. +reagent-name-mutadon = мутадон +reagent-desc-mutadon = Экспериментальное лекарство, вызывающее обратные генетические мутации. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_wega/reagents/meta/physical-desc.ftl b/Resources/Locale/ru-RU/_wega/reagents/meta/physical-desc.ftl index 893e67d08c..9e50285f80 100644 --- a/Resources/Locale/ru-RU/_wega/reagents/meta/physical-desc.ftl +++ b/Resources/Locale/ru-RU/_wega/reagents/meta/physical-desc.ftl @@ -1 +1,8 @@ reagent-physical-desc-unholy = зловещее +reagent-physical-desc-herbal = травяное +reagent-physical-desc-anise = анисовое +reagent-physical-desc-chocolatey = шоколадное +reagent-physical-desc-sophisticated = изысканное +reagent-physical-desc-fruity = фруктовое +reagent-physical-desc-warm = тёплое +reagent-physical-desc-earthy = земляное \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_wega/recipes/structures.ftl b/Resources/Locale/ru-RU/_wega/recipes/structures.ftl new file mode 100644 index 0000000000..9d4969dc7f --- /dev/null +++ b/Resources/Locale/ru-RU/_wega/recipes/structures.ftl @@ -0,0 +1,23 @@ +construction-recipe-bench-sofa-middle = диван (средний) +construction-recipe-bench-sofa-left = диван (левый) +construction-recipe-bench-sofa-right = диван (правый) +construction-recipe-bench-sofa-corner = диван (угол) +construction-recipe-bench-corp-sofa-middle = серый диван (средний) +construction-recipe-bench-corp-sofa-left = серый диван (левый) +construction-recipe-bench-corp-sofa-right = серый диван (правый) +construction-recipe-bench-corp-sofa-corner = серый диван (угол) +construction-recipe-bench-steel-middle = стальная скамейка (средний) +construction-recipe-bench-steel-left = стальная скамейка (левый) +construction-recipe-bench-steel-right = стальная скамейка (правый) +construction-recipe-bench-pew-middle = скамья (средний) +construction-recipe-bench-pew-left = скамья (левый) +construction-recipe-bench-pew-right = скамья (правый) +construction-recipe-bench-park-middle = парковая скамейка (средний) +construction-recipe-bench-park-left = парковая скамейка (левый) +construction-recipe-bench-park-right = парковая скамейка (правый) +construction-recipe-bench-steel-white-middle = белая стальная скамейка (средний) +construction-recipe-bench-steel-white-left = белая стальная скамейка (левый) +construction-recipe-bench-steel-white-right = белая стальная скамейка (правый) +construction-recipe-bench-park-bamboo-middle = бамбуковая парковая скамейка (средний) +construction-recipe-bench-park-bamboo-left = бамбуковая парковая скамейка (левый) +construction-recipe-bench-park-bamboo-right = бамбуковая парковая скамейка (правый) \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_wega/recipes/tags.ftl b/Resources/Locale/ru-RU/_wega/recipes/tags.ftl new file mode 100644 index 0000000000..1e17ce3511 --- /dev/null +++ b/Resources/Locale/ru-RU/_wega/recipes/tags.ftl @@ -0,0 +1,7 @@ +construction-graph-tag-energy-potato = картофельная батарея +construction-graph-tag-rose = роза +construction-graph-tag-sunflower = подсолнух +construction-graph-tag-poppy = мак +construction-graph-tag-peaceflower = пион +construction-graph-tag-alienberries = инопланетные ягоды +construction-graph-tag-soil-bag = мешок почвы \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_wega/stack/stacks.ftl b/Resources/Locale/ru-RU/_wega/stack/stacks.ftl new file mode 100644 index 0000000000..78d8d31532 --- /dev/null +++ b/Resources/Locale/ru-RU/_wega/stack/stacks.ftl @@ -0,0 +1,19 @@ +stack-runemetal = + { $amount -> + [1] лист + [few] листа + *[other] листов + } рунической стали +stack-capacitor = + { $amount -> + [1] конденсатор + [few] конденсатора + *[other] конденсаторов + } +stack-matter-bin = + { $amount -> + [1] ёмкость материи + [few] ёмкостей материи + *[other] ёмкостей материи + } +stack-sepia-floor = стальная светлая плитка \ No newline at end of file diff --git a/Resources/Prototypes/Maps/fland.yml b/Resources/Prototypes/Maps/fland.yml index d0ffd1cf24..a0cbf1933e 100644 --- a/Resources/Prototypes/Maps/fland.yml +++ b/Resources/Prototypes/Maps/fland.yml @@ -1,7 +1,7 @@ - type: gameMap id: Fland mapName: 'Fland Installation' - mapPath: Maps/_Wega/wegafland.yml # Corvax-Wega-Maps + mapPath: /Maps/_Wega/wegafland.yml # Corvax-Wega-Maps minPlayers: 55 # Corvax stations: Fland: diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml index 56d8e6a403..cfbda34915 100644 --- a/Resources/Prototypes/Maps/marathon.yml +++ b/Resources/Prototypes/Maps/marathon.yml @@ -1,7 +1,7 @@ - type: gameMap id: Marathon mapName: 'Marathon Station' - mapPath: Maps/_Wega/wegamarathon.yml #Corvax-Wega-Maps + mapPath: /Maps/_Wega/wegamarathon.yml #Corvax-Wega-Maps # Corvax-start minPlayers: 25 maxPlayers: 55 diff --git a/Resources/Prototypes/_Wega/Actions/bloodcult.yml b/Resources/Prototypes/_Wega/Actions/bloodcult.yml index ec2b911f21..f82ce8fa09 100644 --- a/Resources/Prototypes/_Wega/Actions/bloodcult.yml +++ b/Resources/Prototypes/_Wega/Actions/bloodcult.yml @@ -308,7 +308,6 @@ prototypes: - id: WallCult amount: 1 - offsetVector2: 0, 1 - type: entity id: ConstructBuildConstructSpell @@ -328,7 +327,6 @@ prototypes: - id: BloodCultConstruct amount: 1 - offsetVector2: 0, 1 - type: entity id: SoulStoneConstructSpell @@ -348,7 +346,6 @@ prototypes: - id: BloodCultSoulStone amount: 1 - offsetVector2: 0, 1 - type: entity id: CloneConstructSpell @@ -369,4 +366,3 @@ prototypes: - id: MobConstructHarvester amount: 1 - offsetVector2: 0, 1 diff --git a/Resources/Prototypes/_Wega/Actions/revenant.yml b/Resources/Prototypes/_Wega/Actions/revenant.yml index c5ba7f871e..293b33f961 100644 --- a/Resources/Prototypes/_Wega/Actions/revenant.yml +++ b/Resources/Prototypes/_Wega/Actions/revenant.yml @@ -5,7 +5,7 @@ description: Cheat to please yourself. components: - type: Action - icon: { sprite: _Wega/Interface/Actions, state: transmit } + icon: _Wega/Interface/Actions/transmit.png itemIconStyle: BigAction useDelay: 5 - type: TargetAction @@ -19,7 +19,7 @@ description: Costs 50 Essence. components: - type: Action - icon: { sprite: _Wega/Interface/Actions, state: haunt } + icon: _Wega/Interface/Actions/haunt.png itemIconStyle: BigAction useDelay: 60 - type: InstantAction @@ -32,7 +32,7 @@ description: Costs 25 Essence. components: - type: Action - icon: { sprite: _Wega/Interface/Actions, state: hallucination } + icon: _Wega/Interface/Actions/hallucination.png itemIconStyle: BigAction useDelay: 15 - type: InstantAction diff --git a/Resources/Prototypes/_Wega/Actions/vampire.yml b/Resources/Prototypes/_Wega/Actions/vampire.yml index d3a592addd..09afbae4c8 100644 --- a/Resources/Prototypes/_Wega/Actions/vampire.yml +++ b/Resources/Prototypes/_Wega/Actions/vampire.yml @@ -254,7 +254,6 @@ itemIconStyle: BigAction useDelay: 30 - type: TargetAction - canTargetSelf: false range: 5 - type: EntityTargetAction event: !type:VampireShadowBoxingActionEvent diff --git a/Resources/Prototypes/_Wega/Actions/vehicles.yml b/Resources/Prototypes/_Wega/Actions/vehicles.yml index d0d8ad368c..fc266be97d 100644 --- a/Resources/Prototypes/_Wega/Actions/vehicles.yml +++ b/Resources/Prototypes/_Wega/Actions/vehicles.yml @@ -3,7 +3,7 @@ parent: BaseAction name: Honk description: Honk! - noSpawn: true + categories: [ HideSpawnMenu ] components: - type: Action icon: Objects/Fun/bikehorn.rsi/icon.png diff --git a/Resources/Prototypes/_Wega/Catalog/ert_catalog.yml b/Resources/Prototypes/_Wega/Catalog/ert_catalog.yml index 30fbdebd1c..eddcd4276b 100644 --- a/Resources/Prototypes/_Wega/Catalog/ert_catalog.yml +++ b/Resources/Prototypes/_Wega/Catalog/ert_catalog.yml @@ -582,7 +582,7 @@ id: ERTTelecomServer name: tactical-interface-telecom-server-name description: tactical-interface-telecom-server-desc - icon: { sprite: /Textures/Structures/Machines/telecomms.rsi, state: icon } + icon: { sprite: /Textures/Structures/Machines/telecomms.rsi, state: telecom-nopower } productEntity: TelecomServerFlatpack cost: TacticalResource: 6 diff --git a/Resources/Prototypes/_Wega/Catalog/uplink_catalog.yml b/Resources/Prototypes/_Wega/Catalog/uplink_catalog.yml index 865a3ba33f..6b3bcaa0c1 100644 --- a/Resources/Prototypes/_Wega/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_Wega/Catalog/uplink_catalog.yml @@ -84,7 +84,7 @@ cost: Telecrystal: 5 categories: - - UplinkMisc + - UplinkPointless conditions: - !type:BuyerWhitelistCondition blacklist: diff --git a/Resources/Prototypes/_Wega/Catalog/void_catalog.yml b/Resources/Prototypes/_Wega/Catalog/void_catalog.yml index d352eff571..13ede948c9 100644 --- a/Resources/Prototypes/_Wega/Catalog/void_catalog.yml +++ b/Resources/Prototypes/_Wega/Catalog/void_catalog.yml @@ -519,7 +519,7 @@ id: UplinkNocturineVoid name: uplink-void-nocturine-name description: uplink-void-nocturine-desc - productEntity: NocturineChemistryBottle + productEntity: ChemistryBottleNocturine cost: Credit: 20000 categories: diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/_Wega/Entities/Clothing/Head/hardsuit-helmets.yml index ca4f884084..3319f76c9e 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/Head/hardsuit-helmets.yml @@ -16,7 +16,8 @@ highPressureMultiplier: 0.08 lowPressureMultiplier: 1000 - type: TemperatureProtection - coefficient: 0.005 + heatingCoefficient: 0.005 + coolingCoefficient: 0.005 - type: FireProtection reduction: 0.2 - type: Armor @@ -45,7 +46,8 @@ highPressureMultiplier: 0.08 lowPressureMultiplier: 1000 - type: TemperatureProtection - coefficient: 0.005 + heatingCoefficient: 0.005 + coolingCoefficient: 0.005 - type: FireProtection reduction: 0.2 - type: Armor diff --git a/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/hardsuits.yml index ee8a739203..cd7fada023 100644 --- a/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_Wega/Entities/Clothing/OuterClothing/hardsuits.yml @@ -12,7 +12,8 @@ highPressureMultiplier: 0.02 lowPressureMultiplier: 1000 - type: TemperatureProtection - coefficient: 0.001 + heatingCoefficient: 0.001 + coolingCoefficient: 0.001 - type: ExplosionResistance damageCoefficient: 0.5 - type: FireProtection @@ -60,7 +61,8 @@ highPressureMultiplier: 0.02 lowPressureMultiplier: 1000 - type: TemperatureProtection - coefficient: 0.001 + heatingCoefficient: 0.001 + coolingCoefficient: 0.001 - type: ExplosionResistance damageCoefficient: 0.4 - type: FireProtection diff --git a/Resources/Prototypes/_Wega/Entities/Effects/bloodcult.yml b/Resources/Prototypes/_Wega/Entities/Effects/bloodcult.yml index 8f4ae30dd9..362352ac58 100644 --- a/Resources/Prototypes/_Wega/Entities/Effects/bloodcult.yml +++ b/Resources/Prototypes/_Wega/Entities/Effects/bloodcult.yml @@ -48,7 +48,9 @@ sprite: _Wega/Structures/Specific/bloodcult_structures.rsi - type: Appearance appearanceDataInit: - enum.RuneColorVisuals.Color: Red + enum.RuneColorVisuals.Color: + !type:String + "#ff0000" - type: BloodRune prototype: default - type: TimedDespawn diff --git a/Resources/Prototypes/_Wega/Entities/Effects/puddle.yml b/Resources/Prototypes/_Wega/Entities/Effects/puddle.yml index 6032abad9c..d3f3583f12 100644 --- a/Resources/Prototypes/_Wega/Entities/Effects/puddle.yml +++ b/Resources/Prototypes/_Wega/Entities/Effects/puddle.yml @@ -41,5 +41,5 @@ defaultRotation: 0 horizontalRotation: 0 - type: MovementSpeedModifier - walkSpeedModifier: 8 + baseWalkSpeed: 8 baseSprintSpeed: 8 diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/silicon.yml index 5c400b9805..28082ac9ad 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/silicon.yml @@ -31,7 +31,6 @@ description: ghost-role-information-taxibot-description - type: Strap buckleOffset: "0, 0" - maxBuckleDistance: 1 - type: Construction graph: TaxiBot node: bot diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/xenobiology.yml b/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/xenobiology.yml index ee67f8c4f4..2adc324cc3 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/xenobiology.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/NPCs/xenobiology.yml @@ -31,11 +31,7 @@ - type: SlimeHunger - type: SlimeSocial - type: SlimeGrowth - - type: Appearance - visuals: - enum.SlimeVisualLayers: - Type: Gray - Stage: Young + - type: SlimeVisuals defaultVisuals: MobXenoSlimeGray typeVisuals: @@ -84,11 +80,6 @@ Base: blue_baby_dead - type: SlimeGrowth slimeType: Blue - - type: Appearance - visuals: - enum.SlimeVisualLayers: - Type: Blue - Stage: Young - type: entity name: purple slime @@ -107,10 +98,6 @@ - type: SlimeGrowth slimeType: Purple - type: Appearance - visuals: - enum.SlimeVisualLayers: - Type: Purple - Stage: Young - type: entity name: orange slime @@ -128,11 +115,6 @@ Base: orange_baby_dead - type: SlimeGrowth slimeType: Orange - - type: Appearance - visuals: - enum.SlimeVisualLayers: - Type: Orange - Stage: Young - type: entity name: metallic slime @@ -150,11 +132,6 @@ Base: metallic_baby_dead - type: SlimeGrowth slimeType: Metallic - - type: Appearance - visuals: - enum.SlimeVisualLayers: - Type: Metallic - Stage: Young - type: entity name: dark-purple slime @@ -172,11 +149,6 @@ Base: darkpurple_baby_dead - type: SlimeGrowth slimeType: DarkPurple - - type: Appearance - visuals: - enum.SlimeVisualLayers: - Type: DarkPurple - Stage: Young - type: entity name: green slime @@ -194,11 +166,6 @@ Base: green_baby_dead - type: SlimeGrowth slimeType: Green - - type: Appearance - visuals: - enum.SlimeVisualLayers: - Type: Green - Stage: Young - type: entity name: dark-blue slime @@ -216,11 +183,6 @@ Base: darkblue_baby_dead - type: SlimeGrowth slimeType: DarkBlue - - type: Appearance - visuals: - enum.SlimeVisualLayers: - Type: DarkBlue - Stage: Young - type: entity name: pink slime @@ -238,11 +200,6 @@ Base: pink_baby_dead - type: SlimeGrowth slimeType: Pink - - type: Appearance - visuals: - enum.SlimeVisualLayers: - Type: Pink - Stage: Young - type: entity name: red slime @@ -260,11 +217,6 @@ Base: red_baby_dead - type: SlimeGrowth slimeType: Red - - type: Appearance - visuals: - enum.SlimeVisualLayers: - Type: Red - Stage: Young - type: entity name: yellow slime @@ -282,11 +234,6 @@ Base: yellow_baby_dead - type: SlimeGrowth slimeType: Yellow - - type: Appearance - visuals: - enum.SlimeVisualLayers: - Type: Yellow - Stage: Young - type: entity name: gold slime @@ -304,11 +251,6 @@ Base: gold_baby_dead - type: SlimeGrowth slimeType: Gold - - type: Appearance - visuals: - enum.SlimeVisualLayers: - Type: Gold - Stage: Young - type: entity name: silver slime @@ -326,11 +268,6 @@ Base: silver_baby_dead - type: SlimeGrowth slimeType: Silver - - type: Appearance - visuals: - enum.SlimeVisualLayers: - Type: Silver - Stage: Young - type: entity name: black slime @@ -348,11 +285,6 @@ Base: black_baby_dead - type: SlimeGrowth slimeType: Black - - type: Appearance - visuals: - enum.SlimeVisualLayers: - Type: Black - Stage: Young - type: entity name: sepia slime @@ -370,11 +302,6 @@ Base: sepia_baby_dead - type: SlimeGrowth slimeType: Sepia - - type: Appearance - visuals: - enum.SlimeVisualLayers: - Type: Sepia - Stage: Young - type: entity name: oil slime @@ -392,11 +319,6 @@ Base: oil_baby_dead - type: SlimeGrowth slimeType: Oil - - type: Appearance - visuals: - enum.SlimeVisualLayers: - Type: Oil - Stage: Young - type: entity name: bluespace slime @@ -414,11 +336,6 @@ Base: bluespace_baby_dead - type: SlimeGrowth slimeType: Bluespace - - type: Appearance - visuals: - enum.SlimeVisualLayers: - Type: Bluespace - Stage: Young - type: entity name: adamantine slime @@ -436,11 +353,6 @@ Base: adamantine_baby_dead - type: SlimeGrowth slimeType: Adamantine - - type: Appearance - visuals: - enum.SlimeVisualLayers: - Type: Adamantine - Stage: Young - type: entity name: pyrite slime @@ -458,11 +370,6 @@ Base: pyrite_baby_dead - type: SlimeGrowth slimeType: Pyrite - - type: Appearance - visuals: - enum.SlimeVisualLayers: - Type: Pyrite - Stage: Young - type: entity name: azure slime @@ -480,11 +387,6 @@ Base: azure_baby_dead - type: SlimeGrowth slimeType: Azure - - type: Appearance - visuals: - enum.SlimeVisualLayers: - Type: Azure - Stage: Young - type: entity name: light-pink slime @@ -502,11 +404,6 @@ Base: lightpink_baby_dead - type: SlimeGrowth slimeType: LightPink - - type: Appearance - visuals: - enum.SlimeVisualLayers: - Type: LightPink - Stage: Young - type: entity name: rainbow slime @@ -524,8 +421,3 @@ Base: rainbow_baby_dead - type: SlimeGrowth slimeType: Rainbow - - type: Appearance - visuals: - enum.SlimeVisualLayers: - Type: Rainbow - Stage: Young diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/Player/bloodcult.yml b/Resources/Prototypes/_Wega/Entities/Mobs/Player/bloodcult.yml index bf95620e05..bc503bc6ac 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/Player/bloodcult.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/Player/bloodcult.yml @@ -101,7 +101,8 @@ - FlyingMobLayer - type: MovementAlwaysTouching - type: TemperatureProtection - coefficient: 0.001 + heatingCoefficient: 0.001 + coolingCoefficient: 0.001 - type: FlashImmunity - type: PressureImmunity - type: ZombieImmune @@ -165,8 +166,7 @@ Blunt: 0 - type: Metabolizer solutionOnBody: false - updateFrequency: 10 - metabolizerTypes: [ bloodsucker ] + metabolizerTypes: [ Bloodsucker ] groups: - id: Medicine - id: Poison @@ -230,7 +230,7 @@ min: 1 max: 4 - type: Tool - speed: 1.5 + speedModifier: 1.5 qualities: - Prying useSound: @@ -363,7 +363,7 @@ min: 1 max: 1 - type: Tool - speed: 1.5 + speedModifier: 1.5 qualities: - Prying useSound: @@ -433,7 +433,7 @@ min: 1 max: 3 - type: Tool - speed: 1.5 + speedModifier: 1.5 qualities: - Prying useSound: diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/Player/genetics.yml b/Resources/Prototypes/_Wega/Entities/Mobs/Player/genetics.yml index cf3ea91a27..50faa372f8 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/Player/genetics.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/Player/genetics.yml @@ -44,7 +44,7 @@ sprite: _Wega/Mobs/Aliens/Genetics/hulk.rsi state: hulk - type: Tool - speed: 1.5 + speedModifier: 1.5 qualities: - Prying useSound: diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/_Wega/Entities/Mobs/Player/humanoid.yml index 86e650d70a..d4be4f9fb5 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/Player/humanoid.yml @@ -152,5 +152,5 @@ settings: short - type: RandomMetadata nameSegments: - - NamesFirstMilitaryLeader - - NamesLastMilitary \ No newline at end of file + - NamesMilitaryFirstLeader + - NamesMilitaryLast \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Entities/Mobs/Player/observer.yml b/Resources/Prototypes/_Wega/Entities/Mobs/Player/observer.yml index 01a945522d..2549cee875 100644 --- a/Resources/Prototypes/_Wega/Entities/Mobs/Player/observer.yml +++ b/Resources/Prototypes/_Wega/Entities/Mobs/Player/observer.yml @@ -5,7 +5,7 @@ description: Go to the GhostBar! components: - type: Action - icon: { sprite: _Wega/Interface/Actions, state: ghostbar } + icon: _Wega/Interface/Actions/ghostbar.png checkCanInteract: false startDelay: true useDelay: 30 diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Consumable/Food/ramen.yml b/Resources/Prototypes/_Wega/Entities/Objects/Consumable/Food/ramen.yml index cdf6487c0c..6098486d67 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Consumable/Food/ramen.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Consumable/Food/ramen.yml @@ -26,11 +26,9 @@ maxVol: 30 reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 15 - ReagentId: Protein Quantity: 3 - - ReagentId: Flavorol - Quantity: 5 - ReagentId: Soysauce Quantity: 2 - type: Tag @@ -55,11 +53,9 @@ maxVol: 30 reagents: - ReagentId: Nutriment - Quantity: 10 + Quantity: 15 - ReagentId: Protein Quantity: 3 - - ReagentId: Flavorol - Quantity: 5 - ReagentId: CapsaicinOil Quantity: 2 - ReagentId: Soysauce diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Materials/Sheets/metal.yml b/Resources/Prototypes/_Wega/Entities/Objects/Materials/Sheets/metal.yml index 5553a016c3..451f503913 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Materials/Sheets/metal.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Materials/Sheets/metal.yml @@ -7,7 +7,7 @@ - type: Material - type: PhysicalComposition materialComposition: - Runemetal: 100 + RuneMetal: 100 - type: Stack stackType: RuneMetal baseLayer: base diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Tools/garrotte.yml b/Resources/Prototypes/_Wega/Entities/Objects/Tools/garrotte.yml index 0349fcdadf..41928e543c 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Tools/garrotte.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Tools/garrotte.yml @@ -23,7 +23,7 @@ parent: [BaseItem] components: - type: Construction - graph: craftGarrotte + graph: makegarrotte node: garrottecrafted - type: Item size: Small diff --git a/Resources/Prototypes/_Wega/Entities/Objects/Vehicles/buckleable.yml b/Resources/Prototypes/_Wega/Entities/Objects/Vehicles/buckleable.yml index 377b7571ac..c7bb1d2502 100644 --- a/Resources/Prototypes/_Wega/Entities/Objects/Vehicles/buckleable.yml +++ b/Resources/Prototypes/_Wega/Entities/Objects/Vehicles/buckleable.yml @@ -16,7 +16,7 @@ baseWalkSpeed: 4.5 baseSprintSpeed: 6 - type: Repairable - fuelcost: 20 + fuelCost: 20 doAfterDelay: 20 - type: Damageable damageContainer: Inorganic @@ -48,7 +48,6 @@ components: - type: Strap buckleOffset: "0.10, 0.36" - maxBuckleDistance: 1 - type: InputMover - type: InteractionOutline - type: Vehicle @@ -190,7 +189,6 @@ noRot: true - type: Strap buckleOffset: "0.15, -0.05" - maxBuckleDistance: 1 - type: MovementSpeedModifier baseAcceleration: 1 baseFriction: 1 @@ -215,8 +213,6 @@ path: /Audio/Effects/Vehicle/vehiclestartup.ogg params: volume: -3 - - type: StealTarget - stealGroup: VehicleSecway - type: entity parent: BaseVehicleRideable @@ -244,7 +240,6 @@ baseSprintSpeed: 7 - type: Strap buckleOffset: "0.1, -0.05" - maxBuckleDistance: 1 - type: UnpoweredFlashlight - type: PointLight enabled: false @@ -288,7 +283,6 @@ noRot: true - type: Strap buckleOffset: "0.15, -0.05" - maxBuckleDistance: 1 - type: Armor modifiers: coefficients: @@ -328,7 +322,6 @@ noRot: true - type: Strap buckleOffset: "0.1, -0.05" - maxBuckleDistance: 1 - type: MovementSpeedModifier baseAcceleration: 2 baseFriction: 1.5 @@ -380,7 +373,6 @@ noRot: true - type: Strap buckleOffset: "0.1, -0.05" - maxBuckleDistance: 1 - type: MovementSpeedModifier baseAcceleration: 1 baseFriction: 0.8 @@ -437,7 +429,6 @@ baseSprintSpeed: 2 - type: Strap buckleOffset: "0,0" - maxBuckleDistance: 1 - type: Fixtures fixtures: fix1: diff --git a/Resources/Prototypes/_Wega/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_Wega/Entities/Structures/Machines/vending_machines.yml index cee24e3f39..a040bc1dc3 100644 --- a/Resources/Prototypes/_Wega/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_Wega/Entities/Structures/Machines/vending_machines.yml @@ -90,6 +90,5 @@ - type: ActivatableUI key: enum.StoreUiKey.Key - type: Store - preset: StorePresetGeneralVoid balance: Credit: 5000 diff --git a/Resources/Prototypes/_Wega/Entities/Structures/Specific/bloodcult.yml b/Resources/Prototypes/_Wega/Entities/Structures/Specific/bloodcult.yml index 226a3cfa6a..231f150d8d 100644 --- a/Resources/Prototypes/_Wega/Entities/Structures/Specific/bloodcult.yml +++ b/Resources/Prototypes/_Wega/Entities/Structures/Specific/bloodcult.yml @@ -11,7 +11,9 @@ - type: InteractionOutline - type: Appearance appearanceDataInit: - enum.RuneColorVisuals.Color: Red + enum.RuneColorVisuals.Color: + !type:String + "#ff0000" - type: Physics bodyType: Static - type: UseDelay diff --git a/Resources/Prototypes/_Wega/Flavors/flavors.yml b/Resources/Prototypes/_Wega/Flavors/flavors.yml index a8ade1c01b..3301428c8a 100644 --- a/Resources/Prototypes/_Wega/Flavors/flavors.yml +++ b/Resources/Prototypes/_Wega/Flavors/flavors.yml @@ -3,6 +3,11 @@ flavorType: Complex description: flavor-complex-bacchus +- type: flavor + id: triple-citrus + flavorType: Complex + description: flavor-complex-triple-citrus + - type: flavor id: unholy flavorType: Complex @@ -231,4 +236,89 @@ - type: flavor id: demonicwatermelon flavorType: Complex - description: flavor-complex-demonic-watermelon \ No newline at end of file + description: flavor-complex-demonic-watermelon + +- type: flavor + id: flaming-moe + flavorType: Complex + description: flavor-complex-flaming-moe + +- type: flavor + id: ginsonic + flavorType: Complex + description: flavor-complex-ginsonic + +- type: flavor + id: rainbow-sky + flavorType: Complex + description: flavor-complex-rainbow-sky + +- type: flavor + id: three-mile-island-iced-tea + flavorType: Complex + description: flavor-complex-three-mile-island-iced-tea + +- type: flavor + id: iron + flavorType: Base + description: flavor-base-iron + +- type: flavor + id: acrid + flavorType: Base + description: flavor-base-acrid + +- type: flavor + id: fiery + flavorType: Base + description: flavor-base-fiery + +- type: flavor + id: zesty + flavorType: Base + description: flavor-base-zesty + +- type: flavor + id: rich + flavorType: Base + description: flavor-base-rich + +- type: flavor + id: crisp + flavorType: Base + description: flavor-base-crisp + +- type: flavor + id: smoky + flavorType: Base + description: flavor-base-smoky + +- type: flavor + id: musty + flavorType: Base + description: flavor-base-musty + +- type: flavor + id: petroleum + flavorType: Base + description: flavor-base-petroleum + +- type: flavor + id: robust + flavorType: Base + description: flavor-base-robust + +- type: flavor + id: chaotic + flavorType: Base + description: flavor-base-chaotic + +- type: flavor + id: cum + flavorType: Base + description: flavor-base-cum + +- type: flavor + id: money + flavorType: Base + description: flavor-base-money \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Genetics/minor.yml b/Resources/Prototypes/_Wega/Genetics/minor.yml index 964099a745..bbaa444c83 100644 --- a/Resources/Prototypes/_Wega/Genetics/minor.yml +++ b/Resources/Prototypes/_Wega/Genetics/minor.yml @@ -28,5 +28,5 @@ message: genetics-strong-message typeDeviation: Minor costInstability: 15 - remComponent: + addComponent: - type: StrongnessGen diff --git a/Resources/Prototypes/_Wega/Maps/wegabarratry.yml b/Resources/Prototypes/_Wega/Maps/wegabarratry.yml index 7a519a72e3..aa74b725e2 100644 --- a/Resources/Prototypes/_Wega/Maps/wegabarratry.yml +++ b/Resources/Prototypes/_Wega/Maps/wegabarratry.yml @@ -16,8 +16,6 @@ - type: StationEmergencyShuttle emergencyShuttlePath: /Maps/Shuttles/emergency_raven.yml - type: StationJobs - overflowJobs: - - Passenger availableJobs: #service Captain: [ 1, 1 ] diff --git a/Resources/Prototypes/_Wega/Maps/wegacerestation.yml b/Resources/Prototypes/_Wega/Maps/wegacerestation.yml index c52b917876..c910cfa2a3 100644 --- a/Resources/Prototypes/_Wega/Maps/wegacerestation.yml +++ b/Resources/Prototypes/_Wega/Maps/wegacerestation.yml @@ -15,8 +15,6 @@ - type: StationEmergencyShuttle emergencyShuttlePath: /Maps/Shuttles/emergency_courser.yml - type: StationJobs - overflowJobs: - - Passenger availableJobs: #service Captain: [ 1, 1 ] diff --git a/Resources/Prototypes/_Wega/Maps/wegacore.yml b/Resources/Prototypes/_Wega/Maps/wegacore.yml index f5197cc6ff..850079792a 100644 --- a/Resources/Prototypes/_Wega/Maps/wegacore.yml +++ b/Resources/Prototypes/_Wega/Maps/wegacore.yml @@ -1,7 +1,7 @@ - type: gameMap id: Core mapName: 'Core' - mapPath: Maps/_Wega/wegacore.yml + mapPath: /Maps/_Wega/wegacore.yml minPlayers: 35 maxPlayers: 70 stations: @@ -17,9 +17,7 @@ emergencyShuttlePath: /Maps/Shuttles/emergency_rod.yml - type: StationCargoShuttle path: /Maps/Shuttles/cargo_core.yml - - type: StationJobs - overflowJobs: - - Passenger + - type: StationJobs availableJobs: #service Bartender: [ 2, 2 ] diff --git a/Resources/Prototypes/_Wega/Maps/wegacyberiad.yml b/Resources/Prototypes/_Wega/Maps/wegacyberiad.yml index 5bee20cf0d..4792d195f2 100644 --- a/Resources/Prototypes/_Wega/Maps/wegacyberiad.yml +++ b/Resources/Prototypes/_Wega/Maps/wegacyberiad.yml @@ -16,8 +16,6 @@ - type: StationEmergencyShuttle emergencyShuttlePath: /Maps/Shuttles/emergency_courser.yml - type: StationJobs - overflowJobs: - - Passenger availableJobs: #service Captain: [ 1, 1 ] diff --git a/Resources/Prototypes/_Wega/Maps/wegaemerald.yml b/Resources/Prototypes/_Wega/Maps/wegaemerald.yml index 40b42de669..4ea39e1671 100644 --- a/Resources/Prototypes/_Wega/Maps/wegaemerald.yml +++ b/Resources/Prototypes/_Wega/Maps/wegaemerald.yml @@ -15,8 +15,6 @@ - type: StationEmergencyShuttle emergencyShuttlePath: /Maps/_Wega/Shuttles/emeraldemergency.yml - type: StationJobs - overflowJobs: - - Passenger availableJobs: #service Captain: [ 1, 1 ] diff --git a/Resources/Prototypes/_Wega/Maps/wegakerberos.yml b/Resources/Prototypes/_Wega/Maps/wegakerberos.yml index 6bfe485744..0c91e46755 100644 --- a/Resources/Prototypes/_Wega/Maps/wegakerberos.yml +++ b/Resources/Prototypes/_Wega/Maps/wegakerberos.yml @@ -15,8 +15,6 @@ - type: StationEmergencyShuttle emergencyShuttlePath: /Maps/_Wega/Shuttles/kerberosemergency.yml - type: StationJobs - overflowJobs: - - Passenger availableJobs: #service Captain: [ 1, 1 ] diff --git a/Resources/Prototypes/_Wega/Maps/wegaspectrum.yml b/Resources/Prototypes/_Wega/Maps/wegaspectrum.yml index 0ee5d9d11a..02c45bd415 100644 --- a/Resources/Prototypes/_Wega/Maps/wegaspectrum.yml +++ b/Resources/Prototypes/_Wega/Maps/wegaspectrum.yml @@ -15,8 +15,6 @@ - type: StationEmergencyShuttle emergencyShuttlePath: /Maps/Shuttles/emergency_box.yml - type: StationJobs - overflowJobs: - - Passenger availableJobs: #service Captain: [ 1, 1 ] diff --git a/Resources/Prototypes/_Wega/NPCs/Combat/melee.yml b/Resources/Prototypes/_Wega/NPCs/Combat/melee.yml index 10a68f84f2..aa5890c885 100644 --- a/Resources/Prototypes/_Wega/NPCs/Combat/melee.yml +++ b/Resources/Prototypes/_Wega/NPCs/Combat/melee.yml @@ -42,11 +42,7 @@ damageAmount: 5 cooldown: 1.5 - - preconditions: - - !type:KeyExistsPrecondition - key: AttackTarget - invert: true - tasks: + - tasks: # Trying to eat - !type:HTNCompoundTask task: SlimeHungryBehavior @@ -91,7 +87,6 @@ targetKey: AttackCoordinates rangeKey: AttackRange pathfindKey: AttackPath - repathTime: 0.3 removeKeyOnFinish: false - !type:HTNPrimitiveTask diff --git a/Resources/Prototypes/_Wega/NPCs/slime.yml b/Resources/Prototypes/_Wega/NPCs/slime.yml index cc2dfa56b7..6ab31cd6d6 100644 --- a/Resources/Prototypes/_Wega/NPCs/slime.yml +++ b/Resources/Prototypes/_Wega/NPCs/slime.yml @@ -59,8 +59,6 @@ operator: !type:SlimeWanderOperator rangeKey: WanderRange wanderRange: 5.0 - minIdleTime: 2.0 - maxIdleTime: 5.0 - type: htnCompound id: SlimeRebellionPriority @@ -90,8 +88,6 @@ operator: !type:SlimeWanderOperator rangeKey: WanderRange wanderRange: 5.0 - minIdleTime: 2.0 - maxIdleTime: 5.0 - type: htnCompound id: SlimeHungryBehavior @@ -107,7 +103,6 @@ targetKey: TargetCoordinates rangeKey: MovementRange pathfindInPlanning: true - repathTime: 0.3 removeKeyOnFinish: false - !type:HTNPrimitiveTask @@ -115,17 +110,11 @@ targetKey: FoodTarget eatRange: 1.5 - - preconditions: - - !type:KeyExistsPrecondition - key: FoodTarget - invert: true - tasks: + - tasks: - !type:HTNPrimitiveTask operator: !type:SlimeWanderOperator rangeKey: WanderRange wanderRange: 5.0 - minIdleTime: 2.0 - maxIdleTime: 5.0 - type: htnCompound id: SlimeFollowCompound @@ -141,11 +130,8 @@ targetKey: TargetCoordinates rangeKey: MovementRange pathfindInPlanning: true - repathTime: 0.5 removeKeyOnFinish: false - !type:HTNPrimitiveTask operator: !type:WaitOperator key: IdleTime - minTime: 1.0 - maxTime: 3.0 diff --git a/Resources/Prototypes/_Wega/Pain/baseprofile.yml b/Resources/Prototypes/_Wega/Pain/baseprofile.yml index 3d0176eddf..654bcdb367 100644 --- a/Resources/Prototypes/_Wega/Pain/baseprofile.yml +++ b/Resources/Prototypes/_Wega/Pain/baseprofile.yml @@ -53,10 +53,10 @@ message: "pain-fracture-pulsing-pain" - threshold: 50 effect: DropItem - hand: "Any" - threshold: 75 effect: MovementPenalty speedMultiplier: 0.7 + duration: 15 LegFracture: type: "LegFracture" @@ -68,6 +68,7 @@ - threshold: 60 effect: MovementPenalty speedMultiplier: 0.5 + duration: 20 - threshold: 90 effect: Stun duration: 3 @@ -82,6 +83,7 @@ - threshold: 50 effect: MovementPenalty speedMultiplier: 0.8 + duration: 10 - threshold: 80 effect: Vomit diff --git a/Resources/Prototypes/_Wega/Reagents/Consumable/Drink/alcohol.yml b/Resources/Prototypes/_Wega/Reagents/Consumable/Drink/alcohol.yml index d46b36a12b..cd27226335 100644 --- a/Resources/Prototypes/_Wega/Reagents/Consumable/Drink/alcohol.yml +++ b/Resources/Prototypes/_Wega/Reagents/Consumable/Drink/alcohol.yml @@ -132,7 +132,7 @@ parent: BaseAlcohol desc: reagent-desc-flaming-moe physicalDesc: reagent-physical-desc-blazing - flavor: flaming-moe + flavor: sbiten color: "#ff4500" metamorphicChangeColor: true metabolisms: diff --git a/Resources/Prototypes/_Wega/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/_Wega/Reagents/Consumable/Drink/drinks.yml index 310745635e..c72bfa5e28 100644 --- a/Resources/Prototypes/_Wega/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/_Wega/Reagents/Consumable/Drink/drinks.yml @@ -5,7 +5,7 @@ group: Drinks desc: reagent-desc-cafe-mocha physicalDesc: reagent-physical-desc-creamy - flavor: cafe-mocha + flavor: funny color: "#6f4e37" metamorphicSprite: sprite: _Wega/Objects/Consumable/Drinks/cafemochaglass.rsi @@ -62,7 +62,7 @@ group: Drinks desc: reagent-desc-gibb-floats physicalDesc: reagent-physical-desc-fizzy - flavor: gibb-floats + flavor: fizzy color: "#9400d3" metamorphicSprite: sprite: _Wega/Objects/Consumable/Drinks/gibbfloatsglass.rsi @@ -81,7 +81,7 @@ group: Drinks desc: reagent-desc-milkshake physicalDesc: reagent-physical-desc-creamy - flavor: milkshake + flavor: sweet color: "#ffddc1" metamorphicSprite: sprite: _Wega/Objects/Consumable/Drinks/milkshakeglass.rsi @@ -119,7 +119,7 @@ group: Drinks desc: reagent-desc-mate-de-coca physicalDesc: reagent-physical-desc-herbal - flavor: mate-de-coca + flavor: spaceshroom color: "#6b8e23" metamorphicSprite: sprite: _Wega/Objects/Consumable/Drinks/matedecocaglass.rsi @@ -138,7 +138,7 @@ group: Drinks desc: reagent-desc-true-milkshake physicalDesc: reagent-physical-desc-slimy - flavor: true-milkshake + flavor: sweet color: "#fff0f5" metamorphicSprite: sprite: _Wega/Objects/Consumable/Drinks/milkshakeglass.rsi diff --git a/Resources/Prototypes/_Wega/Reagents/biological.yml b/Resources/Prototypes/_Wega/Reagents/biological.yml index b1951acfcf..549c289473 100644 --- a/Resources/Prototypes/_Wega/Reagents/biological.yml +++ b/Resources/Prototypes/_Wega/Reagents/biological.yml @@ -7,7 +7,9 @@ flavor: cum color: "#DFDFDF" recognizable: true - slippery: false + slipData: + requiredSlipSpeed: 4 + superSlippery: true metabolisms: Drink: effects: @@ -33,7 +35,9 @@ color: "#c048c2" recognizable: true physicalDesc: reagent-physical-desc-slimy - slippery: false + slipData: + requiredSlipSpeed: 4 + superSlippery: true - type: reagent id: SlimeExtractGray diff --git a/Resources/Prototypes/_Wega/Reagents/potion.yml b/Resources/Prototypes/_Wega/Reagents/potion.yml index 5fe14f5d83..cf02f19233 100644 --- a/Resources/Prototypes/_Wega/Reagents/potion.yml +++ b/Resources/Prototypes/_Wega/Reagents/potion.yml @@ -26,11 +26,8 @@ time: 16 refresh: false - !type:MovespeedModifier - walkSpeedModifier: 1.10 - sprintSpeedModifier: 1.10 - conditions: - - !type:ReagentThreshold - min: 5 + walkSpeedModifier: 1.1 + sprintSpeedModifier: 1.1 - !type:HealthChange conditions: - !type:ReagentThreshold @@ -108,21 +105,20 @@ conditions: - !type:ReagentThreshold min: 15 - - !type:GenericStatusEffect - key: MovespeedModifier + - !type:MovespeedModifier walkSpeedModifier: 0.9 sprintSpeedModifier: 0.9 - type: reagent id: MutationsPotion name: reagent-name-mutations-potion - group: Toxin + group: Toxins desc: reagent-desc-mutations-potion physicalDesc: reagent-physical-desc-opaque - flavor: toxin + flavor: toxinsspecial color: "#007FFF" metabolisms: - Toxin: + Poison: effects: - !type:ChemIncreaseMutationChanceEffect conditions: diff --git a/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/structures/soil.yml b/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/structures/soil.yml index a88dc07058..64c560fd54 100644 --- a/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/structures/soil.yml +++ b/Resources/Prototypes/_Wega/Recipes/Construction/Graphs/structures/soil.yml @@ -11,7 +11,7 @@ - !type:SnapToGrid { } steps: - tag: SoilBag - name: bag soil + name: construction-graph-tag-soil-bag icon: sprite: _Wega/Objects/Misc/soilbag.rsi state: icon diff --git a/Resources/Prototypes/_Wega/Recipes/Construction/furniture.yml b/Resources/Prototypes/_Wega/Recipes/Construction/furniture.yml index 290ad574cb..382554d6eb 100644 --- a/Resources/Prototypes/_Wega/Recipes/Construction/furniture.yml +++ b/Resources/Prototypes/_Wega/Recipes/Construction/furniture.yml @@ -1,15 +1,11 @@ # Seat - type: construction id: BenchSofaMiddle - name: sofa (middle) - description: Multiple seats spanning a single object. Truly a marvel of science. + name: construction-recipe-bench-sofa-middle graph: SofasGraph startNode: start targetNode: BenchSofaMiddleNode category: construction-category-furniture - icon: - sprite: _Wega/Structures/Furniture/Benches/sofa.rsi - state: middle objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -18,15 +14,11 @@ - type: construction id: BenchSofaLeft - name: sofa (left) - description: Multiple seats spanning a single object. Truly a marvel of science. + name: construction-recipe-bench-sofa-left graph: SofasGraph startNode: start targetNode: BenchSofaLeftNode category: construction-category-furniture - icon: - sprite: _Wega/Structures/Furniture/Benches/sofa.rsi - state: left objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -35,15 +27,11 @@ - type: construction id: BenchSofaRight - name: sofa (right) - description: Multiple seats spanning a single object. Truly a marvel of science. + name: construction-recipe-bench-sofa-right graph: SofasGraph startNode: start targetNode: BenchSofaRightNode category: construction-category-furniture - icon: - sprite: _Wega/Structures/Furniture/Benches/sofa.rsi - state: right objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -52,15 +40,11 @@ - type: construction id: BenchSofaCorner - name: sofa (corner) - description: Multiple seats spanning a single object. Truly a marvel of science. + name: construction-recipe-bench-sofa-corner graph: SofasGraph startNode: start targetNode: BenchSofaCornerNode category: construction-category-furniture - icon: - sprite: _Wega/Structures/Furniture/Benches/sofa.rsi - state: corner objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -69,15 +53,11 @@ - type: construction id: BenchSofaCorpMiddle - name: grey sofa (middle) - description: Multiple seats spanning a single object. Truly a marvel of science. + name: construction-recipe-bench-corp-sofa-middle graph: SofasGraph startNode: start targetNode: BenchSofaCorpMiddleNode category: construction-category-furniture - icon: - sprite: _Wega/Structures/Furniture/Benches/sofa_corp.rsi - state: middle objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -86,15 +66,11 @@ - type: construction id: BenchSofaCorpLeft - name: grey sofa (left) - description: Multiple seats spanning a single object. Truly a marvel of science. + name: construction-recipe-bench-corp-sofa-left graph: SofasGraph startNode: start targetNode: BenchSofaCorpLeftNode category: construction-category-furniture - icon: - sprite: _Wega/Structures/Furniture/Benches/sofa_corp.rsi - state: left objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -103,15 +79,11 @@ - type: construction id: BenchSofaCorpRight - name: grey sofa (right) - description: Multiple seats spanning a single object. Truly a marvel of science. + name: construction-recipe-bench-corp-sofa-right graph: SofasGraph startNode: start targetNode: BenchSofaCorpRightNode category: construction-category-furniture - icon: - sprite: _Wega/Structures/Furniture/Benches/sofa_corp.rsi - state: right objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -120,15 +92,11 @@ - type: construction id: BenchSofaCorpCorner - name: grey sofa (corner) - description: Multiple seats spanning a single object. Truly a marvel of science. + name: construction-recipe-bench-corp-sofa-corner graph: SofasGraph startNode: start targetNode: BenchSofaCorpCornerNode category: construction-category-furniture - icon: - sprite: _Wega/Structures/Furniture/Benches/sofa_corp.rsi - state: corner objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -137,15 +105,11 @@ - type: construction id: BenchSteelMiddle - name: steel bench (middle) - description: Multiple seats spanning a single object. Truly a marvel of science. + name: construction-recipe-bench-steel-middle graph: BenchesGraph startNode: start targetNode: BenchSteelMiddleNode category: construction-category-furniture - icon: - sprite: _Wega/Structures/Furniture/Benches/steel_bench.rsi - state: middle objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -154,15 +118,11 @@ - type: construction id: BenchSteelRight - name: steel bench (right) - description: Multiple seats spanning a single object. Truly a marvel of science. + name: construction-recipe-bench-steel-right graph: BenchesGraph startNode: start targetNode: BenchSteelRightNode category: construction-category-furniture - icon: - sprite: _Wega/Structures/Furniture/Benches/steel_bench.rsi - state: right objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -171,15 +131,11 @@ - type: construction id: BenchSteelLeft - name: steel bench (left) - description: Multiple seats spanning a single object. Truly a marvel of science. + name: construction-recipe-bench-steel-left graph: BenchesGraph startNode: start targetNode: BenchSteelLeftNode category: construction-category-furniture - icon: - sprite: _Wega/Structures/Furniture/Benches/steel_bench.rsi - state: left objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -188,15 +144,11 @@ - type: construction id: BenchPewMiddle - name: pew (middle) - description: Multiple seats spanning a single object. Truly a marvel of science. + name: construction-recipe-bench-pew-middle graph: BenchesGraph startNode: start targetNode: BenchPewMiddleNode category: construction-category-furniture - icon: - sprite: _Wega/Structures/Furniture/Benches/pews.rsi - state: middle objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -205,15 +157,11 @@ - type: construction id: BenchPewRight - name: pew (right) - description: Multiple seats spanning a single object. Truly a marvel of science. + name: construction-recipe-bench-pew-right graph: BenchesGraph startNode: start targetNode: BenchPewRightNode category: construction-category-furniture - icon: - sprite: _Wega/Structures/Furniture/Benches/pews.rsi - state: right objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -222,15 +170,11 @@ - type: construction id: BenchPewLeft - name: pew (left) - description: Multiple seats spanning a single object. Truly a marvel of science. + name: construction-recipe-bench-pew-left graph: BenchesGraph startNode: start targetNode: BenchPewLeftNode category: construction-category-furniture - icon: - sprite: _Wega/Structures/Furniture/Benches/pews.rsi - state: left objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -239,15 +183,11 @@ - type: construction id: BenchParkMiddle - name: park bench (middle) - description: Multiple seats spanning a single object. Truly a marvel of science. + name: construction-recipe-bench-park-middle graph: BenchesGraph startNode: start targetNode: BenchParkMiddleNode category: construction-category-furniture - icon: - sprite: _Wega/Structures/Furniture/Benches/parkbench_wooden.rsi - state: middle objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -256,15 +196,11 @@ - type: construction id: BenchParkRight - name: park bench (right) - description: Multiple seats spanning a single object. Truly a marvel of science. + name: construction-recipe-bench-park-right graph: BenchesGraph startNode: start targetNode: BenchParkRightNode category: construction-category-furniture - icon: - sprite: _Wega/Structures/Furniture/Benches/parkbench_wooden.rsi - state: right objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -273,15 +209,11 @@ - type: construction id: BenchParkLeft - name: park bench (left) - description: Multiple seats spanning a single object. Truly a marvel of science. + name: construction-recipe-bench-park-left graph: BenchesGraph startNode: start targetNode: BenchParkLeftNode category: construction-category-furniture - icon: - sprite: _Wega/Structures/Furniture/Benches/parkbench_wooden.rsi - state: left objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -290,15 +222,11 @@ - type: construction id: BenchSteelWhiteMiddle - name: white bench (middle) - description: Multiple seats spanning a single object. Truly a marvel of science. + name: construction-recipe-bench-steel-white-middle graph: BenchesGraph startNode: start targetNode: BenchSteelWhiteMiddleNode category: construction-category-furniture - icon: - sprite: _Wega/Structures/Furniture/Benches/steel_bench_white.rsi - state: middle objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -307,15 +235,11 @@ - type: construction id: BenchSteelWhiteRight - name: white bench (right) - description: Multiple seats spanning a single object. Truly a marvel of science. + name: construction-recipe-bench-steel-white-right graph: BenchesGraph startNode: start targetNode: BenchSteelWhiteRightNode category: construction-category-furniture - icon: - sprite: _Wega/Structures/Furniture/Benches/steel_bench_white.rsi - state: right objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -324,15 +248,11 @@ - type: construction id: BenchSteelWhiteLeft - name: white bench (left) - description: Multiple seats spanning a single object. Truly a marvel of science. + name: construction-recipe-bench-steel-white-left graph: BenchesGraph startNode: start targetNode: BenchSteelWhiteLeftNode category: construction-category-furniture - icon: - sprite: _Wega/Structures/Furniture/Benches/steel_bench_white.rsi - state: left objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -341,15 +261,11 @@ - type: construction id: BenchParkBambooMiddle - name: bamboo park bench (middle) - description: Multiple seats spanning a single object. Truly a marvel of science. + name: construction-recipe-bench-park-bamboo-middle graph: BenchesGraph startNode: start targetNode: BenchParkBambooMiddleNode category: construction-category-furniture - icon: - sprite: _Wega/Structures/Furniture/Benches/parkbench_bamboo.rsi - state: middle objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -358,15 +274,11 @@ - type: construction id: BenchParkBambooRight - name: bamboo park bench (right) - description: Multiple seats spanning a single object. Truly a marvel of science. + name: construction-recipe-bench-park-bamboo-right graph: BenchesGraph startNode: start targetNode: BenchParkBambooRightNode category: construction-category-furniture - icon: - sprite: _Wega/Structures/Furniture/Benches/parkbench_bamboo.rsi - state: right objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -375,15 +287,11 @@ - type: construction id: BenchParkBambooLeft - name: bamboo park bench (left) - description: Multiple seats spanning a single object. Truly a marvel of science. + name: construction-recipe-bench-park-bamboo-left graph: BenchesGraph startNode: start targetNode: BenchParkBambooLeftNode category: construction-category-furniture - icon: - sprite: _Wega/Structures/Furniture/Benches/parkbench_bamboo.rsi - state: left objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false @@ -393,15 +301,10 @@ # Bed - type: construction id: OperatingTable - name: operating table - description: Special medical table for surgery. This one just seems to be a useless prop, though. graph: operatingtable startNode: start targetNode: operatingtable category: construction-category-furniture - icon: - sprite: Structures/Furniture/Tables/optable.rsi - state: operating_table objectType: Structure placementMode: SnapgridCenter canBuildInImpassable: false diff --git a/Resources/Prototypes/_Wega/Recipes/Construction/structures.yml b/Resources/Prototypes/_Wega/Recipes/Construction/structures.yml index b96f24bdac..d5474e9712 100644 --- a/Resources/Prototypes/_Wega/Recipes/Construction/structures.yml +++ b/Resources/Prototypes/_Wega/Recipes/Construction/structures.yml @@ -1,14 +1,9 @@ - type: construction - name: cult girder id: CultGirder graph: CultGirder startNode: start targetNode: cultgirder category: construction-category-structures - description: A large structural assembly made out of metal. - icon: - sprite: _Wega/Structures/Walls/cult.rsi - state: cult_girder objectType: Structure placementMode: SnapgridCenter canRotate: false @@ -17,16 +12,11 @@ - !type:TileNotBlocked - type: construction - name: altar of blood id: BloodCultStructureAltar graph: BloodCultStructureAltarGraph startNode: start targetNode: BloodCultStructureAltar category: construction-category-structures - description: An altar in the name of the great Nar'Si! - icon: - sprite: _Wega/Structures/Specific/bloodcult_structures.rsi - state: altar objectType: Structure placementMode: SnapgridCenter canRotate: false @@ -35,16 +25,11 @@ - !type:TileNotBlocked - type: construction - name: archives id: BloodCultStructureArchives graph: BloodCultStructureArchivesGraph startNode: start targetNode: BloodCultStructureArchives category: construction-category-structures - description: A desk covered with mysterious manuscripts. It's used to cast spells. - icon: - sprite: _Wega/Structures/Specific/bloodcult_structures.rsi - state: archive objectType: Structure placementMode: SnapgridCenter canRotate: false @@ -53,16 +38,11 @@ - !type:TileNotBlocked - type: construction - name: forge of souls id: BloodCultStructureForge graph: BloodCultStructureForgeGraph startNode: start targetNode: BloodCultStructureForge category: construction-category-structures - description: An cult forge where you can craft equipment. - icon: - sprite: _Wega/Structures/Specific/bloodcult_structures.rsi - state: forge objectType: Structure placementMode: SnapgridCenter canRotate: false @@ -71,16 +51,11 @@ - !type:TileNotBlocked - type: construction - name: pylon id: BloodCultStructurePylon graph: BloodCultStructurePylonGraph startNode: start targetNode: BloodCultStructurePylon category: construction-category-structures - description: A bloody sculpture treating Nar'SI supporters. - icon: - sprite: _Wega/Structures/Specific/bloodcult_structures.rsi - state: pylon objectType: Structure placementMode: SnapgridCenter canRotate: false @@ -89,16 +64,11 @@ - !type:TileNotBlocked - type: construction - name: soil id: Soil graph: SoilGraph startNode: start targetNode: soil category: construction-category-structures - description: Mud. - icon: - sprite: Structures/Hydroponics/misc.rsi - state: soil objectType: Structure placementMode: SnapgridCenter canRotate: false diff --git a/Resources/Prototypes/_Wega/Recipes/Crafting/Graphs/bots/taxibot.yml b/Resources/Prototypes/_Wega/Recipes/Crafting/Graphs/bots/taxibot.yml index 4be8848fec..bde53afb3d 100644 --- a/Resources/Prototypes/_Wega/Recipes/Crafting/Graphs/bots/taxibot.yml +++ b/Resources/Prototypes/_Wega/Recipes/Crafting/Graphs/bots/taxibot.yml @@ -10,18 +10,18 @@ icon: sprite: Objects/Misc/proximity_sensor.rsi state: icon - name: proximity sensor + name: construction-graph-tag-proximity-sensor - tag: BorgHead icon: sprite: Objects/Specific/Robotics/cyborg_parts.rsi state: borg_head - name: borg head + name: construction-graph-tag-borg-head doAfter: 1 - tag: BorgArm icon: sprite: Mobs/Silicon/drone.rsi state: l_hand - name: borg arm + name: construction-graph-tag-borg-arm doAfter: 2 - material: Steel amount: 5 diff --git a/Resources/Prototypes/_Wega/Recipes/Crafting/Graphs/improvised/artifact_fragment.yml b/Resources/Prototypes/_Wega/Recipes/Crafting/Graphs/improvised/artifact_fragment.yml index b24e7b95d4..3305b3c416 100644 --- a/Resources/Prototypes/_Wega/Recipes/Crafting/Graphs/improvised/artifact_fragment.yml +++ b/Resources/Prototypes/_Wega/Recipes/Crafting/Graphs/improvised/artifact_fragment.yml @@ -7,61 +7,61 @@ - to: fragmentart steps: - tag: AlienBerries - name: a alien berries + name: construction-graph-tag-alienberries icon: sprite: _Wega/Objects/Specific/Hydroponics/alien_berry.rsi state: produce doAfter: 2 - tag: AlienBerries - name: a alien berries + name: construction-graph-tag-alienberries icon: sprite: _Wega/Objects/Specific/Hydroponics/alien_berry.rsi state: produce doAfter: 2 - tag: AlienBerries - name: a alien berries + name: construction-graph-tag-alienberries icon: sprite: _Wega/Objects/Specific/Hydroponics/alien_berry.rsi state: produce doAfter: 2 - tag: AlienBerries - name: a alien berries + name: construction-graph-tag-alienberries icon: sprite: _Wega/Objects/Specific/Hydroponics/alien_berry.rsi state: produce doAfter: 2 - tag: AlienBerries - name: a alien berries + name: construction-graph-tag-alienberries icon: sprite: _Wega/Objects/Specific/Hydroponics/alien_berry.rsi state: produce doAfter: 2 - tag: AlienBerries - name: a alien berries + name: construction-graph-tag-alienberries icon: sprite: _Wega/Objects/Specific/Hydroponics/alien_berry.rsi state: produce doAfter: 2 - tag: AlienBerries - name: a alien berries + name: construction-graph-tag-alienberries icon: sprite: _Wega/Objects/Specific/Hydroponics/alien_berry.rsi state: produce doAfter: 2 - tag: AlienBerries - name: a alien berries + name: construction-graph-tag-alienberries icon: sprite: _Wega/Objects/Specific/Hydroponics/alien_berry.rsi state: produce doAfter: 2 - tag: AlienBerries - name: a alien berries + name: construction-graph-tag-alienberries icon: sprite: _Wega/Objects/Specific/Hydroponics/alien_berry.rsi state: produce doAfter: 2 - tag: AlienBerries - name: a alien berries + name: construction-graph-tag-alienberries icon: sprite: _Wega/Objects/Specific/Hydroponics/alien_berry.rsi state: produce diff --git a/Resources/Prototypes/_Wega/Recipes/Crafting/Graphs/improvised/bouquets.yml b/Resources/Prototypes/_Wega/Recipes/Crafting/Graphs/improvised/bouquets.yml index 852ffd9d72..4d6d8f529b 100644 --- a/Resources/Prototypes/_Wega/Recipes/Crafting/Graphs/improvised/bouquets.yml +++ b/Resources/Prototypes/_Wega/Recipes/Crafting/Graphs/improvised/bouquets.yml @@ -7,27 +7,27 @@ - to: rosebouquet steps: - tag: Rose - name: rose + name: construction-graph-tag-rose icon: sprite: _Wega/Objects/Specific/Hydroponics/rose.rsi state: produce - tag: Rose - name: rose + name: construction-graph-tag-rose icon: sprite: _Wega/Objects/Specific/Hydroponics/rose.rsi state: produce - tag: Rose - name: rose + name: construction-graph-tag-rose icon: sprite: _Wega/Objects/Specific/Hydroponics/rose.rsi state: produce - tag: Rose - name: rose + name: construction-graph-tag-rose icon: sprite: _Wega/Objects/Specific/Hydroponics/rose.rsi state: produce - tag: Rose - name: rose + name: construction-graph-tag-rose icon: sprite: _Wega/Objects/Specific/Hydroponics/rose.rsi state: produce @@ -55,27 +55,27 @@ - to: sunflowerbouquet steps: - tag: Sunflower - name: sunflower + name: construction-graph-tag-sunflower icon: sprite: _Wega/Objects/Specific/Hydroponics/sunflower.rsi state: produce - tag: Sunflower - name: sunflower + name: construction-graph-tag-sunflower icon: sprite: _Wega/Objects/Specific/Hydroponics/sunflower.rsi state: produce - tag: Sunflower - name: sunflower + name: construction-graph-tag-sunflower icon: sprite: _Wega/Objects/Specific/Hydroponics/sunflower.rsi state: produce - tag: Sunflower - name: sunflower + name: construction-graph-tag-sunflower icon: sprite: _Wega/Objects/Specific/Hydroponics/sunflower.rsi state: produce - tag: Sunflower - name: sunflower + name: construction-graph-tag-sunflower icon: sprite: _Wega/Objects/Specific/Hydroponics/sunflower.rsi state: produce @@ -103,27 +103,27 @@ - to: poppybouquet steps: - tag: Poppyflower - name: poppy + name: construction-graph-tag-poppy icon: sprite: Objects/Specific/Hydroponics/poppy.rsi state: produce - tag: Poppyflower - name: poppy + name: construction-graph-tag-poppy icon: sprite: Objects/Specific/Hydroponics/poppy.rsi state: produce - tag: Poppyflower - name: poppy + name: construction-graph-tag-poppy icon: sprite: Objects/Specific/Hydroponics/poppy.rsi state: produce - tag: Poppyflower - name: poppy + name: construction-graph-tag-poppy icon: sprite: Objects/Specific/Hydroponics/poppy.rsi state: produce - tag: Poppyflower - name: poppy + name: construction-graph-tag-poppy icon: sprite: Objects/Specific/Hydroponics/poppy.rsi state: produce @@ -151,22 +151,22 @@ - to: bouquetmixed steps: - tag: Flower - name: poppy + name: construction-graph-tag-poppy icon: sprite: Objects/Specific/Hydroponics/poppy.rsi state: produce - tag: Sunflower - name: sunflower + name: construction-graph-tag-sunflower icon: sprite: _Wega/Objects/Specific/Hydroponics/sunflower.rsi state: produce - tag: Peaceflower - name: peaceflower + name: construction-graph-tag-peaceflower icon: sprite: _Wega/Objects/Specific/Hydroponics/peaceflower.rsi state: produce - tag: Rose - name: rose + name: construction-graph-tag-rose icon: sprite: _Wega/Objects/Specific/Hydroponics/rose.rsi state: produce diff --git a/Resources/Prototypes/_Wega/Recipes/Crafting/Graphs/improvised/potato.yml b/Resources/Prototypes/_Wega/Recipes/Crafting/Graphs/improvised/potato.yml index 2eaf690343..15a672c814 100644 --- a/Resources/Prototypes/_Wega/Recipes/Crafting/Graphs/improvised/potato.yml +++ b/Resources/Prototypes/_Wega/Recipes/Crafting/Graphs/improvised/potato.yml @@ -7,7 +7,7 @@ - to: superpotatobattery steps: - tag: SuperPotato - name: a energy potato + name: construction-graph-tag-energy-potato icon: sprite: _Wega/Objects/Specific/Hydroponics/energy_potato.rsi state: produce diff --git a/Resources/Prototypes/_Wega/Recipes/Crafting/artifact_fragment.yml b/Resources/Prototypes/_Wega/Recipes/Crafting/artifact_fragment.yml index 3a8e6d6f10..31007db539 100644 --- a/Resources/Prototypes/_Wega/Recipes/Crafting/artifact_fragment.yml +++ b/Resources/Prototypes/_Wega/Recipes/Crafting/artifact_fragment.yml @@ -1,12 +1,7 @@ - type: construction - name: artifact fragment id: ArtifactFragmentCraft graph: ArtifactFragmentCraft startNode: start targetNode: fragmentart category: construction-category-misc objectType: Item - description: A strange artifact fragment. - icon: - sprite: Objects/Specific/Xenoarchaeology/artifact_fragments.rsi - state: wizardball1 \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Recipes/Crafting/bots.yml b/Resources/Prototypes/_Wega/Recipes/Crafting/bots.yml index 48fb0a1f2b..50bafa0ecb 100644 --- a/Resources/Prototypes/_Wega/Recipes/Crafting/bots.yml +++ b/Resources/Prototypes/_Wega/Recipes/Crafting/bots.yml @@ -1,12 +1,7 @@ - type: construction - name: taxibot id: taxibot graph: TaxiBot startNode: start targetNode: bot category: construction-category-utilities objectType: Item - description: This bot takes people to their destination. - icon: - sprite: Mobs/Silicon/Bots/taxibot.rsi - state: taxibot diff --git a/Resources/Prototypes/_Wega/Recipes/Crafting/improvised.yml b/Resources/Prototypes/_Wega/Recipes/Crafting/improvised.yml index 4fa13f45ef..7d8ca9e1a1 100644 --- a/Resources/Prototypes/_Wega/Recipes/Crafting/improvised.yml +++ b/Resources/Prototypes/_Wega/Recipes/Crafting/improvised.yml @@ -1,54 +1,39 @@ - type: construction - name: bouquet roses id: FlowerRoseBouquetCraft graph: FlowerRoseBouquetCraft startNode: start targetNode: rosebouquet category: construction-category-misc - description: It looks beautiful and smells good. - icon: { sprite: _Wega/Objects/Misc/rosebouquet.rsi, state: icon } objectType: Item - type: construction - name: bouquet sunflowers id: FlowerSunflowerBouquetCraft graph: FlowerSunflowerBouquetCraft startNode: start targetNode: sunflowerbouquet category: construction-category-misc - description: It looks beautiful and smells good. - icon: { sprite: _Wega/Objects/Misc/sunbouquet.rsi, state: icon } objectType: Item - type: construction - name: bouquet poppies id: PoppyFlowerBouquetCraft graph: PoppyFlowerBouquetCraft startNode: start targetNode: poppybouquet category: construction-category-misc - description: It looks beautiful and smells good. - icon: { sprite: _Wega/Objects/Misc/poppybouquet.rsi, state: icon } objectType: Item - type: construction - name: mixed bouquet id: MixedFlowerBouquetCraft graph: MixedFlowerBouquetCraft startNode: start targetNode: bouquetmixed category: construction-category-misc - description: It looks beautiful and smells good. - icon: { sprite: _Wega/Objects/Misc/mixedbouquet.rsi, state: icon } objectType: Item - type: construction - name: garrotte homemade id: makegarrotte graph: makegarrotte startNode: start targetNode: garrottecrafted category: construction-category-weapons - description: "Homemade garrotte used by criminals and other assholes." - icon: { sprite: _Wega/Objects/Devices/garrotte.rsi, state: garrotte_homemade } objectType: Item diff --git a/Resources/Prototypes/_Wega/Recipes/Crafting/potato.yml b/Resources/Prototypes/_Wega/Recipes/Crafting/potato.yml index 20f96a1e2b..cb9625681e 100644 --- a/Resources/Prototypes/_Wega/Recipes/Crafting/potato.yml +++ b/Resources/Prototypes/_Wega/Recipes/Crafting/potato.yml @@ -1,10 +1,7 @@ - type: construction - name: super potato battery id: PowerCellSuperPotatoCraft graph: PowerCellSuperPotatoCraft startNode: start targetNode: superpotatobattery category: construction-category-misc - description: A truly ingenious source of power. - icon: { sprite: _Wega/Objects/Power/power_cells.rsi, state: superpotato } objectType: Item \ No newline at end of file diff --git a/Resources/Prototypes/_Wega/Recipes/Lathes/misc.yml b/Resources/Prototypes/_Wega/Recipes/Lathes/misc.yml index 4c6af83db8..ec048b2ba0 100644 --- a/Resources/Prototypes/_Wega/Recipes/Lathes/misc.yml +++ b/Resources/Prototypes/_Wega/Recipes/Lathes/misc.yml @@ -1,7 +1,8 @@ - type: latheRecipe id: CassetteTape result: CassetteTape - category: Tools + categories: + - Tools completetime: 2 materials: Steel: 50 @@ -10,7 +11,8 @@ - type: latheRecipe id: TapeRecorder result: TapeRecorder - category: Tools + categories: + - Tools completetime: 3 materials: Steel: 250 diff --git a/Resources/Prototypes/_Wega/Stack/Materials/materials.yml b/Resources/Prototypes/_Wega/Stack/Materials/materials.yml index c7b625eb2b..f7aa94e813 100644 --- a/Resources/Prototypes/_Wega/Stack/Materials/materials.yml +++ b/Resources/Prototypes/_Wega/Stack/Materials/materials.yml @@ -1,7 +1,6 @@ - type: stack id: RuneMetal - name: runemetal + name: stack-runemetal icon: { sprite: _Wega/Objects/Materials/Sheets/metal.rsi, state: runemetal } spawn: SheetRuneMetal1 maxCount: 30 - itemSize: 1 diff --git a/Resources/Prototypes/_Wega/Stack/floor_tile_stacks.yml b/Resources/Prototypes/_Wega/Stack/floor_tile_stacks.yml index 5612dd8fcc..7e1f824414 100644 --- a/Resources/Prototypes/_Wega/Stack/floor_tile_stacks.yml +++ b/Resources/Prototypes/_Wega/Stack/floor_tile_stacks.yml @@ -1,5 +1,5 @@ - type: stack id: FloorTileItemSepia - name: steel dark checker tile + name: stack-sepia-floor spawn: FloorTileItemSepia maxCount: 30 diff --git a/Resources/Prototypes/_Wega/Store/currency.yml b/Resources/Prototypes/_Wega/Store/currency.yml index e695c9229a..cc86480ab1 100644 --- a/Resources/Prototypes/_Wega/Store/currency.yml +++ b/Resources/Prototypes/_Wega/Store/currency.yml @@ -7,5 +7,5 @@ id: Credit displayName: store-currency-display-credit cash: - 1: Credit + 1: SpaceCash canWithdraw: false diff --git a/Resources/Prototypes/_Wega/Surgery/Operations/Nodes/basenodes.yml b/Resources/Prototypes/_Wega/Surgery/Operations/Nodes/basenodes.yml index 07b3c822f4..2975dda94e 100644 --- a/Resources/Prototypes/_Wega/Surgery/Operations/Nodes/basenodes.yml +++ b/Resources/Prototypes/_Wega/Surgery/Operations/Nodes/basenodes.yml @@ -1,9 +1,19 @@ # Default +- type: surgeryNode + id: "" + description: "" + transitions: [] + - type: surgeryNode id: Default description: "" transitions: [] +- type: surgeryNode + id: OrganManipulation + description: "" + transitions: [] + # ======================== # УЗЛЫ ТОРСА # ======================== diff --git a/Resources/Prototypes/_Wega/Surgery/Operations/Transitions/basetransition.yml b/Resources/Prototypes/_Wega/Surgery/Operations/Transitions/basetransition.yml index 819cab5921..8e349be329 100644 --- a/Resources/Prototypes/_Wega/Surgery/Operations/Transitions/basetransition.yml +++ b/Resources/Prototypes/_Wega/Surgery/Operations/Transitions/basetransition.yml @@ -459,7 +459,7 @@ - type: surgeryTransition id: ExtractBrainTransition - target: HeadRemoved + target: HeadOpen label: Манипуляция с органами stepGroups: - conditions: diff --git a/Resources/Prototypes/_Wega/Tiles/floors.yml b/Resources/Prototypes/_Wega/Tiles/floors.yml index 4346e5894c..1c9e6fb953 100644 --- a/Resources/Prototypes/_Wega/Tiles/floors.yml +++ b/Resources/Prototypes/_Wega/Tiles/floors.yml @@ -2,7 +2,6 @@ id: FloorSepia name: tiles-sepia-floor sprite: /Textures/_Wega/Tiles/sepia.png - color: "#FFFFFF" variants: 4 placementVariants: - 1.0 diff --git a/Resources/Prototypes/_Wega/flavors.yml b/Resources/Prototypes/_Wega/flavors.yml deleted file mode 100644 index 122e0b0dd2..0000000000 --- a/Resources/Prototypes/_Wega/flavors.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: flavor - id: cum - flavorType: Base - description: flavor-base-cum - -- type: flavor - id: money - flavorType: Base - description: flavor-base-money diff --git a/Resources/Prototypes/_Wega/tags.yml b/Resources/Prototypes/_Wega/tags.yml index 5aadf641f6..d9238d70a8 100644 --- a/Resources/Prototypes/_Wega/tags.yml +++ b/Resources/Prototypes/_Wega/tags.yml @@ -116,3 +116,6 @@ - type: Tag id: VehicleKey + +- type: Tag + id: CapacitorStockPart