diff --git a/Resources/Prototypes/Entities/Clothing/Back/gas_tanks.yml b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml similarity index 98% rename from Resources/Prototypes/Entities/Clothing/Back/gas_tanks.yml rename to Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml index 6164e8cc28..7f1b12ea5f 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/gas_tanks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/gas_tanks.yml @@ -132,7 +132,6 @@ - type: Clothing sprite: Objects/Tanks/emergency.rsi Slots: - - Back - Pocket - Belt @@ -168,7 +167,6 @@ - type: Clothing sprite: Objects/Tanks/emergency_yellow.rsi Slots: - - Back - Pocket - Belt @@ -204,7 +202,6 @@ - type: Clothing sprite: Objects/Tanks/emergency_double.rsi Slots: - - Back - Pocket - Belt @@ -282,8 +279,9 @@ temperature: 293.15 - type: Clothing sprite: Objects/Tanks/phoron.rsi - Slots: [] # no straps - + Slots: + - Belt + - type: entity id: PhoronTankFilled parent: PhoronTank diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-BELT.png new file mode 100644 index 0000000000..a37261e3f7 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/inhand-left.png b/Resources/Textures/Objects/Tanks/emergency.rsi/inhand-left.png index 4cb29ce56c..720d3f4e6b 100644 Binary files a/Resources/Textures/Objects/Tanks/emergency.rsi/inhand-left.png and b/Resources/Textures/Objects/Tanks/emergency.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/inhand-right.png b/Resources/Textures/Objects/Tanks/emergency.rsi/inhand-right.png index 6703263be1..60819651ea 100644 Binary files a/Resources/Textures/Objects/Tanks/emergency.rsi/inhand-right.png and b/Resources/Textures/Objects/Tanks/emergency.rsi/inhand-right.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json b/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json index 5123c111a0..6575e1e487 100644 --- a/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/emergency.rsi/meta.json @@ -1,38 +1,27 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at commit e1142f20f5e4661cb6845cfcf2dd69f864d67432", "states": [ { "name": "icon", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "directions": 1 + }, + { + "name": "equipped-BELT", + "directions": 4 }, { "name": "inhand-left", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "directions": 4 }, { "name": "inhand-right", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-BELT.png new file mode 100644 index 0000000000..f139bc6db2 Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_double.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/inhand-left.png b/Resources/Textures/Objects/Tanks/emergency_double.rsi/inhand-left.png index 55ff15618f..ad6e0f9bea 100644 Binary files a/Resources/Textures/Objects/Tanks/emergency_double.rsi/inhand-left.png and b/Resources/Textures/Objects/Tanks/emergency_double.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/inhand-right.png b/Resources/Textures/Objects/Tanks/emergency_double.rsi/inhand-right.png index e72d222b94..4983a573c3 100644 Binary files a/Resources/Textures/Objects/Tanks/emergency_double.rsi/inhand-right.png and b/Resources/Textures/Objects/Tanks/emergency_double.rsi/inhand-right.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 5123c111a0..6575e1e487 100644 --- a/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/emergency_double.rsi/meta.json @@ -1,38 +1,27 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at commit e1142f20f5e4661cb6845cfcf2dd69f864d67432", "states": [ { "name": "icon", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "directions": 1 + }, + { + "name": "equipped-BELT", + "directions": 4 }, { "name": "inhand-left", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "directions": 4 }, { "name": "inhand-right", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-BELT.png new file mode 100644 index 0000000000..0470c6895f Binary files /dev/null and b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/inhand-left.png b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/inhand-left.png index 55ff15618f..ad6e0f9bea 100644 Binary files a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/inhand-left.png and b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/inhand-left.png differ diff --git a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/inhand-right.png b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/inhand-right.png index e72d222b94..4983a573c3 100644 Binary files a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/inhand-right.png and b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/inhand-right.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 5123c111a0..6575e1e487 100644 --- a/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/emergency_yellow.rsi/meta.json @@ -1,38 +1,27 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at commit e1142f20f5e4661cb6845cfcf2dd69f864d67432", "states": [ { "name": "icon", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "directions": 1 + }, + { + "name": "equipped-BELT", + "directions": 4 }, { "name": "inhand-left", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "directions": 4 }, { "name": "inhand-right", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Tanks/phoron.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tanks/phoron.rsi/equipped-BELT.png new file mode 100644 index 0000000000..e282da2e6d Binary files /dev/null and b/Resources/Textures/Objects/Tanks/phoron.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Tanks/phoron.rsi/meta.json b/Resources/Textures/Objects/Tanks/phoron.rsi/meta.json index 5123c111a0..6575e1e487 100644 --- a/Resources/Textures/Objects/Tanks/phoron.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/phoron.rsi/meta.json @@ -1,38 +1,27 @@ { "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/tgstation/tgstation at commit e1142f20f5e4661cb6845cfcf2dd69f864d67432", "states": [ { "name": "icon", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "directions": 1 + }, + { + "name": "equipped-BELT", + "directions": 4 }, { "name": "inhand-left", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "directions": 4 }, { "name": "inhand-right", - "directions": 1, - "delays": [ - [ - 1.0 - ] - ] + "directions": 4 } ] -} \ No newline at end of file +} diff --git a/Resources/Textures/Objects/Tanks/plasmaman.rsi/equipped-BELT.png b/Resources/Textures/Objects/Tanks/plasmaman.rsi/equipped-BELT.png new file mode 100644 index 0000000000..91184dba1e Binary files /dev/null and b/Resources/Textures/Objects/Tanks/plasmaman.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Objects/Tanks/plasmaman.rsi/meta.json b/Resources/Textures/Objects/Tanks/plasmaman.rsi/meta.json index 19e8d88681..6331b3935e 100644 --- a/Resources/Textures/Objects/Tanks/plasmaman.rsi/meta.json +++ b/Resources/Textures/Objects/Tanks/plasmaman.rsi/meta.json @@ -15,6 +15,10 @@ "name": "equipped-BACKPACK", "directions": 4 }, + { + "name": "equipped-BELT", + "directions": 4 + }, { "name": "inhand-left", "directions": 4