Merge branch 'space-wizards:master' into master

Author: Merrokitsune

Content.Server/Atmos/EntitySystems/AtmosphereSystem.Commands.cs

@@ -69,8 +69,8 @@ private void FixGridAtmosCommand(IConsoleShell shell, string argstr, string[] ar
        mixtures[7].AdjustMoles(Gas.Nitrogen, Atmospherics.MolesCellStandard);
 
        // 8: Air (GM)
-       mixtures[8].AdjustMoles(Gas.Oxygen, Atmospherics.MolesCellGasMiner);
-       mixtures[8].AdjustMoles(Gas.Nitrogen, Atmospherics.MolesCellGasMiner);
+       mixtures[8].AdjustMoles(Gas.Oxygen, Atmospherics.OxygenMolesGasMiner);
+       mixtures[8].AdjustMoles(Gas.Nitrogen, Atmospherics.NitrogenMolesGasMiner);
 
        foreach (var arg in args)
        {

Content.Server/IdentityManagement/IdentitySystem.cs

@@ -72,7 +72,7 @@ private void OnMapInit(EntityUid uid, IdentityComponent component, MapInitEvent
     /// <summary>
     ///     Queues an identity update to the start of the next tick.
     /// </summary>
-    public void QueueIdentityUpdate(EntityUid uid)
+    public override void QueueIdentityUpdate(EntityUid uid)
     {
         _queuedIdentityUpdates.Add(uid);
     }

Content.Shared/DrawDepth/DrawDepth.cs

@@ -81,42 +81,46 @@ public enum DrawDepth
         WallMountedItems = DrawDepthTag.Default + 2,
 
         /// <summary>
-        ///     Generic items. Things that should be above crates & tables, but underneath mobs.
+        ///     To use for objects that would usually fall under SmallObjects, but appear taller than 1 tile. For example: Reagent Grinder
         /// </summary>
-        Items = DrawDepthTag.Default + 3,
+        LargeObjects = DrawDepthTag.Default + 3,
 
+        /// <summary>
+        ///     Generic items. Things that should be above crates & tables, but underneath mobs.
+        /// </summary>
+        Items = DrawDepthTag.Default + 4,
         /// <summary>
         /// Stuff that should be drawn below mobs, but on top of items. Like muzzle flash.
         /// </summary>
-        BelowMobs = DrawDepthTag.Default + 4,
+        BelowMobs = DrawDepthTag.Default + 5,
 
-        Mobs = DrawDepthTag.Default + 5,
+        Mobs = DrawDepthTag.Default + 6,
 
-        OverMobs = DrawDepthTag.Default + 6,
+        OverMobs = DrawDepthTag.Default + 7,
 
-        Doors = DrawDepthTag.Default + 7,
+        Doors = DrawDepthTag.Default + 8,
 
         /// <summary>
         /// Blast doors and shutters which go over the usual doors.
         /// </summary>
-        BlastDoors = DrawDepthTag.Default + 8,
+        BlastDoors = DrawDepthTag.Default + 9,
 
         /// <summary>
         /// Stuff that needs to draw over most things, but not effects, like Kudzu.
         /// </summary>
-        Overdoors = DrawDepthTag.Default + 9,
+        Overdoors = DrawDepthTag.Default + 10,
 
         /// <summary>
         ///     Explosions, fire, melee swings. Whatever.
         /// </summary>
-        Effects = DrawDepthTag.Default + 10,
+        Effects = DrawDepthTag.Default + 11,
 
-        Ghosts = DrawDepthTag.Default + 11,
+        Ghosts = DrawDepthTag.Default + 12,
 
         /// <summary>
         ///    Use this selectively if it absolutely needs to be drawn above (almost) everything else. Examples include
         ///    the pointing arrow, the drag & drop ghost-entity, and some debug tools.
         /// </summary>
-        Overlays = DrawDepthTag.Default + 12,
+        Overlays = DrawDepthTag.Default + 13,
     }
 }

Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs

@@ -39,6 +39,7 @@ public abstract class SharedHumanoidAppearanceSystem : EntitySystem
     [Dependency] private readonly ISerializationManager _serManager = default!;
     [Dependency] private readonly MarkingManager _markingManager = default!;
     [Dependency] private readonly GrammarSystem _grammarSystem = default!;
+    [Dependency] private readonly SharedIdentitySystem _identity = default!;
 
     [ValidatePrototypeId<SpeciesPrototype>]
     public const string DefaultSpecies = "Human";
@@ -161,6 +162,7 @@ public void CloneAppearance(EntityUid source, EntityUid target, HumanoidAppearan
         if (TryComp<GrammarComponent>(target, out var grammar))
             _grammarSystem.SetGender((target, grammar), sourceHumanoid.Gender);
 
+        _identity.QueueIdentityUpdate(target);
         Dirty(target, targetHumanoid);
     }
 

Content.Shared/IdentityManagement/SharedIdentitySystem.cs

@@ -39,6 +39,11 @@ private void OnMaskToggled(Entity<IdentityBlockerComponent> ent, ref ItemMaskTog
     {
         ent.Comp.Enabled = !args.Mask.Comp.IsToggled;
     }
+
+    /// <summary>
+    /// Queues an identity update to the start of the next tick.
+    /// </summary>
+    public virtual void QueueIdentityUpdate(EntityUid uid) { }
 }
 /// <summary>
 ///     Gets called whenever an entity changes their identity.

Resources/Changelog/Changelog.yml

@@ -1,19 +1,4 @@
 Entries:
-- author: centcomofficer24
-  changes:
-  - message: Added a genderqueer pin!
-    type: Add
-  id: 7908
-  time: '2025-02-06T05:49:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34561
-- author: SG6732
-  changes:
-  - message: Swapped the stick of butter with 5 u of olive oil in the boiled spaghetti
-      recipe.
-    type: Tweak
-  id: 7909
-  time: '2025-02-06T11:45:35.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/34904
 - author: deltanedas
   changes:
   - message: Fixed huds showing for chameleon projector users.
@@ -3918,3 +3903,19 @@
   id: 8409
   time: '2025-05-02T18:31:49.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/37109
+- author: ScarKy0
+  changes:
+  - message: Added Traumoxadone! A cryochemical used to treat brute damage in living
+      patients as well as corpses.
+    type: Add
+  id: 8410
+  time: '2025-05-02T22:56:47.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/37126
+- author: Unkn0wnGh0st333
+  changes:
+  - message: Knuckle Dusters have arrived to Space Station 14. QM can now rule cargo
+      with a golden-covered fist!
+    type: Add
+  id: 8411
+  time: '2025-05-03T04:18:08.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33470

Resources/Changelog/Maps.yml

@@ -67,18 +67,11 @@
   id: 9
   time: '2025-04-30T14:49:36.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/36653
-- author: K-Dynamic
-  changes:
-  - message: Atmos air (6500 kPa) markers are available for mapping.
-    type: Add
-  id: 10
-  time: '2025-05-01T22:03:47.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/37061
 - author: Southbridge
   changes:
   - message: 'New salvage ruin: Atmos Interchange'
     type: Add
-  id: 11
+  id: 10
   time: '2025-05-02T15:45:46.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/37115
 Order: 1

Resources/Locale/en-US/objectives/conditions/steal-target-groups.ftl

@@ -5,6 +5,7 @@ steal-target-groups-clothing-outer-hardsuit-rd = experimental research hardsuit
 steal-target-groups-hand-teleporter = hand teleporter
 steal-target-groups-clothing-shoes-boots-mag-adv = advanced magboots
 steal-target-groups-box-folder-qm-clipboard = requisition digi-board
+steal-target-groups-clothing-hands-knuckledusters-qm = golden knuckledusters
 steal-target-groups-food-meat-corgi = prime-cut corgi meat
 steal-target-groups-captain-id-card = captain ID card
 steal-target-groups-jetpack-captain-filled = captain's jetpack

Resources/Locale/en-US/reagents/meta/chemicals.ftl

@@ -30,3 +30,6 @@ reagent-desc-cellulose = A crystaline polydextrose polymer, plants swear by this
 
 reagent-name-rororium = rororium
 reagent-desc-rororium = A strange substance which fills the cores of the hivelords that roam the mining asteroid. Thought to be the source of their regenerative powers.
+
+reagent-name-salicylic-acid = salicylic acid
+reagent-desc-salicylic-acid = A powdery substance used for dermatological treatments.

Resources/Locale/en-US/reagents/meta/medicine.ftl

@@ -147,3 +147,6 @@ reagent-desc-potassium-iodide = Will reduce the damaging effects of radiation by
 
 reagent-name-haloperidol = haloperidol
 reagent-desc-haloperidol = Removes most stimulating and hallucinogenic drugs. Reduces druggy effects and jitteriness. Causes drowsiness.
+
+reagent-name-traumoxadone = traumoxadone
+reagent-desc-traumoxadone = A cryogenics chemical. Used to treat severe trauma to tissues via patching them with tiny particles within the liquid. Works regardless of the patient being alive or dead.