diff --git a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml index 0364011361c..600a6f2825e 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml @@ -33,20 +33,21 @@ weightlessModifier: 1.2 - type: CanMoveInAir - type: Sprite - sprite: Objects/Tanks/Jetpacks/blue.rsi + sprite: DeltaV/Objects/Tanks/Jetpacks/blue.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. state: icon - type: Item - sprite: Objects/Tanks/Jetpacks/blue.rsi + sprite: DeltaV/Objects/Tanks/Jetpacks/blue.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. size: Huge - type: UserInterface interfaces: enum.SharedGasTankUiKey.Key: type: GasTankBoundUserInterface - type: Clothing - sprite: Objects/Tanks/Jetpacks/blue.rsi + sprite: DeltaV/Objects/Tanks/Jetpacks/blue.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. quickEquip: false slots: - Back + - SuitStorage # DeltaV - Allow all jetpacks to fit in the suit storage slot - type: GasTank outputPressure: 21.3 air: @@ -87,11 +88,13 @@ suffix: Empty components: - type: Sprite - sprite: Objects/Tanks/Jetpacks/blue.rsi + sprite: DeltaV/Objects/Tanks/Jetpacks/blue.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. - type: Clothing - sprite: Objects/Tanks/Jetpacks/blue.rsi - slots: - - Back + sprite: DeltaV/Objects/Tanks/Jetpacks/blue.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. + # DeltaV modifications - Covered by modifications on parent + #slots: + # - Back + # End DeltaV modifications # Filled blue - type: entity @@ -118,13 +121,15 @@ suffix: Empty components: - type: Item - sprite: Objects/Tanks/Jetpacks/black.rsi + sprite: DeltaV/Objects/Tanks/Jetpacks/black.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. - type: Sprite - sprite: Objects/Tanks/Jetpacks/black.rsi + sprite: DeltaV/Objects/Tanks/Jetpacks/black.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. - type: Clothing - sprite: Objects/Tanks/Jetpacks/black.rsi - slots: - - Back + sprite: DeltaV/Objects/Tanks/Jetpacks/black.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. + # DeltaV modifications - Covered by modifications on parent + #slots: + # - Back + # End DeltaV modifications # Filled black - type: entity @@ -154,9 +159,10 @@ sprite: Objects/Tanks/Jetpacks/captain.rsi - type: Clothing sprite: Objects/Tanks/Jetpacks/captain.rsi - slots: - - Back - - SuitStorage + # DeltaV modifications - Covered by modifications on parent + #slots: + # - Back + # End DeltaV modifications - type: Item sprite: Objects/Tanks/Jetpacks/captain.rsi size: Normal @@ -231,13 +237,15 @@ suffix: Empty components: - type: Item - sprite: Objects/Tanks/Jetpacks/security.rsi + sprite: DeltaV/Objects/Tanks/Jetpacks/security.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. - type: Sprite - sprite: Objects/Tanks/Jetpacks/security.rsi + sprite: DeltaV/Objects/Tanks/Jetpacks/security.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. - type: Clothing - sprite: Objects/Tanks/Jetpacks/security.rsi - slots: - - Back + sprite: DeltaV/Objects/Tanks/Jetpacks/security.rsi # DeltaV - Modified sprites to allow SUITSTORAGE use. + # DeltaV modifications - Covered by modifications on parent + #slots: + # - Back + # End DeltaV modifications #Filled security - type: entity diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/equipped-BACKPACK.png b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..9041766c9cc Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..9041766c9cc Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/icon-on.png b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/icon-on.png new file mode 100644 index 00000000000..4c57b04fa40 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/icon-on.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/icon.png new file mode 100644 index 00000000000..749f104b1e4 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/inhand-left.png new file mode 100644 index 00000000000..9f27af40edf Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/inhand-right.png new file mode 100644 index 00000000000..5056a919c84 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/meta.json new file mode 100644 index 00000000000..937ca0f7f35 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/meta.json @@ -0,0 +1,85 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/1592a112e3d33eec4a0704b518a138d5a976f455, modified by Radezolid for SUITSTORAGE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "icon-on", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "on-equipped-BACKPACK", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ] + ] + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "on-equipped-SUITSTORAGE", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ] + ] + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/on-equipped-BACKPACK.png b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/on-equipped-BACKPACK.png new file mode 100644 index 00000000000..fdfc1f64a2f Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/on-equipped-BACKPACK.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/on-equipped-SUITSTORAGE.png b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/on-equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..fdfc1f64a2f Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/black.rsi/on-equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/equipped-BACKPACK.png b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..3add1327196 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..3add1327196 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/icon-on.png b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/icon-on.png new file mode 100644 index 00000000000..290d3717bdc Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/icon-on.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/icon.png new file mode 100644 index 00000000000..059b9765130 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/inhand-left.png new file mode 100644 index 00000000000..da57d6dee3f Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/inhand-right.png new file mode 100644 index 00000000000..c9664e56799 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/meta.json new file mode 100644 index 00000000000..937ca0f7f35 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/meta.json @@ -0,0 +1,85 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/1592a112e3d33eec4a0704b518a138d5a976f455, modified by Radezolid for SUITSTORAGE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "icon-on", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "on-equipped-BACKPACK", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ] + ] + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "on-equipped-SUITSTORAGE", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ] + ] + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/on-equipped-BACKPACK.png b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/on-equipped-BACKPACK.png new file mode 100644 index 00000000000..e6efe984f80 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/on-equipped-BACKPACK.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/on-equipped-SUITSTORAGE.png b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/on-equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..e6efe984f80 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/blue.rsi/on-equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/equipped-BACKPACK.png b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..b8961eaa775 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..b8961eaa775 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/icon-on.png b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/icon-on.png new file mode 100644 index 00000000000..4a7f4ed64c8 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/icon-on.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/icon.png new file mode 100644 index 00000000000..926a586a63a Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/inhand-left.png new file mode 100644 index 00000000000..97d9e6f8891 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/inhand-right.png new file mode 100644 index 00000000000..f19970f2dd4 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/meta.json new file mode 100644 index 00000000000..937ca0f7f35 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/meta.json @@ -0,0 +1,85 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/1592a112e3d33eec4a0704b518a138d5a976f455, modified by Radezolid for SUITSTORAGE", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1 + }, + { + "name": "icon-on", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "on-equipped-BACKPACK", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ] + ] + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "on-equipped-SUITSTORAGE", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ], + [ + 0.2, + 0.2 + ] + ] + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/on-equipped-BACKPACK.png b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/on-equipped-BACKPACK.png new file mode 100644 index 00000000000..0ae456cf0dd Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/on-equipped-BACKPACK.png differ diff --git a/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/on-equipped-SUITSTORAGE.png b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/on-equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..0ae456cf0dd Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Tanks/Jetpacks/security.rsi/on-equipped-SUITSTORAGE.png differ