Skip to content

Commit

Permalink
Allow jetpacks to fit in the suit storage slot (#2400)
Browse files Browse the repository at this point in the history
* Allow jetpacks to fit in the suit storage slot

* Not fucking asleep version
  • Loading branch information
Radezolid authored Dec 12, 2024
1 parent 86e6782 commit 1227893
Show file tree
Hide file tree
Showing 28 changed files with 283 additions and 20 deletions.
48 changes: 28 additions & 20 deletions Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
]
]
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
]
]
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -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
]
]
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 1227893

Please sign in to comment.