diff --git a/Content.Shared/SS220/CultYogg/MiGo/SharedMiGoSystem.cs b/Content.Shared/SS220/CultYogg/MiGo/SharedMiGoSystem.cs index ee3138a85dccbe..2b85ad918ec5b2 100644 --- 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 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 uid, ref MiGoHealEvent args) if (!uid.Comp.IsPhysicalForm) return; + if (!HasComp(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 index 9836882e946558..d7f48eb4a31dec 100644 --- 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 index fc7da00ccf6fd7..1765bbeb6f46d5 100644 --- 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 index 98c038bcecd74a..63ecaa9b86a361 100644 --- 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 index 6c4c1e7b340272..48606edb494df1 100644 --- 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 index 01f69bf61a7033..99e2b4acc573a7 100644 --- 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 index 6b36305c4bf9f4..a44aba24b1ebca 100644 --- 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 index 0228de2abe4b6f..8a472d87edb979 100644 --- 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 index d373b44404f82f..d4122f07407833 100644 --- 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 index 1b9a88dbad7cc9..e3c36f2746b7d2 100644 --- 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