Cherry-picked commit 6c23989 from space-wizards/space-station-14/master

Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

@@ -84,6 +84,7 @@
     quickEquip: false
     slots:
     - Belt
+    - suitStorage
 
 - type: entity
   id: BaseWeaponPowerCellSmall

Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml

@@ -33,6 +33,9 @@
         map: ["enum.GunVisualLayers.Base"]
   - type: Clothing
     sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi
+    slots:
+    - Back
+    - suitStorage
   - type: AmmoCounter
   - type: Gun
     fireRate: 1

Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml

@@ -16,6 +16,7 @@
     quickEquip: false
     slots:
     - Back
+    - suitStorage
   - type: AmmoCounter
   - type: Gun
     fireRate: 0.75

Resources/Prototypes/Entities/Objects/Weapons/Guns/flare_gun.yml

@@ -36,3 +36,4 @@
     quickEquip: false
     slots:
     - Belt
+    - suitStorage

Resources/Textures/Objects/Weapons/Guns/Basic/kinetic_accelerator.rsi/meta.json

@@ -38,6 +38,10 @@
         {
             "name": "equipped-BELT",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Objects/Weapons/Guns/Battery/advancedlasergun.rsi/meta.json

@@ -39,6 +39,10 @@
 		{
 			"name": "equipped-BELT",
 			"directions": 4
+		},
+		{
+			"name": "equipped-SUITSTORAGE",
+			"directions": 4
 		}
     ]
 }

Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json

@@ -71,6 +71,10 @@
 		{
 			"name": "equipped-BELT",
 			"directions": 4
+		},
+		{
+			"name": "equipped-SUITSTORAGE",
+			"directions": 4
 		}
 	]
 }

Resources/Textures/Objects/Weapons/Guns/Battery/disabler.rsi/meta.json

@@ -72,6 +72,10 @@
 		{
 			"name": "equipped-BELT",
 			"directions": 4
+		},
+		{
+			"name": "equipped-SUITSTORAGE",
+			"directions": 4
 		}
     ]
 }

Resources/Textures/Objects/Weapons/Guns/Battery/laser_cannon.rsi/meta.json

@@ -68,6 +68,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+	{
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
 	]
 }

Resources/Textures/Objects/Weapons/Guns/Battery/laser_gun.rsi/meta.json

@@ -36,6 +36,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+	{
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
     ]
 }

Resources/Textures/Objects/Weapons/Guns/Battery/makeshift.rsi/meta.json

@@ -36,6 +36,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+	{
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     },
 	{
 	  "name": "equipped-BELT",

Resources/Textures/Objects/Weapons/Guns/Battery/practice_disabler.rsi/meta.json

@@ -64,6 +64,10 @@
 		{
 			"name": "equipped-BELT",
 			"directions": 4
+		},
+		{
+			"name": "equipped-SUITSTORAGE",
+			"directions": 4
 		}
     ]
 }

Resources/Textures/Objects/Weapons/Guns/Battery/pulse_carbine.rsi/meta.json

@@ -36,6 +36,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+	{
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
     ]
 }

Resources/Textures/Objects/Weapons/Guns/Battery/pulse_rifle.rsi/meta.json

@@ -36,6 +36,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+	{
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
     ]
 }

Resources/Textures/Objects/Weapons/Guns/Battery/taser.rsi/meta.json

@@ -77,6 +77,10 @@
     {
       "name": "equipped-BELT",
       "directions": 4
+    },
+	{
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Objects/Weapons/Guns/Battery/xray.rsi/meta.json

@@ -45,6 +45,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+	{
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Objects/Weapons/Guns/Launchers/china_lake.rsi/meta.json

@@ -24,6 +24,10 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Objects/Weapons/Guns/Pistols/N1984.rsi/meta.json

@@ -30,6 +30,10 @@
         {
             "name": "equipped-BELT",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Objects/Weapons/Guns/Pistols/cobra.rsi/meta.json

@@ -27,6 +27,10 @@
         {
             "name": "equipped-BELT",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Objects/Weapons/Guns/Pistols/mk58.rsi/meta.json

@@ -30,6 +30,10 @@
         {
             "name": "equipped-BELT",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Objects/Weapons/Guns/Pistols/viper.rsi/meta.json

@@ -33,6 +33,10 @@
         {
             "name": "equipped-BELT",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Objects/Weapons/Guns/Revolvers/chimp.rsi/meta.json

@@ -27,6 +27,10 @@
 	{
 	  "name": "equipped-BELT",
 	  "directions": 4
+	},
+	{
+	  "name": "equipped-SUITSTORAGE",
+	  "directions": 4
 	}
   ]
 }

Resources/Textures/Objects/Weapons/Guns/Revolvers/deckard.rsi/meta.json

@@ -33,6 +33,10 @@
 	{
 	  "name": "equipped-BELT",
 	  "directions": 4
+	},
+	{
+	  "name": "equipped-SUITSTORAGE",
+	  "directions": 4
 	}
   ]
 }

Resources/Textures/Objects/Weapons/Guns/Revolvers/inspector.rsi/meta.json

@@ -24,6 +24,10 @@
         {
             "name": "equipped-BELT",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Objects/Weapons/Guns/Revolvers/mateba.rsi/meta.json

@@ -24,6 +24,10 @@
         {
             "name": "equipped-BELT",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi/meta.json

@@ -24,6 +24,10 @@
         {
             "name": "equipped-BELT",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Objects/Weapons/Guns/Rifles/ak.rsi/meta.json

@@ -30,6 +30,10 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+		},
+		{
+			"name": "equipped-SUITSTORAGE",
+			"directions": 4
         }
     ]
 }

Resources/Textures/Objects/Weapons/Guns/Rifles/carbine.rsi/meta.json

@@ -30,6 +30,10 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/meta.json

@@ -30,6 +30,10 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Objects/Weapons/Guns/SMGs/atreides.rsi/meta.json

@@ -33,6 +33,10 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Objects/Weapons/Guns/SMGs/c20r.rsi/meta.json

@@ -48,6 +48,10 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Objects/Weapons/Guns/SMGs/drozd.rsi/meta.json

@@ -33,6 +33,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+	{
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
     ]
 }

Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/meta.json

@@ -30,6 +30,10 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Objects/Weapons/Guns/SMGs/wt550.rsi/meta.json

@@ -147,6 +147,10 @@
     {
       "name": "equipped-BACKPACK",
       "directions": 4
+    },
+	{
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }

Resources/Textures/Objects/Weapons/Guns/Shotguns/bulldog.rsi/meta.json

@@ -30,6 +30,10 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Objects/Weapons/Guns/Shotguns/db_shotgun.rsi/meta.json

@@ -16,6 +16,10 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }

Resources/Textures/Objects/Weapons/Guns/Shotguns/enforcer.rsi/meta.json

@@ -16,6 +16,10 @@
         {
             "name": "equipped-BACKPACK",
             "directions": 4
+        },
+		{
+            "name": "equipped-SUITSTORAGE",
+            "directions": 4
         }
     ]
 }