Emergency Tank + Plasma Can visible on suit storage slot (#27598)

* Suitstorage Sprites + Plasma tank slots

* Fix some extra brackets

diff --git a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
index 65942e330ea47de331ab3310d43acb128017bcaf..7bdd32f45795b21e1cb07acc361b61bb2e39f933 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml
@@ -1,4 +1,4 @@
-- type: entity
+- type: entity
   abstract: true
   parent: BaseItem
   id: GasTankBase
@@ -238,3 +238,6 @@
     outputPressure: 101.3
   - type: Clothing
     sprite: Objects/Tanks/plasma.rsi
+    slots:
+    - Belt
+    - suitStorage

diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE.png
new file mode 100644 (file)
index 0000000..a37261e
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-SUITSTORAGE.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json
index 9dd4186ecdd13f2d91060c0941261b20ed238d5c..59aada80e00f68cfd3b9a6f936c6a2df97245e8e 100644 (file)
--- a/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json
@@ -66,6 +66,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }

diff --git a/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE.png
new file mode 100644 (file)
index 0000000..dd19aa5
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/equipped-SUITSTORAGE.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency_clown.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/meta.json
index 489cf3072aea213907bbaece1e2811d1a4c1a8e4..21d23712e98cfe4c6a068111ab2df5f29a885938 100644 (file)
--- a/Resources/Textures/Objects/Tanks/emergency_clown.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/emergency_clown.rsi/meta.json
@@ -66,6 +66,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }

diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE.png
new file mode 100644 (file)
index 0000000..f139bc6
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-SUITSTORAGE.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json
index a1661aee78ccb9f0ec34cbe0e5d34f27995c3ca9..fe19dcec1cf051f0791296c87e24059c9324d59e 100644 (file)
--- a/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json
@@ -66,6 +66,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }

diff --git a/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/equipped-SUITSTORAGE.png
new file mode 100644 (file)
index 0000000..7e2f947
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/equipped-SUITSTORAGE.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/meta.json
index ce287bf2779213f00c8c1f3ebe12e70c3b7cf4f9..74fc108c09ce8e4f28555f225681624afea242e3 100644 (file)
--- a/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/emergency_double_red.rsi/meta.json
@@ -66,6 +66,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }

diff --git a/Resources/Textures/Objects/Tanks/emergency_extended.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/emergency_extended.rsi/equipped-SUITSTORAGE.png
new file mode 100644 (file)
index 0000000..0470c68
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_extended.rsi/equipped-SUITSTORAGE.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency_extended.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_extended.rsi/meta.json
index a1661aee78ccb9f0ec34cbe0e5d34f27995c3ca9..fe19dcec1cf051f0791296c87e24059c9324d59e 100644 (file)
--- a/Resources/Textures/Objects/Tanks/emergency_extended.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/emergency_extended.rsi/meta.json
@@ -66,6 +66,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }

diff --git a/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/equipped-SUITSTORAGE.png
new file mode 100644 (file)
index 0000000..db800b2
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/equipped-SUITSTORAGE.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/meta.json
index ce287bf2779213f00c8c1f3ebe12e70c3b7cf4f9..74fc108c09ce8e4f28555f225681624afea242e3 100644 (file)
--- a/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/meta.json
@@ -66,6 +66,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }

diff --git a/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE.png
new file mode 100644 (file)
index 0000000..db800b2
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_red.rsi/equipped-SUITSTORAGE.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency_red.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_red.rsi/meta.json
index ce3d401ca2f60dfe98d3a7b3da1418d173283ff8..d71cdae541cbc9a437c8b32bfe70eb583aa12fc4 100644 (file)
--- a/Resources/Textures/Objects/Tanks/emergency_red.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/emergency_red.rsi/meta.json
@@ -66,6 +66,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }

diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE.png
new file mode 100644 (file)
index 0000000..0470c68
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-SUITSTORAGE.png differ

diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json
index a1661aee78ccb9f0ec34cbe0e5d34f27995c3ca9..fe19dcec1cf051f0791296c87e24059c9324d59e 100644 (file)
--- a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json
@@ -66,6 +66,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }

diff --git a/Resources/Textures/Objects/Tanks/plasma.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/Objects/Tanks/plasma.rsi/equipped-SUITSTORAGE.png
new file mode 100644 (file)
index 0000000..e282da2
Binary files /dev/null and b/Resources/Textures/Objects/Tanks/plasma.rsi/equipped-SUITSTORAGE.png differ

diff --git a/Resources/Textures/Objects/Tanks/plasma.rsi/meta.json b/Resources/Textures/Objects/Tanks/plasma.rsi/meta.json
index a88e367a852327cfca28d084d5d7e598eceed878..2d3199f75cd55f4fd11953216c5e795fb09b73fc 100644 (file)
--- a/Resources/Textures/Objects/Tanks/plasma.rsi/meta.json
+++ b/Resources/Textures/Objects/Tanks/plasma.rsi/meta.json
@@ -21,6 +21,10 @@
     {
       "name": "inhand-right",
       "directions": 4
+    },
+    {
+      "name": "equipped-SUITSTORAGE",
+      "directions": 4
     }
   ]
 }