Merge branch 'space-wizards:master' into master

Author: SonicHDC

Content.IntegrationTests/Tests/PostMapInitTest.cs

@@ -65,8 +65,8 @@ public sealed class PostMapInitTest
             "Loop",
             "Plasma",
             "Elkridge",
-            "Convex"
-
+            "Convex",
+            "Relic"
         };
 
         /// <summary>

Content.Server/Administration/Systems/AdminSystem.cs

@@ -11,6 +11,7 @@
 using Content.Shared.Administration;
 using Content.Shared.Administration.Events;
 using Content.Shared.CCVar;
+using Content.Shared.Forensics.Components;
 using Content.Shared.GameTicking;
 using Content.Shared.Hands.Components;
 using Content.Shared.IdentityManagement;

Content.Server/Body/Systems/BloodstreamSystem.cs

@@ -13,6 +13,7 @@
 using Content.Shared.Drunk;
 using Content.Shared.FixedPoint;
 using Content.Shared.Forensics;
+using Content.Shared.Forensics.Components;
 using Content.Shared.HealthExaminable;
 using Content.Shared.Mobs.Systems;
 using Content.Shared.Popups;

Content.Server/Damage/Components/DamageOnLandComponent.cs

@@ -5,10 +5,16 @@ namespace Content.Server.Damage.Components
     [RegisterComponent]
     public sealed partial class DamageOnLandComponent : Component
     {
+        /// <summary>
+        /// Should this entity be damaged when it lands regardless of its resistances?
+        /// </summary>
         [DataField("ignoreResistances")]
         [ViewVariables(VVAccess.ReadWrite)]
         public bool IgnoreResistances = false;
 
+        /// <summary>
+        /// How much damage.
+        /// </summary>
         [DataField("damage", required: true)]
         [ViewVariables(VVAccess.ReadWrite)]
         public DamageSpecifier Damage = default!;

Content.Server/Damage/Systems/DamageOnLandSystem.cs

@@ -1,10 +1,12 @@
 using Content.Server.Damage.Components;
-using Content.Shared.CombatMode.Pacification;
 using Content.Shared.Damage;
 using Content.Shared.Throwing;
 
 namespace Content.Server.Damage.Systems
 {
+    /// <summary>
+    /// Damages the thrown item when it lands.
+    /// </summary>
     public sealed class DamageOnLandSystem : EntitySystem
     {
         [Dependency] private readonly DamageableSystem _damageableSystem = default!;
@@ -13,19 +15,6 @@ public override void Initialize()
         {
             base.Initialize();
             SubscribeLocalEvent<DamageOnLandComponent, LandEvent>(DamageOnLand);
-            SubscribeLocalEvent<DamageOnLandComponent, AttemptPacifiedThrowEvent>(OnAttemptPacifiedThrow);
-        }
-
-        /// <summary>
-        /// Prevent Pacified entities from throwing damaging items.
-        /// </summary>
-        private void OnAttemptPacifiedThrow(Entity<DamageOnLandComponent> ent, ref AttemptPacifiedThrowEvent args)
-        {
-            // Allow healing projectiles, forbid any that do damage:
-            if (ent.Comp.Damage.AnyPositive())
-            {
-                args.Cancel("pacified-cannot-throw");
-            }
         }
 
         private void DamageOnLand(EntityUid uid, DamageOnLandComponent component, ref LandEvent args)

Content.Server/Forensics/Components/DnaComponent.cs

@@ -10,6 +10,7 @@
 using Content.Shared.Chemistry.Components.SolutionManager;
 using Content.Shared.DoAfter;
 using Content.Shared.Forensics;
+using Content.Shared.Forensics.Components;
 using Content.Shared.Interaction;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Inventory;

Content.Server/Forensics/Systems/ForensicsSystem.cs

@@ -20,40 +20,6 @@ public override void Initialize()
         SubscribeLocalEvent<HumanoidAppearanceComponent, GetVerbsEvent<Verb>>(OnVerbsRequest);
     }
 
-    // this was done enough times that it only made sense to do it here
-
-    /// <summary>
-    ///     Clones a humanoid's appearance to a target mob, provided they both have humanoid components.
-    /// </summary>
-    /// <param name="source">Source entity to fetch the original appearance from.</param>
-    /// <param name="target">Target entity to apply the source entity's appearance to.</param>
-    /// <param name="sourceHumanoid">Source entity's humanoid component.</param>
-    /// <param name="targetHumanoid">Target entity's humanoid component.</param>
-    public void CloneAppearance(EntityUid source, EntityUid target, HumanoidAppearanceComponent? sourceHumanoid = null,
-        HumanoidAppearanceComponent? targetHumanoid = null)
-    {
-        if (!Resolve(source, ref sourceHumanoid) || !Resolve(target, ref targetHumanoid))
-        {
-            return;
-        }
-
-        targetHumanoid.Species = sourceHumanoid.Species;
-        targetHumanoid.SkinColor = sourceHumanoid.SkinColor;
-        targetHumanoid.EyeColor = sourceHumanoid.EyeColor;
-        targetHumanoid.Age = sourceHumanoid.Age;
-        SetSex(target, sourceHumanoid.Sex, false, targetHumanoid);
-        targetHumanoid.CustomBaseLayers = new(sourceHumanoid.CustomBaseLayers);
-        targetHumanoid.MarkingSet = new(sourceHumanoid.MarkingSet);
-
-        targetHumanoid.Gender = sourceHumanoid.Gender;
-        if (TryComp<GrammarComponent>(target, out var grammar))
-        {
-            grammar.Gender = sourceHumanoid.Gender;
-        }
-
-        Dirty(target, targetHumanoid);
-    }
-
     /// <summary>
     ///     Removes a marking from a humanoid by ID.
     /// </summary>

Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs

@@ -6,6 +6,7 @@
 using Content.Server.Store.Systems;
 using Content.Shared.Cuffs.Components;
 using Content.Shared.Forensics;
+using Content.Shared.Forensics.Components;
 using Content.Shared.Humanoid;
 using Content.Shared.Implants;
 using Content.Shared.Implants.Components;

Content.Server/Implants/SubdermalImplantSystem.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.Damage;
 using Content.Shared.DoAfter;
 using Content.Shared.Interaction;
@@ -193,9 +193,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"),
+            _chatManager.TrySendInGameICMessage(uid, Loc.GetString(unrevivable.ReasonMessage),
                 InGameICChatType.Speak, true);
         }
         else

Content.Server/Medical/DefibrillatorSystem.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.Server/Medical/HealthAnalyzerSystem.cs

@@ -2,6 +2,7 @@
 using Content.Server.Access.Systems;
 using Content.Server.Forensics;
 using Content.Shared.Access.Components;
+using Content.Shared.Forensics.Components;
 using Content.Shared.GameTicking;
 using Content.Shared.Inventory;
 using Content.Shared.PDA;

Content.Server/StationRecords/Systems/StationRecordsSystem.cs

@@ -0,0 +1,13 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Forensics.Components;
+
+/// <summary>
+/// This component is for mobs that have DNA.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class DnaComponent : Component
+{
+    [DataField("dna"), AutoNetworkedField]
+    public string DNA = String.Empty;
+}

Content.Server/Traits/Assorted/UnrevivableComponent.cs

@@ -132,6 +132,34 @@ public void SetLayerVisibility(EntityUid uid,
             Dirty(uid, humanoid);
     }
 
+    /// <summary>
+    ///     Clones a humanoid's appearance to a target mob, provided they both have humanoid components.
+    /// </summary>
+    /// <param name="source">Source entity to fetch the original appearance from.</param>
+    /// <param name="target">Target entity to apply the source entity's appearance to.</param>
+    /// <param name="sourceHumanoid">Source entity's humanoid component.</param>
+    /// <param name="targetHumanoid">Target entity's humanoid component.</param>
+    public void CloneAppearance(EntityUid source, EntityUid target, HumanoidAppearanceComponent? sourceHumanoid = null,
+        HumanoidAppearanceComponent? targetHumanoid = null)
+    {
+        if (!Resolve(source, ref sourceHumanoid) || !Resolve(target, ref targetHumanoid))
+            return;
+
+        targetHumanoid.Species = sourceHumanoid.Species;
+        targetHumanoid.SkinColor = sourceHumanoid.SkinColor;
+        targetHumanoid.EyeColor = sourceHumanoid.EyeColor;
+        targetHumanoid.Age = sourceHumanoid.Age;
+        SetSex(target, sourceHumanoid.Sex, false, targetHumanoid);
+        targetHumanoid.CustomBaseLayers = new(sourceHumanoid.CustomBaseLayers);
+        targetHumanoid.MarkingSet = new(sourceHumanoid.MarkingSet);
+
+        targetHumanoid.Gender = sourceHumanoid.Gender;
+        if (TryComp<GrammarComponent>(target, out var grammar))
+            grammar.Gender = sourceHumanoid.Gender;
+
+        Dirty(target, targetHumanoid);
+    }
+
     /// <summary>
     ///     Sets the visibility for multiple layers at once on a humanoid's sprite.
     /// </summary>

Content.Shared/Forensics/Components/DnaComponent.cs

@@ -0,0 +1,22 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Traits.Assorted;
+
+/// <summary>
+/// This is used for the unrevivable trait as well as generally preventing revival.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class UnrevivableComponent : Component
+{
+    /// <summary>
+    /// A field to define if we should display the "Genetic incompatibility" warning on health analysers
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public bool Analyzable = true;
+
+    /// <summary>
+    /// The loc string used to provide a reason for being unrevivable
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public LocId ReasonMessage = "defibrillator-unrevivable";
+}

Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs

@@ -1,27 +1,4 @@
 Entries:
-- author: Errant
-  changes:
-  - message: Computers now have a maintenance panel with a Power and AI wire (if AI-connected).
-    type: Tweak
-  - message: Computer deconstruction now begins with the crowbar, not the screwdriver.
-    type: Tweak
-  id: 7423
-  time: '2024-09-23T10:51:48.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32273
-- author: lzk228
-  changes:
-  - message: Guidebook books now do damage like default writeable books.
-    type: Fix
-  id: 7424
-  time: '2024-09-23T11:12:23.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32403
-- author: Jophire
-  changes:
-  - message: VIM mech now can open maintenance doors!
-    type: Add
-  id: 7425
-  time: '2024-09-23T13:08:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32302
 - author: lzk228
   changes:
   - message: Cadet PDA now has wanted list cartridge preinstalled.
@@ -3899,3 +3876,24 @@
   id: 7922
   time: '2025-02-09T21:01:31.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/34996
+- author: notquitehadouken
+  changes:
+  - message: Added loungewear to uniform printer
+    type: Add
+  id: 7923
+  time: '2025-02-09T22:16:17.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/35008
+- author: Vortebo
+  changes:
+  - message: Added Relic station.
+    type: Add
+  id: 7924
+  time: '2025-02-09T23:24:13.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34988
+- author: IProduceWidgets
+  changes:
+  - message: Pacifists can throw things that break.
+    type: Fix
+  id: 7925
+  time: '2025-02-10T01:24:10.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/31060