Merge pull request #849 from Sha-Seng/crushers-and-axes-in-tank-slots

crushers fit in tank slots
impstation · Dec 3, 2024 · 95badf0 · 95badf0
2 parents a0e20fa + ed7932f
commit 95badf0
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 3 deletions.
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -99,6 +99,13 @@
     color: "#ffeead"
     enabled: false
     radius: 4
+  - type: Sprite # Imp note: The lit sprites of crushers don't work at all, and it'll take modifying all equipped, held, and wielded sprites of them to make them work
+    layers:
+    - state: icon
+    - state: icon-lit
+      shader: unshaded
+      visible: false
+      map: [ "light" ]
 
 - type: entity
   parent: [BaseWeaponCrusher, BaseSecurityCargoContraband]
@@ -109,7 +116,6 @@
       - Pickaxe
   - type: Sprite
     sprite: Objects/Weapons/Melee/crusher.rsi
-    state: icon
   - type: AmmoCounter
   - type: UseDelayOnShoot
   - type: UseDelay
@@ -152,6 +158,12 @@
     sprite: Objects/Weapons/Melee/crusher-inhands.rsi
   - type: DisarmMalus
   - type: Prying
+  - type: Clothing # Imp
+    sprite: Objects/Weapons/Melee/crusher.rsi
+    quickEquip: false
+    slots:
+    - Back
+    - suitStorage
 
 - type: entity
   parent: [ BaseWeaponCrusher, BaseSecurityCargoContraband]
@@ -197,3 +209,9 @@
   - type: Item
     size: Ginormous
     sprite: Objects/Weapons/Melee/crusher_glaive-inhands.rsi
+  - type: Clothing # Imp
+    sprite: Objects/Weapons/Melee/crusher_glaive.rsi
+    quickEquip: false
+    slots:
+    - Back
+    - suitStorage
diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/equipped-BACKPACK.png
diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher.rsi/meta.json b/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), equipped sprites modified by Sha-Seng (Github)",
   "size": {
     "x": 32,
     "y": 32
@@ -13,6 +13,14 @@
     {
       "name": "icon-lit"
     },
+    {
+      "name": "equipped-BACKPACK",
+      "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
+    },
     {
       "name": "icon-uncharged",
       "delays": [

diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/equipped-BACKPACK.png b/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/equipped-BACKPACK.png
diff --git a/...rces/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/equipped-SUITSTORAGE.png b/...rces/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/equipped-SUITSTORAGE.png
diff --git a/Resources/Textures/Objects/Weapons/Melee/crusher_glaive.rsi/meta.json b/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), equipped sprites modified by Sha-Seng (Github)",
   "size": {
     "x": 32,
     "y": 32
@@ -13,6 +13,14 @@
     {
       "name": "icon-lit"
     },
+    {
+      "name": "equipped-BACKPACK",
+      "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
+    },
     {
       "name": "icon-uncharged",
       "delays": [