Cult hotfix 1 (#2413)

SerbiaStrong-220 · Dec 28, 2024 · 03a10f6 · 03a10f6
1 parent 126faf3
commit 03a10f6
Show file tree

Hide file tree

Showing 10 changed files with 55 additions and 11 deletions.
diff --git a/Content.Shared/SS220/CultYogg/MiGo/SharedMiGoSystem.cs b/Content.Shared/SS220/CultYogg/MiGo/SharedMiGoSystem.cs
@@ -32,6 +32,7 @@
 using Content.Shared.Roles;
 using Content.Shared.Verbs;
 using Robust.Shared.Utility;
+using Content.Shared.Mobs.Components;
 
 
 namespace Content.Shared.SS220.CultYogg.MiGo;
@@ -144,7 +145,22 @@ private void OnGetVerb(GetVerbsEvent<Verb> args)
                 }
             };
 
+            //ToDo for a future verb
+            /*
+            var healVerb = new Verb
+            {
+                Text = Loc.GetString("cult-yogg-heal-verb"),
+                Icon = new SpriteSpecifier.Rsi(new ResPath("SS220/Interface/Actions/cult_yogg.rsi"), "heal"),
+                Act = () =>
+                {
+
+                    //MiGoHeal((args.User, miGoComp), args.Target);
+                }
+            };
+
             args.Verbs.Add(enslaveVerb);
+            args.Verbs.Add(healVerb);
+            */
         }
     }
 
@@ -157,6 +173,12 @@ private void MiGoHeal(Entity<MiGoComponent> uid, ref MiGoHealEvent args)
         if (!uid.Comp.IsPhysicalForm)
             return;
 
