move to UnrevivableComponent instead of husked

- Move UnrevivableComponent to shared

- add Analyzable and ReasonMessage to UnrevivableComponent
to give granular control of the message and whether or not it shows up
in the analyzer

- remove the check for HuskedComponent in DefibrillatorSystem

Content.Server/Medical/DefibrillatorSystem.cs

@@ -6,7 +6,7 @@
 using Content.Server.Ghost;
 using Content.Server.Popups;
 using Content.Server.PowerCell;
-using Content.Server.Traits.Assorted;
+using Content.Shared.Traits.Assorted;
 using Content.Shared.Changeling.Devour;
 using Content.Shared.Damage;
 using Content.Shared.DoAfter;
@@ -194,14 +194,9 @@ public void Zap(EntityUid uid, EntityUid target, EntityUid user, DefibrillatorCo
             _chatManager.TrySendInGameICMessage(uid, Loc.GetString("defibrillator-rotten"),
                 InGameICChatType.Speak, true);
         }
-        else if (HasComp<UnrevivableComponent>(target))
+        else if (TryComp<UnrevivableComponent>(target, out var unrevivable))
         {
-            _chatManager.TrySendInGameICMessage(uid, Loc.GetString("defibrillator-unrevivable"),
-                InGameICChatType.Speak, true);
-        }
-        else if (HasComp<ChangelingHuskedCorpseComponent>(target))
-        {
-            _chatManager.TrySendInGameICMessage(uid, Loc.GetString("changeling-defibrillator-failure"),
+            _chatManager.TrySendInGameICMessage(uid, Loc.GetString(unrevivable.ReasonMessage),
                 InGameICChatType.Speak, true);
         }
         else

Content.Server/Medical/HealthAnalyzerSystem.cs

@@ -2,7 +2,7 @@
 using Content.Server.Medical.Components;
 using Content.Server.PowerCell;
 using Content.Server.Temperature.Components;
-using Content.Server.Traits.Assorted;
+using Content.Shared.Traits.Assorted;
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Damage;
 using Content.Shared.DoAfter;
@@ -207,7 +207,7 @@ public void UpdateScannedUser(EntityUid healthAnalyzer, EntityUid target, bool s
             bleeding = bloodstream.BleedAmount > 0;
         }
 
-        if (HasComp<UnrevivableComponent>(target))
+        if (TryComp<UnrevivableComponent>(target, out var unrevivableComp) && unrevivableComp.Analyzable)
             unrevivable = true;
 
         _uiSystem.ServerSendUiMessage(healthAnalyzer, HealthAnalyzerUiKey.Key, new HealthAnalyzerScannedUserMessage(

Content.Shared/Changeling/Devour/SharedChangelingDevourSystem.cs

@@ -12,6 +12,7 @@
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Popups;
+using Content.Shared.Traits.Assorted;
 using Content.Shared.Whitelist;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
@@ -202,6 +203,10 @@ private void OnDevourConsume(Entity<ChangelingDevourComponent> ent, ref Changeli
             _changelingIdentitySystem.CloneToNullspace((ent, identityStorage), target.Value);
             EnsureComp<ChangelingHuskedCorpseComponent>(target.Value);
 
+            var unrevivable = EnsureComp<UnrevivableComponent>(target.Value);
+            unrevivable.Analyzable = false; // Remove the analyser text
+            unrevivable.ReasonMessage = "changeling-defibrillator-failure";
+
             foreach (var organ in _bodySystem.GetBodyOrgans(target, body))
             {
                 _entityManager.QueueDeleteEntity(organ.Id);

Content.Shared/Traits/Assorted/UnrevivableComponent.cs

@@ -0,0 +1,19 @@
+namespace Content.Shared.Traits.Assorted;
+
+/// <summary>
+/// This is used for the unrevivable trait.
+/// </summary>
+[RegisterComponent]
+public sealed partial class UnrevivableComponent : Component
+{
+    /// <summary>
+    /// A field to define if we should display the "Genetic incompatibility" warning on health analysers
+    /// </summary>
+    [DataField]
+    public bool Analyzable { get; set; } = true;
+
+    /// <summary>
+    /// The loc string used to provide a reason for being unrevivable
+    /// </summary>
+    public string ReasonMessage = "changeling-defibrillator-failure";
+}