SerbiaStrong-220 · stalengd · Dec 28, 2024 · Dec 27, 2024 · Dec 27, 2024 · Dec 27, 2024
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