+        if (!HasComp<MobStateComponent>(args.Target))
+        {
+            _popup.PopupClient(Loc.GetString("cult-yogg-cant-heal-this", ("target", args.Target)), args.Target, uid);
+            return;
+        }
+
         //check if effect is already applyed
         if (_statusEffectsSystem.HasStatusEffect(args.Target, uid.Comp.RequiedEffect))
         {

diff --git a/Resources/Locale/ru-RU/ss220/cultYogg/cult_yogg_buildings.ftl b/Resources/Locale/ru-RU/ss220/cultYogg/cult_yogg_buildings.ftl
@@ -1,8 +1,8 @@
 ent-CultYoggBuildingFrame = заготовка постройки культа
     .desc = Заготовка для постройки сооружений культа.
-ent-WallCultYogg = проклятая стена
-    .desc = Это стена и она - проклята.
-ent-CultYoggDoor = проклятая дверь
+ent-WallCultYogg = плесневалая стена
+    .desc = Это стена и она прогнила.
+ent-CultYoggDoor = плесневелая дверь
     .desc = Подумайте дважды, прежде чем открыть её.
 ent-CultYoggAltar = алтарь жертвоприношений
     .desc = Загадочный алтарь культа.

diff --git a/Resources/Locale/ru-RU/ss220/cultYogg/cult_yogg_popups.ftl b/Resources/Locale/ru-RU/ss220/cultYogg/cult_yogg_popups.ftl
@@ -10,7 +10,9 @@ cult-yogg-enslave-should-eat-shroom = Кандидат не имеет спор
 cult-yogg-enslave-cant-be-a-chaplain = Кандидат слишком свят
 cult-yogg-enslave-is-sacraficial = Существо ценно, как жертва
 
+cult-yogg-heal-verb = [italic]Исцелить[/italic]
 cult-yogg-heal-only-cultists = Оболочка не принадлежит культу
+cult-yogg-cant-heal-this = МиГо не способен вылечить { $target }
 cult-yogg-heal-already-have-effect = Высшие силы уже исцеляют объект
 cult-yogg-digest-no-nutritions = Недостаточно питательных веществ
 cult-yogg-digest-no-water = Недостаточно воды в организме

diff --git a/Resources/Locale/ru-RU/ss220/prototypes/roles/antags.ftl b/Resources/Locale/ru-RU/ss220/prototypes/roles/antags.ftl
@@ -1,2 +1,2 @@
 roles-antag-cult-yogg-name = Культ Йог-Сотот
-roles-antag-cult-yogg-objective = Вы преданный член культа. Завербуйте как можно больше последователей. Совершите обряд призовыва своего хозяина.
+roles-antag-cult-yogg-objective = Вы преданный член культа. Завербуйте как можно больше последователей. Совершите обряд призыва своего хозяина.
diff --git a/Resources/Prototypes/SS220/Body/Organs/tajaran.yml b/Resources/Prototypes/SS220/Body/Organs/tajaran.yml
@@ -13,6 +13,7 @@
       - Crayon
       - Paper
       - Bread
+      - Omnivorous #SS220 CultYoggs
   - type: SolutionContainerManager
     solutions:
       stomach:

diff --git a/Resources/Prototypes/SS220/Entities/Objects/CultYogg/corruption.yml b/Resources/Prototypes/SS220/Entities/Objects/CultYogg/corruption.yml
@@ -204,6 +204,13 @@
     prototypeId: Stunprod
   result: CultYoggCocoonBeach
   corruptionReverseEffect: ExorcismUncorruptEffect
+
+- type: corrupted
+  id: RollingPin
+  from:
+    prototypeId: RollingPin
+  result: CultYoggCocoonBeach
+  corruptionReverseEffect: ExorcismUncorruptEffect
 #MeleWeapons end
 
 #SedativeSting beginning
@@ -294,7 +301,7 @@
   emptyStorage: true
 
 - type: corrupted
-  id: ultYoggSatchelParent
+  id: CultYoggSatchelParent
   from:
     parentPrototypeId: ClothingBackpackSatchel
   result: ClothingBackpackSatchelCultYogg

diff --git a/Resources/Prototypes/SS220/Entities/Structures/CultYogg/buildings.yml b/Resources/Prototypes/SS220/Entities/Structures/CultYogg/buildings.yml
@@ -67,7 +67,6 @@
       - Wall
   - type: Sprite
     sprite: SS220/Structures/Walls/cult_yogg_walls.rsi
-    state: full
   - type: Icon
     sprite: SS220/Structures/Walls/cult_yogg_walls.rsi
   - type: Destructible
@@ -79,7 +78,7 @@
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
   - type: IconSmooth
-    key: cultYoggWall
+    key: walls
     base: cult
   - type: CultYoggBuilding
     eraseTime: 3

diff --git a/Resources/Prototypes/SS220/Entities/Structures/CultYogg/cultyoggpod.yml b/Resources/Prototypes/SS220/Entities/Structures/CultYogg/cultyoggpod.yml
@@ -36,12 +36,12 @@
     heal:
       types:
         Slash: -6
-        Blunt: -6
+        Blunt: -10
         Piercing: -6
         Heat: -4
         Cold: -4
         Shock: -4
-        Airloss: -5
+        Airloss: -10
         Caustic: -4
         Bloodloss: -10
   - type: CultYoggBuilding

diff --git a/Resources/Prototypes/SS220/ai_factions.yml b/Resources/Prototypes/SS220/ai_factions.yml
@@ -1,4 +1,4 @@
-# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
+# © SS220, An EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt
 # SS220 AI Mapping Update Begin
 
 - type: npcFaction
@@ -12,6 +12,7 @@
   - Zombie
   - Revolutionary
   - SpiderQueen
+  - CultYogg #SS220 CultYogg
 
 # SS220 AI Mapping Update End
 
@@ -24,6 +25,7 @@
   - SimpleHostile
   - Dragon
   - SpiderQueen
+  - CultYogg #SS220 CultYogg
 
 # ss220 reaper passive start
 
@@ -46,7 +48,7 @@
   - Dragon
   - PetsNT
   - SimpleNeutral
-  - SimpleHostile
+  - CultYogg #SS220 CultYogg
 
 - type: npcFaction
   id: SpiderHostile
@@ -58,6 +60,7 @@
   - PetsNT
   - Zombie
   - Revolutionary
+  - CultYogg #SS220 CultYogg
 
 # ss220 spider queen end
 
@@ -75,6 +78,7 @@
   - Revolutionary
   - SpiderQueen
   - SimpleHostile
+  - CultYogg #SS220 CultYogg
 
 #SS220 CultYogg
 - type: npcFaction
@@ -86,3 +90,7 @@
   - Zombie
   - Revolutionary
   - NanoTrasen
+  - DeathSquad
+  - Dragon
+  - BloodCult
+  - SpiderQueen
diff --git a/Resources/Prototypes/ai_factions.yml b/Resources/Prototypes/ai_factions.yml
@@ -9,6 +9,7 @@
     - Zombie
     - Revolutionary
     - SpiderQueen #ss220 spider queen
+    - CultYogg #SS220 CultYogg
 
 - type: npcFaction
   id: NanoTrasen
@@ -47,6 +48,7 @@
   - Zombie
   - Revolutionary
   - SpiderQueen #ss220 spider queen
+  - CultYogg #SS220 CultYogg
 
 - type: npcFaction
   id: SimpleNeutral
@@ -61,6 +63,7 @@
   - PetsNT
   - Zombie
   - SpiderQueen #ss220 spider queen
+  - CultYogg #SS220 CultYogg
 
 - type: npcFaction
   id: Xeno
@@ -73,6 +76,7 @@
   - Zombie
   - Revolutionary
   - SpiderQueen #ss220 spider queen
+  - CultYogg #SS220 CultYogg
 
 - type: npcFaction
   id: Zombie
@@ -86,3 +90,4 @@
   - PetsNT
   - Revolutionary
   - SpiderQueen #ss220 spider queen
+  - CultYogg #SS220 CultYogg