]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Stop Sentience Event targeting Zombified Creatures (#39950)
authorFungiFellow <151778459+FungiFellow@users.noreply.github.com>
Fri, 29 Aug 2025 11:48:31 +0000 (07:48 -0400)
committerGitHub <noreply@github.com>
Fri, 29 Aug 2025 11:48:31 +0000 (13:48 +0200)
* Strip Target From Zed

* Update RandomSentienceRule.cs

* Update RandomSentienceRule.cs

* Update RandomSentienceRule.cs

* Update RandomSentienceRule.cs

* Update RandomSentienceRule.cs

Content.Server/StationEvents/Events/RandomSentienceRule.cs
Content.Server/Zombies/ZombieSystem.Transform.cs

index 359c3edae4595b21586c4ca8d097d9a09f18d881..f2fda7b8c68c359a0ea0e7c30114af1ddbb8bb87 100644 (file)
@@ -16,6 +16,7 @@ public sealed class RandomSentienceRule : StationEventSystem<RandomSentienceRule
 
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly IRobustRandom _random = default!;
+
     protected override void Started(EntityUid uid, RandomSentienceRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
     {
         if (!TryGetRandomStation(out var station))
index a256d7159fb2aa4109a8bc9e738058d84743097c..9c7d4b0699c5da6cbfec23bb5b92a0e275ca016d 100644 (file)
@@ -10,6 +10,7 @@ using Content.Server.Mind;
 using Content.Server.NPC;
 using Content.Server.NPC.HTN;
 using Content.Server.NPC.Systems;
+using Content.Server.StationEvents.Components;
 using Content.Server.Speech.Components;
 using Content.Server.Temperature.Components;
 using Content.Shared.Body.Components;
@@ -106,7 +107,7 @@ public sealed partial class ZombieSystem
         var zombiecomp = AddComp<ZombieComponent>(target);
 
         //we need to basically remove all of these because zombies shouldn't
-        //get diseases, breath, be thirst, be hungry, die in space, have offspring or be paraplegic.
+        //get diseases, breath, be thirst, be hungry, die in space, get double sentience, have offspring or be paraplegic.
         RemComp<RespiratorComponent>(target);
         RemComp<BarotraumaComponent>(target);
         RemComp<HungerComponent>(target);
@@ -115,6 +116,7 @@ public sealed partial class ZombieSystem
         RemComp<ReproductivePartnerComponent>(target);
         RemComp<LegsParalyzedComponent>(target);
         RemComp<ComplexInteractionComponent>(target);
+        RemComp<SentienceTargetComponent>(target);
 
         //funny voice
         var accentType = "zombie";