more ling changes (Simple-Station#435)

* ling gamemode * more shit * gaming * Update game_presets.yml * Update secret_weights.yml * gaming 2 * shittery * fart * fart 2 * gorbing * balance stasis again * fart * goobing * chat is this real? * real. * g * fucking chemical regen i fucking hate it i hate you i hate everythi * fart * fart 2 * Add _timing * fart 3 * fart 5 * fart 6: electrical boogaloo * balance issue * fart * holy shit!! * gorber * gorbing time * init * fart 10 --------- Co-authored-by: whateverusername0 <whateveremail> Co-authored-by: Aidenkrz <aiden@djkraz.com> Co-authored-by: Fishbait <Fishbait@git.ml>
VMSolidus · Aug 16, 2024 · 0bab583 · 0bab583
1 parent d139751
commit 0bab583
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/Content.Server/Goobstation/Changeling/ChangelingSystem.cs b/Content.Server/Goobstation/Changeling/ChangelingSystem.cs
@@ -57,7 +57,8 @@
 using System.Numerics;
 using Content.Shared.Camera;
 using Robust.Shared.Timing;
-using Content.Shared.Gravity;
+using Content.Shared.Damage.Components;
+using Content.Server.Gravity;
 
 namespace Content.Server.Changeling;
 
@@ -357,8 +358,8 @@ public void AddDNA(EntityUid uid, ChangelingComponent comp, TransformData data,
     {
         if (comp.AbsorbedDNA.Count >= comp.MaxAbsorbedDNA)
         {
-            comp.AbsorbedDNA.RemoveAt(0);
             _popup.PopupEntity(Loc.GetString("changeling-sting-extract-max"), uid, uid);
+            return;
         }
         comp.AbsorbedDNA.Add(data);
 

diff --git a/Content.Server/Roles/RoleSystem.cs b/Content.Server/Roles/RoleSystem.cs
@@ -19,6 +19,7 @@ public override void Initialize()
         SubscribeAntagEvents<TraitorRoleComponent>();
         SubscribeAntagEvents<ZombieRoleComponent>();
         SubscribeAntagEvents<ThiefRoleComponent>();
+        SubscribeAntagEvents<ChangelingRoleComponent>();
     }
 
     public string? MindGetBriefing(EntityUid? mindId)

diff --git a/Content.Shared/Goobstation/Changeling/AbsorbedSystem.cs b/Content.Shared/Goobstation/Changeling/AbsorbedSystem.cs
@@ -1,4 +1,5 @@
 using Content.Shared.Examine;
+using Content.Shared.Mobs;
 
 namespace Content.Shared.Changeling;
 
@@ -9,10 +10,18 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<AbsorbedComponent, ExaminedEvent>(OnExamine);
+        SubscribeLocalEvent<AbsorbedComponent, MobStateChangedEvent>(OnMobStateChange);
     }
 
-    private void OnExamine(EntityUid uid, AbsorbedComponent comp, ref ExaminedEvent args)
+    private void OnExamine(Entity<AbsorbedComponent> ent, ref ExaminedEvent args)
     {
         args.PushMarkup(Loc.GetString("changeling-absorb-onexamine"));
     }
+
+    private void OnMobStateChange(Entity<AbsorbedComponent> ent, ref MobStateChangedEvent args)
+    {
+        // in case one somehow manages to dehusk someone
+        if (args.NewMobState != MobState.Dead)
+            RemComp<AbsorbedComponent>(ent);
+    }
 }
diff --git a/Resources/Locale/en-US/Goobstation/changeling/abilities/changeling.ftl b/Resources/Locale/en-US/Goobstation/changeling/abilities/changeling.ftl
@@ -23,8 +23,8 @@ changeling-sting-fail-ling = Someone just tried to silently sting you!
 
 changeling-sting = You silently sting {CAPITALIZE(THE($target))}
 changeling-sting-fail-simplemob = You can't sting a lesser creature!
-changeling-sting-extract-max = Disposed of the first stored DNA to free up space for new DNA
-changeling-sting-extract-fail = Can't extract DNA, need another target
+changeling-sting-extract-fail = Unable to extract DNA
+changeling-sting-extract-max = Need to get rid of the stored DNA beforehand
 
 changeling-stasis-enter = You enter regenerative stasis
 changeling-stasis-enter-fail = Can't enter stasis!