Merge pull request #196 from terezi4real/meleeweaponsonback

Melee weapons on back/suit storage slot
new-frontiers-14 · Aug 13, 2023 · a9c7dc7 · a9c7dc7
2 parents 41ac55d + 8251176
commit a9c7dc7
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 1 deletion.
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml
@@ -22,6 +22,7 @@
     quickEquip: false
     slots:
     - back
+    - suitStorage
   - type: Construction
     graph: WoodenBat
     node: bat

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml
@@ -33,6 +33,7 @@
     quickEquip: false
     slots:
     - back
+    - suitStorage
   - type: Tool
     qualities:
       - Prying
@@ -55,3 +56,4 @@
     quickEquip: false
     slots:
     - back
+    - suitStorage
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml
@@ -63,6 +63,11 @@
   - type: Tool
     qualities:
       - Prying
+  - type: Clothing
+    quickEquip: false
+    slots:
+    - back
+    - suitStorage
 
 - type: entity
   name: crusher dagger
@@ -109,3 +114,8 @@
     size: 150
   - type: StaticPrice
     price: 285
+  - type: Clothing
+    quickEquip: false
+    slots:
+    - back
+    - suitStorage
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml
@@ -25,6 +25,11 @@
     sprite: Objects/Weapons/Melee/pickaxe.rsi
   - type: StaticPrice
     price: 15.5
+  - type: Clothing
+    quickEquip: false
+    slots:
+    - back
+    - suitStorage
 
 - type: entity
   name: mining drill

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml
@@ -27,6 +27,7 @@
     quickEquip: false
     slots:
     - back
+    - suitStorage
   - type: Construction
     graph: Spear
     node: spear
@@ -106,6 +107,7 @@
     quickEquip: false
     slots:
     - back
+    - suitStorage
   - type: Construction
     graph: SpearReinforced
     node: spear
@@ -185,6 +187,7 @@
     quickEquip: false
     slots:
     - back
+    - suitStorage
   - type: Construction
     graph: SpearPlasma
     node: spear
@@ -266,6 +269,7 @@
     quickEquip: false
     slots:
     - back
+    - suitStorage
   - type: Construction
     graph: SpearUranium
     node: spear

diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
@@ -18,14 +18,19 @@
   - type: Reflect
     enabled: true
     reflectProb: .5
-    spread: 90        
+    spread: 90
   - type: Item
     size: 15
     sprite: Objects/Weapons/Melee/captain_sabre.rsi
   - type: Tag
     tags:
     - CaptainSabre
   - type: DisarmMalus
+  - type: Clothing
+    quickEquip: false
+    slots:
+    - back
+    - suitStorage
 
 - type: entity
   name: katana
@@ -50,6 +55,11 @@
     size: 15
     sprite: Objects/Weapons/Melee/katana.rsi
   - type: DisarmMalus
+  - type: Clothing
+    quickEquip: false
+    slots:
+    - back
+    - suitStorage
 
 - type: entity
   name: machete
@@ -74,6 +84,11 @@
     size: 15
     sprite: Objects/Weapons/Melee/machete.rsi
   - type: DisarmMalus
+  - type: Clothing
+    quickEquip: false
+    slots:
+    - back
+    - suitStorage
 
 - type: entity
   name: claymore
@@ -98,6 +113,7 @@
     sprite: Objects/Weapons/Melee/claymore.rsi
     slots:
     - back
+    - suitStorage
   - type: DisarmMalus
 
 - type: entity
@@ -123,3 +139,8 @@
     size: 15
     sprite: Objects/Weapons/Melee/cutlass.rsi
   - type: DisarmMalus
+  - type: Clothing
+    quickEquip: false
+    slots:
+    - back
+    - suitStorage