Merge remote-tracking branch 'space-wizards/master'

# Conflicts:
#	Resources/Textures/Objects/Weapons/Melee/crusher.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Melee/crusher.rsi/equipped-SUITSTORAGE.png
#	Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/equipped-BACKPACK.png
#	Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/equipped-SUITSTORAGE.png

Content.Server/Medical/Components/HealthAnalyzerComponent.cs

@@ -41,10 +41,10 @@ public sealed partial class HealthAnalyzerComponent : Component
     public EntityUid? ScannedEntity;
 
     /// <summary>
-    /// The maximum range in tiles at which the analyzer can receive continuous updates
+    /// The maximum range in tiles at which the analyzer can receive continuous updates, a value of null will be infinite range
     /// </summary>
     [DataField]
-    public float MaxScanRange = 2.5f;
+    public float? MaxScanRange = 2.5f;
 
     /// <summary>
     /// Sound played on scanning begin

Content.Server/Medical/HealthAnalyzerSystem.cs

@@ -63,8 +63,9 @@ public sealed class HealthAnalyzerSystem : EntitySystem
             component.NextUpdate = _timing.CurTime + component.UpdateInterval;
 
             //Get distance between health analyzer and the scanned entity
+            //null is infinite range
             var patientCoordinates = Transform(patient).Coordinates;
-            if (!_transformSystem.InRange(patientCoordinates, transform.Coordinates, component.MaxScanRange))
+            if (component.MaxScanRange != null && !_transformSystem.InRange(patientCoordinates, transform.Coordinates, component.MaxScanRange.Value))
             {
                 //Range too far, disable updates
                 StopAnalyzingEntity((uid, component), patient);

Resources/Changelog/Admin.yml

@@ -976,5 +976,12 @@ Entries:
   id: 118
   time: '2025-03-27T17:42:58.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/35417
+- author: Minemoder
+  changes:
+  - message: Admin PDA Health Analyzer now has infinite range.
+    type: Tweak
+  id: 119
+  time: '2025-04-06T08:31:06.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/36347
 Name: Admin
 Order: 1

Resources/Changelog/Changelog.yml

@@ -1,11 +1,4 @@
 Entries:
-- author: IProduceWidgets
-  changes:
-  - message: The terminal is more tamper proof.
-    type: Fix
-  id: 7638
-  time: '2024-11-22T22:50:41.0000000+00:00'
-  url: https://github.com/space-wizards/space-station-14/pull/33281
 - author: MissKay1994
   changes:
   - message: The salvage vendor now has enough equipment for everyone
@@ -3888,3 +3881,13 @@
   id: 8137
   time: '2025-04-05T21:05:42.0000000+00:00'
   url: https://github.com/space-wizards/space-station-14/pull/36319
+- author: RedBookcase
+  changes:
+  - message: The Crusher Dagger has had it's damage reduced from 15 to 12 Slashing.
+    type: Tweak
+  - message: The Crusher and Crusher Glaive can now be worn on the back and suit storage
+      slots.
+    type: Add
+  id: 8138
+  time: '2025-04-06T06:48:18.0000000+00:00'
+  url: https://github.com/space-wizards/space-station-14/pull/35914

Resources/Prototypes/Entities/Objects/Devices/pda.yml

@@ -1003,6 +1003,7 @@
   - type: Pda
     id: UniversalIDCard
   - type: HealthAnalyzer
+    maxScanRange: null
     scanDelay: 0
     silent: true
   - type: CartridgeLoader

Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml

@@ -110,6 +110,15 @@
   - type: Sprite
     sprite: Objects/Weapons/Melee/crusher.rsi
     state: icon
+  - type: Item
+    size: Ginormous
+    sprite: Objects/Weapons/Melee/crusher-inhands.rsi
+  - type: Clothing
+    sprite: Objects/Weapons/Melee/crusher.rsi
+    quickEquip: false
+    slots:
+    - Back
+    - suitStorage
   - type: AmmoCounter
   - type: UseDelayOnShoot
   - type: UseDelay
@@ -153,9 +162,6 @@
         Slash: 2.5
         Structural: 30
   - type: GunRequiresWield
-  - type: Item
-    size: Ginormous
-    sprite: Objects/Weapons/Melee/crusher-inhands.rsi
   - type: DisarmMalus
   - type: Prying
 
@@ -174,7 +180,7 @@
     attackRate: 2
     damage:
       types:
-        Slash: 15
+        Slash: 12
   - type: EmbeddableProjectile
     sound: /Audio/Weapons/star_hit.ogg
     offset: -0.15,0.0
@@ -197,6 +203,16 @@
   components:
   - type: Sprite
     sprite: Objects/Weapons/Melee/crusher_glaive.rsi
+    state: icon
+  - type: Item
+    size: Ginormous
+    sprite: Objects/Weapons/Melee/crusher_glaive-inhands.rsi
+  - type: Clothing
+    sprite: Objects/Weapons/Melee/crusher_glaive.rsi
+    quickEquip: false
+    slots:
+    - Back
+    - suitStorage
   - type: UseDelay
     delay: 1.9
   - type: LeechOnMarker
@@ -217,6 +233,3 @@
   - type: Tag
     tags:
       - Pickaxe
-  - type: Item
-    size: Ginormous
-    sprite: Objects/Weapons/Melee/crusher_glaive-inhands.rsi

Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi and modified by alzore_ (discord)",
+  "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi and modified by alzore_ (discord). Back/Suit sprites by Redbookcase (github).",
   "size": {
     "x": 32,
     "y": 32
@@ -29,6 +29,14 @@
           0.3
         ]
       ]
+    },
+    {
+      "name": "equipped-BACKPACK",
+      "directions": 4
+    },
+	{
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi and modified by alzore_ (discord)",
+  "copyright": "https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/817e7c1f225876b45891e3f06908e6d032f0a8bc/icons/obj/mining.dmi and modified by alzore_ (discord). Back/Suit sprites by Redbookcase (github).",
   "size": {
     "x": 32,
     "y": 32
@@ -29,6 +29,14 @@
           0.3
         ]
       ]
+    },
+    {
+      "name": "equipped-BACKPACK",
+      "directions": 4
+    },
+	{
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }