From 2beac0254c7c2293e1aa8f5cd16cb5c3feb23e17 Mon Sep 17 00:00:00 2001
From: Absotively <jen@jenpollock.ca>
Date: Wed, 19 Feb 2025 03:44:17 -0700
Subject: [PATCH 01/33] Make CharacterPickerButton the same height for dwarves
 as for non-dwarves (#35297)

Character picker button height equality for dwarves
---
 Content.Client/Lobby/UI/CharacterPickerButton.xaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Content.Client/Lobby/UI/CharacterPickerButton.xaml b/Content.Client/Lobby/UI/CharacterPickerButton.xaml
index 2edfd19a24e..ecd706f5a74 100644
--- a/Content.Client/Lobby/UI/CharacterPickerButton.xaml
+++ b/Content.Client/Lobby/UI/CharacterPickerButton.xaml
@@ -8,7 +8,8 @@
         <SpriteView Scale="2 2"
                     Margin="0 4 4 4"
                     OverrideDirection="South"
-                    Name="View"/>
+                    Name="View"
+                    SetSize="64 64"/>
         <Label Name="DescriptionLabel"
                ClipText="True"
                HorizontalExpand="True"/>

From 5f41726cc9f72227d28c705d6eb2c64e6a7d1b7b Mon Sep 17 00:00:00 2001
From: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Date: Wed, 19 Feb 2025 23:34:40 +1200
Subject: [PATCH 02/33] Returns Explosive Technology recipes to Protolathes
 (#35303)

add scienceexplosives to dynamic pack
---
 Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 78757b1cea8..1207fc46f04 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -195,6 +195,7 @@
     dynamicPacks:
     - AdvancedTools
     - ScienceEquipment
+    - ScienceExplosives
     - ScienceClothing
     - PowerCells
     - ScienceWeapons

From 5148e2f86d6def6d072fba318eee6404b76482c2 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 19 Feb 2025 11:35:48 +0000
Subject: [PATCH 03/33] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index a0ab3963a87..54df3b52c63 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: PJB3005
-  changes:
-  - message: Removed bioluminescence plant mutations due to it breaking the rendering
-      engine.
-    type: Remove
-  id: 7479
-  time: '2024-10-02T13:52:14.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32561
 - author: PJB3005
   changes:
   - message: Fixed borg "hands" showing up in their stripping menu.
@@ -3897,3 +3889,11 @@
   id: 7978
   time: '2025-02-19T06:05:47.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/35257
+- author: K-Dynamic
+  changes:
+  - message: Returned Explosive Technology recipes (triggers, payloads, signaller)
+      back to the Protolathe following undocumented removal.
+    type: Fix
+  id: 7979
+  time: '2025-02-19T11:34:40.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/35303

From 9b7339e49779634e875b1ee0b9ef467e7cf36174 Mon Sep 17 00:00:00 2001
From: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com>
Date: Wed, 19 Feb 2025 16:13:21 +0300
Subject: [PATCH 04/33] Make OuterClothing hide PDA and belt sprites under it.
 (#33448)

Make OuterClothing hide the PDA sprite
---
 Resources/Prototypes/Entities/Mobs/NPCs/animals.yml     | 2 +-
 Resources/Prototypes/Entities/Mobs/Species/arachnid.yml | 2 +-
 Resources/Prototypes/Entities/Mobs/Species/base.yml     | 4 ++--
 Resources/Prototypes/Entities/Mobs/Species/moth.yml     | 2 +-
 Resources/Prototypes/Entities/Mobs/Species/vox.yml      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index a33529cc48c..6dc055ea2a2 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1276,8 +1276,8 @@
       state: body-overlay-2
       visible: false
     - map: [ "ears" ]
-    - map: [ "outerClothing" ]
     - map: [ "id" ]
+    - map: [ "outerClothing" ]
     - map: [ "mask" ]
     - map: [ "head" ]
     - map: [ "clownedon" ]
diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
index 0d7f7717586..40c640f2933 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
@@ -89,10 +89,10 @@
       - map: [ "gloves" ]
       - map: [ "shoes" ]
       - map: [ "ears" ]
-      - map: [ "outerClothing" ]
       - map: [ "eyes" ]
       - map: [ "belt" ]
       - map: [ "id" ]
+      - map: [ "outerClothing" ]
       - map: [ "enum.HumanoidVisualLayers.Tail" ] # Mentioned in moth code: This needs renaming lol.
       - map: [ "neck" ]
       - map: [ "back" ]
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index 100a0ced842..81b37958e65 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -27,10 +27,10 @@
     - map: [ "gloves" ]
     - map: [ "shoes" ]
     - map: [ "ears" ]
-    - map: [ "outerClothing" ]
     - map: [ "eyes" ]
     - map: [ "belt" ]
     - map: [ "id" ]
+    - map: [ "outerClothing" ]
     - map: [ "neck" ]
     - map: [ "back" ]
     - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
@@ -318,10 +318,10 @@
     - map: [ "gloves" ]
     - map: [ "shoes" ]
     - map: [ "ears" ]
-    - map: [ "outerClothing" ]
     - map: [ "eyes" ]
     - map: [ "belt" ]
     - map: [ "id" ]
+    - map: [ "outerClothing" ]
     - map: [ "neck" ]
     - map: [ "back" ]
     - map: [ "enum.HumanoidVisualLayers.FacialHair" ]
diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
index ad09fd57578..cdeeb034427 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -96,10 +96,10 @@
       - map: [ "gloves" ]
       - map: [ "shoes" ]
       - map: [ "ears" ]
-      - map: [ "outerClothing" ]
       - map: [ "eyes" ]
       - map: [ "belt" ]
       - map: [ "id" ]
+      - map: [ "outerClothing" ]
       - map: [ "enum.HumanoidVisualLayers.Tail" ] #in the utopian future we should probably have a wings enum inserted here so everyhting doesn't break
       - map: [ "neck" ]
       - map: [ "back" ]
diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
index a4da88adc02..2d5a1668164 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml
@@ -79,10 +79,10 @@
     - map: [ "gloves" ]
     - map: [ "shoes" ]
     - map: [ "ears" ]
-    - map: [ "outerClothing" ]
     - map: [ "eyes" ]
     - map: [ "belt" ]
     - map: [ "id" ]
+    - map: [ "outerClothing" ]
     - map: [ "neck" ]
     - map: [ "back" ]
     - map: [ "enum.HumanoidVisualLayers.FacialHair" ]

From 353e988520bca75072cb859124fb3ef471fa99b7 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 19 Feb 2025 13:14:29 +0000
Subject: [PATCH 05/33] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 54df3b52c63..a13c1a310f7 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: PJB3005
-  changes:
-  - message: Fixed borg "hands" showing up in their stripping menu.
-    type: Fix
-  id: 7480
-  time: '2024-10-03T00:11:56.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32606
 - author: ArtisticRoomba
   changes:
   - message: X-ray cannons and stinger grenades are now security restricted. HoS's
@@ -3897,3 +3890,10 @@
   id: 7979
   time: '2025-02-19T11:34:40.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/35303
+- author: Winkarst-cpu
+  changes:
+  - message: Now outer clothing hides PDA and belt sprites under it.
+    type: Tweak
+  id: 7980
+  time: '2025-02-19T13:13:22.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33448

From 9bde78a25f8d26e631283eeeb5143fb1b9a61e5a Mon Sep 17 00:00:00 2001
From: Booblesnoot42 <108703193+Booblesnoot42@users.noreply.github.com>
Date: Wed, 19 Feb 2025 08:46:16 -0500
Subject: [PATCH 06/33] Fixing intercom encryption key dropping (#34582)

* Added optional param to PickupOrDrop to allow the item to be moved next to the owner of the hand component

* cleanup placement code
---
 .../Hands/EntitySystems/SharedHandsSystem.Pickup.cs        | 7 +++++++
 Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs  | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
index 7bc0a8025fe..101d206acd8 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
@@ -197,12 +197,14 @@ public bool CanPickupToHand(EntityUid uid, EntityUid entity, Hand hand, bool che
     /// <summary>
     ///     Puts an item into any hand, preferring the active hand, or puts it on the floor.
     /// </summary>
+    /// <param name="dropNear">If true, the item will be dropped near the owner of the hand if possible.</param>
     public void PickupOrDrop(
         EntityUid? uid,
         EntityUid entity,
         bool checkActionBlocker = true,
         bool animateUser = false,
         bool animate = true,
+        bool dropNear = false,
         HandsComponent? handsComp = null,
         ItemComponent? item = null)
     {
@@ -214,6 +216,11 @@ public void PickupOrDrop(
             // TODO make this check upwards for any container, and parent to that.
             // Currently this just checks the direct parent, so items can still teleport through containers.
             ContainerSystem.AttachParentToContainerOrGrid((entity, Transform(entity)));
+
+            if (dropNear && uid.HasValue)
+            {
+                TransformSystem.PlaceNextTo(entity, uid.Value);
+            }
         }
     }
 
diff --git a/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs b/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs
index 94d839a4208..9ddcb423b42 100644
--- a/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs
+++ b/Content.Shared/Radio/EntitySystems/EncryptionKeySystem.cs
@@ -55,7 +55,7 @@ private void OnKeyRemoval(EntityUid uid, EncryptionKeyHolderComponent component,
         _container.EmptyContainer(component.KeyContainer, reparent: false);
         foreach (var ent in contained)
         {
-            _hands.PickupOrDrop(args.User, ent);
+            _hands.PickupOrDrop(args.User, ent, dropNear: true);
         }
 
         if (!_timing.IsFirstTimePredicted)

From bc1c82ac6004319822bb2ca08d94a038bff3e36f Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 19 Feb 2025 13:47:22 +0000
Subject: [PATCH 07/33] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index a13c1a310f7..bce1bc8ad62 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: ArtisticRoomba
-  changes:
-  - message: X-ray cannons and stinger grenades are now security restricted. HoS's
-      armored trench coat and its variants are security and command restricted.
-    type: Fix
-  id: 7481
-  time: '2024-10-03T10:01:58.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32614
 - author: Myra
   changes:
   - message: Medibots and Janibots can no longer become sentient via the sentience
@@ -3897,3 +3889,11 @@
   id: 7980
   time: '2025-02-19T13:13:22.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/33448
+- author: Booblesnoot42
+  changes:
+  - message: When removing encryption keys from an intercom, excess keys will now
+      be dropped at the remover's feet instead of dropping inside the wall.
+    type: Fix
+  id: 7981
+  time: '2025-02-19T13:46:16.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34582

From cc18ba72a64de020bb7f7d82749af5b4ad120767 Mon Sep 17 00:00:00 2001
From: MilenVolf <63782763+MilenVolf@users.noreply.github.com>
Date: Wed, 19 Feb 2025 17:23:53 +0300
Subject: [PATCH 08/33] Fix ExaminableHunger spelling (#35309)

Fix ExaminableHunger spelling mistake
---
 ...Component.cs => ExaminableHungerComponent.cs} | 16 ++++++++--------
 ...HungerSystem.cs => ExaminableHungerSystem.cs} |  8 ++++----
 .../components/examinable-hunger-component.ftl   |  5 +++++
 .../components/examineable-hunger-component.ftl  |  5 -----
 .../Prototypes/Entities/Mobs/NPCs/animals.yml    |  8 ++++----
 5 files changed, 21 insertions(+), 21 deletions(-)
 rename Content.Shared/Nutrition/Components/{ExamineableHungerComponent.cs => ExaminableHungerComponent.cs} (54%)
 rename Content.Shared/Nutrition/EntitySystems/{ExamineableHungerSystem.cs => ExaminableHungerSystem.cs} (79%)
 create mode 100644 Resources/Locale/en-US/nutrition/components/examinable-hunger-component.ftl
 delete mode 100644 Resources/Locale/en-US/nutrition/components/examineable-hunger-component.ftl

diff --git a/Content.Shared/Nutrition/Components/ExamineableHungerComponent.cs b/Content.Shared/Nutrition/Components/ExaminableHungerComponent.cs
similarity index 54%
rename from Content.Shared/Nutrition/Components/ExamineableHungerComponent.cs
rename to Content.Shared/Nutrition/Components/ExaminableHungerComponent.cs
index 00aba82e583..4431a5ef4ad 100644
--- a/Content.Shared/Nutrition/Components/ExamineableHungerComponent.cs
+++ b/Content.Shared/Nutrition/Components/ExaminableHungerComponent.cs
@@ -7,8 +7,8 @@ namespace Content.Shared.Nutrition.Components;
 /// Adds text to the entity's description box based on its current hunger threshold.
 /// </summary>
 [RegisterComponent, NetworkedComponent]
-[Access(typeof(ExamineableHungerSystem))]
-public sealed partial class ExamineableHungerComponent : Component
+[Access(typeof(ExaminableHungerSystem))]
+public sealed partial class ExaminableHungerComponent : Component
 {
     /// <summary>
     /// Dictionary of hunger thresholds to LocIds of the messages to display.
@@ -16,16 +16,16 @@ public sealed partial class ExamineableHungerComponent : Component
     [DataField]
     public Dictionary<HungerThreshold, LocId> Descriptions = new()
     {
-        { HungerThreshold.Overfed, "examineable-hunger-component-examine-overfed"},
-        { HungerThreshold.Okay, "examineable-hunger-component-examine-okay"},
-        { HungerThreshold.Peckish, "examineable-hunger-component-examine-peckish"},
-        { HungerThreshold.Starving, "examineable-hunger-component-examine-starving"},
-        { HungerThreshold.Dead, "examineable-hunger-component-examine-starving"}
+        { HungerThreshold.Overfed, "examinable-hunger-component-examine-overfed"},
+        { HungerThreshold.Okay, "examinable-hunger-component-examine-okay"},
+        { HungerThreshold.Peckish, "examinable-hunger-component-examine-peckish"},
+        { HungerThreshold.Starving, "examinable-hunger-component-examine-starving"},
+        { HungerThreshold.Dead, "examinable-hunger-component-examine-starving"}
     };
 
     /// <summary>
     /// LocId of a fallback message to display if the entity has no <see cref="HungerComponent"/>
     /// or does not have a value in <see cref="Descriptions"/> for the current threshold.
     /// </summary>
-    public LocId NoHungerDescription = "examineable-hunger-component-examine-none";
+    public LocId NoHungerDescription = "examinable-hunger-component-examine-none";
 }
diff --git a/Content.Shared/Nutrition/EntitySystems/ExamineableHungerSystem.cs b/Content.Shared/Nutrition/EntitySystems/ExaminableHungerSystem.cs
similarity index 79%
rename from Content.Shared/Nutrition/EntitySystems/ExamineableHungerSystem.cs
rename to Content.Shared/Nutrition/EntitySystems/ExaminableHungerSystem.cs
index e0ac767bcf5..1a1418b644c 100644
--- a/Content.Shared/Nutrition/EntitySystems/ExamineableHungerSystem.cs
+++ b/Content.Shared/Nutrition/EntitySystems/ExaminableHungerSystem.cs
@@ -4,8 +4,8 @@
 
 namespace Content.Shared.Nutrition.EntitySystems;
 
-/// <inheritdoc cref="ExamineableHungerComponent"/>
-public sealed class ExamineableHungerSystem : EntitySystem
+/// <inheritdoc cref="ExaminableHungerComponent"/>
+public sealed class ExaminableHungerSystem : EntitySystem
 {
     [Dependency] private readonly HungerSystem _hunger = default!;
     private EntityQuery<HungerComponent> _hungerQuery;
@@ -16,14 +16,14 @@ public override void Initialize()
 
         _hungerQuery = GetEntityQuery<HungerComponent>();
 
-        SubscribeLocalEvent<ExamineableHungerComponent, ExaminedEvent>(OnExamine);
+        SubscribeLocalEvent<ExaminableHungerComponent, ExaminedEvent>(OnExamine);
     }
 
     /// <summary>
     ///     Defines the text provided on examine.
     ///     Changes depending on the amount of hunger the target has.
     /// </summary>
-    private void OnExamine(Entity<ExamineableHungerComponent> entity, ref ExaminedEvent args)
+    private void OnExamine(Entity<ExaminableHungerComponent> entity, ref ExaminedEvent args)
     {
         var identity = Identity.Entity(entity, EntityManager);
 
diff --git a/Resources/Locale/en-US/nutrition/components/examinable-hunger-component.ftl b/Resources/Locale/en-US/nutrition/components/examinable-hunger-component.ftl
new file mode 100644
index 00000000000..c42b56ef88a
--- /dev/null
+++ b/Resources/Locale/en-US/nutrition/components/examinable-hunger-component.ftl
@@ -0,0 +1,5 @@
+examinable-hunger-component-examine-overfed = {CAPITALIZE(SUBJECT($entity))} {CONJUGATE-BASIC($entity, "look", "looks")} stuffed!
+examinable-hunger-component-examine-okay = {CAPITALIZE(SUBJECT($entity))} {CONJUGATE-BASIC($entity, "look", "looks")} content.
+examinable-hunger-component-examine-peckish = {CAPITALIZE(SUBJECT($entity))} {CONJUGATE-BASIC($entity, "look", "looks")} hungry.
+examinable-hunger-component-examine-starving = {CAPITALIZE(SUBJECT($entity))} {CONJUGATE-BASIC($entity, "look", "looks")} starved!
+examinable-hunger-component-examine-none = {CAPITALIZE(SUBJECT($entity))} {CONJUGATE-BASIC($entity, "seem", "seems")} not to get hungry.
diff --git a/Resources/Locale/en-US/nutrition/components/examineable-hunger-component.ftl b/Resources/Locale/en-US/nutrition/components/examineable-hunger-component.ftl
deleted file mode 100644
index d8d99639089..00000000000
--- a/Resources/Locale/en-US/nutrition/components/examineable-hunger-component.ftl
+++ /dev/null
@@ -1,5 +0,0 @@
-examineable-hunger-component-examine-overfed = {CAPITALIZE(SUBJECT($entity))} {CONJUGATE-BASIC($entity, "look", "looks")} stuffed!
-examineable-hunger-component-examine-okay = {CAPITALIZE(SUBJECT($entity))} {CONJUGATE-BASIC($entity, "look", "looks")} content.
-examineable-hunger-component-examine-peckish = {CAPITALIZE(SUBJECT($entity))} {CONJUGATE-BASIC($entity, "look", "looks")} hungry.
-examineable-hunger-component-examine-starving = {CAPITALIZE(SUBJECT($entity))} {CONJUGATE-BASIC($entity, "look", "looks")} starved!
-examineable-hunger-component-examine-none = {CAPITALIZE(SUBJECT($entity))} {CONJUGATE-BASIC($entity, "seem", "seems")} not to get hungry.
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index 6dc055ea2a2..aaca8961754 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -229,7 +229,7 @@
   - type: EggLayer
     eggSpawn:
     - id: FoodEgg
-  - type: ExamineableHunger
+  - type: ExaminableHunger
   - type: ReplacementAccent
     accent: chicken
   - type: SentienceTarget
@@ -664,7 +664,7 @@
   - type: EggLayer
     eggSpawn:
     - id: FoodEgg
-  - type: ExamineableHunger
+  - type: ExaminableHunger
   - type: ReplacementAccent
     accent: duck
   - type: SentienceTarget
@@ -830,7 +830,7 @@
     reagentId: Milk
     quantityPerUpdate: 25
     growthDelay: 30
-  - type: ExamineableHunger
+  - type: ExaminableHunger
   - type: Butcherable
     spawned:
     - id: FoodMeat
@@ -987,7 +987,7 @@
     reagentId: MilkGoat
     quantityPerUpdate: 25
     growthDelay: 20
-  - type: ExamineableHunger
+  - type: ExaminableHunger
   - type: Wooly
   - type: Food
     solution: wool

From 22254a14e64b3da4fcbd5379d2da4a2aea1421e3 Mon Sep 17 00:00:00 2001
From: robinthedragon <92946919+robinthedragon@users.noreply.github.com>
Date: Wed, 19 Feb 2025 14:25:17 -0500
Subject: [PATCH 09/33] ports two barsigns from frontier (#35296)

* adds two new barsigns

* webedit to fix a typo

* the typo was in two locations

* reformatted meta.json and added attribution links
---
 .../en-US/barsign/barsign-component.ftl       |   8 ++++
 .../Structures/Wallmounts/Signs/bar_sign.yml  |  18 ++++++++
 Resources/Prototypes/bar_signs.yml            |  16 +++++++
 .../Wallmounts/barsign.rsi/maltroach.png      | Bin 0 -> 10419 bytes
 .../Wallmounts/barsign.rsi/meta.json          |  39 ++++++++++++++++--
 .../Wallmounts/barsign.rsi/whiskeyechoes.png  | Bin 0 -> 17171 bytes
 6 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 Resources/Textures/Structures/Wallmounts/barsign.rsi/maltroach.png
 create mode 100644 Resources/Textures/Structures/Wallmounts/barsign.rsi/whiskeyechoes.png

diff --git a/Resources/Locale/en-US/barsign/barsign-component.ftl b/Resources/Locale/en-US/barsign/barsign-component.ftl
index cf7ddd1e246..af9bfa56b28 100644
--- a/Resources/Locale/en-US/barsign/barsign-component.ftl
+++ b/Resources/Locale/en-US/barsign/barsign-component.ftl
@@ -96,6 +96,14 @@ barsign-prototype-description-emprah = Enjoyed by fanatics, heretics, and brain-
 barsign-prototype-name-spacebucks = Spacebucks
 barsign-prototype-description-spacebucks = You can't get away from them, even in space, and even after we started calling them 'spesos' instead.
 
+## Maltroach
+barsign-prototype-name-maltroach = Maltroach
+barsign-prototype-description-maltroach = Squeak!
+
+## Whiskey Echoes
+barsign-prototype-name-whiskeyechoes = Whiskey Echoes
+barsign-prototype-description-whiskeyechoes = An elite bar for elite oper-wait, this is a Nanotrasen station. Why's this sign in the database?
+
 ## EmpBarSign
 barsign-prototype-description-empbarsign = Something has gone very wrong.
 
diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
index 721b5e13202..653031133c1 100644
--- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
+++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/bar_sign.yml
@@ -273,3 +273,21 @@
   components:
   - type: BarSign
     current: Spacebucks
+
+- type: entity
+  parent: BaseBarSign
+  id: BarSignMaltroach
+  name: The Maltroach
+  description: Squeak!
+  components:
+  - type: BarSign
+    current: Maltroach
+
+- type: entity
+  parent: BaseBarSign
+  id: BarSignWhiskeyEchoes
+  name: Whiskey Echoes
+  description: An elite bar for elite oper-wait, this is a Nanotrasen station. Why's this sign in the database?
+  components:
+  - type: BarSign
+    current: WhiskeyEchoes
diff --git a/Resources/Prototypes/bar_signs.yml b/Resources/Prototypes/bar_signs.yml
index e3f9d30a42d..3bfeedbe449 100644
--- a/Resources/Prototypes/bar_signs.yml
+++ b/Resources/Prototypes/bar_signs.yml
@@ -181,3 +181,19 @@
     sprite: Structures/Wallmounts/barsign.rsi
     state: spacebucks
   description: barsign-prototype-description-spacebucks
+
+- type: barSign
+  id: Maltroach
+  name: barsign-prototype-name-maltroach
+  icon:
+    sprite: Structures/Wallmounts/barsign.rsi
+    state: maltroach
+  description: barsign-prototype-description-maltroach
+
+- type: barSign
+  id: WhiskeyEchoes
+  name: barsign-prototype-name-whiskeyechoes
+  icon:
+    sprite: Structures/Wallmounts/barsign.rsi
+    state: whiskeyechoes
+  description: barsign-prototype-description-whiskeyechoes
diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/maltroach.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/maltroach.png
new file mode 100644
index 0000000000000000000000000000000000000000..bbe6df843f2dce9b7d151a0195a9380e6ec31905
GIT binary patch
literal 10419
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/barsign.rsi/meta.json
index a7b77a84fd0..ab57aa99cbb 100644
--- a/Resources/Textures/Structures/Wallmounts/barsign.rsi/meta.json
+++ b/Resources/Textures/Structures/Wallmounts/barsign.rsi/meta.json
@@ -5,9 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/vgstation-coders/vgstation13/commit/1fbb5e417d0200fe60c6b628656a371093d2d715",
-  "copyright": "https://github.com/tgstation/tgstation/commit/68aade356cf53032f206cb5a887581ac7d166cae",
-  "copyright": "https://github.com/space-wizards/space-station-14/commit/b301d3ac26cb2301048eda4535667c28e2283d41 - Made by ProPandaBear for SS14",
+  "copyright": "https://github.com/vgstation-coders/vgstation13/commit/1fbb5e417d0200fe60c6b628656a371093d2d715, https://github.com/tgstation/tgstation/commit/68aade356cf53032f206cb5a887581ac7d166cae, https://github.com/space-wizards/space-station-14/commit/b301d3ac26cb2301048eda4535667c28e2283d41 - Made by ProPandaBear for SS14, maltroach made by robinthedragon for SS14, based on maltroach by MoffNyan for tgstation at commit https://github.com/tgstation/tgstation/commit/dcf2f8268d21e91dcb9d9d4c199e8e8dd3984d60, whiskeyechoes by cerebralerror (Discord) from frontier station at commit https://github.com/new-frontiers-14/frontier-station-14/commit/9ecd9645151fd03c6b0bfdda104188a2bc73c96b",
   "states": [
     {
       "name": "combocafe",
@@ -496,6 +494,41 @@
           2.2
         ]
       ]
+    },
+    {
+      "name": "maltroach",
+      "delays": [
+        [
+          0.75,
+          0.75,
+          0.75,
+          0.75,
+          0.75,
+          0.75,
+          1,
+          1,
+          1,
+          1,
+          1,
+          1
+        ]
+      ]
+    },
+    {
+      "name": "whiskeyechoes",
+      "delays": [
+        [
+          0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+          0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+          0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+          0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+          0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+          0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+          0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+          0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
+          0.1, 0.1, 0.1
+        ]
+      ]
     }
   ]
 }
diff --git a/Resources/Textures/Structures/Wallmounts/barsign.rsi/whiskeyechoes.png b/Resources/Textures/Structures/Wallmounts/barsign.rsi/whiskeyechoes.png
new file mode 100644
index 0000000000000000000000000000000000000000..894d19286d721e0eb7375b527acbc2fab9b4ebef
GIT binary patch
literal 17171
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

literal 0
HcmV?d00001


From 201ec61ce06eaea27a01873e65cdbee884752b2c Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Wed, 19 Feb 2025 19:26:27 +0000
Subject: [PATCH 10/33] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index bce1bc8ad62..9d38bb29599 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,12 +1,4 @@
 Entries:
-- author: Myra
-  changes:
-  - message: Medibots and Janibots can no longer become sentient via the sentience
-      event.
-    type: Remove
-  id: 7482
-  time: '2024-10-03T10:32:11.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32383
 - author: eoineoineoin
   changes:
   - message: Action bar can be reconfigured again
@@ -3897,3 +3889,11 @@
   id: 7981
   time: '2025-02-19T13:46:16.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/34582
+- author: cerebralerror, robinthedragon
+  changes:
+  - message: 'New barsigns: Maltroach (based on sign by MoffNyan, from tgstation)
+      and Whiskey Echoes (by cerebralerror, from frontier station)'
+    type: Add
+  id: 7982
+  time: '2025-02-19T19:25:20.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/35296

From 33b9149a56a449a470b95403f1a79f2e18719931 Mon Sep 17 00:00:00 2001
From: SeamLesss <kai.julian.watson@gmail.com>
Date: Wed, 19 Feb 2025 11:27:57 -0800
Subject: [PATCH 11/33] Space Lizard Plushie In-hands (#35295)

* space lizard

* attributions

* attribution fix
---
 .../Prototypes/Entities/Objects/Fun/toys.yml    |   2 ++
 .../Textures/Objects/Fun/toys.rsi/meta.json     |  10 +++++++++-
 .../Fun/toys.rsi/spacelizard-inhand-left.png    | Bin 0 -> 16598 bytes
 .../Fun/toys.rsi/spacelizard-inhand-right.png   | Bin 0 -> 16598 bytes
 4 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/spacelizard-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/spacelizard-inhand-right.png

diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index eeb0fa6bffa..585e3b31f1b 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -391,6 +391,8 @@
   name: space lizard plushie
   description: An adorable stuffed toy that resembles a lizardperson in an EVA suit. Made by CentComm as a token initiative to combat speciesism in space environments. "Welcome your new colleges as you do this plush, with open arms!"
   components:
+  - type: Item
+    heldPrefix: spacelizard
   - type: Sprite
     state: plushie_spacelizard
   - type: EmitSoundOnUse
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
index 4a0cb492eb0..4bfa1f10d95 100644
--- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github), lizard hat sprite made by Cinder, rubber_chicken by xprospero, in-hand lizard plushie sprites by KieueCaprie, plushie_lizard_inversed and inhand sprites modified from plushie_lizard_mirrored and plushielizard-inhand-left, plushielizard-inhand-right by ArtisticRoomba, rainbowcarplush and inhand sprites modified from carpplush and inhand sprites by ArtisticRoomba, spacelizard-equipped-HELMET by miamioni",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003, holoplush and magicplush modified by deltanedas (github), lizard hat sprite made by Cinder, rubber_chicken by xprospero, in-hand lizard plushie sprites by KieueCaprie, plushie_lizard_inversed and inhand sprites modified from plushie_lizard_mirrored and plushielizard-inhand-left, plushielizard-inhand-right by ArtisticRoomba, rainbowcarplush and inhand sprites modified from carpplush and inhand sprites by ArtisticRoomba, spacelizard-equipped-HELMET by miamioni, spacelizard-inhand-(left/right) by SeamLesss (GitHub)",
   "size": {
     "x": 32,
     "y": 32
@@ -201,6 +201,14 @@
       "name": "spacelizard-equipped-HELMET",
       "directions": 4
     },
+    {
+      "name": "spacelizard-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "spacelizard-inhand-left",
+      "directions": 4
+    },
     {
       "name": "spbox"
     },
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/spacelizard-inhand-left.png b/Resources/Textures/Objects/Fun/toys.rsi/spacelizard-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..25ba6f710b199ca6b7926a1060309471383b8463
GIT binary patch
literal 16598
zcmeI4e`wTY9LGO9oi}CE%|8Ze9j1seVr&F5LS@R0c}PcXj&1~7jg=Poi$X341g9|#
zf>2Z<I)lQ~++ZgpC_^IJ)<rpPu&`of2#51mQIOlBuh0AO`#B!Z;eGFq$8PiUIlkZL
z$M^X@&+~pgKW^;#a0g!qH<m3}x`2qvLYsn3Dy+v<GEd!4zp;Bv1@k&KHwMYU=S2U>
z!zyR~u1&3P5iR^0SJB|kc&Ezrza4tM!GF!Sh@O3F>-y0I(Q*m}H*AR(71h^Yyr@cu
z2>~G>1cZPP5CTF#2nYcoAOwVf5D)@FKnOfm1d42{O{S;f*=?*@QXI+7Q{_G~^HiDF
z&9tq!RRBuVQPuJLgt<bZCInY}EKB68j{<@<02uk>`}e%G?cGDQ=dK>T1aWhxeDrVe
ze-wJ+&03Yz5Lo;dsSgJjK<VOQlzDF8d}3f%d$YAZqCIPsA2<?oZl<r$ob{ztUgl?Q
z8UPY5gl&jl`1SZ!gn$DBs6YOipp}1C(TNZC>Aaz#AuE0L>Dn#a0)c?872<#REUn`#
zFcrIYUyI1+XAlp=EU2icpvuZhvLznvSOc(R#nWd3PX=i4<1w1J^G`<LcgKFyX*8~^
zTwOjE%}WF@Y9=?*rT#vus;bfjZQbVDsyO(}vX;JYMjT3xP*+zMeR(C8fq?Xsy9c0s
zRqi#KbbI24gJ(adnwlDlL?TwEKI^txxhu{=80hKMZT{ZeL~3@NGQS1zAR3K25Ij6Q
ztjo2vwNWaSn)v|Y@wii6U9H8ePF|+HzkII+CK8DZd{aCiu-P7cv}0`#U=bVw!sRuq
z^_n)<HH$~N(b3V&3_y9n<M(ZanNhIS0P1BSJiU38%@J1OosNzUz3T%IFNf~#ZmWH?
zwh1!Oa5(I+aEvgfJ}(O{gIR#}Zkh?l%%4$lh{wg9M!c@BE|cbbGsJWA9rM|&h<g#2
z3z8=geb-BGurGk87o?C75CTF#2nYcoAOwVf5D)@FKnMr{As_^VfDjM@j~fB2|9^kf
zFqPlINwZCL6xV8|r;E=T0Iv9$5^0`%wdaB`D*&ASG3oq#`&;c`!HyYlwrHu|8B#zV
z3c;i`-3%%CJdFJE^4dlShIn?mKwP=$oKpfm&0ZR&sJsE-NXx9CK;k}lm%!NZ0!|um
z%*bVV1ISh3|MmRuTgv@H8D;>)d$qg);IOlh%-!VLF#{kTAp9lsbr<24qU@o2Kwc-s
znEr(Z015#?t#c}V|GfyjQP#eUT%swTKc4Gb!1D}X@#Ev;_i8V&``A}K5r1b3t*V%#
zFZdhncyZkW-l^H$_5=W@yBPUG6%SGHM__*ggy=8a?Q)$u=LEnNuy~vPd)cGoHO&JA
z2+Gq$|82uAIbI-mZKtrxExwuFqk6O%zYCB@&oH1osM)VI{j|O0@F(w-AwSd*4)$(*
GW#3&pag~$+

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Fun/toys.rsi/spacelizard-inhand-right.png b/Resources/Textures/Objects/Fun/toys.rsi/spacelizard-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ab7c53ed71f66fc2afcdf1e3e9ccda2917a19f6
GIT binary patch
literal 16598
zcmeI4TS!z<6o%JWHYJ%_AQ&}TbQKgOGBW}bMW<-Gs5KFhmPtl*FQhOieXzG8sEFty
zU53gaeDF!6qLhM^c^K*;i3mg=B1kB+vi)ynZ4MJNnuN@;wd3sjK4<^mzA(5Jo!jUs
zj*puiM?~@NlETd@&Brr!ii+>o9PUxclwIqJ3uzetZnoXKsA{GiD%p0FXvQ-<j*f%A
zDplz`=3Zaq?2AdDoJ9>8tz|@M<StxOR_k!&=eM`39ukCr5D)@FKnMr{As_^VfDjM@
zLO=)z0U;m+{wo3wtJ;^nLq2O6`J9wkZ)ly}%1YN&>ztLQYAzc9LGg{;U`eahfPI#-
zt+GM!H$o;|$q*)^fyK9eywo*$D29H-{?h&3bM|FlX*f}%+GpBvC!D|4JgkJ|DP1oH
zJ`HJ2h{`h$<^c>KIIQB)2ml;De;K5oPX}mLN-CY&Uukv=w?}K5o0|*aRB_}qy-NsC
zV!YEVD(fqnw>M99sWfW+H~O?5Uj5g%d-Xt6x?C>ZW|ye5v(u5BoJ>hcNi=<Cte!Rt
zhd$Pb1_NO5+gEyZ`MvIp4k&kA>mk=%7p2T!@=!O}C`wOHr>?fgl=Zzp3x+0!5KQ$w
zptm)SLF})=t#x&Ew7e!wcU+rVNht5xy^A)i%COD$x2}=T=Ns<s?xvONw_B@qo;4X^
zfY96XW~;0Dk?!!J6y_MRt$55G05UT(si~<6Mas&`A^>S@Y&5z}#^dqmi{s3KW%M>@
zF=3$J?<cR<Yx?N7*en7Bo-)LTLNIp#&I}$F&x7oo@(zFohz|q;S`Hx8*4An;`gZ_R
zLMJ>N?7sS}g~j*x_v@Xl7TWA;y#uh_5pXs@i9ztOU?6r&p(k_^ajbdu|ImXU5LVI1
zTg!h8ut^0p@Q<U2Q=SN7jlgAr<#*W^z*G{A3WTM<WQBkb5CTF#2nYcoAOwVf5D)@F
zKnMr{As_^VfDo9t1kB&cBS};yw0qWeWn<rFE!#OiB7mUyTNaV<q=1!mLO_TJfW<%X
zUucEH0RkK-kYAXzg0?Kpi8x*li1NtT2}9?};+3n35f6Ji!~;TFVs>%p(FlEq9m-(=
z@Z{k@0jCKBb~XrlV2n7H-!WckSo2qe35;3<Ah4T>)%hsGyKT`F7C`Wl+gV><uZ1|L
zP9q2hgy0U?8EqFKo5KHw{D_wr&bjg;F^-e)CK)<@(id&wAsTj0_&Zp=K}LcRb_ejl
z1DjTRJ6i6jTYr*%oK@x2^Q74T;eOGO!WRI$;BW4NhyY+!h3gq!3L85DQg%X!2GOB&
zU<jkNdWQwT;_(4&t6=J2&x_H1Ko1<J2)=^&6d)js*({EMV;-zOJr2>16WSee9sXZ{
afAqOcrAMx}lscZ{b?zch;iH0zv%dlSv6#mI

literal 0
HcmV?d00001


From f189bdcf6e858f0e87477b8a69733bb3ab0435c8 Mon Sep 17 00:00:00 2001
From: FungiFellow <151778459+FungiFellow@users.noreply.github.com>
Date: Wed, 19 Feb 2025 18:27:34 -0600
Subject: [PATCH 12/33] Removed Contraband Status from Flares (#34705)

* Update shotgun.yml

* Update shotgun.yml

* Update shotgun.yml
---
 .../Guns/Ammunition/Cartridges/shotgun.yml     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
index fd6f2b8c3cb..3870b872a6e 100644
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/shotgun.yml
@@ -1,7 +1,7 @@
 - type: entity
   id: BaseShellShotgun
   name: shell (.50)
-  parent: [ BaseCartridge, BaseSecurityContraband ]
+  parent: BaseCartridge
   abstract: true
   components:
   - type: Tag
@@ -41,7 +41,7 @@
 - type: entity
   id: ShellShotgunSlug
   name: shell (.50 slug)
-  parent: BaseShellShotgun
+  parent: [ BaseShellShotgun, BaseSecurityContraband]
   components:
   - type: Sprite
     layers:
@@ -55,7 +55,7 @@
 - type: entity
   id: ShellShotgunFlare
   name: shell (.50 flare)
-  parent: [ BaseShellShotgun, BaseSecurityBartenderContraband ]
+  parent: BaseShellShotgun
   components:
   - type: Tag
     tags:
@@ -74,7 +74,7 @@
 - type: entity
   id: ShellShotgun
   name: shell (.50)
-  parent: BaseShellShotgun
+  parent: [ BaseShellShotgun, BaseSecurityContraband ]
   components:
   - type: Sprite
     layers:
@@ -86,7 +86,7 @@
 - type: entity
   id: ShellShotgunIncendiary
   name: shell (.50 incendiary)
-  parent: BaseShellShotgun
+  parent: [ BaseShellShotgun, BaseSecurityContraband ]
   components:
   - type: Sprite
     layers:
@@ -100,7 +100,7 @@
 - type: entity
   id: ShellShotgunPractice
   name: shell (.50 practice)
-  parent: BaseShellShotgun
+  parent: [ BaseShellShotgun, BaseSecurityContraband ]
   components:
   - type: Sprite
     layers:
@@ -114,7 +114,7 @@
 - type: entity
   id: ShellTranquilizer
   name: shell (.50 tranquilizer)
-  parent: BaseShellShotgun
+  parent: [ BaseShellShotgun, BaseSecurityContraband ]
   components:
   - type: Tag
     tags:
@@ -143,7 +143,7 @@
   id: ShellShotgunImprovised
   name: improvised shotgun shell
   description: A homemade shotgun shell that shoots painful glass shrapnel. The spread is so wide that it couldn't hit the broad side of a barn.
-  parent: BaseShellShotgun
+  parent: [ BaseShellShotgun, BaseSecurityContraband ]
   components:
   - type: Tag
     tags:
@@ -165,7 +165,7 @@
 - type: entity
   id: ShellShotgunUranium
   name: uranium shotgun shell
-  parent: BaseShellShotgun
+  parent: [ BaseShellShotgun, BaseSecurityContraband ]
   components:
     - type: Sprite
       layers:

From 8b50ac722beae97945d03dfc5c4cf7a2950ee3c4 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 20 Feb 2025 00:28:40 +0000
Subject: [PATCH 13/33] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 9d38bb29599..fb497f008ef 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: eoineoineoin
-  changes:
-  - message: Action bar can be reconfigured again
-    type: Fix
-  id: 7483
-  time: '2024-10-03T14:01:01.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32552
 - author: Southbridge
   changes:
   - message: Box station's recycler has been properly connected.
@@ -3897,3 +3890,10 @@
   id: 7982
   time: '2025-02-19T19:25:20.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/35296
+- author: FungiFellow
+  changes:
+  - message: Flare Shells no longer restricted contraband
+    type: Tweak
+  id: 7983
+  time: '2025-02-20T00:27:34.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/34705

From 3e449f755f1fa49b79a2082cc5caa7e9c9d8763e Mon Sep 17 00:00:00 2001
From: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com>
Date: Thu, 20 Feb 2025 04:12:06 +0300
Subject: [PATCH 14/33] Fix: Toys sounds (#33449)

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
---
 .../Entities/Objects/Fun/bike_horn.yml        | 61 +++++++++++-
 .../Prototypes/Entities/Objects/Fun/skub.yml  | 16 ++++
 .../Prototypes/Entities/Objects/Fun/toys.yml  | 93 +++++++++++++++++++
 3 files changed, 167 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
index 3e05c0e8ff9..288c41dc6bc 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/bike_horn.yml
@@ -14,18 +14,33 @@
     sprite: Objects/Fun/bikehorn.rsi
     slots: [Belt]
     quickEquip: false
+  - type: UseDelay
+    delay: 0.5
   - type: EmitSoundOnUse
     sound:
       collection: BikeHorn
       params:
         variation: 0.125
-  - type: UseDelay
-    delay: 0.5
+  - type: EmitSoundOnLand
+    sound:
+      collection: BikeHorn
+      params:
+        variation: 0.125
   - type: EmitSoundOnTrigger
     sound:
       collection: BikeHorn
       params:
         variation: 0.125
+  - type: EmitSoundOnActivate
+    sound:
+      collection: BikeHorn
+      params:
+        variation: 0.125
+  - type: EmitSoundOnCollide
+    sound:
+      collection: BikeHorn
+      params:
+        variation: 0.125
   - type: Tag
     tags:
     - Payload # yes, you can make re-usable prank grenades
@@ -75,7 +90,22 @@
     sound:
       collection: CluwneHorn
       params:
-        variation: 0.246
+        variation: 0.125
+  - type: EmitSoundOnActivate
+    sound:
+      collection: CluwneHorn
+      params:
+        variation: 0.125
+  - type: EmitSoundOnCollide
+    sound:
+      collection: CluwneHorn
+      params:
+        variation: 0.125
+  - type: EmitSoundOnLand
+    sound:
+      collection: CluwneHorn
+      params:
+        variation: 0.125
   - type: MeleeWeapon
     wideAnimationRotation: 135
     soundHit:
@@ -133,11 +163,36 @@
       collection: BananiumHorn
       params:
         variation: 0.246
+  - type: EmitSoundOnLand
+    sound:
+      collection: BananiumHorn
+      params:
+        variation: 0.246
   - type: EmitSoundOnTrigger
     sound:
       collection: BananiumHorn
       params:
         variation: 0.246
+  - type: EmitSoundOnActivate
+    sound:
+      collection: BananiumHorn
+      params:
+        variation: 0.246
+  - type: EmitSoundOnCollide
+    sound:
+      collection: BananiumHorn
+      params:
+        variation: 0.246
+  - type: MeleeWeapon
+    wideAnimationRotation: 135
+    soundHit:
+      collection: BananiumHorn
+      params:
+        variation: 0.246
+    damage:
+      types:
+        Blunt: 0
+    hidden: true
   - type: Construction
     graph: BananiumHorn
     node: bananiumHorn
diff --git a/Resources/Prototypes/Entities/Objects/Fun/skub.yml b/Resources/Prototypes/Entities/Objects/Fun/skub.yml
index 9d4bfe79bb0..ce73d4f3ef3 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/skub.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/skub.yml
@@ -15,8 +15,24 @@
   - type: EmitSoundOnUse
     sound:
       collection: Skub
+  - type: EmitSoundOnLand
+    sound:
+      collection: Skub
   - type: EmitSoundOnTrigger
     sound:
       collection: Skub
+  - type: EmitSoundOnActivate
+    sound:
+      collection: Skub
+  - type: EmitSoundOnCollide
+    sound:
+      collection: Skub
+  - type: MeleeWeapon
+    soundHit:
+      collection: Skub
+    damage:
+      types:
+        Blunt: 0
+    hidden: true
   - type: UseDelay
     delay: 2.0
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 585e3b31f1b..6255ce49981 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -199,6 +199,9 @@
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Items/Toys/mousesqueek.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Items/Toys/mousesqueek.ogg
   - type: Food
     requiresSpecialDigestion: true
     useSound:
@@ -285,6 +288,9 @@
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Voice/Arachnid/arachnid_laugh.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Voice/Arachnid/arachnid_laugh.ogg
   - type: Food
     requiresSpecialDigestion: true
     useSound:
@@ -317,6 +323,9 @@
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Items/Toys/weh.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Items/Toys/weh.ogg
   - type: Food
     requiresSpecialDigestion: true
     useSound:
@@ -407,6 +416,9 @@
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Items/Toys/muffled_weh.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Items/Toys/muffled_weh.ogg
   - type: Food
     requiresSpecialDigestion: true
     useSound:
@@ -514,6 +526,9 @@
     - type: EmitSoundOnTrigger
       sound:
         path: /Audio/Items/Toys/toy_rustle.ogg
+    - type: EmitSoundOnCollide
+      sound:
+        path: /Audio/Items/Toys/toy_rustle.ogg
     - type: MeleeWeapon
       wideAnimationRotation: 180
       soundHit:
@@ -587,6 +602,9 @@
   - type: EmitSoundOnActivate
     sound:
       path: /Audio/Items/Toys/rawr.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Items/Toys/rawr.ogg
   - type: MeleeWeapon
     wideAnimationRotation: 180
     soundHit:
@@ -676,6 +694,9 @@
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Effects/bite.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Effects/bite.ogg
   - type: Food
     requiresSpecialDigestion: true
     useSound:
@@ -768,9 +789,18 @@
   - type: EmitSoundOnUse
     sound:
       path: /Audio/Items/Toys/rattle.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Items/Toys/rattle.ogg
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/Items/Toys/rattle.ogg
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Items/Toys/rattle.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Items/Toys/rattle.ogg
   - type: Food
     requiresSpecialDigestion: true
     useSound:
@@ -791,9 +821,18 @@
   - type: EmitSoundOnUse
     sound:
       path: /Audio/Items/Toys/mousesqueek.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Items/Toys/mousesqueek.ogg
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/Items/Toys/mousesqueek.ogg
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Items/Toys/mousesqueek.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Items/Toys/mousesqueek.ogg
   - type: Food
     requiresSpecialDigestion: true
     useSound:
@@ -828,9 +867,18 @@
   - type: EmitSoundOnUse
     sound:
       path: /Audio/Items/Toys/quack.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Items/Toys/quack.ogg
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/Items/Toys/quack.ogg
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Items/Toys/quack.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Items/Toys/quack.ogg
   - type: Food
     requiresSpecialDigestion: true
     useSound:
@@ -853,9 +901,15 @@
   - type: EmitSoundOnLand
     sound:
       path: /Audio/Voice/Vox/shriek1.ogg
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/Voice/Vox/shriek1.ogg
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Voice/Vox/shriek1.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Voice/Vox/shriek1.ogg
   - type: Food
     requiresSpecialDigestion: true
     useSound:
@@ -896,6 +950,9 @@
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Weapons/Xeno/alien_spitacid.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Weapons/Xeno/alien_spitacid.ogg
   - type: Food
     requiresSpecialDigestion: true
     useSound:
@@ -930,6 +987,9 @@
   - type: EmitSoundOnActivate
     sound:
       path: /Audio/Voice/Human/malescream_3.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Voice/Human/malescream_4.ogg
   - type: Food
     requiresSpecialDigestion: true
     useSound:
@@ -961,6 +1021,9 @@
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Voice/Moth/moth_chitter.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Voice/Moth/moth_chitter.ogg
   - type: MeleeWeapon
     soundHit:
       path: /Audio/Voice/Moth/moth_chitter.ogg
@@ -1043,9 +1106,18 @@
   - type: EmitSoundOnUse
     sound:
       path: /Audio/Items/Toys/ian.ogg
+  - type: EmitSoundOnLand
+    sound:
+      path: /Audio/Items/Toys/ian.ogg
+  - type: EmitSoundOnActivate
+    sound:
+      path: /Audio/Items/Toys/ian.ogg
   - type: EmitSoundOnTrigger
     sound:
       path: /Audio/Items/Toys/ian.ogg
+  - type: EmitSoundOnCollide
+    sound:
+      path: /Audio/Items/Toys/ian.ogg
   - type: MeleeWeapon
     soundHit:
       path: /Audio/Items/Toys/ian.ogg
@@ -1508,12 +1580,18 @@
   - type: EmitSoundOnUse
     sound:
       collection: ClownRecorder
+  - type: EmitSoundOnLand
+    sound:
+      collection: ClownRecorder
   - type: EmitSoundOnActivate
     sound:
       collection: ClownRecorder
   - type: EmitSoundOnTrigger
     sound:
       collection: ClownRecorder
+  - type: EmitSoundOnCollide
+    sound:
+      collection: ClownRecorder
   - type: UseDelay
     delay: 30.0
   - type: Tag
@@ -1575,6 +1653,21 @@
       collection: Parp
       params:
         variation: 0.125
+  - type: EmitSoundOnLand
+    sound:
+      collection: Parp
+      params:
+        variation: 0.125
+  - type: EmitSoundOnActivate
+    sound:
+      collection: Parp
+      params:
+        variation: 0.125
+  - type: EmitSoundOnCollide
+    sound:
+      collection: Parp
+      params:
+        variation: 0.125
   - type: UseDelay
     delay: 0.8
   - type: Slippery

From 112d7c320f105cca1f863c55f45a00ab5d580dc3 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 20 Feb 2025 01:13:13 +0000
Subject: [PATCH 15/33] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index fb497f008ef..07e52473a03 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,16 +1,4 @@
 Entries:
-- author: Southbridge
-  changes:
-  - message: Box station's recycler has been properly connected.
-    type: Fix
-  - message: Box station's singlo substation has been rewired to the station-wide
-      HV network.
-    type: Tweak
-  - message: Box station now has AI law boards in the upload room.
-    type: Add
-  id: 7484
-  time: '2024-10-04T01:12:59.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32608
 - author: Plykiya
   changes:
   - message: You can no longer FTL the station.
@@ -3897,3 +3885,10 @@
   id: 7983
   time: '2025-02-20T00:27:34.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/34705
+- author: Winkarst-cpu
+  changes:
+  - message: Now all toys and bike horns make an appropriate sound.
+    type: Tweak
+  id: 7984
+  time: '2025-02-20T01:12:07.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33449

From 1079da46006661c37b72fcafd436ec319b50cbf8 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Thu, 20 Feb 2025 14:32:45 +1100
Subject: [PATCH 16/33] Update engine to v247.1.0 (#35324)

---
 RobustToolbox | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RobustToolbox b/RobustToolbox
index 8f75560ec4a..7104a4f4594 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit 8f75560ec4a2173842f132ff43f690a6ff77f1ad
+Subproject commit 7104a4f4594149f5c09aeefc34275b1cbac4e297

From 3ce81d35be92273a71d638d3cbc621a5d58d35c2 Mon Sep 17 00:00:00 2001
From: Sigil <84070966+Siigiil@users.noreply.github.com>
Date: Thu, 20 Feb 2025 14:52:28 +0700
Subject: [PATCH 17/33] Added a component that lets ranged weapons make melee
 attacks. (#29484)

---
 .../Weapons/Melee/MeleeWeaponSystem.cs        | 96 +++++++++++--------
 .../Melee/Components/AltFireMeleeComponent.cs | 22 +++++
 2 files changed, 78 insertions(+), 40 deletions(-)
 create mode 100644 Content.Shared/Weapons/Melee/Components/AltFireMeleeComponent.cs

diff --git a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
index dc865803699..c4fef410c4b 100644
--- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
@@ -6,6 +6,7 @@
 using Content.Shared.Mobs.Components;
 using Content.Shared.StatusEffect;
 using Content.Shared.Weapons.Melee;
+using Content.Shared.Weapons.Melee.Components;
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.Weapons.Ranged.Components;
 using Robust.Client.GameObjects;
@@ -89,16 +90,6 @@ public override void Update(float frameTime)
 
         // TODO using targeted actions while combat mode is enabled should NOT trigger attacks.
 
-        // TODO: Need to make alt-fire melee its own component I guess?
-        // Melee and guns share a lot in the middle but share virtually nothing at the start and end so
-        // it's kinda tricky.
-        // I think as long as we make secondaries their own component it's probably fine
-        // as long as guncomp has an alt-use key then it shouldn't be too much of a PITA to deal with.
-        if (TryComp<GunComponent>(weaponUid, out var gun) && gun.UseKey)
-        {
-            return;
-        }
-
         var mousePos = _eyeManager.PixelToMap(_inputManager.MouseScreenPosition);
 
         if (mousePos.MapId == MapId.Nullspace)
@@ -116,6 +107,30 @@ public override void Update(float frameTime)
         {
             coordinates = TransformSystem.ToCoordinates(_map.GetMap(mousePos.MapId), mousePos);
         }
+        
+        // If the gun has AltFireComponent, it can be used to attack.
+        if (TryComp<GunComponent>(weaponUid, out var gun) && gun.UseKey)
+        {
+            if (!TryComp<AltFireMeleeComponent>(weaponUid, out var altFireComponent) || altDown != BoundKeyState.Down)
+                return;
+            
+            switch(altFireComponent.AttackType)
+            {
+                case AltFireAttackType.Light:
+                    ClientLightAttack(entity, mousePos, coordinates, weaponUid, weapon);
+                    break;
+                
+                case AltFireAttackType.Heavy:
+                    ClientHeavyAttack(entity, coordinates, weaponUid, weapon);
+                    break;
+                
+                case AltFireAttackType.Disarm:
+                    ClientDisarm(entity, mousePos, coordinates);
+                    break;
+            }
+            
+            return;
+        }
 
         // Heavy attack.
         if (altDown == BoundKeyState.Down)
@@ -123,14 +138,7 @@ public override void Update(float frameTime)
             // If it's an unarmed attack then do a disarm
             if (weapon.AltDisarm && weaponUid == entity)
             {
-                EntityUid? target = null;
-
-                if (_stateManager.CurrentState is GameplayStateBase screen)
-                {
-                    target = screen.GetClickedEntity(mousePos);
-                }
-
-                EntityManager.RaisePredictiveEvent(new DisarmAttackEvent(GetNetEntity(target), GetNetCoordinates(coordinates)));
+                ClientDisarm(entity, mousePos, coordinates);
                 return;
             }
 
@@ -140,28 +148,7 @@ public override void Update(float frameTime)
 
         // Light attack
         if (useDown == BoundKeyState.Down)
-        {
-            var attackerPos = TransformSystem.GetMapCoordinates(entity);
-
-            if (mousePos.MapId != attackerPos.MapId ||
-                (attackerPos.Position - mousePos.Position).Length() > weapon.Range)
-            {
-                return;
-            }
-
-            EntityUid? target = null;
-
-            if (_stateManager.CurrentState is GameplayStateBase screen)
-            {
-                target = screen.GetClickedEntity(mousePos);
-            }
-
-            // Don't light-attack if interaction will be handling this instead
-            if (Interaction.CombatModeCanHandInteract(entity, target))
-                return;
-
-            RaisePredictiveEvent(new LightAttackEvent(GetNetEntity(target), GetNetEntity(weaponUid), GetNetCoordinates(coordinates)));
-        }
+            ClientLightAttack(entity, mousePos, coordinates, weaponUid, weapon);
     }
 
     protected override bool InRange(EntityUid user, EntityUid target, float range, ICommonSession? session)
@@ -235,6 +222,35 @@ private void ClientHeavyAttack(EntityUid user, EntityCoordinates coordinates, En
         var entities = GetNetEntityList(ArcRayCast(userPos, direction.ToWorldAngle(), component.Angle, distance, userXform.MapID, user).ToList());
         RaisePredictiveEvent(new HeavyAttackEvent(GetNetEntity(meleeUid), entities.GetRange(0, Math.Min(MaxTargets, entities.Count)), GetNetCoordinates(coordinates)));
     }
+    
+    private void ClientDisarm(EntityUid attacker, MapCoordinates mousePos, EntityCoordinates coordinates)
+    {
+        EntityUid? target = null;
+
+        if (_stateManager.CurrentState is GameplayStateBase screen)
+            target = screen.GetClickedEntity(mousePos);
+
+        RaisePredictiveEvent(new DisarmAttackEvent(GetNetEntity(target), GetNetCoordinates(coordinates)));
+    }
+    
+    private void ClientLightAttack(EntityUid attacker, MapCoordinates mousePos, EntityCoordinates coordinates, EntityUid weaponUid, MeleeWeaponComponent meleeComponent)
+    {
+        var attackerPos = TransformSystem.GetMapCoordinates(attacker);
+
+        if (mousePos.MapId != attackerPos.MapId || (attackerPos.Position - mousePos.Position).Length() > meleeComponent.Range)
+            return;
+
+        EntityUid? target = null;
+
+        if (_stateManager.CurrentState is GameplayStateBase screen)
+            target = screen.GetClickedEntity(mousePos);
+
+        // Don't light-attack if interaction will be handling this instead
+        if (Interaction.CombatModeCanHandInteract(attacker, target))
+            return;
+
+        RaisePredictiveEvent(new LightAttackEvent(GetNetEntity(target), GetNetEntity(weaponUid), GetNetCoordinates(coordinates)));
+    }
 
     private void OnMeleeLunge(MeleeLungeEvent ev)
     {
diff --git a/Content.Shared/Weapons/Melee/Components/AltFireMeleeComponent.cs b/Content.Shared/Weapons/Melee/Components/AltFireMeleeComponent.cs
new file mode 100644
index 00000000000..998d8f63f48
--- /dev/null
+++ b/Content.Shared/Weapons/Melee/Components/AltFireMeleeComponent.cs
@@ -0,0 +1,22 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Weapons.Melee.Components;
+
+/// <summary>
+/// This is used to allow ranged weapons to make melee attacks by right-clicking.
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(SharedMeleeWeaponSystem))]
+public sealed partial class AltFireMeleeComponent : Component
+{
+    [DataField, AutoNetworkedField]
+    public AltFireAttackType AttackType = AltFireAttackType.Light;
+}
+
+
+[Flags]
+public enum AltFireAttackType : byte
+{
+    Light = 0, // Standard single-target attack.
+    Heavy = 1 << 0, // Wide swing.
+    Disarm = 1 << 1
+}

From 7e6e237277f49992cd889265f810052170e8ad07 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Mon, 17 Feb 2025 19:24:34 +1100
Subject: [PATCH 18/33] General storage fixes (#34845)

* Fix storage stars

* Fix some more storage bugs

- Fix positions not saving.
- Fix the 1-tick delay between parent and child storage UIs opening / closing.
- Fix BackButton being visible sometimes when it shouldn't be.

* milon is a furry
---
 Content.Client/PDA/PdaBoundUserInterface.cs   |  3 +-
 .../Storage/StorageBoundUserInterface.cs      | 27 +++++++++-
 .../Storage/Systems/StorageSystem.cs          | 34 +++++++++++--
 .../Systems/Storage/Controls/StorageWindow.cs | 51 +++++++++++++++----
 .../Systems/Storage/StorageUIController.cs    | 22 +++++++-
 .../EntitySystems/SharedStorageSystem.cs      | 43 +++++++++-------
 6 files changed, 143 insertions(+), 37 deletions(-)

diff --git a/Content.Client/PDA/PdaBoundUserInterface.cs b/Content.Client/PDA/PdaBoundUserInterface.cs
index 2d4033390c3..2f7ebc37f73 100644
--- a/Content.Client/PDA/PdaBoundUserInterface.cs
+++ b/Content.Client/PDA/PdaBoundUserInterface.cs
@@ -30,8 +30,7 @@ protected override void Open()
 
         private void CreateMenu()
         {
-            _menu = this.CreateWindow<PdaMenu>();
-            _menu.OpenCenteredLeft();
+            _menu = this.CreateWindowCenteredLeft<PdaMenu>();
 
             _menu.FlashLightToggleButton.OnToggled += _ =>
             {
diff --git a/Content.Client/Storage/StorageBoundUserInterface.cs b/Content.Client/Storage/StorageBoundUserInterface.cs
index bacc90eabff..16545c35784 100644
--- a/Content.Client/Storage/StorageBoundUserInterface.cs
+++ b/Content.Client/Storage/StorageBoundUserInterface.cs
@@ -1,8 +1,10 @@
+using System.Numerics;
 using Content.Client.UserInterface.Systems.Storage;
 using Content.Client.UserInterface.Systems.Storage.Controls;
 using Content.Shared.Storage;
 using JetBrains.Annotations;
 using Robust.Client.UserInterface;
+using Robust.Client.UserInterface.Controls;
 
 namespace Content.Client.Storage;
 
@@ -11,6 +13,8 @@ public sealed class StorageBoundUserInterface : BoundUserInterface
 {
     private StorageWindow? _window;
 
+    public Vector2? Position => _window?.Position;
+
     public StorageBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
     {
     }
@@ -21,7 +25,7 @@ protected override void Open()
 
         _window = IoCManager.Resolve<IUserInterfaceManager>()
             .GetUIController<StorageUIController>()
-            .CreateStorageWindow(Owner);
+            .CreateStorageWindow(this);
 
         if (EntMan.TryGetComponent(Owner, out StorageComponent? storage))
         {
@@ -50,10 +54,20 @@ public void Reclaim()
     protected override void Dispose(bool disposing)
     {
         base.Dispose(disposing);
-
         Reclaim();
     }
 
+    public void CloseWindow(Vector2 position)
+    {
+        if (_window == null)
+            return;
+
+        // Update its position before potentially saving.
+        // Listen it makes sense okay.
+        LayoutContainer.SetPosition(_window, position);
+        _window?.Close();
+    }
+
     public void Hide()
     {
         if (_window == null)
@@ -70,6 +84,15 @@ public void Show()
         _window.Visible = true;
     }
 
+    public void Show(Vector2 position)
+    {
+        if (_window == null)
+            return;
+
+        Show();
+        LayoutContainer.SetPosition(_window, position);
+    }
+
     public void ReOpen()
     {
         _window?.Orphan();
diff --git a/Content.Client/Storage/Systems/StorageSystem.cs b/Content.Client/Storage/Systems/StorageSystem.cs
index 70e02c46939..8eab2d82495 100644
--- a/Content.Client/Storage/Systems/StorageSystem.cs
+++ b/Content.Client/Storage/Systems/StorageSystem.cs
@@ -19,6 +19,8 @@ public sealed class StorageSystem : SharedStorageSystem
 
     private Dictionary<EntityUid, ItemStorageLocation> _oldStoredItems = new();
 
+    private List<(StorageBoundUserInterface Bui, bool Value)> _queuedBuis = new();
+
     public override void Initialize()
     {
         base.Initialize();
@@ -72,7 +74,7 @@ private void OnStorageHandleState(EntityUid uid, StorageComponent component, ref
             if (NestedStorage && player != null && ContainerSystem.TryGetContainingContainer((uid, null, null), out var container) &&
                 UI.TryGetOpenUi<StorageBoundUserInterface>(container.Owner, StorageComponent.StorageUiKey.Key, out var containerBui))
             {
-                containerBui.Hide();
+                _queuedBuis.Add((containerBui, false));
             }
         }
     }
@@ -89,7 +91,7 @@ protected override void HideStorageWindow(EntityUid uid, EntityUid actor)
     {
         if (UI.TryGetOpenUi<StorageBoundUserInterface>(uid, StorageComponent.StorageUiKey.Key, out var storageBui))
         {
-            storageBui.Hide();
+            _queuedBuis.Add((storageBui, false));
         }
     }
 
@@ -97,7 +99,7 @@ protected override void ShowStorageWindow(EntityUid uid, EntityUid actor)
     {
         if (UI.TryGetOpenUi<StorageBoundUserInterface>(uid, StorageComponent.StorageUiKey.Key, out var storageBui))
         {
-            storageBui.Show();
+            _queuedBuis.Add((storageBui, true));
         }
     }
 
@@ -152,4 +154,30 @@ public void HandleAnimatingInsertingEntities(AnimateInsertingEntitiesEvent msg)
             }
         }
     }
+
+    public override void Update(float frameTime)
+    {
+        base.Update(frameTime);
+
+        if (!_timing.IsFirstTimePredicted)
+        {
+            return;
+        }
+
+        // This update loop exists just to synchronize with UISystem and avoid 1-tick delays.
+        // If deferred opens / closes ever get removed you can dump this.
+        foreach (var (bui, open) in _queuedBuis)
+        {
+            if (open)
+            {
+                bui.Show();
+            }
+            else
+            {
+                bui.Hide();
+            }
+        }
+
+        _queuedBuis.Clear();
+    }
 }
diff --git a/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs b/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs
index 88b4c06d72c..a4afebc217b 100644
--- a/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs
+++ b/Content.Client/UserInterface/Systems/Storage/Controls/StorageWindow.cs
@@ -9,6 +9,7 @@
 using Content.Shared.Input;
 using Content.Shared.Item;
 using Content.Shared.Storage;
+using Robust.Client.GameObjects;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
@@ -190,6 +191,26 @@ public void UpdateContainer(Entity<StorageComponent>? entity)
         BuildGridRepresentation();
     }
 
+    private void CloseParent()
+    {
+        if (StorageEntity == null)
+            return;
+
+        var containerSystem = _entity.System<SharedContainerSystem>();
+        var uiSystem = _entity.System<UserInterfaceSystem>();
+
+        if (containerSystem.TryGetContainingContainer(StorageEntity.Value, out var container) &&
+            _entity.TryGetComponent(container.Owner, out StorageComponent? storage) &&
+            storage.Container.Contains(StorageEntity.Value) &&
+            uiSystem
+                .TryGetOpenUi<StorageBoundUserInterface>(container.Owner,
+                    StorageComponent.StorageUiKey.Key,
+                    out var parentBui))
+        {
+            parentBui.CloseWindow(Position);
+        }
+    }
+
     private void BuildGridRepresentation()
     {
         if (!_entity.TryGetComponent<StorageComponent>(StorageEntity, out var comp) || comp.Grid.Count == 0)
@@ -212,7 +233,9 @@ private void BuildGridRepresentation()
         };
         exitButton.OnPressed += _ =>
         {
+            // Close ourselves and all parent BUIs.
             Close();
+            CloseParent();
         };
         exitButton.OnKeyBindDown += args =>
         {
@@ -220,6 +243,7 @@ private void BuildGridRepresentation()
             if (!args.Handled && args.Function == ContentKeyFunctions.ActivateItemInWorld)
             {
                 Close();
+                CloseParent();
                 args.Handle();
             }
         };
@@ -258,7 +282,8 @@ private void BuildGridRepresentation()
                 var containerSystem = _entity.System<SharedContainerSystem>();
 
                 if (containerSystem.TryGetContainingContainer(StorageEntity.Value, out var container) &&
-                    _entity.TryGetComponent(container.Owner, out StorageComponent? storage))
+                    _entity.TryGetComponent(container.Owner, out StorageComponent? storage) &&
+                    storage.Container.Contains(StorageEntity.Value))
                 {
                     Close();
 
@@ -267,7 +292,7 @@ private void BuildGridRepresentation()
                             StorageComponent.StorageUiKey.Key,
                             out var parentBui))
                     {
-                        parentBui.Show();
+                        parentBui.Show(Position);
                     }
                 }
             };
@@ -412,6 +437,8 @@ public void BuildItemPieces()
         {
             if (storageComp.StoredItems.TryGetValue(ent, out var updated))
             {
+                data.Control.Marked = IsMarked(ent);
+
                 if (data.Loc.Equals(updated))
                 {
                     DebugTools.Assert(data.Control.Location == updated);
@@ -450,12 +477,7 @@ public void BuildItemPieces()
                 var gridPiece = new ItemGridPiece((ent, itemEntComponent), loc, _entity)
                 {
                     MinSize = size,
-                    Marked = _contained.IndexOf(ent) switch
-                    {
-                        0 => ItemGridPieceMarks.First,
-                        1 => ItemGridPieceMarks.Second,
-                        _ => null,
-                    }
+                    Marked = IsMarked(ent),
                 };
                 gridPiece.OnPiecePressed += OnPiecePressed;
                 gridPiece.OnPieceUnpressed += OnPieceUnpressed;
@@ -467,6 +489,16 @@ public void BuildItemPieces()
         }
     }
 
+    private ItemGridPieceMarks? IsMarked(EntityUid uid)
+    {
+        return _contained.IndexOf(uid) switch
+        {
+            0 => ItemGridPieceMarks.First,
+            1 => ItemGridPieceMarks.Second,
+            _ => null,
+        };
+    }
+
     protected override void FrameUpdate(FrameEventArgs args)
     {
         base.FrameUpdate(args);
@@ -486,8 +518,9 @@ protected override void FrameUpdate(FrameEventArgs args)
         {
             if (StorageEntity != null && _entity.System<StorageSystem>().NestedStorage)
             {
+                // If parent container nests us then show back button
                 if (containerSystem.TryGetContainingContainer(StorageEntity.Value, out var container) &&
-                    _entity.HasComponent<StorageComponent>(container.Owner))
+                    _entity.TryGetComponent(container.Owner, out StorageComponent? storageComp) && storageComp.Container.Contains(StorageEntity.Value))
                 {
                     _backButton.Visible = true;
                 }
diff --git a/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs b/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
index 5c3f0479827..dbb16ab24ac 100644
--- a/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
+++ b/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
@@ -11,6 +11,7 @@
 using Content.Shared.Input;
 using Content.Shared.Interaction;
 using Content.Shared.Storage;
+using Robust.Client.GameObjects;
 using Robust.Client.Input;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;
@@ -37,6 +38,7 @@ public sealed class StorageUIController : UIController, IOnSystemChanged<Storage
     [Dependency] private readonly IInputManager _input = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
     [UISystemDependency] private readonly StorageSystem _storage = default!;
+    [UISystemDependency] private readonly UserInterfaceSystem _ui = default!;
 
     private readonly DragDropHelper<ItemGridPiece> _menuDragHelper;
 
@@ -107,7 +109,7 @@ private void OnStaticStorageChanged(bool obj)
         StaticStorageUIEnabled = obj;
     }
 
-    public StorageWindow CreateStorageWindow(EntityUid uid)
+    public StorageWindow CreateStorageWindow(StorageBoundUserInterface sBui)
     {
         var window = new StorageWindow();
         window.MouseFilter = Control.MouseFilterMode.Pass;
@@ -127,9 +129,25 @@ public StorageWindow CreateStorageWindow(EntityUid uid)
         }
         else
         {
-            window.OpenCenteredLeft();
+            // Open at parent position if it's open.
+            if (_ui.TryGetOpenUi<StorageBoundUserInterface>(EntityManager.GetComponent<TransformComponent>(sBui.Owner).ParentUid,
+                    StorageComponent.StorageUiKey.Key, out var bui) && bui.Position != null)
+            {
+                window.Open(bui.Position.Value);
+            }
+            // Open at the saved position if it exists.
+            else if (_ui.TryGetPosition(sBui.Owner, StorageComponent.StorageUiKey.Key, out var pos))
+            {
+                window.Open(pos);
+            }
+            // Open at the default position.
+            else
+            {
+                window.OpenCenteredLeft();
+            }
         }
 
+        _ui.RegisterControl(sBui, window);
         return window;
     }
 
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index 7bf6d74c60b..b6228ae779b 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -318,11 +318,33 @@ private void AddUiVerb(EntityUid uid, StorageComponent component, GetVerbsEvent<
         args.Verbs.Add(verb);
     }
 
+    public void OpenStorageUI(EntityUid uid, EntityUid actor, StorageComponent? storageComp = null, bool silent = true)
+    {
+        // Handle recursively opening nested storages.
+        if (ContainerSystem.TryGetContainingContainer(uid, out var container) &&
+            UI.IsUiOpen(container.Owner, StorageComponent.StorageUiKey.Key, actor))
+        {
+            _nestedCheck = true;
+            HideStorageWindow(container.Owner, actor);
+            OpenStorageUIInternal(uid, actor, storageComp, silent: true);
+            _nestedCheck = false;
+        }
+        else
+        {
+            // If you need something more sophisticated for multi-UI you'll need to code some smarter
+            // interactions.
+            if (_openStorageLimit == 1)
+                UI.CloseUserUis<StorageComponent.StorageUiKey>(actor);
+
+            OpenStorageUIInternal(uid, actor, storageComp, silent: silent);
+        }
+    }
+
     /// <summary>
     ///     Opens the storage UI for an entity
     /// </summary>
     /// <param name="entity">The entity to open the UI for</param>
-    public void OpenStorageUI(EntityUid uid, EntityUid entity, StorageComponent? storageComp = null, bool silent = true)
+    private void OpenStorageUIInternal(EntityUid uid, EntityUid entity, StorageComponent? storageComp = null, bool silent = true)
     {
         if (!Resolve(uid, ref storageComp, false))
             return;
@@ -407,24 +429,7 @@ private void OnActivate(EntityUid uid, StorageComponent storageComp, ActivateInW
         }
         else
         {
-            // Handle recursively opening nested storages.
-            if (ContainerSystem.TryGetContainingContainer((args.Target, null, null), out var container) &&
-                UI.IsUiOpen(container.Owner, StorageComponent.StorageUiKey.Key, args.User))
-            {
-                _nestedCheck = true;
-                HideStorageWindow(container.Owner, args.User);
-                OpenStorageUI(uid, args.User, storageComp, silent: true);
-                _nestedCheck = false;
-            }
-            else
-            {
-                // If you need something more sophisticated for multi-UI you'll need to code some smarter
-                // interactions.
-                if (_openStorageLimit == 1)
-                    UI.CloseUserUis<StorageComponent.StorageUiKey>(args.User);
-
-                OpenStorageUI(uid, args.User, storageComp, silent: false);
-            }
+            OpenStorageUI(uid, args.User, storageComp);
         }
 
         args.Handled = true;

From 5e0a1d8581fda1d6c10bfe4a1e26066b538dd965 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Thu, 20 Feb 2025 22:19:26 +1100
Subject: [PATCH 19/33] Fix missing errorOnMissing arg being passed thru
 (#35328)

---
 .../Chemistry/EntitySystems/SharedSolutionContainerSystem.cs    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
index 9e5e24b3e48..99d1459340c 100644
--- a/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
+++ b/Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
@@ -145,7 +145,7 @@ public bool TryGetSolution(
         [NotNullWhen(true)] out Solution? solution,
         bool errorOnMissing = false)
     {
-        if (!TryGetSolution(container, name, out entity))
+        if (!TryGetSolution(container, name, out entity, errorOnMissing: errorOnMissing))
         {
             solution = null;
             return false;

From c8dce26dbbb8af7a431bb31ebe6f29d1b3aa6a24 Mon Sep 17 00:00:00 2001
From: Kyle Tyo <36606155+VerinSenpai@users.noreply.github.com>
Date: Thu, 20 Feb 2025 07:03:42 -0500
Subject: [PATCH 20/33] Replace obsolete FromMap calls with ToCoordinates
 (#35304)

---
 Content.Client/Gameplay/GameplayStateBase.cs           |  8 +++++---
 Content.Client/Weapons/Misc/TetherGunSystem.cs         |  5 +++--
 .../Administration/Systems/AdminVerbSystem.Smites.cs   |  2 +-
 .../Explosion/EntitySystems/ExplosionSystem.cs         |  4 +++-
 Content.Shared/Coordinates/Helpers/SnapgridHelper.cs   |  4 ++--
 .../Hands/EntitySystems/SharedHandsSystem.Pickup.cs    |  2 +-
 .../Storage/EntitySystems/MagnetPickupSystem.cs        |  2 +-
 .../Storage/EntitySystems/SharedStorageSystem.cs       | 10 ++++------
 8 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/Content.Client/Gameplay/GameplayStateBase.cs b/Content.Client/Gameplay/GameplayStateBase.cs
index 1e6fd485b38..162c45d4125 100644
--- a/Content.Client/Gameplay/GameplayStateBase.cs
+++ b/Content.Client/Gameplay/GameplayStateBase.cs
@@ -219,10 +219,12 @@ protected virtual void OnKeyBindStateChanged(ViewportBoundKeyEventArgs args)
                 {
                     entityToClick = GetClickedEntity(mousePosWorld);
                 }
+                var transformSystem = _entitySystemManager.GetEntitySystem<SharedTransformSystem>();
+                var mapSystem = _entitySystemManager.GetEntitySystem<MapSystem>();
 
-                coordinates = _mapManager.TryFindGridAt(mousePosWorld, out _, out var grid) ?
-                    grid.MapToGrid(mousePosWorld) :
-                    EntityCoordinates.FromMap(_mapManager, mousePosWorld);
+                coordinates = _mapManager.TryFindGridAt(mousePosWorld, out var uid, out _) ?
+                    mapSystem.MapToGrid(uid, mousePosWorld) :
+                    transformSystem.ToCoordinates(mousePosWorld);
             }
             else
             {
diff --git a/Content.Client/Weapons/Misc/TetherGunSystem.cs b/Content.Client/Weapons/Misc/TetherGunSystem.cs
index 398aeabb839..3471fcc1fc4 100644
--- a/Content.Client/Weapons/Misc/TetherGunSystem.cs
+++ b/Content.Client/Weapons/Misc/TetherGunSystem.cs
@@ -16,6 +16,7 @@ public sealed class TetherGunSystem : SharedTetherGunSystem
     [Dependency] private readonly IMapManager _mapManager = default!;
     [Dependency] private readonly IOverlayManager _overlay = default!;
     [Dependency] private readonly IPlayerManager _player = default!;
+    [Dependency] private readonly MapSystem _mapSystem = default!;
 
     public override void Initialize()
     {
@@ -73,11 +74,11 @@ public override void Update(float frameTime)
 
         if (_mapManager.TryFindGridAt(mouseWorldPos, out var gridUid, out _))
         {
-            coords = EntityCoordinates.FromMap(gridUid, mouseWorldPos, TransformSystem);
+            coords = TransformSystem.ToCoordinates(gridUid, mouseWorldPos);
         }
         else
         {
-            coords = EntityCoordinates.FromMap(_mapManager.GetMapEntityId(mouseWorldPos.MapId), mouseWorldPos, TransformSystem);
+            coords = TransformSystem.ToCoordinates(_mapSystem.GetMap(mouseWorldPos.MapId), mouseWorldPos);
         }
 
         const float BufferDistance = 0.1f;
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
index 08e86ff400d..ed46412a084 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
@@ -136,7 +136,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
                     Filter.PvsExcept(args.Target), true, PopupType.MediumCaution);
                 var board = Spawn("ChessBoard", xform.Coordinates);
                 var session = _tabletopSystem.EnsureSession(Comp<TabletopGameComponent>(board));
-                xform.Coordinates = EntityCoordinates.FromMap(_mapManager, session.Position);
+                xform.Coordinates = _transformSystem.ToCoordinates(session.Position);
                 _transformSystem.SetWorldRotationNoLerp((args.Target, xform), Angle.Zero);
             },
             Impact = LogImpact.Extreme,
diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
index beffbd6d68e..57759fedfe9 100644
--- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs
@@ -16,6 +16,7 @@
 using Content.Shared.Inventory;
 using Content.Shared.Projectiles;
 using Content.Shared.Throwing;
+using Robust.Server.GameObjects;
 using Robust.Server.GameStates;
 using Robust.Server.Player;
 using Robust.Shared.Audio.Systems;
@@ -38,6 +39,7 @@ public sealed partial class ExplosionSystem : SharedExplosionSystem
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly IPlayerManager _playerManager = default!;
 
+    [Dependency] private readonly MapSystem _mapSystem = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly DamageableSystem _damageableSystem = default!;
     [Dependency] private readonly NodeGroupSystem _nodeGroupSystem = default!;
@@ -345,7 +347,7 @@ public void QueueExplosion(MapCoordinates epicenter,
         CameraShake(iterationIntensity.Count * 4f, pos, queued.TotalIntensity);
 
         //For whatever bloody reason, sound system requires ENTITY coordinates.
-        var mapEntityCoords = EntityCoordinates.FromMap(_mapManager.GetMapEntityId(pos.MapId), pos, _transformSystem, EntityManager);
+        var mapEntityCoords = _transformSystem.ToCoordinates(_mapSystem.GetMap(pos.MapId), pos);
 
         // play sound.
         // for the normal audio, we want everyone in pvs range
diff --git a/Content.Shared/Coordinates/Helpers/SnapgridHelper.cs b/Content.Shared/Coordinates/Helpers/SnapgridHelper.cs
index db9ee85a0cd..264b647afba 100644
--- a/Content.Shared/Coordinates/Helpers/SnapgridHelper.cs
+++ b/Content.Shared/Coordinates/Helpers/SnapgridHelper.cs
@@ -15,11 +15,11 @@ public static EntityCoordinates SnapToGrid(this EntityCoordinates coordinates, I
             if (gridId == null)
             {
                 var xformSys = entMan.System<SharedTransformSystem>();
-                var mapPos = coordinates.ToMap(entMan, xformSys);
+                var mapPos = xformSys.ToMapCoordinates(coordinates);
                 var mapX = (int)Math.Floor(mapPos.X) + 0.5f;
                 var mapY = (int)Math.Floor(mapPos.Y) + 0.5f;
                 mapPos = new MapCoordinates(new Vector2(mapX, mapY), mapPos.MapId);
-                return EntityCoordinates.FromMap(coordinates.EntityId, mapPos, xformSys);
+                return xformSys.ToCoordinates(coordinates.EntityId, mapPos);
             }
 
             var grid = entMan.GetComponent<MapGridComponent>(gridId.Value);
diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
index 101d206acd8..0fbf87f5af4 100644
--- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
+++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
@@ -115,7 +115,7 @@ public bool TryPickup(
                 && (itemPos.Position - TransformSystem.GetMapCoordinates(uid, xform: xform).Position).Length() <= MaxAnimationRange
                 && MetaData(entity).VisibilityMask == MetaData(uid).VisibilityMask) // Don't animate aghost pickups.
             {
-                var initialPosition = EntityCoordinates.FromMap(coordinateEntity, itemPos, TransformSystem, EntityManager);
+                var initialPosition = TransformSystem.ToCoordinates(coordinateEntity, itemPos);
                 _storage.PlayPickupAnimation(entity, initialPosition, xform.Coordinates, itemXform.LocalRotation, uid);
             }
         }
diff --git a/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs b/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
index 7a8961485d6..c1fc856ff39 100644
--- a/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/MagnetPickupSystem.cs
@@ -81,7 +81,7 @@ public override void Update(float frameTime)
                 // game state handling we can't show a lerp animation for it.
                 var nearXform = Transform(near);
                 var nearMap = _transform.GetMapCoordinates(near, xform: nearXform);
-                var nearCoords = EntityCoordinates.FromMap(moverCoords.EntityId, nearMap, _transform, EntityManager);
+                var nearCoords = _transform.ToCoordinates(moverCoords.EntityId, nearMap);
 
                 if (!_storage.Insert(uid, near, out var stacked, storageComp: storage, playSound: !playedSound))
                     continue;
diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
index b6228ae779b..51ee89c10b4 100644
--- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
+++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
@@ -532,10 +532,9 @@ private void AfterInteract(EntityUid uid, StorageComponent storageComp, AfterInt
             {
                 var parent = transformOwner.ParentUid;
 
-                var position = EntityCoordinates.FromMap(
+                var position = TransformSystem.ToCoordinates(
                     parent.IsValid() ? parent : uid,
-                    TransformSystem.GetMapCoordinates(transformEnt),
-                    TransformSystem
+                    TransformSystem.GetMapCoordinates(transformEnt)
                 );
 
                 args.Handled = true;
@@ -585,10 +584,9 @@ private void OnDoAfter(EntityUid uid, StorageComponent component, AreaPickupDoAf
                 continue;
             }
 
-            var position = EntityCoordinates.FromMap(
+            var position = TransformSystem.ToCoordinates(
                 xform.ParentUid.IsValid() ? xform.ParentUid : uid,
-                new MapCoordinates(TransformSystem.GetWorldPosition(targetXform), targetXform.MapID),
-                TransformSystem
+                new MapCoordinates(TransformSystem.GetWorldPosition(targetXform), targetXform.MapID)
             );
 
             var angle = targetXform.LocalRotation;

From a4001fba1b3071f1b26d24d136cf70f8b93cb850 Mon Sep 17 00:00:00 2001
From: TemporalOroboros <TemporalOroboros@gmail.com>
Date: Thu, 20 Feb 2025 04:06:39 -0800
Subject: [PATCH 21/33] Purge uses of TransformComponent.Anchored.set. Also
 adds parentheses. (#34938)

---
 Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs | 4 ++--
 .../Administration/Systems/AdminVerbSystem.Smites.cs        | 4 ++--
 .../Atmos/EntitySystems/PipeRestrictOverlapSystem.cs        | 2 +-
 Content.Server/Cargo/Systems/CargoSystem.Orders.cs          | 2 +-
 Content.Server/Construction/Completions/SetAnchor.cs        | 4 ++--
 Content.Server/Construction/ConstructionSystem.Graph.cs     | 2 +-
 Content.Server/Defusable/Systems/DefusableSystem.cs         | 4 ++--
 Content.Server/Explosion/EntitySystems/TriggerSystem.cs     | 2 +-
 Content.Server/Holosign/HolosignSystem.cs                   | 2 +-
 Content.Server/Nuke/NukeSystem.cs                           | 6 +++---
 .../Procedural/DungeonJob/DungeonJob.PostGenBiome.cs        | 4 ++--
 .../DungeonJob/DungeonJob.PostGenBiomeMarkerLayer.cs        | 2 +-
 Content.Server/Procedural/DungeonSystem.Rooms.cs            | 2 +-
 Content.Server/Rotatable/RotatableSystem.cs                 | 3 ++-
 Content.Shared/Blocking/BlockingSystem.cs                   | 4 ++--
 .../Construction/EntitySystems/AnchorableSystem.cs          | 4 ++--
 Content.Shared/Construction/SharedConstructionSystem.cs     | 4 ++--
 Content.Shared/Magic/SharedMagicSystem.cs                   | 2 +-
 .../Polymorph/Systems/SharedChameleonProjectorSystem.cs     | 4 ++--
 Content.Shared/Security/Systems/DeployableBarrierSystem.cs  | 4 ++--
 Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs       | 2 +-
 Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs        | 2 +-
 22 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
index 9109fdbe4f7..8c087fcb254 100644
--- a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
+++ b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
@@ -181,14 +181,14 @@ await server.WaitAssertion(() =>
                 });
 
                 // Can't insert, unanchored and unpowered
-                xformSystem.Unanchor(unitUid, entityManager.GetComponent<TransformComponent>(unitUid));
+                xformSystem.Unanchor((unitUid, entityManager.GetComponent<TransformComponent>(unitUid)));
                 UnitInsertContains(disposalUnit, unitComponent, false, disposalSystem, human, wrench, disposalUnit, disposalTrunk);
             });
 
             await server.WaitAssertion(() =>
             {
                 // Anchor the disposal unit
-                xformSystem.AnchorEntity(unitUid, entityManager.GetComponent<TransformComponent>(unitUid));
+                xformSystem.AnchorEntity((unitUid, entityManager.GetComponent<TransformComponent>(unitUid)));
 
                 // No power
                 Assert.That(unitComponent.Powered, Is.False);
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
index ed46412a084..4ea15ced85e 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
@@ -421,7 +421,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
                 {
                     var xform = Transform(args.Target);
                     var fixtures = Comp<FixturesComponent>(args.Target);
-                    xform.Anchored = false; // Just in case.
+                    _transformSystem.Unanchor((args.Target, xform)); // Just in case.
                     _physics.SetBodyType(args.Target, BodyType.Dynamic, manager: fixtures, body: physics);
                     _physics.SetBodyStatus(args.Target, physics, BodyStatus.InAir);
                     _physics.WakeBody(args.Target, manager: fixtures, body: physics);
@@ -456,7 +456,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
                 {
                     var xform = Transform(args.Target);
                     var fixtures = Comp<FixturesComponent>(args.Target);
-                    xform.Anchored = false; // Just in case.
+                    _transformSystem.Unanchor((args.Target, xform));
 
                     _physics.SetBodyType(args.Target, BodyType.Dynamic, body: physics);
                     _physics.SetBodyStatus(args.Target, physics, BodyStatus.InAir);
diff --git a/Content.Server/Atmos/EntitySystems/PipeRestrictOverlapSystem.cs b/Content.Server/Atmos/EntitySystems/PipeRestrictOverlapSystem.cs
index c2ff87ca79c..032e8638933 100644
--- a/Content.Server/Atmos/EntitySystems/PipeRestrictOverlapSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/PipeRestrictOverlapSystem.cs
@@ -40,7 +40,7 @@ private void OnAnchorStateChanged(Entity<PipeRestrictOverlapComponent> ent, ref
         if (HasComp<AnchorableComponent>(ent) && CheckOverlap(ent))
         {
             _popup.PopupEntity(Loc.GetString("pipe-restrict-overlap-popup-blocked", ("pipe", ent.Owner)), ent);
-            _xform.Unanchor(ent, Transform(ent));
+            _xform.Unanchor((ent, Transform(ent)));
         }
     }
 
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
index 2c86a5590a5..9a8480dd3aa 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
@@ -522,7 +522,7 @@ private bool FulfillOrder(CargoOrderData order, EntityCoordinates spawn, string?
             var item = Spawn(order.ProductId, spawn);
 
             // Ensure the item doesn't start anchored
-            _transformSystem.Unanchor(item, Transform(item));
+            _transformSystem.Unanchor((item, Transform(item)));
 
             // Create a sheet of paper to write the order details on
             var printed = EntityManager.SpawnEntity(paperProto, spawn);
diff --git a/Content.Server/Construction/Completions/SetAnchor.cs b/Content.Server/Construction/Completions/SetAnchor.cs
index 989ecc99bda..b82db0339bf 100644
--- a/Content.Server/Construction/Completions/SetAnchor.cs
+++ b/Content.Server/Construction/Completions/SetAnchor.cs
@@ -11,8 +11,8 @@ public sealed partial class SetAnchor : IGraphAction
 
         public void PerformAction(EntityUid uid, EntityUid? userUid, IEntityManager entityManager)
         {
-            var transform = entityManager.GetComponent<TransformComponent>(uid);
-            transform.Anchored = Value;
+            var transformSystem = entityManager.System<SharedTransformSystem>();
+            transformSystem.TrySetAnchor(uid, Value);
         }
     }
 }
diff --git a/Content.Server/Construction/ConstructionSystem.Graph.cs b/Content.Server/Construction/ConstructionSystem.Graph.cs
index 4c73cef703d..fb513b6f6b7 100644
--- a/Content.Server/Construction/ConstructionSystem.Graph.cs
+++ b/Content.Server/Construction/ConstructionSystem.Graph.cs
@@ -364,7 +364,7 @@ public bool ChangeNode(EntityUid uid, EntityUid? userUid, string id, bool perfor
             var newTransform = Transform(newUid);
             TransformSystem.AttachToGridOrMap(newUid, newTransform); // in case in hands or a container
             newTransform.LocalRotation = transform.LocalRotation;
-            newTransform.Anchored = transform.Anchored;
+            TransformSystem.SetAnchor((newUid, newTransform), transform.Anchored);
 
             // Container transferring.
             if (containerManager != null)
diff --git a/Content.Server/Defusable/Systems/DefusableSystem.cs b/Content.Server/Defusable/Systems/DefusableSystem.cs
index 1e9caece945..58a08bf91d9 100644
--- a/Content.Server/Defusable/Systems/DefusableSystem.cs
+++ b/Content.Server/Defusable/Systems/DefusableSystem.cs
@@ -133,7 +133,7 @@ public void TryStartCountdown(EntityUid uid, EntityUid user, DefusableComponent
 
         var xform = Transform(uid);
         if (!xform.Anchored)
-            _transform.AnchorEntity(uid, xform);
+            _transform.AnchorEntity((uid, xform));
 
         SetBolt(comp, true);
         SetActivated(comp, true);
@@ -203,7 +203,7 @@ public void TryDefuseBomb(EntityUid uid, DefusableComponent comp)
         comp.Bolted = false;
 
         if (xform.Anchored)
-            _transform.Unanchor(uid, xform);
+            _transform.Unanchor((uid, xform));
 
         _appearance.SetData(uid, DefusableVisuals.Active, comp.Activated);
     }
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
index 53f6dfacf85..8db161eeb62 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
@@ -149,7 +149,7 @@ private void OnAnchorTrigger(EntityUid uid, AnchorOnTriggerComponent component,
             if (xform.Anchored)
                 return;
 
-            _transformSystem.AnchorEntity(uid, xform);
+            _transformSystem.AnchorEntity((uid, xform));
 
             if (component.RemoveOnTrigger)
                 RemCompDeferred<AnchorOnTriggerComponent>(uid);
diff --git a/Content.Server/Holosign/HolosignSystem.cs b/Content.Server/Holosign/HolosignSystem.cs
index b63a5459898..13886ac69f2 100644
--- a/Content.Server/Holosign/HolosignSystem.cs
+++ b/Content.Server/Holosign/HolosignSystem.cs
@@ -54,7 +54,7 @@ private void OnBeforeInteract(EntityUid uid, HolosignProjectorComponent componen
         var holoUid = EntityManager.SpawnEntity(component.SignProto, args.ClickLocation.SnapToGrid(EntityManager));
         var xform = Transform(holoUid);
         if (!xform.Anchored)
-            _transform.AnchorEntity(holoUid, xform); // anchor to prevent any tempering with (don't know what could even interact with it)
+            _transform.AnchorEntity((holoUid, xform)); // anchor to prevent any tempering with (don't know what could even interact with it)
 
         args.Handled = true;
     }
diff --git a/Content.Server/Nuke/NukeSystem.cs b/Content.Server/Nuke/NukeSystem.cs
index 84118931b10..9c0b14ea4e1 100644
--- a/Content.Server/Nuke/NukeSystem.cs
+++ b/Content.Server/Nuke/NukeSystem.cs
@@ -181,7 +181,7 @@ private async void OnAnchorButtonPressed(EntityUid uid, NukeComponent component,
         var xform = Transform(uid);
         if (xform.Anchored)
         {
-            _transform.Unanchor(uid, xform);
+            _transform.Unanchor((uid, xform));
             _itemSlots.SetLock(uid, component.DiskSlot, true);
         }
         else
@@ -203,7 +203,7 @@ private async void OnAnchorButtonPressed(EntityUid uid, NukeComponent component,
             }
 
             _transform.SetCoordinates(uid, xform, xform.Coordinates.SnapToGrid());
-            _transform.AnchorEntity(uid, xform);
+            _transform.AnchorEntity((uid, xform));
             _itemSlots.SetLock(uid, component.DiskSlot, false);
         }
 
@@ -490,7 +490,7 @@ public void ArmBomb(EntityUid uid, NukeComponent? component = null)
         if (!nukeXform.Anchored)
         {
             // Admin command shenanigans, just make sure.
-            _transform.AnchorEntity(uid, nukeXform);
+            _transform.AnchorEntity((uid, nukeXform));
         }
 
         component.Status = NukeStatus.ARMED;
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiome.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiome.cs
index 9e5f3bdcfc1..4f419110d56 100644
--- a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiome.cs
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiome.cs
@@ -31,7 +31,7 @@ private async Task PostGen(BiomeDunGen dunGen, DungeonData data, Dungeon dungeon
 
             if (reservedTiles.Contains(node))
                 continue;
-            
+
             if (dunGen.TileMask is not null)
             {
                 if (!dunGen.TileMask.Contains(((ContentTileDefinition) _tileDefManager[tileRef.Value.Tile.TypeId]).ID))
@@ -59,7 +59,7 @@ private async Task PostGen(BiomeDunGen dunGen, DungeonData data, Dungeon dungeon
 
                 if (!xform.Comp.Anchored)
                 {
-                    _transform.AnchorEntity(ent, xform);
+                    _transform.AnchorEntity((ent, xform));
                 }
 
                 // TODO: Engine bug with SpawnAtPosition
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiomeMarkerLayer.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiomeMarkerLayer.cs
index fb0eaa01573..cf6a4e1794e 100644
--- a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiomeMarkerLayer.cs
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiomeMarkerLayer.cs
@@ -94,7 +94,7 @@ private async Task PostGen(BiomeMarkerLayerDunGen dunGen, DungeonData data, Dung
                 var xform = xformQuery.Get(ent);
 
                 if (!xform.Comp.Anchored)
-                    _transform.AnchorEntity(ent, xform);
+                    _transform.AnchorEntity((ent, xform));
 
                 await SuspendDungeon();
                 if (!ValidateResume())
diff --git a/Content.Server/Procedural/DungeonSystem.Rooms.cs b/Content.Server/Procedural/DungeonSystem.Rooms.cs
index f74868bb52a..09aad2de1ff 100644
--- a/Content.Server/Procedural/DungeonSystem.Rooms.cs
+++ b/Content.Server/Procedural/DungeonSystem.Rooms.cs
@@ -195,7 +195,7 @@ public void SpawnRoom(
             if (anchored && !childXform.Anchored)
                 _transform.AnchorEntity((ent, childXform), (gridUid, grid));
             else if (!anchored && childXform.Anchored)
-                _transform.Unanchor(ent, childXform);
+                _transform.Unanchor((ent, childXform));
         }
 
         // Load decals
diff --git a/Content.Server/Rotatable/RotatableSystem.cs b/Content.Server/Rotatable/RotatableSystem.cs
index 63b5e44c3d2..d516560ab98 100644
--- a/Content.Server/Rotatable/RotatableSystem.cs
+++ b/Content.Server/Rotatable/RotatableSystem.cs
@@ -21,6 +21,7 @@ public sealed class RotatableSystem : EntitySystem
         [Dependency] private readonly PopupSystem _popup = default!;
         [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
         [Dependency] private readonly SharedInteractionSystem _interaction = default!;
+        [Dependency] private readonly SharedTransformSystem _transform = default!;
 
         public override void Initialize()
         {
@@ -112,7 +113,7 @@ public void Flip(EntityUid uid, FlippableComponent component)
             var entity = EntityManager.SpawnEntity(component.MirrorEntity, oldTransform.Coordinates);
             var newTransform = EntityManager.GetComponent<TransformComponent>(entity);
             newTransform.LocalRotation = oldTransform.LocalRotation;
-            newTransform.Anchored = false;
+            _transform.Unanchor((entity, newTransform));
             EntityManager.DeleteEntity(uid);
         }
 
diff --git a/Content.Shared/Blocking/BlockingSystem.cs b/Content.Shared/Blocking/BlockingSystem.cs
index 594d1baf6c6..47f137032ac 100644
--- a/Content.Shared/Blocking/BlockingSystem.cs
+++ b/Content.Shared/Blocking/BlockingSystem.cs
@@ -189,7 +189,7 @@ public bool StartBlocking(EntityUid item, BlockingComponent component, EntityUid
             }
 
             //Don't allow someone to block if they're somehow not anchored.
-            _transformSystem.AnchorEntity(user, xform);
+            _transformSystem.AnchorEntity((user, xform));
             if (!xform.Anchored)
             {
                 CantBlockError(user);
@@ -259,7 +259,7 @@ public bool StopBlocking(EntityUid item, BlockingComponent component, EntityUid
                                                      && TryComp<PhysicsComponent>(user, out var physicsComponent))
         {
             if (xform.Anchored)
-                _transformSystem.Unanchor(user, xform);
+                _transformSystem.Unanchor((user, xform));
 
             _actionsSystem.SetToggled(component.BlockingToggleActionEntity, false);
             _fixtureSystem.DestroyFixture(user, BlockingComponent.BlockFixtureID, body: physicsComponent);
diff --git a/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs b/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
index 9c3d6fc9fb3..183727775ed 100644
--- a/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
+++ b/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
@@ -114,7 +114,7 @@ private void OnUnanchorComplete(EntityUid uid, AnchorableComponent component, Tr
         var xform = Transform(uid);
 
         RaiseLocalEvent(uid, new BeforeUnanchoredEvent(args.User, used));
-        _transformSystem.Unanchor(uid, xform);
+        _transformSystem.Unanchor((uid, xform));
         RaiseLocalEvent(uid, new UserUnanchoredEvent(args.User, used));
 
         _popup.PopupClient(Loc.GetString("anchorable-unanchored"), uid, args.User);
@@ -165,7 +165,7 @@ private void OnAnchorComplete(EntityUid uid, AnchorableComponent component, TryA
         RaiseLocalEvent(uid, new BeforeAnchoredEvent(args.User, used));
 
         if (!xform.Anchored)
-            _transformSystem.AnchorEntity(uid, xform);
+            _transformSystem.AnchorEntity((uid, xform));
 
         RaiseLocalEvent(uid, new UserAnchoredEvent(args.User, used));
 
diff --git a/Content.Shared/Construction/SharedConstructionSystem.cs b/Content.Shared/Construction/SharedConstructionSystem.cs
index a2b647ae927..6d09b131d49 100644
--- a/Content.Shared/Construction/SharedConstructionSystem.cs
+++ b/Content.Shared/Construction/SharedConstructionSystem.cs
@@ -8,7 +8,7 @@ namespace Content.Shared.Construction
 {
     public abstract class SharedConstructionSystem : EntitySystem
     {
-        [Dependency] private readonly IMapManager _mapManager = default!;
+        [Dependency] protected readonly IMapManager MapManager = default!;
         [Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
         [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
 
@@ -20,7 +20,7 @@ public abstract class SharedConstructionSystem : EntitySystem
             if (!canBuildInImpassable)
                 return null;
 
-            if (!_mapManager.TryFindGridAt(coords, out _, out var grid))
+            if (!MapManager.TryFindGridAt(coords, out _, out var grid))
                 return null;
 
             var ignored = grid.GetAnchoredEntities(coords).ToHashSet();
diff --git a/Content.Shared/Magic/SharedMagicSystem.cs b/Content.Shared/Magic/SharedMagicSystem.cs
index 0be5646f4b2..35eef77be39 100644
--- a/Content.Shared/Magic/SharedMagicSystem.cs
+++ b/Content.Shared/Magic/SharedMagicSystem.cs
@@ -546,7 +546,7 @@ private void OnAnimateSpell(AnimateSpellEvent ev)
         var xform = Transform(ev.Target);
         var fixture = fixtures.Fixtures.First();
 
-        _transform.Unanchor(ev.Target);
+        _transform.Unanchor((ev.Target, xform));
         _physics.SetCanCollide(ev.Target, true, true, false, fixtures, physics);
         _physics.SetCollisionMask(ev.Target, fixture.Key, fixture.Value, (int)CollisionGroup.FlyingMobMask, fixtures, physics);
         _physics.SetCollisionLayer(ev.Target, fixture.Key, fixture.Value, (int)CollisionGroup.FlyingMobLayer, fixtures, physics);
diff --git a/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs b/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs
index 99737996b08..0d2641ae6b2 100644
--- a/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs
+++ b/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs
@@ -146,7 +146,7 @@ private void OnToggleAnchored(Entity<ChameleonProjectorComponent> ent, ref Disgu
 
         var xform = Transform(uid);
         if (xform.Anchored)
-            _xform.Unanchor(uid, xform);
+            _xform.Unanchor((uid, xform));
         else
             _xform.AnchorEntity((uid, xform));
 
@@ -241,7 +241,7 @@ public bool TryReveal(Entity<ChameleonDisguisedComponent?> ent)
 
         var xform = Transform(ent);
         xform.NoLocalRotation = false;
-        _xform.Unanchor(ent, xform);
+        _xform.Unanchor((ent, xform));
 
         Del(ent.Comp.Disguise);
         RemComp<ChameleonDisguisedComponent>(ent);
diff --git a/Content.Shared/Security/Systems/DeployableBarrierSystem.cs b/Content.Shared/Security/Systems/DeployableBarrierSystem.cs
index 622edc4b62e..4aed7b87309 100644
--- a/Content.Shared/Security/Systems/DeployableBarrierSystem.cs
+++ b/Content.Shared/Security/Systems/DeployableBarrierSystem.cs
@@ -43,13 +43,13 @@ private void ToggleBarrierDeploy(EntityUid uid, bool isDeployed, DeployableBarri
 
         if (isDeployed && transform.GridUid != null)
         {
-            _transform.AnchorEntity(uid, transform);
+            _transform.AnchorEntity((uid, transform));
             if (fixture != null)
                 _physics.SetHard(uid, fixture, true);
         }
         else
         {
-            _transform.Unanchor(uid, transform);
+            _transform.Unanchor((uid, transform));
             if (fixture != null)
                 _physics.SetHard(uid, fixture, false);
         }
diff --git a/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs b/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
index 78863562330..20857770c70 100644
--- a/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
+++ b/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
@@ -47,7 +47,7 @@ private void OnMeleeHit(Entity<MeleeThrowOnHitComponent> ent, ref MeleeHitEvent
 
             if (comp.UnanchorOnHit && HasComp<AnchorableComponent>(hit))
             {
-                _transform.Unanchor(hit, Transform(hit));
+                _transform.Unanchor((hit, Transform(hit)));
             }
 
             RemComp<MeleeThrownComponent>(hit);
diff --git a/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs b/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs
index 3d7f9df458e..49096bfbdcf 100644
--- a/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs
+++ b/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs
@@ -207,7 +207,7 @@ protected virtual void StartTether(EntityUid gunUid, BaseForceGunComponent compo
         _appearance.SetData(gunUid, ToggleableLightVisuals.Enabled, true, appearance);
 
         // Target updates
-        TransformSystem.Unanchor(target, targetXform);
+        TransformSystem.Unanchor((target, targetXform));
         component.Tethered = target;
         var tethered = EnsureComp<TetheredComponent>(target);
         _physics.SetBodyStatus(target, targetPhysics, BodyStatus.InAir, false);

From fa35c9623d71aa2f1bca21fcbf6e61605c33af58 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Fri, 21 Feb 2025 00:12:12 +1100
Subject: [PATCH 22/33] Revert "Purge uses of TransformComponent.Anchored.set.
 Also adds parentheses." (#35332)

---
 Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs | 4 ++--
 .../Administration/Systems/AdminVerbSystem.Smites.cs        | 4 ++--
 .../Atmos/EntitySystems/PipeRestrictOverlapSystem.cs        | 2 +-
 Content.Server/Cargo/Systems/CargoSystem.Orders.cs          | 2 +-
 Content.Server/Construction/Completions/SetAnchor.cs        | 4 ++--
 Content.Server/Construction/ConstructionSystem.Graph.cs     | 2 +-
 Content.Server/Defusable/Systems/DefusableSystem.cs         | 4 ++--
 Content.Server/Explosion/EntitySystems/TriggerSystem.cs     | 2 +-
 Content.Server/Holosign/HolosignSystem.cs                   | 2 +-
 Content.Server/Nuke/NukeSystem.cs                           | 6 +++---
 .../Procedural/DungeonJob/DungeonJob.PostGenBiome.cs        | 4 ++--
 .../DungeonJob/DungeonJob.PostGenBiomeMarkerLayer.cs        | 2 +-
 Content.Server/Procedural/DungeonSystem.Rooms.cs            | 2 +-
 Content.Server/Rotatable/RotatableSystem.cs                 | 3 +--
 Content.Shared/Blocking/BlockingSystem.cs                   | 4 ++--
 .../Construction/EntitySystems/AnchorableSystem.cs          | 4 ++--
 Content.Shared/Construction/SharedConstructionSystem.cs     | 4 ++--
 Content.Shared/Magic/SharedMagicSystem.cs                   | 2 +-
 .../Polymorph/Systems/SharedChameleonProjectorSystem.cs     | 4 ++--
 Content.Shared/Security/Systems/DeployableBarrierSystem.cs  | 4 ++--
 Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs       | 2 +-
 Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs        | 2 +-
 22 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
index 8c087fcb254..9109fdbe4f7 100644
--- a/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
+++ b/Content.IntegrationTests/Tests/Disposal/DisposalUnitTest.cs
@@ -181,14 +181,14 @@ await server.WaitAssertion(() =>
                 });
 
                 // Can't insert, unanchored and unpowered
-                xformSystem.Unanchor((unitUid, entityManager.GetComponent<TransformComponent>(unitUid)));
+                xformSystem.Unanchor(unitUid, entityManager.GetComponent<TransformComponent>(unitUid));
                 UnitInsertContains(disposalUnit, unitComponent, false, disposalSystem, human, wrench, disposalUnit, disposalTrunk);
             });
 
             await server.WaitAssertion(() =>
             {
                 // Anchor the disposal unit
-                xformSystem.AnchorEntity((unitUid, entityManager.GetComponent<TransformComponent>(unitUid)));
+                xformSystem.AnchorEntity(unitUid, entityManager.GetComponent<TransformComponent>(unitUid));
 
                 // No power
                 Assert.That(unitComponent.Powered, Is.False);
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
index 4ea15ced85e..ed46412a084 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
@@ -421,7 +421,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
                 {
                     var xform = Transform(args.Target);
                     var fixtures = Comp<FixturesComponent>(args.Target);
-                    _transformSystem.Unanchor((args.Target, xform)); // Just in case.
+                    xform.Anchored = false; // Just in case.
                     _physics.SetBodyType(args.Target, BodyType.Dynamic, manager: fixtures, body: physics);
                     _physics.SetBodyStatus(args.Target, physics, BodyStatus.InAir);
                     _physics.WakeBody(args.Target, manager: fixtures, body: physics);
@@ -456,7 +456,7 @@ private void AddSmiteVerbs(GetVerbsEvent<Verb> args)
                 {
                     var xform = Transform(args.Target);
                     var fixtures = Comp<FixturesComponent>(args.Target);
-                    _transformSystem.Unanchor((args.Target, xform));
+                    xform.Anchored = false; // Just in case.
 
                     _physics.SetBodyType(args.Target, BodyType.Dynamic, body: physics);
                     _physics.SetBodyStatus(args.Target, physics, BodyStatus.InAir);
diff --git a/Content.Server/Atmos/EntitySystems/PipeRestrictOverlapSystem.cs b/Content.Server/Atmos/EntitySystems/PipeRestrictOverlapSystem.cs
index 032e8638933..c2ff87ca79c 100644
--- a/Content.Server/Atmos/EntitySystems/PipeRestrictOverlapSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/PipeRestrictOverlapSystem.cs
@@ -40,7 +40,7 @@ private void OnAnchorStateChanged(Entity<PipeRestrictOverlapComponent> ent, ref
         if (HasComp<AnchorableComponent>(ent) && CheckOverlap(ent))
         {
             _popup.PopupEntity(Loc.GetString("pipe-restrict-overlap-popup-blocked", ("pipe", ent.Owner)), ent);
-            _xform.Unanchor((ent, Transform(ent)));
+            _xform.Unanchor(ent, Transform(ent));
         }
     }
 
diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
index 9a8480dd3aa..2c86a5590a5 100644
--- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs
@@ -522,7 +522,7 @@ private bool FulfillOrder(CargoOrderData order, EntityCoordinates spawn, string?
             var item = Spawn(order.ProductId, spawn);
 
             // Ensure the item doesn't start anchored
-            _transformSystem.Unanchor((item, Transform(item)));
+            _transformSystem.Unanchor(item, Transform(item));
 
             // Create a sheet of paper to write the order details on
             var printed = EntityManager.SpawnEntity(paperProto, spawn);
diff --git a/Content.Server/Construction/Completions/SetAnchor.cs b/Content.Server/Construction/Completions/SetAnchor.cs
index b82db0339bf..989ecc99bda 100644
--- a/Content.Server/Construction/Completions/SetAnchor.cs
+++ b/Content.Server/Construction/Completions/SetAnchor.cs
@@ -11,8 +11,8 @@ public sealed partial class SetAnchor : IGraphAction
 
         public void PerformAction(EntityUid uid, EntityUid? userUid, IEntityManager entityManager)
         {
-            var transformSystem = entityManager.System<SharedTransformSystem>();
-            transformSystem.TrySetAnchor(uid, Value);
+            var transform = entityManager.GetComponent<TransformComponent>(uid);
+            transform.Anchored = Value;
         }
     }
 }
diff --git a/Content.Server/Construction/ConstructionSystem.Graph.cs b/Content.Server/Construction/ConstructionSystem.Graph.cs
index fb513b6f6b7..4c73cef703d 100644
--- a/Content.Server/Construction/ConstructionSystem.Graph.cs
+++ b/Content.Server/Construction/ConstructionSystem.Graph.cs
@@ -364,7 +364,7 @@ public bool ChangeNode(EntityUid uid, EntityUid? userUid, string id, bool perfor
             var newTransform = Transform(newUid);
             TransformSystem.AttachToGridOrMap(newUid, newTransform); // in case in hands or a container
             newTransform.LocalRotation = transform.LocalRotation;
-            TransformSystem.SetAnchor((newUid, newTransform), transform.Anchored);
+            newTransform.Anchored = transform.Anchored;
 
             // Container transferring.
             if (containerManager != null)
diff --git a/Content.Server/Defusable/Systems/DefusableSystem.cs b/Content.Server/Defusable/Systems/DefusableSystem.cs
index 58a08bf91d9..1e9caece945 100644
--- a/Content.Server/Defusable/Systems/DefusableSystem.cs
+++ b/Content.Server/Defusable/Systems/DefusableSystem.cs
@@ -133,7 +133,7 @@ public void TryStartCountdown(EntityUid uid, EntityUid user, DefusableComponent
 
         var xform = Transform(uid);
         if (!xform.Anchored)
-            _transform.AnchorEntity((uid, xform));
+            _transform.AnchorEntity(uid, xform);
 
         SetBolt(comp, true);
         SetActivated(comp, true);
@@ -203,7 +203,7 @@ public void TryDefuseBomb(EntityUid uid, DefusableComponent comp)
         comp.Bolted = false;
 
         if (xform.Anchored)
-            _transform.Unanchor((uid, xform));
+            _transform.Unanchor(uid, xform);
 
         _appearance.SetData(uid, DefusableVisuals.Active, comp.Activated);
     }
diff --git a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
index 8db161eeb62..53f6dfacf85 100644
--- a/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
+++ b/Content.Server/Explosion/EntitySystems/TriggerSystem.cs
@@ -149,7 +149,7 @@ private void OnAnchorTrigger(EntityUid uid, AnchorOnTriggerComponent component,
             if (xform.Anchored)
                 return;
 
-            _transformSystem.AnchorEntity((uid, xform));
+            _transformSystem.AnchorEntity(uid, xform);
 
             if (component.RemoveOnTrigger)
                 RemCompDeferred<AnchorOnTriggerComponent>(uid);
diff --git a/Content.Server/Holosign/HolosignSystem.cs b/Content.Server/Holosign/HolosignSystem.cs
index 13886ac69f2..b63a5459898 100644
--- a/Content.Server/Holosign/HolosignSystem.cs
+++ b/Content.Server/Holosign/HolosignSystem.cs
@@ -54,7 +54,7 @@ private void OnBeforeInteract(EntityUid uid, HolosignProjectorComponent componen
         var holoUid = EntityManager.SpawnEntity(component.SignProto, args.ClickLocation.SnapToGrid(EntityManager));
         var xform = Transform(holoUid);
         if (!xform.Anchored)
-            _transform.AnchorEntity((holoUid, xform)); // anchor to prevent any tempering with (don't know what could even interact with it)
+            _transform.AnchorEntity(holoUid, xform); // anchor to prevent any tempering with (don't know what could even interact with it)
 
         args.Handled = true;
     }
diff --git a/Content.Server/Nuke/NukeSystem.cs b/Content.Server/Nuke/NukeSystem.cs
index 9c0b14ea4e1..84118931b10 100644
--- a/Content.Server/Nuke/NukeSystem.cs
+++ b/Content.Server/Nuke/NukeSystem.cs
@@ -181,7 +181,7 @@ private async void OnAnchorButtonPressed(EntityUid uid, NukeComponent component,
         var xform = Transform(uid);
         if (xform.Anchored)
         {
-            _transform.Unanchor((uid, xform));
+            _transform.Unanchor(uid, xform);
             _itemSlots.SetLock(uid, component.DiskSlot, true);
         }
         else
@@ -203,7 +203,7 @@ private async void OnAnchorButtonPressed(EntityUid uid, NukeComponent component,
             }
 
             _transform.SetCoordinates(uid, xform, xform.Coordinates.SnapToGrid());
-            _transform.AnchorEntity((uid, xform));
+            _transform.AnchorEntity(uid, xform);
             _itemSlots.SetLock(uid, component.DiskSlot, false);
         }
 
@@ -490,7 +490,7 @@ public void ArmBomb(EntityUid uid, NukeComponent? component = null)
         if (!nukeXform.Anchored)
         {
             // Admin command shenanigans, just make sure.
-            _transform.AnchorEntity((uid, nukeXform));
+            _transform.AnchorEntity(uid, nukeXform);
         }
 
         component.Status = NukeStatus.ARMED;
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiome.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiome.cs
index 4f419110d56..9e5f3bdcfc1 100644
--- a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiome.cs
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiome.cs
@@ -31,7 +31,7 @@ private async Task PostGen(BiomeDunGen dunGen, DungeonData data, Dungeon dungeon
 
             if (reservedTiles.Contains(node))
                 continue;
-
+            
             if (dunGen.TileMask is not null)
             {
                 if (!dunGen.TileMask.Contains(((ContentTileDefinition) _tileDefManager[tileRef.Value.Tile.TypeId]).ID))
@@ -59,7 +59,7 @@ private async Task PostGen(BiomeDunGen dunGen, DungeonData data, Dungeon dungeon
 
                 if (!xform.Comp.Anchored)
                 {
-                    _transform.AnchorEntity((ent, xform));
+                    _transform.AnchorEntity(ent, xform);
                 }
 
                 // TODO: Engine bug with SpawnAtPosition
diff --git a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiomeMarkerLayer.cs b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiomeMarkerLayer.cs
index cf6a4e1794e..fb0eaa01573 100644
--- a/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiomeMarkerLayer.cs
+++ b/Content.Server/Procedural/DungeonJob/DungeonJob.PostGenBiomeMarkerLayer.cs
@@ -94,7 +94,7 @@ private async Task PostGen(BiomeMarkerLayerDunGen dunGen, DungeonData data, Dung
                 var xform = xformQuery.Get(ent);
 
                 if (!xform.Comp.Anchored)
-                    _transform.AnchorEntity((ent, xform));
+                    _transform.AnchorEntity(ent, xform);
 
                 await SuspendDungeon();
                 if (!ValidateResume())
diff --git a/Content.Server/Procedural/DungeonSystem.Rooms.cs b/Content.Server/Procedural/DungeonSystem.Rooms.cs
index 09aad2de1ff..f74868bb52a 100644
--- a/Content.Server/Procedural/DungeonSystem.Rooms.cs
+++ b/Content.Server/Procedural/DungeonSystem.Rooms.cs
@@ -195,7 +195,7 @@ public void SpawnRoom(
             if (anchored && !childXform.Anchored)
                 _transform.AnchorEntity((ent, childXform), (gridUid, grid));
             else if (!anchored && childXform.Anchored)
-                _transform.Unanchor((ent, childXform));
+                _transform.Unanchor(ent, childXform);
         }
 
         // Load decals
diff --git a/Content.Server/Rotatable/RotatableSystem.cs b/Content.Server/Rotatable/RotatableSystem.cs
index d516560ab98..63b5e44c3d2 100644
--- a/Content.Server/Rotatable/RotatableSystem.cs
+++ b/Content.Server/Rotatable/RotatableSystem.cs
@@ -21,7 +21,6 @@ public sealed class RotatableSystem : EntitySystem
         [Dependency] private readonly PopupSystem _popup = default!;
         [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!;
         [Dependency] private readonly SharedInteractionSystem _interaction = default!;
-        [Dependency] private readonly SharedTransformSystem _transform = default!;
 
         public override void Initialize()
         {
@@ -113,7 +112,7 @@ public void Flip(EntityUid uid, FlippableComponent component)
             var entity = EntityManager.SpawnEntity(component.MirrorEntity, oldTransform.Coordinates);
             var newTransform = EntityManager.GetComponent<TransformComponent>(entity);
             newTransform.LocalRotation = oldTransform.LocalRotation;
-            _transform.Unanchor((entity, newTransform));
+            newTransform.Anchored = false;
             EntityManager.DeleteEntity(uid);
         }
 
diff --git a/Content.Shared/Blocking/BlockingSystem.cs b/Content.Shared/Blocking/BlockingSystem.cs
index 47f137032ac..594d1baf6c6 100644
--- a/Content.Shared/Blocking/BlockingSystem.cs
+++ b/Content.Shared/Blocking/BlockingSystem.cs
@@ -189,7 +189,7 @@ public bool StartBlocking(EntityUid item, BlockingComponent component, EntityUid
             }
 
             //Don't allow someone to block if they're somehow not anchored.
-            _transformSystem.AnchorEntity((user, xform));
+            _transformSystem.AnchorEntity(user, xform);
             if (!xform.Anchored)
             {
                 CantBlockError(user);
@@ -259,7 +259,7 @@ public bool StopBlocking(EntityUid item, BlockingComponent component, EntityUid
                                                      && TryComp<PhysicsComponent>(user, out var physicsComponent))
         {
             if (xform.Anchored)
-                _transformSystem.Unanchor((user, xform));
+                _transformSystem.Unanchor(user, xform);
 
             _actionsSystem.SetToggled(component.BlockingToggleActionEntity, false);
             _fixtureSystem.DestroyFixture(user, BlockingComponent.BlockFixtureID, body: physicsComponent);
diff --git a/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs b/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
index 183727775ed..9c3d6fc9fb3 100644
--- a/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
+++ b/Content.Shared/Construction/EntitySystems/AnchorableSystem.cs
@@ -114,7 +114,7 @@ private void OnUnanchorComplete(EntityUid uid, AnchorableComponent component, Tr
         var xform = Transform(uid);
 
         RaiseLocalEvent(uid, new BeforeUnanchoredEvent(args.User, used));
-        _transformSystem.Unanchor((uid, xform));
+        _transformSystem.Unanchor(uid, xform);
         RaiseLocalEvent(uid, new UserUnanchoredEvent(args.User, used));
 
         _popup.PopupClient(Loc.GetString("anchorable-unanchored"), uid, args.User);
@@ -165,7 +165,7 @@ private void OnAnchorComplete(EntityUid uid, AnchorableComponent component, TryA
         RaiseLocalEvent(uid, new BeforeAnchoredEvent(args.User, used));
 
         if (!xform.Anchored)
-            _transformSystem.AnchorEntity((uid, xform));
+            _transformSystem.AnchorEntity(uid, xform);
 
         RaiseLocalEvent(uid, new UserAnchoredEvent(args.User, used));
 
diff --git a/Content.Shared/Construction/SharedConstructionSystem.cs b/Content.Shared/Construction/SharedConstructionSystem.cs
index 6d09b131d49..a2b647ae927 100644
--- a/Content.Shared/Construction/SharedConstructionSystem.cs
+++ b/Content.Shared/Construction/SharedConstructionSystem.cs
@@ -8,7 +8,7 @@ namespace Content.Shared.Construction
 {
     public abstract class SharedConstructionSystem : EntitySystem
     {
-        [Dependency] protected readonly IMapManager MapManager = default!;
+        [Dependency] private readonly IMapManager _mapManager = default!;
         [Dependency] protected readonly IPrototypeManager PrototypeManager = default!;
         [Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
 
@@ -20,7 +20,7 @@ public abstract class SharedConstructionSystem : EntitySystem
             if (!canBuildInImpassable)
                 return null;
 
-            if (!MapManager.TryFindGridAt(coords, out _, out var grid))
+            if (!_mapManager.TryFindGridAt(coords, out _, out var grid))
                 return null;
 
             var ignored = grid.GetAnchoredEntities(coords).ToHashSet();
diff --git a/Content.Shared/Magic/SharedMagicSystem.cs b/Content.Shared/Magic/SharedMagicSystem.cs
index 35eef77be39..0be5646f4b2 100644
--- a/Content.Shared/Magic/SharedMagicSystem.cs
+++ b/Content.Shared/Magic/SharedMagicSystem.cs
@@ -546,7 +546,7 @@ private void OnAnimateSpell(AnimateSpellEvent ev)
         var xform = Transform(ev.Target);
         var fixture = fixtures.Fixtures.First();
 
-        _transform.Unanchor((ev.Target, xform));
+        _transform.Unanchor(ev.Target);
         _physics.SetCanCollide(ev.Target, true, true, false, fixtures, physics);
         _physics.SetCollisionMask(ev.Target, fixture.Key, fixture.Value, (int)CollisionGroup.FlyingMobMask, fixtures, physics);
         _physics.SetCollisionLayer(ev.Target, fixture.Key, fixture.Value, (int)CollisionGroup.FlyingMobLayer, fixtures, physics);
diff --git a/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs b/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs
index 0d2641ae6b2..99737996b08 100644
--- a/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs
+++ b/Content.Shared/Polymorph/Systems/SharedChameleonProjectorSystem.cs
@@ -146,7 +146,7 @@ private void OnToggleAnchored(Entity<ChameleonProjectorComponent> ent, ref Disgu
 
         var xform = Transform(uid);
         if (xform.Anchored)
-            _xform.Unanchor((uid, xform));
+            _xform.Unanchor(uid, xform);
         else
             _xform.AnchorEntity((uid, xform));
 
@@ -241,7 +241,7 @@ public bool TryReveal(Entity<ChameleonDisguisedComponent?> ent)
 
         var xform = Transform(ent);
         xform.NoLocalRotation = false;
-        _xform.Unanchor((ent, xform));
+        _xform.Unanchor(ent, xform);
 
         Del(ent.Comp.Disguise);
         RemComp<ChameleonDisguisedComponent>(ent);
diff --git a/Content.Shared/Security/Systems/DeployableBarrierSystem.cs b/Content.Shared/Security/Systems/DeployableBarrierSystem.cs
index 4aed7b87309..622edc4b62e 100644
--- a/Content.Shared/Security/Systems/DeployableBarrierSystem.cs
+++ b/Content.Shared/Security/Systems/DeployableBarrierSystem.cs
@@ -43,13 +43,13 @@ private void ToggleBarrierDeploy(EntityUid uid, bool isDeployed, DeployableBarri
 
         if (isDeployed && transform.GridUid != null)
         {
-            _transform.AnchorEntity((uid, transform));
+            _transform.AnchorEntity(uid, transform);
             if (fixture != null)
                 _physics.SetHard(uid, fixture, true);
         }
         else
         {
-            _transform.Unanchor((uid, transform));
+            _transform.Unanchor(uid, transform);
             if (fixture != null)
                 _physics.SetHard(uid, fixture, false);
         }
diff --git a/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs b/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
index 20857770c70..78863562330 100644
--- a/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
+++ b/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
@@ -47,7 +47,7 @@ private void OnMeleeHit(Entity<MeleeThrowOnHitComponent> ent, ref MeleeHitEvent
 
             if (comp.UnanchorOnHit && HasComp<AnchorableComponent>(hit))
             {
-                _transform.Unanchor((hit, Transform(hit)));
+                _transform.Unanchor(hit, Transform(hit));
             }
 
             RemComp<MeleeThrownComponent>(hit);
diff --git a/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs b/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs
index 49096bfbdcf..3d7f9df458e 100644
--- a/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs
+++ b/Content.Shared/Weapons/Misc/SharedTetherGunSystem.cs
@@ -207,7 +207,7 @@ protected virtual void StartTether(EntityUid gunUid, BaseForceGunComponent compo
         _appearance.SetData(gunUid, ToggleableLightVisuals.Enabled, true, appearance);
 
         // Target updates
-        TransformSystem.Unanchor((target, targetXform));
+        TransformSystem.Unanchor(target, targetXform);
         component.Tethered = target;
         var tethered = EnsureComp<TetheredComponent>(target);
         _physics.SetBodyStatus(target, targetPhysics, BodyStatus.InAir, false);

From 580f908ca20eb9f51544ebf24437438b580c8ec1 Mon Sep 17 00:00:00 2001
From: Zokkie <6126135+Zokkie@users.noreply.github.com>
Date: Thu, 20 Feb 2025 17:12:55 +0100
Subject: [PATCH 23/33] Fix to make all corpses butcher able and better
 disposable (#33727)

* Made all corpses disposable. Argocytes, Mimics, Butterflies, Bees, Space Kangaroos, Laser Raptors and Watchers their corpses can now be butchered.

* Accidentally removed a line break. restored it.

* Removed a dash that did not belong there.

* Changed mimic giving a "Changeling Sting Can" when butchered instead of normal meat.
---
 .../Prototypes/Entities/Mobs/NPCs/animals.yml | 29 +++++++++++
 .../Entities/Mobs/NPCs/argocyte.yml           | 50 +++++++++++++++++++
 .../Entities/Mobs/NPCs/lavaland.yml           |  4 ++
 .../Prototypes/Entities/Mobs/NPCs/mimic.yml   |  4 ++
 .../Entities/Mobs/NPCs/miscellaneous.yml      |  6 ++-
 .../Prototypes/Entities/Mobs/NPCs/space.yml   |  4 ++
 6 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
index aaca8961754..2290269adfe 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -107,6 +107,17 @@
         Base: dead
       Dead:
         Base: dead
+  - type: Extractable
+    grindableSolutionName: food
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: GroundBee
+          Quantity: 1
+  - type: Butcherable
+    spawned:
+    - id: null # Should give nothing when you butcher it so we set the item id it needs to spawn to null
   - type: Item
     size: Tiny
   - type: Tag
@@ -114,6 +125,7 @@
     - Bee
     - Trash
   - type: Bloodstream
+    bloodReagent: InsectBlood
     bloodMaxVolume: 0.1
   - type: MobPrice
     price: 50
@@ -771,7 +783,24 @@
         Base: dead
       Dead:
         Base: dead
+  - type: Extractable
+    grindableSolutionName: food
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 1
+  - type: Butcherable
+    spawned:
+    - id: null # Should give nothing when you butcher it so we set the item id it needs to spawn to null
+  - type: Item
+    size: Tiny
+  - type: Tag
+    tags:
+    - Trash
   - type: Bloodstream
+    bloodReagent: InsectBlood
     bloodMaxVolume: 0.1
   - type: MobPrice
     price: 50
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
index 3b6c4e8ed92..36ddf71d4b4 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/argocyte.yml
@@ -74,6 +74,10 @@
     thresholds:
       0: Alive
       30: Dead
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatXeno
+      amount: 1
   - type: MovementSpeedModifier
     baseSprintSpeed : 3.5
     baseWalkSpeed : 3
@@ -104,6 +108,10 @@
     thresholds:
       0: Alive
       30: Dead
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatXeno
+      amount: 1
   - type: Fixtures
     fixtures:
       fix1:
@@ -140,6 +148,10 @@
     thresholds:
       0: Alive
       30: Dead
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatXeno
+      amount: 1
   - type: Fixtures
     fixtures:
       fix1:
@@ -176,6 +188,10 @@
     thresholds:
       0: Alive
       60: Dead
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatXeno
+      amount: 2
   - type: MovementSpeedModifier
     baseSprintSpeed : 5
 
@@ -198,6 +214,10 @@
     thresholds:
       0: Alive
       100: Dead
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatXeno
+      amount: 2
   - type: MovementSpeedModifier
     baseSprintSpeed : 4
     baseWalkSpeed : 3.5
@@ -221,6 +241,10 @@
     thresholds:
       0: Alive
       100: Dead
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatXeno
+      amount: 2
   - type: MeleeWeapon
     damage:
       types:
@@ -246,6 +270,10 @@
     thresholds:
       0: Alive
       100: Dead
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatXeno
+      amount: 2
   - type: MeleeWeapon
     damage:
       types:
@@ -274,6 +302,10 @@
     thresholds:
       0: Alive
       150: Dead
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatXeno
+      amount: 2
   - type: MeleeWeapon
     damage:
       types:
@@ -301,6 +333,10 @@
     thresholds:
       0: Alive
       150: Dead
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatXeno
+      amount: 2
   - type: MeleeWeapon
     damage:
       types:
@@ -330,6 +366,10 @@
     thresholds:
       0: Alive
       300: Dead
+  - type: Butcherable
+    spawned:
+    - id: FoodMeatXeno
+      amount: 3
   - type: MeleeWeapon
     damage:
       types:
@@ -356,6 +396,11 @@
         Base: founder
       Dead:
         Base: founder_dead
+  - type: Butcherable
+    butcheringType: Spike
+    spawned:
+    - id: FoodMeatXeno
+      amount: 5
   - type: Fixtures
     fixtures:
       fix1:
@@ -397,6 +442,11 @@
         Base: leviathing
       Dead:
         Base: leviathing_dead
+  - type: Butcherable
+    butcheringType: Spike
+    spawned:
+    - id: FoodMeatXeno
+      amount: 10
   - type: Fixtures
     fixtures:
       fix1:
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml b/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml
index 7571d8c8f45..7d6c28fc95c 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/lavaland.yml
@@ -43,6 +43,10 @@
     thresholds:
       0: Alive
       50: Dead
+  - type: Butcherable
+    spawned:
+    - id: DiamondOre1
+      amount: 1
   - type: MovementSpeedModifier
     baseWalkSpeed: 5
     baseSprintSpeed: 7
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
index 6ef65cc1ae2..829bbe4bf14 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/mimic.yml
@@ -40,3 +40,7 @@
   - type: MovementSpeedModifier
     baseWalkSpeed : 1
     baseSprintSpeed : 1
+  - type: Butcherable
+    spawned:
+    - id: DrinkChangelingStingCan
+      amount: 1
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
index f10d03886a5..cdd90611f7e 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/miscellaneous.yml
@@ -37,6 +37,10 @@
       thresholds:
         0: Alive
         100: Dead
+    - type: Butcherable
+      spawned:
+      - id: FoodMeatChicken
+        amount: 2
     - type: MovementSpeedModifier
       baseWalkSpeed: 2
       baseSprintSpeed: 5
@@ -220,4 +224,4 @@
       types:
         Blunt: 0.11
   - type: StaticPrice
-    price: 400
\ No newline at end of file
+    price: 400
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
index 6f6fa6afb3d..7c549e484de 100644
--- a/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
+++ b/Resources/Prototypes/Entities/Mobs/NPCs/space.yml
@@ -167,6 +167,10 @@
       collection: FootstepBounce
   - type: ReplacementAccent
     accent: kangaroo
+  - type: Butcherable
+    spawned:
+    - id: FoodMeat
+      amount: 1
 
 - type: entity
   id: MobKangarooSpaceSalvage

From 5e9e1518e521a6ab138304cf6800d8cee150a693 Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 20 Feb 2025 16:14:06 +0000
Subject: [PATCH 24/33] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 07e52473a03..a08e41925ec 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: Plykiya
-  changes:
-  - message: You can no longer FTL the station.
-    type: Fix
-  id: 7485
-  time: '2024-10-04T02:55:36.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32558
 - author: SoulFN
   changes:
   - message: Dragon can now pull things using tail.
@@ -3892,3 +3885,15 @@
   id: 7984
   time: '2025-02-20T01:12:07.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/33449
+- author: Zokkie
+  changes:
+  - message: Argocytes, Mimics, Butterflies, Bees, Space Kangaroos, Laser Raptors
+      and Watchers their corpses can now be butchered.
+    type: Fix
+  - message: Butterflies can now be picked up and can also be put into trash bags.
+    type: Fix
+  - message: You can now grind Butterflies and Bees in the reagent grinder.
+    type: Fix
+  id: 7985
+  time: '2025-02-20T16:12:56.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/33727

From abb20c0256b933f787069fbc30c82cf8ee9bc8eb Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Fri, 21 Feb 2025 03:51:01 +1100
Subject: [PATCH 25/33] Remove storage hotbar GUI bandaid (#35054)

* Remove storage hotbar GUI bandaid

With BUI deferred opens it also happened to fix this issue which is nice.

* Update Content.Client/Storage/StorageBoundUserInterface.cs
---
 .../Storage/StorageBoundUserInterface.cs      |  7 -----
 .../Systems/Storage/StorageUIController.cs    | 28 -------------------
 2 files changed, 35 deletions(-)

diff --git a/Content.Client/Storage/StorageBoundUserInterface.cs b/Content.Client/Storage/StorageBoundUserInterface.cs
index 16545c35784..8cb415dead5 100644
--- a/Content.Client/Storage/StorageBoundUserInterface.cs
+++ b/Content.Client/Storage/StorageBoundUserInterface.cs
@@ -92,12 +92,5 @@ public void Show(Vector2 position)
         Show();
         LayoutContainer.SetPosition(_window, position);
     }
-
-    public void ReOpen()
-    {
-        _window?.Orphan();
-        _window = null;
-        Open();
-    }
 }
 
diff --git a/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs b/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
index dbb16ab24ac..768a434d837 100644
--- a/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
+++ b/Content.Client/UserInterface/Systems/Storage/StorageUIController.cs
@@ -61,39 +61,11 @@ public override void Initialize()
     {
         base.Initialize();
 
-        UIManager.OnScreenChanged += OnScreenChange;
-
         _configuration.OnValueChanged(CCVars.StaticStorageUI, OnStaticStorageChanged, true);
         _configuration.OnValueChanged(CCVars.OpaqueStorageWindow, OnOpaqueWindowChanged, true);
         _configuration.OnValueChanged(CCVars.StorageWindowTitle, OnStorageWindowTitle, true);
     }
 
-    private void OnScreenChange((UIScreen? Old, UIScreen? New) obj)
-    {
-        // Handle reconnects with hotbargui.
-
-        // Essentially HotbarGui / the screen gets loaded AFTER gamestates at the moment (because clientgameticker manually changes it via event)
-        // and changing this may be a massive change.
-        // So instead we'll just manually reload it for now.
-        if (!StaticStorageUIEnabled ||
-            obj.New == null ||
-            !EntityManager.TryGetComponent(_player.LocalEntity, out UserInterfaceUserComponent? userComp))
-        {
-            return;
-        }
-
-        // UISystemDependency not injected at this point so do it the old fashion way, I love ordering issues.
-        var uiSystem = EntityManager.System<SharedUserInterfaceSystem>();
-
-        foreach (var bui in uiSystem.GetActorUis((_player.LocalEntity.Value, userComp)))
-        {
-            if (!uiSystem.TryGetOpenUi<StorageBoundUserInterface>(bui.Entity, StorageComponent.StorageUiKey.Key, out var storageBui))
-                continue;
-
-            storageBui.ReOpen();
-        }
-    }
-
     private void OnStorageWindowTitle(bool obj)
     {
         WindowTitle = obj;

From 93021c4879a65f9a92b842bf67c01e923e7174ba Mon Sep 17 00:00:00 2001
From: PJBot <pieterjan.briers+bot@gmail.com>
Date: Thu, 20 Feb 2025 16:52:12 +0000
Subject: [PATCH 26/33] Automatic changelog update

---
 Resources/Changelog/Changelog.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index a08e41925ec..8d5068bdcf4 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -1,11 +1,4 @@
 Entries:
-- author: SoulFN
-  changes:
-  - message: Dragon can now pull things using tail.
-    type: Add
-  id: 7486
-  time: '2024-10-04T05:39:50.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/32568
 - author: SaphireLattice
   changes:
   - message: Explosives throw a container they are in
@@ -3897,3 +3890,10 @@
   id: 7985
   time: '2025-02-20T16:12:56.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/33727
+- author: metalgearsloth
+  changes:
+  - message: Fix storage windows being duplicated when reconnecting.
+    type: Fix
+  id: 7986
+  time: '2025-02-20T16:51:04.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/35054

From 09f75394be7879d43b89f55005beec1301e7dcb4 Mon Sep 17 00:00:00 2001
From: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Date: Thu, 20 Feb 2025 10:04:45 -0800
Subject: [PATCH 27/33] Require hwid (#35331)

* Make cvar to require that the client has a modern hwid

* Ignore guests and don't disable cvar on dev

* Rename and add docs
---
 Content.Server.Database/Model.cs               | 2 ++
 Content.Server/Connection/ConnectionManager.cs | 5 +++++
 Content.Shared/CCVar/CCVars.Admin.cs           | 6 ++++++
 Resources/Locale/en-US/connection-messages.ftl | 2 ++
 4 files changed, 15 insertions(+)

diff --git a/Content.Server.Database/Model.cs b/Content.Server.Database/Model.cs
index bd62bdda9b6..88d0a582b22 100644
--- a/Content.Server.Database/Model.cs
+++ b/Content.Server.Database/Model.cs
@@ -987,6 +987,8 @@ public enum ConnectionDenyReason : byte
         BabyJail = 4,
         /// Results from rejected connections with external API checking tools
         IPChecks = 5,
+        /// Results from rejected connections who are authenticated but have no modern hwid associated with them.
+        NoHwid = 6
     }
 
     public class ServerBanHit
diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
index bc0f06de98c..dbc43ac47a0 100644
--- a/Content.Server/Connection/ConnectionManager.cs
+++ b/Content.Server/Connection/ConnectionManager.cs
@@ -220,6 +220,11 @@ session.Status is SessionStatus.Connected or SessionStatus.InGame
 
             var modernHwid = e.UserData.ModernHWIds;
 
+            if (modernHwid.Length == 0 && e.AuthType == LoginType.LoggedIn && _cfg.GetCVar(CCVars.RequireModernHardwareId))
+            {
+                return (ConnectionDenyReason.NoHwid, Loc.GetString("hwid-required"), null);
+            }
+
             var bans = await _db.GetServerBansAsync(addr, userId, hwId, modernHwid, includeUnbanned: false);
             if (bans.Count > 0)
             {
diff --git a/Content.Shared/CCVar/CCVars.Admin.cs b/Content.Shared/CCVar/CCVars.Admin.cs
index f05eb3376ea..7f26106ff16 100644
--- a/Content.Shared/CCVar/CCVars.Admin.cs
+++ b/Content.Shared/CCVar/CCVars.Admin.cs
@@ -183,6 +183,12 @@ public sealed partial class CCVars
     public static readonly CVarDef<bool> BanHardwareIds =
         CVarDef.Create("ban.hardware_ids", true, CVar.SERVERONLY);
 
+    /// <summary>
+    /// Determines if we'll reject connections from clients who don't have a modern hwid.
+    /// </summary>
+    public static readonly CVarDef<bool> RequireModernHardwareId =
+        CVarDef.Create("admin.require_modern_hwid", true, CVar.SERVERONLY);
+
     /// <summary>
     /// If true, players are allowed to connect to multiple game servers at once.
     /// If false, they will be kicked from the first when connecting to another.
diff --git a/Resources/Locale/en-US/connection-messages.ftl b/Resources/Locale/en-US/connection-messages.ftl
index 3d41049fd45..befe646676d 100644
--- a/Resources/Locale/en-US/connection-messages.ftl
+++ b/Resources/Locale/en-US/connection-messages.ftl
@@ -60,3 +60,5 @@ generic-misconfigured = The server is misconfigured and is not accepting players
 ipintel-server-ratelimited = This server uses a security system with external verification, which has reached its maximum verification limit. Please contact the administration team of the server for assistance and try again later.
 ipintel-unknown = This server uses a security system with external verification, but it encountered an error. Please contact the administration team of the server for assistance and try again later.
 ipintel-suspicious = You seem to be connecting through a datacenter or VPN. For administrative reasons we do not allow VPN connections to play. Please contact the administration team of the server for assistance if you believe this is false.
+
+hwid-required = Your client has refused to send a hardware id. Please contact the administration team for further assistance.

From 53c82ebdd6c0f3b902c17052f43b7c764e63226d Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Thu, 20 Feb 2025 20:24:21 +0100
Subject: [PATCH 28/33] 2 lines yaml cleanup (#35338)

---
 Resources/Prototypes/Magic/touch_spells.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Resources/Prototypes/Magic/touch_spells.yml b/Resources/Prototypes/Magic/touch_spells.yml
index deb036f215a..5e20bc2b2ba 100644
--- a/Resources/Prototypes/Magic/touch_spells.yml
+++ b/Resources/Prototypes/Magic/touch_spells.yml
@@ -25,8 +25,6 @@
 - type: entity
   id: ActionSmiteNoReq
   parent: ActionSmite
-  name: Smite
-  description: Instantly gibs a target.
   components:
   - type: Magic
 

From ddeda2eb1552f2fdac7ff63c3ad88c861ab294a4 Mon Sep 17 00:00:00 2001
From: lzk <124214523+lzk228@users.noreply.github.com>
Date: Thu, 20 Feb 2025 20:28:15 +0100
Subject: [PATCH 29/33] fix migration.yml (#35339)

https://github.com/space-wizards/space-station-14/pull/34293
---
 Resources/migration.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/migration.yml b/Resources/migration.yml
index f53dc9fd329..9ac55bb789b 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -549,3 +549,9 @@ FoodCondimentPacketFrostoil: FoodCondimentPacketColdsauce
 #2025-02-05
 WeaponSubMachineGunVector: null
 WeaponSubMachineGunVectorRubber: null
+
+# 2025-02-20
+MagazineBoxAntiMaterielBig: null
+MagazineBoxCaselessRifle10x24: null
+MagazineBoxCaselessRifleBig: null
+MagazinePistolHighCapacityRubber: null

From a9054c5e9c8f595874c034abd14fc63b3831a411 Mon Sep 17 00:00:00 2001
From: keronshb <54602815+keronshb@users.noreply.github.com>
Date: Thu, 20 Feb 2025 18:38:52 -0500
Subject: [PATCH 30/33] Mjollnir and Singularity Hammer for Wizard (#34446)

---
 .../Anomaly/SharedAnomalyCoreSystem.cs        |   6 +-
 Content.Shared/Anomaly/SharedAnomalySystem.cs |  10 +-
 .../RepulseAttract/RepulseAttractComponent.cs |  38 +++
 .../RepulseAttract/RepulseAttractSystem.cs    |  78 ++++++
 Content.Shared/Throwing/ThrowingSystem.cs     |  22 +-
 Content.Shared/Timing/UseDelaySystem.cs       |   7 +-
 .../Components/MeleeThrowOnHitComponent.cs    |  91 ++-----
 .../Components/UseDelayOnMeleeHitComponent.cs |  12 +
 .../Weapons/Melee/MeleeThrowOnHitSystem.cs    | 117 +++------
 .../Weapons/Melee/UseDelayOnMeleeHitSystem.cs |  39 +++
 .../Components/WieldableComponent.cs          |   8 +-
 .../Wieldable/SharedWieldableSystem.cs        |  11 +-
 .../Locale/en-US/store/spellbook-catalog.ftl  |   6 +
 .../Prototypes/Catalog/spellbook_catalog.yml  |  26 ++
 .../Objects/Specific/Research/anomaly.yml     |   1 -
 .../Objects/Weapons/Melee/hammers.yml         | 109 ++++++++
 .../Objects/Weapons/Melee/sledgehammer.yml    |  25 --
 .../Weapons/Melee/mjollnir.rsi/icon.png       | Bin 0 -> 1297 bytes
 .../Melee/mjollnir.rsi/inhand-left.png        | Bin 0 -> 686 bytes
 .../Melee/mjollnir.rsi/inhand-right.png       | Bin 0 -> 681 bytes
 .../Weapons/Melee/mjollnir.rsi/meta.json      |  42 +++
 .../mjollnir.rsi/wielded-inhand-left.png      | Bin 0 -> 695 bytes
 .../mjollnir.rsi/wielded-inhand-right.png     | Bin 0 -> 684 bytes
 .../Melee/singularityhammer.rsi/icon.png      | Bin 0 -> 2836 bytes
 .../singularityhammer.rsi/inhand-left.png     | Bin 0 -> 4596 bytes
 .../singularityhammer.rsi/inhand-right.png    | Bin 0 -> 4704 bytes
 .../Melee/singularityhammer.rsi/meta.json     | 244 ++++++++++++++++++
 .../wielded-inhand-left.png                   | Bin 0 -> 6297 bytes
 .../wielded-inhand-right.png                  | Bin 0 -> 6401 bytes
 29 files changed, 692 insertions(+), 200 deletions(-)
 create mode 100644 Content.Shared/RepulseAttract/RepulseAttractComponent.cs
 create mode 100644 Content.Shared/RepulseAttract/RepulseAttractSystem.cs
 create mode 100644 Content.Shared/Weapons/Melee/Components/UseDelayOnMeleeHitComponent.cs
 create mode 100644 Content.Shared/Weapons/Melee/UseDelayOnMeleeHitSystem.cs
 create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Melee/hammers.yml
 delete mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/mjollnir.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/mjollnir.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/mjollnir.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/mjollnir.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/mjollnir.rsi/wielded-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/mjollnir.rsi/wielded-inhand-right.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/singularityhammer.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/singularityhammer.rsi/inhand-left.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/singularityhammer.rsi/inhand-right.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/singularityhammer.rsi/meta.json
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/singularityhammer.rsi/wielded-inhand-left.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/singularityhammer.rsi/wielded-inhand-right.png

diff --git a/Content.Shared/Anomaly/SharedAnomalyCoreSystem.cs b/Content.Shared/Anomaly/SharedAnomalyCoreSystem.cs
index f4864a532b8..70735dbb405 100644
--- a/Content.Shared/Anomaly/SharedAnomalyCoreSystem.cs
+++ b/Content.Shared/Anomaly/SharedAnomalyCoreSystem.cs
@@ -36,9 +36,9 @@ private void OnAttemptMeleeThrowOnHit(Entity<CorePoweredThrowerComponent> ent, r
         var (uid, comp) = ent;
 
         // don't waste charges on non-anchorable non-anomalous static bodies.
-        if (!HasComp<AnomalyComponent>(args.Hit)
-            && !HasComp<AnchorableComponent>(args.Hit)
-            && TryComp<PhysicsComponent>(args.Hit, out var body)
+        if (!HasComp<AnomalyComponent>(args.Target)
+            && !HasComp<AnchorableComponent>(args.Target)
+            && TryComp<PhysicsComponent>(args.Target, out var body)
             && body.BodyType == BodyType.Static)
             return;
 
diff --git a/Content.Shared/Anomaly/SharedAnomalySystem.cs b/Content.Shared/Anomaly/SharedAnomalySystem.cs
index 05e12d406e2..3f8da9e3c8b 100644
--- a/Content.Shared/Anomaly/SharedAnomalySystem.cs
+++ b/Content.Shared/Anomaly/SharedAnomalySystem.cs
@@ -4,6 +4,7 @@
 using Content.Shared.Database;
 using Content.Shared.Physics;
 using Content.Shared.Popups;
+using Content.Shared.Throwing;
 using Content.Shared.Weapons.Melee.Components;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Map;
@@ -41,19 +42,22 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<AnomalyComponent, MeleeThrowOnHitStartEvent>(OnAnomalyThrowStart);
-        SubscribeLocalEvent<AnomalyComponent, MeleeThrowOnHitEndEvent>(OnAnomalyThrowEnd);
+        SubscribeLocalEvent<AnomalyComponent, LandEvent>(OnLand);
     }
 
     private void OnAnomalyThrowStart(Entity<AnomalyComponent> ent, ref MeleeThrowOnHitStartEvent args)
     {
-        if (!TryComp<CorePoweredThrowerComponent>(args.Used, out var corePowered) || !TryComp<PhysicsComponent>(ent, out var body))
+        if (!TryComp<CorePoweredThrowerComponent>(args.Weapon, out var corePowered) || !TryComp<PhysicsComponent>(ent, out var body))
             return;
+
+        // anomalies are static by default, so we have set them to dynamic to be throwable
         _physics.SetBodyType(ent, BodyType.Dynamic, body: body);
         ChangeAnomalyStability(ent, Random.NextFloat(corePowered.StabilityPerThrow.X, corePowered.StabilityPerThrow.Y), ent.Comp);
     }
 
-    private void OnAnomalyThrowEnd(Entity<AnomalyComponent> ent, ref MeleeThrowOnHitEndEvent args)
+    private void OnLand(Entity<AnomalyComponent> ent, ref LandEvent args)
     {
+        // revert back to static
         _physics.SetBodyType(ent, BodyType.Static);
     }
 
diff --git a/Content.Shared/RepulseAttract/RepulseAttractComponent.cs b/Content.Shared/RepulseAttract/RepulseAttractComponent.cs
new file mode 100644
index 00000000000..c167d81ec65
--- /dev/null
+++ b/Content.Shared/RepulseAttract/RepulseAttractComponent.cs
@@ -0,0 +1,38 @@
+using Content.Shared.Physics;
+using Content.Shared.Whitelist;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.RepulseAttract;
+
+/// <summary>
+///     Used to repulse or attract entities away from the entity this is on
+/// </summary>
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState, Access(typeof(RepulseAttractSystem))]
+public sealed partial class RepulseAttractComponent : Component
+{
+    /// <summary>
+    ///     How fast should the Repulsion/Attraction be?
+    ///     A positive value will repulse objects, a negative value will attract
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Speed = 5.0f;
+
+    /// <summary>
+    ///     How close do the entities need to be?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public float Range = 5.0f;
+
+    /// <summary>
+    ///     What kind of entities should this effect apply to?
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public EntityWhitelist? Whitelist;
+
+    /// <summary>
+    ///     What collision layers should be excluded?
+    ///     The default excludes ghost mobs, revenants, the AI camera etc.
+    /// </summary>
+    [DataField, AutoNetworkedField]
+    public CollisionGroup CollisionMask = CollisionGroup.GhostImpassable;
+}
diff --git a/Content.Shared/RepulseAttract/RepulseAttractSystem.cs b/Content.Shared/RepulseAttract/RepulseAttractSystem.cs
new file mode 100644
index 00000000000..9363d7bbec5
--- /dev/null
+++ b/Content.Shared/RepulseAttract/RepulseAttractSystem.cs
@@ -0,0 +1,78 @@
+using Content.Shared.Physics;
+using Content.Shared.Throwing;
+using Content.Shared.Timing;
+using Content.Shared.Weapons.Melee.Events;
+using Content.Shared.Whitelist;
+using Content.Shared.Wieldable;
+using Robust.Shared.Map;
+using Robust.Shared.Physics.Components;
+using System.Numerics;
+using Content.Shared.Weapons.Melee;
+
+namespace Content.Shared.RepulseAttract;
+
+public sealed class RepulseAttractSystem : EntitySystem
+{
+    [Dependency] private readonly EntityLookupSystem _lookup = default!;
+    [Dependency] private readonly ThrowingSystem _throw = default!;
+    [Dependency] private readonly EntityWhitelistSystem _whitelist = default!;
+    [Dependency] private readonly SharedTransformSystem _xForm = default!;
+    [Dependency] private readonly UseDelaySystem _delay = default!;
+
+    private EntityQuery<PhysicsComponent> _physicsQuery;
+    private HashSet<EntityUid> _entSet = new();
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        _physicsQuery = GetEntityQuery<PhysicsComponent>();
+
+        SubscribeLocalEvent<RepulseAttractComponent, MeleeHitEvent>(OnMeleeAttempt, before: [typeof(UseDelayOnMeleeHitSystem)], after: [typeof(SharedWieldableSystem)]);
+    }
+    private void OnMeleeAttempt(Entity<RepulseAttractComponent> ent, ref MeleeHitEvent args)
+    {
+        if (_delay.IsDelayed(ent.Owner))
+            return;
+
+        TryRepulseAttract(ent, args.User);
+    }
+
+    public bool TryRepulseAttract(Entity<RepulseAttractComponent> ent, EntityUid user)
+    {
+        var position = _xForm.GetMapCoordinates(ent.Owner);
+        return TryRepulseAttract(position, user, ent.Comp.Speed, ent.Comp.Range, ent.Comp.Whitelist, ent.Comp.CollisionMask);
+    }
+
+    public bool TryRepulseAttract(MapCoordinates position, EntityUid? user, float speed, float range, EntityWhitelist? whitelist = null, CollisionGroup layer = CollisionGroup.SingularityLayer)
+    {
+        _entSet.Clear();
+        var epicenter = position.Position;
+        _lookup.GetEntitiesInRange(position.MapId, epicenter, range, _entSet, flags: LookupFlags.Dynamic | LookupFlags.Sundries);
+
+        foreach (var target in _entSet)
+        {
+            if (!_physicsQuery.TryGetComponent(target, out var physics)
+                || (physics.CollisionLayer & (int)layer) != 0x0) // exclude layers like ghosts
+                continue;
+
+            if (_whitelist.IsWhitelistFail(whitelist, target))
+                continue;
+
+            var targetPos = _xForm.GetWorldPosition(target);
+
+            // vector from epicenter to target entity
+            var direction = targetPos - epicenter;
+
+            if (direction == Vector2.Zero)
+                continue;
+
+            // attract: throw all items directly to to the epicenter
+            // repulse: throw them up to the maximum range
+            var throwDirection = speed < 0 ? -direction : direction.Normalized() * (range - direction.Length());
+
+            _throw.TryThrow(target, throwDirection, Math.Abs(speed), user, recoil: false, compensateFriction: true);
+        }
+
+        return true;
+    }
+}
diff --git a/Content.Shared/Throwing/ThrowingSystem.cs b/Content.Shared/Throwing/ThrowingSystem.cs
index 549473278e4..c37f2356989 100644
--- a/Content.Shared/Throwing/ThrowingSystem.cs
+++ b/Content.Shared/Throwing/ThrowingSystem.cs
@@ -2,6 +2,7 @@
 using Content.Shared.Administration.Logs;
 using Content.Shared.Camera;
 using Content.Shared.CCVar;
+using Content.Shared.Construction.Components;
 using Content.Shared.Database;
 using Content.Shared.Friction;
 using Content.Shared.Gravity;
@@ -57,7 +58,8 @@ public void TryThrow(
         bool recoil = true,
         bool animated = true,
         bool playSound = true,
-        bool doSpin = true)
+        bool doSpin = true,
+        bool unanchor = false)
     {
         var thrownPos = _transform.GetMapCoordinates(uid);
         var mapPos = _transform.ToMapCoordinates(coordinates);
@@ -65,7 +67,7 @@ public void TryThrow(
         if (mapPos.MapId != thrownPos.MapId)
             return;
 
-        TryThrow(uid, mapPos.Position - thrownPos.Position, baseThrowSpeed, user, pushbackRatio, friction, compensateFriction: compensateFriction, recoil: recoil, animated: animated, playSound: playSound, doSpin: doSpin);
+        TryThrow(uid, mapPos.Position - thrownPos.Position, baseThrowSpeed, user, pushbackRatio, friction, compensateFriction: compensateFriction, recoil: recoil, animated: animated, playSound: playSound, doSpin: doSpin, unanchor: unanchor);
     }
 
     /// <summary>
@@ -78,6 +80,7 @@ public void TryThrow(
     /// <param name="friction">friction value used for the distance calculation. If set to null this defaults to the standard tile values</param>
     /// <param name="compensateFriction">True will adjust the throw so the item stops at the target coordinates. False means it will land at the target and keep sliding.</param>
     /// <param name="doSpin">Whether spin will be applied to the thrown entity.</param>
+    /// <param name="unanchor">If true and the thrown entity has <see cref="AnchorableComponent"/>, unanchor the thrown entity</param>
     public void TryThrow(EntityUid uid,
         Vector2 direction,
         float baseThrowSpeed = 10.0f,
@@ -88,7 +91,8 @@ public void TryThrow(EntityUid uid,
         bool recoil = true,
         bool animated = true,
         bool playSound = true,
-        bool doSpin = true)
+        bool doSpin = true,
+        bool unanchor = false)
     {
         var physicsQuery = GetEntityQuery<PhysicsComponent>();
         if (!physicsQuery.TryGetComponent(uid, out var physics))
@@ -105,7 +109,7 @@ public void TryThrow(EntityUid uid,
             baseThrowSpeed,
             user,
             pushbackRatio,
-            friction, compensateFriction: compensateFriction, recoil: recoil, animated: animated, playSound: playSound, doSpin: doSpin);
+            friction, compensateFriction: compensateFriction, recoil: recoil, animated: animated, playSound: playSound, doSpin: doSpin, unanchor: unanchor);
     }
 
     /// <summary>
@@ -118,6 +122,7 @@ public void TryThrow(EntityUid uid,
     /// <param name="friction">friction value used for the distance calculation. If set to null this defaults to the standard tile values</param>
     /// <param name="compensateFriction">True will adjust the throw so the item stops at the target coordinates. False means it will land at the target and keep sliding.</param>
     /// <param name="doSpin">Whether spin will be applied to the thrown entity.</param>
+    /// <param name="unanchor">If true and the thrown entity has <see cref="AnchorableComponent"/>, unanchor the thrown entity</param>
     public void TryThrow(EntityUid uid,
         Vector2 direction,
         PhysicsComponent physics,
@@ -131,16 +136,17 @@ public void TryThrow(EntityUid uid,
         bool recoil = true,
         bool animated = true,
         bool playSound = true,
-        bool doSpin = true)
+        bool doSpin = true,
+        bool unanchor = false)
     {
         if (baseThrowSpeed <= 0 || direction == Vector2Helpers.Infinity || direction == Vector2Helpers.NaN || direction == Vector2.Zero || friction < 0)
             return;
 
+        if (unanchor && HasComp<AnchorableComponent>(uid))
+            _transform.Unanchor(uid);
+
         if ((physics.BodyType & (BodyType.Dynamic | BodyType.KinematicController)) == 0x0)
-        {
-            Log.Warning($"Tried to throw entity {ToPrettyString(uid)} but can't throw {physics.BodyType} bodies!");
             return;
-        }
 
         // Allow throwing if this projectile only acts as a projectile when shot, otherwise disallow
         if (projectileQuery.TryGetComponent(uid, out var proj) && !proj.OnlyCollideWhenShot)
diff --git a/Content.Shared/Timing/UseDelaySystem.cs b/Content.Shared/Timing/UseDelaySystem.cs
index 9707a4ddbe5..c6a1818443a 100644
--- a/Content.Shared/Timing/UseDelaySystem.cs
+++ b/Content.Shared/Timing/UseDelaySystem.cs
@@ -88,8 +88,11 @@ public bool SetLength(Entity<UseDelayComponent?> ent, TimeSpan length, string id
     /// <summary>
     /// Returns true if the entity has a currently active UseDelay with the specified ID.
     /// </summary>
-    public bool IsDelayed(Entity<UseDelayComponent> ent, string id = DefaultId)
+    public bool IsDelayed(Entity<UseDelayComponent?> ent, string id = DefaultId)
     {
+        if (!Resolve(ent, ref ent.Comp, false))
+            return false;
+
         if (!ent.Comp.Delays.TryGetValue(id, out var entry))
             return false;
 
@@ -144,7 +147,7 @@ public UseDelayInfo GetLastEndingDelay(Entity<UseDelayComponent> ent)
     /// Otherwise reset it and return true.</param>
     public bool TryResetDelay(Entity<UseDelayComponent> ent, bool checkDelayed = false, string id = DefaultId)
     {
-        if (checkDelayed && IsDelayed(ent, id))
+        if (checkDelayed && IsDelayed((ent.Owner, ent.Comp), id))
             return false;
 
         if (!ent.Comp.Delays.TryGetValue(id, out var entry))
diff --git a/Content.Shared/Weapons/Melee/Components/MeleeThrowOnHitComponent.cs b/Content.Shared/Weapons/Melee/Components/MeleeThrowOnHitComponent.cs
index 82ffc5e51fc..84e75129b14 100644
--- a/Content.Shared/Weapons/Melee/Components/MeleeThrowOnHitComponent.cs
+++ b/Content.Shared/Weapons/Melee/Components/MeleeThrowOnHitComponent.cs
@@ -9,104 +9,49 @@ namespace Content.Shared.Weapons.Melee.Components;
 /// This is used for a melee weapon that throws whatever gets hit by it in a line
 /// until it hits a wall or a time limit is exhausted.
 /// </summary>
-[RegisterComponent, NetworkedComponent]
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 [Access(typeof(MeleeThrowOnHitSystem))]
-[AutoGenerateComponentState]
 public sealed partial class MeleeThrowOnHitComponent : Component
 {
     /// <summary>
     /// The speed at which hit entities should be thrown.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    [AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public float Speed = 10f;
 
     /// <summary>
-    /// How long hit entities remain thrown, max.
+    /// The maximum distance the hit entity should be thrown.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    [AutoNetworkedField]
-    public float Lifetime = 3f;
-
-    /// <summary>
-    /// How long we wait to start accepting collision.
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float MinLifetime = 0.05f;
+    [DataField, AutoNetworkedField]
+    public float Distance = 20f;
 
     /// <summary>
     /// Whether or not anchorable entities should be unanchored when hit.
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    [AutoNetworkedField]
+    [DataField, AutoNetworkedField]
     public bool UnanchorOnHit;
 
     /// <summary>
-    /// Whether or not the throwing behavior occurs by default.
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    [AutoNetworkedField]
-    public bool Enabled = true;
-}
-
-/// <summary>
-/// Component used to track entities that have been yeeted by <see cref="MeleeThrowOnHitComponent"/>
-/// </summary>
-[RegisterComponent, NetworkedComponent]
-[AutoGenerateComponentState]
-[Access(typeof(MeleeThrowOnHitSystem))]
-public sealed partial class MeleeThrownComponent : Component
-{
-    /// <summary>
-    /// The velocity of the throw
-    /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    [AutoNetworkedField]
-    public Vector2 Velocity;
-
-    /// <summary>
-    /// How long the throw will last.
+    /// How long should this stun the target, if applicable?
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    [AutoNetworkedField]
-    public float Lifetime;
+    [DataField, AutoNetworkedField]
+    public TimeSpan? StunTime;
 
     /// <summary>
-    /// How long we wait to start accepting collision.
+    /// Should this also work on a throw-hit?
     /// </summary>
-    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public float MinLifetime;
-
-    /// <summary>
-    /// At what point in time will the throw be complete?
-    /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
-    [AutoNetworkedField]
-    public TimeSpan ThrownEndTime;
-
-    /// <summary>
-    /// At what point in time will the <see cref="MinLifetime"/> be exhausted
-    /// </summary>
-    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
-    [AutoNetworkedField]
-    public TimeSpan MinLifetimeTime;
-
-    /// <summary>
-    /// the status to which the entity will return when the thrown ends
-    /// </summary>
-    [DataField]
-    public BodyStatus PreviousStatus;
+    [DataField, AutoNetworkedField]
+    public bool ActivateOnThrown;
 }
 
 /// <summary>
-/// Event raised before an entity is thrown by <see cref="MeleeThrowOnHitComponent"/> to see if a throw is allowed.
-/// If not handled, the enabled field on the component will be used instead.
+/// Raised a weapon entity with <see cref="MeleeThrowOnHitComponent"/> to see if a throw is allowed.
 /// </summary>
 [ByRefEvent]
-public record struct AttemptMeleeThrowOnHitEvent(EntityUid Hit, bool Cancelled = false, bool Handled = false);
-
-[ByRefEvent]
-public record struct MeleeThrowOnHitStartEvent(EntityUid User, EntityUid Used);
+public record struct AttemptMeleeThrowOnHitEvent(EntityUid Target, EntityUid? User, bool Cancelled = false, bool Handled = false);
 
+/// <summary>
+/// Raised a target entity before it is thrown by <see cref="MeleeThrowOnHitComponent"/>.
+/// </summary>
 [ByRefEvent]
-public record struct MeleeThrowOnHitEndEvent();
+public record struct MeleeThrowOnHitStartEvent(EntityUid Weapon, EntityUid? User);
diff --git a/Content.Shared/Weapons/Melee/Components/UseDelayOnMeleeHitComponent.cs b/Content.Shared/Weapons/Melee/Components/UseDelayOnMeleeHitComponent.cs
new file mode 100644
index 00000000000..644971bc017
--- /dev/null
+++ b/Content.Shared/Weapons/Melee/Components/UseDelayOnMeleeHitComponent.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared.Weapons.Melee.Components;
+
+/// <summary>
+///     Activates UseDelay when a Melee Weapon is used to hit something.
+/// </summary>
+[RegisterComponent, NetworkedComponent, Access(typeof(UseDelayOnMeleeHitSystem))]
+public sealed partial class UseDelayOnMeleeHitComponent : Component
+{
+
+}
diff --git a/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs b/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
index 78863562330..bc95be926ab 100644
--- a/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
+++ b/Content.Shared/Weapons/Melee/MeleeThrowOnHitSystem.cs
@@ -1,12 +1,13 @@
-using System.Numerics;
 using Content.Shared.Construction.Components;
+using Content.Shared.Stunnable;
+using Content.Shared.Throwing;
+using Content.Shared.Timing;
 using Content.Shared.Weapons.Melee.Components;
 using Content.Shared.Weapons.Melee.Events;
 using Robust.Shared.Physics;
 using Robust.Shared.Physics.Components;
-using Robust.Shared.Physics.Events;
 using Robust.Shared.Physics.Systems;
-using Robust.Shared.Timing;
+using System.Numerics;
 
 namespace Content.Shared.Weapons.Melee;
 
@@ -15,113 +16,67 @@ namespace Content.Shared.Weapons.Melee;
 /// </summary>
 public sealed class MeleeThrowOnHitSystem : EntitySystem
 {
-    [Dependency] private readonly IGameTiming _timing = default!;
     [Dependency] private readonly SharedTransformSystem _transform = default!;
     [Dependency] private readonly SharedPhysicsSystem _physics = default!;
-
+    [Dependency] private readonly UseDelaySystem _delay = default!;
+    [Dependency] private readonly SharedStunSystem _stun = default!;
+    [Dependency] private readonly ThrowingSystem _throwing = default!;
     /// <inheritdoc/>
     public override void Initialize()
     {
         SubscribeLocalEvent<MeleeThrowOnHitComponent, MeleeHitEvent>(OnMeleeHit);
-        SubscribeLocalEvent<MeleeThrownComponent, ComponentStartup>(OnThrownStartup);
-        SubscribeLocalEvent<MeleeThrownComponent, ComponentShutdown>(OnThrownShutdown);
-        SubscribeLocalEvent<MeleeThrownComponent, StartCollideEvent>(OnStartCollide);
+        SubscribeLocalEvent<MeleeThrowOnHitComponent, ThrowDoHitEvent>(OnThrowHit);
     }
 
-    private void OnMeleeHit(Entity<MeleeThrowOnHitComponent> ent, ref MeleeHitEvent args)
+    private void OnMeleeHit(Entity<MeleeThrowOnHitComponent> weapon, ref MeleeHitEvent args)
     {
-        var (_, comp) = ent;
+        // TODO: MeleeHitEvent is weird. Why is this even raised if we don't hit something?
         if (!args.IsHit)
             return;
 
-        var mapPos = _transform.GetMapCoordinates(args.User).Position;
-        foreach (var hit in args.HitEntities)
-        {
-            var hitPos = _transform.GetMapCoordinates(hit).Position;
-            var angle = args.Direction ?? hitPos - mapPos;
-            if (angle == Vector2.Zero)
-                continue;
-
-            if (!CanThrowOnHit(ent, hit))
-                continue;
-
-            if (comp.UnanchorOnHit && HasComp<AnchorableComponent>(hit))
-            {
-                _transform.Unanchor(hit, Transform(hit));
-            }
-
-            RemComp<MeleeThrownComponent>(hit);
-            var ev = new MeleeThrowOnHitStartEvent(args.User, ent);
-            RaiseLocalEvent(hit, ref ev);
-            var thrownComp = new MeleeThrownComponent
-            {
-                Velocity = angle.Normalized() * comp.Speed,
-                Lifetime = comp.Lifetime,
-                MinLifetime = comp.MinLifetime
-            };
-            AddComp(hit, thrownComp);
-        }
-    }
-
-    private void OnThrownStartup(Entity<MeleeThrownComponent> ent, ref ComponentStartup args)
-    {
-        var (_, comp) = ent;
-
-        if (!TryComp<PhysicsComponent>(ent, out var body) ||
-            (body.BodyType & (BodyType.Dynamic | BodyType.KinematicController)) == 0x0)
+        if (_delay.IsDelayed(weapon.Owner))
             return;
 
-        comp.PreviousStatus = body.BodyStatus;
-        comp.ThrownEndTime = _timing.CurTime + TimeSpan.FromSeconds(comp.Lifetime);
-        comp.MinLifetimeTime = _timing.CurTime + TimeSpan.FromSeconds(comp.MinLifetime);
-        _physics.SetBodyStatus(ent, body, BodyStatus.InAir);
-        _physics.SetLinearVelocity(ent, Vector2.Zero, body: body);
-        _physics.ApplyLinearImpulse(ent, comp.Velocity * body.Mass, body: body);
-        Dirty(ent, ent.Comp);
-    }
+        if (args.HitEntities.Count == 0)
+            return;
 
-    private void OnThrownShutdown(Entity<MeleeThrownComponent> ent, ref ComponentShutdown args)
-    {
-        if (TryComp<PhysicsComponent>(ent, out var body))
-            _physics.SetBodyStatus(ent, body, ent.Comp.PreviousStatus);
-        var ev = new MeleeThrowOnHitEndEvent();
-        RaiseLocalEvent(ent, ref ev);
+        var userPos = _transform.GetWorldPosition(args.User);
+        foreach (var target in args.HitEntities)
+        {
+            var targetPos = _transform.GetMapCoordinates(target).Position;
+            var direction = args.Direction ?? targetPos - userPos;
+            ThrowOnHitHelper(weapon, args.User, target, direction);
+        }
     }
 
-    private void OnStartCollide(Entity<MeleeThrownComponent> ent, ref StartCollideEvent args)
+    private void OnThrowHit(Entity<MeleeThrowOnHitComponent> weapon, ref ThrowDoHitEvent args)
     {
-        var (_, comp) = ent;
-        if (!args.OtherFixture.Hard || !args.OtherBody.CanCollide || !args.OurFixture.Hard || !args.OurBody.CanCollide)
+        if (!weapon.Comp.ActivateOnThrown)
             return;
 
-        if (_timing.CurTime < comp.MinLifetimeTime)
+        if (!TryComp<PhysicsComponent>(args.Thrown, out var weaponPhysics))
             return;
 
-        RemCompDeferred(ent, ent.Comp);
+        ThrowOnHitHelper(weapon, args.Component.Thrower, args.Target, weaponPhysics.LinearVelocity);
     }
 
-    public bool CanThrowOnHit(Entity<MeleeThrowOnHitComponent> ent, EntityUid target)
+    private void ThrowOnHitHelper(Entity<MeleeThrowOnHitComponent> ent, EntityUid? user, EntityUid target, Vector2 direction)
     {
-        var (uid, comp) = ent;
+        var attemptEvent = new AttemptMeleeThrowOnHitEvent(target, user);
+        RaiseLocalEvent(ent.Owner, ref attemptEvent);
 
-        var ev = new AttemptMeleeThrowOnHitEvent(target);
-        RaiseLocalEvent(uid, ref ev);
+        if (attemptEvent.Cancelled)
+            return;
 
-        if (ev.Handled)
-            return !ev.Cancelled;
+        var startEvent = new MeleeThrowOnHitStartEvent(ent.Owner, user);
+        RaiseLocalEvent(target, ref startEvent);
 
-        return comp.Enabled;
-    }
+        if (ent.Comp.StunTime != null)
+            _stun.TryParalyze(target, ent.Comp.StunTime.Value, false);
 
-    public override void Update(float frameTime)
-    {
-        base.Update(frameTime);
+        if (direction == Vector2.Zero)
+            return;
 
-        var query = EntityQueryEnumerator<MeleeThrownComponent>();
-        while (query.MoveNext(out var uid, out var comp))
-        {
-            if (_timing.CurTime > comp.ThrownEndTime)
-                RemCompDeferred(uid, comp);
-        }
+        _throwing.TryThrow(target, direction.Normalized() * ent.Comp.Distance, ent.Comp.Speed, user, unanchor: ent.Comp.UnanchorOnHit);
     }
 }
diff --git a/Content.Shared/Weapons/Melee/UseDelayOnMeleeHitSystem.cs b/Content.Shared/Weapons/Melee/UseDelayOnMeleeHitSystem.cs
new file mode 100644
index 00000000000..0400bf5f911
--- /dev/null
+++ b/Content.Shared/Weapons/Melee/UseDelayOnMeleeHitSystem.cs
@@ -0,0 +1,39 @@
+using Content.Shared.Throwing;
+using Content.Shared.Timing;
+using Content.Shared.Weapons.Melee.Components;
+using Content.Shared.Weapons.Melee.Events;
+
+namespace Content.Shared.Weapons.Melee;
+
+/// <inheritdoc cref="UseDelayOnMeleeHitComponent"/>
+public sealed class UseDelayOnMeleeHitSystem : EntitySystem
+{
+    [Dependency] private readonly UseDelaySystem _delay = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<UseDelayOnMeleeHitComponent, MeleeHitEvent>(OnMeleeHit);
+        SubscribeLocalEvent<UseDelayOnMeleeHitComponent, ThrowDoHitEvent>(OnThrowHitEvent);
+    }
+
+    private void OnThrowHitEvent(Entity<UseDelayOnMeleeHitComponent> ent, ref ThrowDoHitEvent args)
+    {
+        TryResetDelay(ent);
+    }
+
+    private void OnMeleeHit(Entity<UseDelayOnMeleeHitComponent> ent, ref MeleeHitEvent args)
+    {
+        TryResetDelay(ent);
+    }
+
+    private void TryResetDelay(Entity<UseDelayOnMeleeHitComponent> ent)
+    {
+        var uid = ent.Owner;
+
+        if (!TryComp<UseDelayComponent>(uid, out var useDelay))
+            return;
+
+        _delay.TryResetDelay((uid, useDelay), checkDelayed: true);
+    }
+}
diff --git a/Content.Shared/Wieldable/Components/WieldableComponent.cs b/Content.Shared/Wieldable/Components/WieldableComponent.cs
index c146940b7a2..c7be70e7c96 100644
--- a/Content.Shared/Wieldable/Components/WieldableComponent.cs
+++ b/Content.Shared/Wieldable/Components/WieldableComponent.cs
@@ -28,11 +28,17 @@ public sealed partial class WieldableComponent : Component
 
     /// <summary>
     ///     Whether using the item inhand while wielding causes the item to unwield.
-    ///     Unwielding can conflict with other inhand actions. 
+    ///     Unwielding can conflict with other inhand actions.
     /// </summary>
     [DataField]
     public bool UnwieldOnUse = true;
 
+    /// <summary>
+    ///     Should use delay trigger after the wield/unwield?
+    /// </summary>
+    [DataField]
+    public bool UseDelayOnWield = true;
+
     [DataField("wieldedInhandPrefix")]
     public string? WieldedInhandPrefix = "wielded";
 
diff --git a/Content.Shared/Wieldable/SharedWieldableSystem.cs b/Content.Shared/Wieldable/SharedWieldableSystem.cs
index 110c941dac7..b3d2e1bdf15 100644
--- a/Content.Shared/Wieldable/SharedWieldableSystem.cs
+++ b/Content.Shared/Wieldable/SharedWieldableSystem.cs
@@ -191,6 +191,9 @@ private void OnUseInHand(EntityUid uid, WieldableComponent component, UseInHandE
             args.Handled = TryWield(uid, component, args.User);
         else if (component.UnwieldOnUse)
             args.Handled = TryUnwield(uid, component, args.User);
+
+        if (HasComp<UseDelayComponent>(uid) && !component.UseDelayOnWield)
+            args.ApplyDelay = false;
     }
 
     public bool CanWield(EntityUid uid, WieldableComponent component, EntityUid user, bool quiet = false)
@@ -235,9 +238,11 @@ public bool TryWield(EntityUid used, WieldableComponent component, EntityUid use
         if (!CanWield(used, component, user))
             return false;
 
-        if (TryComp(used, out UseDelayComponent? useDelay)
-            && !_delay.TryResetDelay((used, useDelay), true))
-            return false;
+        if (TryComp(used, out UseDelayComponent? useDelay) && component.UseDelayOnWield)
+        {
+            if (!_delay.TryResetDelay((used, useDelay), true))
+                return false;
+        }
 
         var attemptEv = new WieldAttemptEvent(user);
         RaiseLocalEvent(used, ref attemptEv);
diff --git a/Resources/Locale/en-US/store/spellbook-catalog.ftl b/Resources/Locale/en-US/store/spellbook-catalog.ftl
index 0c650c0d4d2..73d8118fc53 100644
--- a/Resources/Locale/en-US/store/spellbook-catalog.ftl
+++ b/Resources/Locale/en-US/store/spellbook-catalog.ftl
@@ -52,6 +52,12 @@ spellbook-wand-polymorph-carp-description = For when you need a carp filet quick
 spellbook-wand-locker-name = Wand of the Locker
 spellbook-wand-locker-description = Shoot cursed lockers at your enemies and lock em away!
 
+spellbook-hammer-mjollnir-name = Mjollnir
+spellbook-hammer-mjollnir-description = Wield the power of THUNDER in your hands. Send foes flying with a mighty swing or by throwing it right at em!
+
+spellbook-hammer-singularity-name = Singularity Hammer
+spellbook-hammer-singularity-description = Ever wonder what it'd be like to be the singularity? Swing this hammer to draw in your surroundings, even works if you miss!
+
 spellbook-staff-animation-name = Staff of Animation
 spellbook-staff-animation-description = Bring inanimate objects to life!
 
diff --git a/Resources/Prototypes/Catalog/spellbook_catalog.yml b/Resources/Prototypes/Catalog/spellbook_catalog.yml
index 0486330940d..768475a03b4 100644
--- a/Resources/Prototypes/Catalog/spellbook_catalog.yml
+++ b/Resources/Prototypes/Catalog/spellbook_catalog.yml
@@ -197,6 +197,32 @@
   - !type:ListingLimitedStockCondition
     stock: 1
 
+- type: listing
+  id: SpellbookHammerMjollnir
+  name: spellbook-hammer-mjollnir-name
+  description: spellbook-hammer-mjollnir-description
+  productEntity: Mjollnir
+  cost:
+    WizCoin: 2
+  categories:
+  - SpellbookEquipment
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+
+- type: listing
+  id: SpellbookHammerSingularity
+  name: spellbook-hammer-singularity-name
+  description: spellbook-hammer-singularity-description
+  productEntity: SingularityHammer
+  cost:
+    WizCoin: 2
+  categories:
+  - SpellbookEquipment
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+
 - type: listing
   id: SpellbookStaffAnimation
   name: spellbook-staff-animation-name
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
index efbd7c2db4f..0872f0fc3eb 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Research/anomaly.yml
@@ -142,7 +142,6 @@
   - type: CorePoweredThrower
   - type: MeleeThrowOnHit
     unanchorOnHit: true
-    enabled: false
   - type: ItemSlots
     slots:
       core_slot:
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/hammers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/hammers.yml
new file mode 100644
index 00000000000..d2a0ecdbfb9
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/hammers.yml
@@ -0,0 +1,109 @@
+- type: entity
+  name: sledgehammer
+  parent: BaseItem
+  id: Sledgehammer
+  description: The perfect tool for wanton carnage.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/sledgehammer.rsi
+    state: icon
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    damage:
+      types:
+        Blunt: 10
+        Structural: 10
+    soundHit:
+      collection: MetalThud
+  - type: Wieldable
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 10
+        Structural: 10
+  - type: Item
+    size: Large
+
+- type: entity
+  id: Mjollnir
+  parent: [ BaseItem, BaseMagicalContraband ]
+  name: Mjollnir
+  description: A weapon worthy of a god, able to strike with the force of a lightning bolt. It crackles with barely contained energy.
+  components:
+  - type: Wieldable
+    useDelayOnWield: false
+  - type: MeleeRequiresWield
+  - type: LandAtCursor
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/mjollnir.rsi
+    layers:
+    - state: icon
+  - type: UseDelay
+    delay: 10
+  - type: UseDelayOnMeleeHit
+  - type: MeleeThrowOnHit
+    stunTime: 3
+    activateOnThrown: true
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    damage:
+      types:
+        Blunt: 5
+        Structural: 5
+    soundHit:
+      path: /Audio/Effects/tesla_consume.ogg
+      params:
+        variation: 0.10
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 20
+        Structural: 25
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Blunt: 15
+        Structural: 15
+  - type: Item
+    size: Ginormous
+
+- type: entity
+  id: SingularityHammer
+  parent: [ BaseItem, BaseMagicalContraband ]
+  name: Singularity Hammer
+  description: The pinnacle of close combat technology, the hammer harnesses the power of a miniaturized singularity to deal crushing blows.
+  components:
+  - type: Wieldable
+    useDelayOnWield: false
+  - type: MeleeRequiresWield
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/singularityhammer.rsi
+    layers:
+    - state: icon
+  - type: RepulseAttract
+    speed: -15 #Anything above this pushes things too far away from the Wizard
+    range: 5
+    whitelist:
+      components:
+      - MobMover
+      - Item
+  - type: UseDelay
+    delay: 10
+  - type: UseDelayOnMeleeHit
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    damage:
+      types:
+        Blunt: 5
+        Structural: 5
+    soundHit:
+      path: /Audio/Effects/radpulse5.ogg
+      params:
+        variation: 0.10
+  - type: IncreaseDamageOnWield
+    damage:
+      types:
+        Blunt: 15
+        Structural: 15
+  - type: Item
+    size: Ginormous
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
deleted file mode 100644
index 0c75015d9aa..00000000000
--- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-- type: entity
-  name: sledgehammer
-  parent: BaseItem
-  id: Sledgehammer
-  description: The perfect tool for wanton carnage.
-  components:
-  - type: Sprite
-    sprite: Objects/Weapons/Melee/sledgehammer.rsi
-    state: icon
-  - type: MeleeWeapon
-    wideAnimationRotation: -135
-    damage:
-      types:
-        Blunt: 10
-        Structural: 10
-    soundHit:
-      collection: MetalThud
-  - type: Wieldable
-  - type: IncreaseDamageOnWield
-    damage:
-      types:
-        Blunt: 10
-        Structural: 10
-  - type: Item
-    size: Large
diff --git a/Resources/Textures/Objects/Weapons/Melee/mjollnir.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/mjollnir.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..420a46f29a14632f8f2ada2bb1c3d90fdfa1f8e1
GIT binary patch
literal 1297
zcmb7Ee>l^59RGY9+lb~zemwGQyB3~UGdsFY_xNsEm(7|VvFghCO?6fYXN7I0POdr;
zHNu?CQ%AUd;5hM+q*Afk^c)vrDu&Fjx$o@e{<#19<Nf3HdS37M^M3vF&JN`6GB<TF
z1pt_{{FuRp8nGH!v>}g3Qnwk3$#K8^NdT;SxEfG_+qw+^7<I6ij1WPwx}^1(oW8z`
zV09+@HezgSX-i`?$1~WW*%ZsnDlXZ^*Am6PO73n8Tv&ILjn0=5UtKKm2L3V-++y_e
zLj@%^#$(01_+167$lG1Woyw3s{?SUC^dR*CVId<$$#QaC0F%?xY5g_T)dxvXkAu_;
zh}|iag-sQ&j|6SKzI&5zT<!~7fU4zH4X1WSdGwE@AwE4ENvMxMD4*dtTMKidH<b?_
z#dH<0JKYM{lZC|YMef?~H5YsnwbmHm;zeysY~C4b^?O5u9irOy%idb$8ycf1eDEZl
z{%9<~5ir-gsI#s&;RtO?g`%B#BCfq!v;Q|@v6)M!54~{=e7li2c|A|8?(Q~8biIU(
z+^t<1WL%ql;}E%L4d-4iHsOoOcZ=`U0)fD<n7x7EkYzZxZMPk{$mFsXzhk56xiyJy
z83--b_K9A!B}+dse%Ba;k>!hO=khBi&ZLW#y<0dgt&VjX|9)?jHUSdomU5MX`8--c
zNtvgo!=<%Oz1XfwVg2a<HAznx1WYX%0?2TS@hMR{d#;9CGl5RQ*E?JGkJvX5hKhBc
z<}`3{Deu-WC49(W4<$;Q$t)dc-ThXmH%T+Dyq^=-evjg#Mxtuufr}a!Q}Jm#*fDkZ
z?cmU8rSyUVpY7pvImyD)KYbQOJr4(g<4>Ve<BFaLy}VY6a(|wWeSRUQqn59qUyNN6
zZlKOAM`J(^c-bGaRf_5A7;4EL+T-XGuSyCNRRbnL7=|wWNtG=c1NPfKhD-(XNqRQa
z#*ZJ83#t=H21(idUD45aSEsO9RiWrGD9<#zILG<QZFA3dQ4Bzv)AI7okzXNuug88n
z>Swah5d(}z_hQzzx&W2VHMxL+zLqeW1yM=czai76-LH^S>SsH^Tx&1uyVXWwXQbi_
z`|cDF(16tZo-dj6lk<cDB(le!4JEa5`8gS6VfzE12H70o@Cqc->5K;xUN8PO`iHlS
zdPa_XmYFM&<~-Xg62szKe0<Q2#LQO&;wbJWJ_aF9_B9!=h*?_liWq6P?fqKSl5jTD
zJ_K{W=Qb6q`G}L`zZk(CAAF81MIF7yA)Rk>m)?kQ-d8j}?yotigZ|)VC<|>SmqL5d
zc~LSr;-F6zTy~OIhC~$(+&%Hq`iXl`-LV_1d@~HfdU;i;M;2~sKMkZG%7;N}{MHGJ
zhLL6K$|)S3j?i9e-d5<KLQN?AZu6llig5BCesigV=#0&ZIIj6Gj~Tbl$3hwsq&y~r
z%bMh-oMc&^89|wYCoL(KQH@{1lyDu?o?eAOher>L;rvMd!Fdc;^O`_hwNL#FBIQ(5
zohNATn@63MO<=J8N}R>j8Um3V2GjR73B`5EIuQ9`8Tw!F)Ko;bLK^S%5s04}(<IgN
vm_T;L3W&UA(0??{E*tiIF8nZ;9H~P&rJ1qduF)yOj{~foTxQLVh%^5Jn(kZ_

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/mjollnir.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/mjollnir.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b5216cc45728e0d38f560912a3d7e351e0dff17
GIT binary patch
literal 686
zcmV;f0#W^mP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000ie
z000ie0hKEb8vp<TU`a$lRCt{2n!joSK@f*WNJy1u2*DI~*98J0b&9KOtn9=`NOQGK
z9zpD`vJnCn)=5A}ccigUB;XThWp&AK$sQ);&+U1$xHtPX>fxW8&%M3bojD@mcmX6F
zFMx#O1(0yO01{3i0psyF#bX$THF6wd0li*N1z)e%)$=HdoR(lDpxtg~!Gj<OoR^SW
zfd1zZ^kT74$C4zW<EIC58KV(^;1RTD+#k@z=?UH6UZ!`G7bizSZUGqPxC9!F2F+$O
znm<0P;OCny(Q56i1fvlU$FY)tM|I%rJk=87NySHiCJX+9>D#gf31PQGQ4pjq-WK;x
zgdkxWMQV~ne!wMx>$^+K1TjZ&O5hS(YAUQHkVBNd7H};oVqFaBH3Kjm!uTw54sM~W
z0uTU_C#24K=LRj!M(}`D0D>P5htz7dC~xqPH5!f7XKlbL070AF74-X&X;wl2FunFo
zrR~c>?g-h;C=XJAO}qdSju$|}@d8LVUH}Ql3n1Zm0VEtRz}64#(^J6Nk6=Xrw#u>9
zg{rb?Ii0&7fn5MjT5oS52yAwKsW1M4jeZ1n0q7q{c3x{4{{>>JAAwZ>O6IStHO>12
zqHZTU{=LuOH*EAHunEY5-)z-MtCPRECiE9ztNg!9z*av3n*f~L)lUC_sv^hB+}A&_
z(T~6;K$o`g&#OLyPx1!;)B8F45m*Fp*7eHnM_>_Pqpnw0DV{}utrB?|zvI^eR3VDY
z36&C{?mC7Gr%DOXnPaor%sm<^B>*66#M(jR2q@B9P$>aG^dwjWFMx#O1(0yw0UpGA
U0m2tiv;Y7A07*qoM6N<$g1e+A)&Kwi

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/mjollnir.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/mjollnir.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c4128442ba30552fc3763c8a9091d426d599305
GIT binary patch
literal 681
zcmV;a0#^NrP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000ie
z000ie0hKEb8vp<TTS-JgRCt{2nlVemKorMcLFv@bAkq%qvI&AXJ9O&Oshju_Trzj@
zBZyn3E(M{3vkC>b;?kj|2z~;coMQfgS7J$PFLxJmdG}jd%jN9*<y~^=dq*T3FMx#O
z1(0yO01}QDK*BL1U^<<~c<uFi4RQ=^0i)3<ZnxXCTCLLeVHi3kK}!Gv4uT+k4+-=6
zoQA_;97T~c60`&yzdX`B^Eb<IDH93{xVt)w-#@=-dH+CkbG`W-5|9b5P)NWg`0pR;
zw3;+cBy=t>sN3z*cs!=sFM->qx5oL&X^h|@VfL|Z%%Zh(>mL*nfZHC@9A_TE^XIMw
z50nLP@KwFY;rprVN0bCqJ$RtH8B-Ea_27%3B%p4=gPj6+e-B*T;{)EQ?)(0^0uVg!
z?_Ju|Y=ex2gnbWdxdJc{2Vqk)7!1f|cxT%0_jB(MJC^`Ua5eq2EEbD2n-9(arVhdX
zcOpgnBBXo~l!O;R!tnw~I9>n=#|t3gcmX6FFMx#O1=yHWr(dA#UIXI-bovD_9<MmQ
ztO~PH0XqEx7{|u}%u|L0qXLTd3-Fo8cw`QMJj`bsV*+&h1-8efCHGb{ofp+;vV;)<
zy8Qyk4lDtT$1k|c=U3v=J0<hllwd@FiGBf$`!hZ>UsUxBFx4-R9iPsVNa!WYDGUN@
z^$BeOHcRGdCWRq!dCP_bZ2@JJ%(=#AV{UB$WtGfr{U84<pn5=E3Z~4#0{9`t<$i%Y
z4idl(6O+kgv%Reg2MOR3Gj?er1%Ns=Ok`2I2-Yol;BSK@94~-`BVNES;pKfa6A%aW
P00000NkvXXu0mjfpm`)T

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/mjollnir.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/mjollnir.rsi/meta.json
new file mode 100644
index 00000000000..d3043135234
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/mjollnir.rsi/meta.json
@@ -0,0 +1,42 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from and modified by ProtivogaSpriter on TGStation at commit https://github.com/tgstation/tgstation/commit/2614518661bfac1dcc96f07cfcc70b4abacd27bf",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "wielded-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "icon",
+      "delays": [
+        [
+          2,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/mjollnir.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/mjollnir.rsi/wielded-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..499a827bc9d01461c72caa65f37d92acf27227b2
GIT binary patch
literal 695
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Qg0
zr;B4q#hkZMyS<nlMfM*0*X}VZVY1%`ex0DDo>T2NhzN@5v@F^1jepw&la)ac-2xl9
zo0b@KOwjL`8sTzolC;|9^0d#JJl@&*mYus>Ip^`4T?XokPYswoEYC0m@fkNvIn1Mg
z%6-sXw%fLtJ9C!YMMlLX`VW)VhMne~>eX7cS58(*s+X<z_~SoPvl5*yz5kwm_@RL~
z-v{3B;^~`TFTcJtR-rJpbpGL*uT`-!%3-%fX8iy1Y1#t8TM_EFX6PSeWj0^Xd-p=^
z8LsBNzRN0?Ur4z-d-Wx|hz1oAnd>udw@S|VU%sw$>n=5w#TPqPU46A_LY}$Bg6tcs
z3VtWNN!zS>@A}IUuI!tv3j!~3>M?e5|9fq0x38Xyx$(4;{_)R`Cm(wE;dje6%N_qK
zSPbfG*9j){=6E!TJFdPu>*KZOj~=|<yg{H-d-d-ap9kxXe*V*JqMDIXo8$CP=!omI
z)SaAfE-gG%yJex|{!V`xEvH{^yeD7=4O&P+xeXD8@y5)r*H~v9*q6?>M5m!-eujgF
zF~h&V5Bq-Xxo`jb`L@&f#SdP7n|kcq^?+%t6Rs&r37q12P;N3)FYDh;`{&Ftc2n3R
zT=&ctpKz?Ka^2BQ3_>o<*G}@Zu%+2eW7lxj&=)wZaRe;tG?Vee-{;d^Zv#!OX*iw#
zi{nQnV`k3u=TSP`3XUcUQzSpcs{qa19$PotxPJS3lWq6)PBVEFv;60NQ=R5;ipis+
xj{Qw`TEg7Y+tU>^+a(=NC9+K@T4DZxKYhWQ$KnYr=Yc7a!PC{xWt~$(695DVHq!tA

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/mjollnir.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/mjollnir.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ef1c92af24967cc50d8e47b9c7a568524b1dd4e
GIT binary patch
literal 684
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fA0|Qf>
zr;B4q#hkaZHhM8T3bd(D_%7gCd}E1l4RiPEOG{2kM|5$pi#Y{F{ALSZ>RH;lm4k7&
z^8{@kr5`L&ovvqO&TX7|=ia*XyxBAPnX0XC-kn)*Uf%fow}Ol)L(5{OhJp|Vfj%yV
zLxGGA7FrA(?yL+CS1>FTo8`AW`?Hnjq<is?Vg<jj^tdTUtPM+*=3b_>(N>1<^uL1%
z4BbbSBK)G6QX;qYJ>KE->e-iy+QRQUwsM!&uCw?iJ2%#G-t*Lt5eiM$cgSsBIiJO-
z_@;Wzy?v4gR5VupeERd;gXQ1*wc^@y&wO9za3@hm#L(5?;G^PicmE&yyj04wWv#Hm
z?6V48i;i*LRtXbv{rRvsS^m)P=btU#aL>~}XDipg`n4BB$dQm|PaYJcFORp|uaLXL
z^5(H4vzb;#c%2YoxxM9gOSW>&L-XL*{tSl9r?+39>-73pOyQeoHBKM3$*<hpTZ4)u
z7BB8!pb%@z`lD9$MeqTeTbZ-IoiXcjSgxXSki~#IPxw98Uv&=Du)!H{FN!{Gd;iC|
ziq*=V(agW0_d*<_K4Z>4#&_%svZt#b_;yb|*=+rR&u>jH+$qiev~B(V1DXz#^BaD%
zYJ3y-Z|IbK9M_m+oPK$h&9PdBwX6=aYM8e*#mr;4Eg`?Yp}*q}d%|Iu`e%<hS1A9I
z4Sp_q;+?$I^(Pzm{$&xE4K#}J#jWGQ0qn<O;uvqw+Vl3c{;NNl37=VRaJ&_L5z+v0
l-Iw_a&{$TG`N;H#;ehm=o*PTcrvj57gQu&X%Q~loCIEu@CC&f<

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/singularityhammer.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/singularityhammer.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c3a04bce1c0fd51d28462ea41794c0a3c3687e9
GIT binary patch
literal 2836
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

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/singularityhammer.rsi/inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/singularityhammer.rsi/inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..f385980712b2cbd89db07385db88f741eab6cf77
GIT binary patch
literal 4596
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
U=r1A6XB>dBfw_LUu3gxF0h5^w0ssI2

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/singularityhammer.rsi/inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/singularityhammer.rsi/inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..51774aca75e4106aa46d0f5ae8f90098e07fa8eb
GIT binary patch
literal 4704
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
A=Kufz

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/singularityhammer.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/singularityhammer.rsi/meta.json
new file mode 100644
index 00000000000..395910364c3
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/singularityhammer.rsi/meta.json
@@ -0,0 +1,244 @@
+{
+  "version": 1,
+  "license": "CC-BY-NC-SA-3.0",
+  "copyright": "Taken from and modified by LemonInTheDark on TGStation at commit https://github.com/tgstation/tgstation/commit/a64baadebe20b10c69c1747c42dc51c7377c9c97",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05
+        ],
+        [
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05
+        ],
+        [
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05
+        ],
+        [
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05
+        ]
+      ]
+    },
+    {
+      "name": "wielded-inhand-left",
+      "directions": 4,
+      "delays": [
+        [
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05
+        ],
+        [
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05
+        ],
+        [
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05
+        ],
+        [
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05
+        ]
+      ]
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05
+        ],
+        [
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05
+        ],
+        [
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05
+        ],
+        [
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05
+        ]
+      ]
+    },
+    {
+      "name": "wielded-inhand-right",
+      "directions": 4,
+      "delays": [
+        [
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05
+        ],
+        [
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05
+        ],
+        [
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05
+        ],
+        [
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05
+        ]
+      ]
+    },
+    {
+      "name": "icon",
+      "delays": [
+        [
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05,
+          0.05
+        ]
+      ]
+    }
+  ]
+}
diff --git a/Resources/Textures/Objects/Weapons/Melee/singularityhammer.rsi/wielded-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/singularityhammer.rsi/wielded-inhand-left.png
new file mode 100644
index 0000000000000000000000000000000000000000..f798047ee2c16e4a1f3d5e62f51a69b530b2ee33
GIT binary patch
literal 6297
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
F{{`^CCvgA(

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/singularityhammer.rsi/wielded-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/singularityhammer.rsi/wielded-inhand-right.png
new file mode 100644
index 0000000000000000000000000000000000000000..cec47b089da7fe8d46421264fc8de376b5fcb1f1
GIT binary patch
literal 6401
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
O0Aqa%y#`&kxc>sg!e%7^

literal 0
HcmV?d00001


From d6cc1675064b783160b80daee15694cf57d44306 Mon Sep 17 00:00:00 2001
From: spderman3333 <118777573+spderman3333@users.noreply.github.com>
Date: Thu, 20 Feb 2025 20:50:30 -0800
Subject: [PATCH 31/33] Fixed Veggie pizza slice having 40u of reagent space
 (#35343)

* Fixed Veg pizza slice having 40u of reagent space

* Changed FoodPizzaVegetableSlice to hold 10u rather than 6u

* Fixed donk pocket slice having 50u reagent space.
---
 .../Entities/Objects/Consumable/Food/Baked/pizza.yml          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
index f8990b7f52d..1426d53adb8 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
@@ -226,7 +226,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 40
+        maxVol: 10
         reagents:
         - ReagentId: Nutriment
           Quantity: 4
@@ -283,7 +283,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 50
+        maxVol: 10
         reagents:
         - ReagentId: Nutriment
           Quantity: 4.5

From 4299ed341d8b7373e9469f1571009a3bc499d1a2 Mon Sep 17 00:00:00 2001
From: Zack Backmen <backmen@bk.ru>
Date: Fri, 21 Feb 2025 12:19:37 +0300
Subject: [PATCH 32/33] fix upstream

---
 Content.Server/Backmen/EnergyDome/EnergyDomeSystem.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Server/Backmen/EnergyDome/EnergyDomeSystem.cs b/Content.Server/Backmen/EnergyDome/EnergyDomeSystem.cs
index bccc15a355d..d8d4a4c020f 100644
--- a/Content.Server/Backmen/EnergyDome/EnergyDomeSystem.cs
+++ b/Content.Server/Backmen/EnergyDome/EnergyDomeSystem.cs
@@ -174,7 +174,7 @@ private void OnComponentRemove(Entity<EnergyDomeGeneratorComponent> generator, r
     // Functional
     public bool AttemptToggle(Entity<EnergyDomeGeneratorComponent> generator, bool status)
     {
-        if (TryComp<UseDelayComponent>(generator, out var useDelay) && _useDelay.IsDelayed(new Entity<UseDelayComponent>(generator, useDelay)))
+        if (TryComp<UseDelayComponent>(generator, out var useDelay) && _useDelay.IsDelayed((generator, useDelay)))
         {
             _audio.PlayPvs(generator.Comp.TurnOffSound, generator);
             _popup.PopupEntity(

From 53b1c09e59b7f409c5d104b8d95fc89ebd43fe7a Mon Sep 17 00:00:00 2001
From: bkm CL <dev@backmen.ru>
Date: Fri, 21 Feb 2025 13:00:09 +0300
Subject: [PATCH 33/33] Automatic changelog update

---
 Resources/Changelog/ChangelogBkm.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Resources/Changelog/ChangelogBkm.yml b/Resources/Changelog/ChangelogBkm.yml
index 1aaccb4af46..1a19effd210 100644
--- a/Resources/Changelog/ChangelogBkm.yml
+++ b/Resources/Changelog/ChangelogBkm.yml
@@ -1399,3 +1399,10 @@
   id: 93
   time: '2025-02-20T01:49:48.0000000+00:00'
   url: https://github.com/Rxup/space-station-14/pull/1063
+- author: Rxup
+  changes:
+  - message: Upstream
+    type: Fix
+  id: 94
+  time: '2025-02-21T09:50:00.0000000+00:00'
+  url: https://github.com/Rxup/space-station-14/pull/1066