Skip to content

Commit c48fd5d

Browse files
New security mini jetpack sprites, fixes security mini jetpack's name (#4914)
## Short description <!-- What do you propose to change with your PR? --> **This PR doesn't change any mechanics, it is strictly visual.** We inherited an upstream change to security jetpacks from: space-wizards/space-station-14#39569 That PR has issues: - It changed the name of `JetpackSecurity` to "security mini jetpack" but _didn't_ change the name of `JetpackSecurityFilled` which is still "security jetpack" - It didn't change the sprites of the security jetpack This makes the security jetpack super confusing, because it looks like a full-size jetpack but it _is_ a mini jetpack, meaning it can go in your suit storage or in your belt slot. This PR: - Changes the name of `JetpackSecurityFilled` to match `JetpackSecurity`: "security mini jetpack" - Adds new sprites to make it obvious that the jetpack is a mini jetpack. ## Why we need to add this <!-- What is the reason for adding these changes? Please post links to Discussions as well as Bug Reports here. Please describe how this will change the game balance. --> - Naming consistency is good - Visual clarity (via new sprites) is good ## Media (Video/Screenshots) <!-- If your PR contains in-game changes you must provide screenshots/videos of the changes. --> <img width="924" height="733" alt="image" src="https://github.com/user-attachments/assets/77c4ef0f-ef9b-43d4-8e71-866a27a69514" /> fig. 1 - New security mini jetpack sprites <img width="148" height="76" alt="animation in gui" src="https://github.com/user-attachments/assets/a3e8cf7d-9fb8-43dd-9208-2c48823b7325" /> fig. 2 - Animation in GUI <img width="344" height="166" alt="image" src="https://github.com/user-attachments/assets/f7b9b305-2b77-4742-b041-bf4251cd7a33" /> <img width="493" height="272" alt="image" src="https://github.com/user-attachments/assets/ffd9e7f8-f291-415a-acf1-d927ea48f005" /> fig. 3 - Fixed name. ## Checks <!-- check boxes for faster reviewing of your PR --> - [x] I do not require assistance to complete the PR. - [x] Before posting/requesting review of a PR, I have verified that the changes work. - [x] I have added screenshots/videos of the changes, or this PR does not change in-game mechanics. - [x] I affirm that my changes are licensed under the [MIT License](https://github.com/ss14Starlight/space-station-14/blob/Starlight/LICENSE.TXT) and grant permission for use in this repository under its conditions. **Changelog** <!-- If you want the players to know about changes made in this PR, specify them using the template outside the comment. Short and informative. :cl: STARLIGHT TEAM - add: Added Starlight. - remove: Removed SS13. - tweak: Changed SS14. - fix: Fixed Rinary. --> :cl: Caws - add: Added new sprites for the Security mini jetpack to make it more obvious it's a mini jetpack (and not a full-size jetpack). - fix: Fixed the name of the security mini jetpack. Previously, it was "security jetpack" if it spawned full of gas and "security mini jetpack" if it spawned empty.
1 parent 7a9baec commit c48fd5d

14 files changed

Lines changed: 126 additions & 4 deletions

Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,17 +256,17 @@
256256
suffix: Empty
257257
components:
258258
- type: Item
259-
sprite: Objects/Tanks/Jetpacks/security.rsi
259+
sprite: _Starlight/Objects/Tanks/Jetpacks/security_mini.rsi # Starlight - mini jetpack textures
260260
- type: Sprite
261-
sprite: Objects/Tanks/Jetpacks/security.rsi
261+
sprite: _Starlight/Objects/Tanks/Jetpacks/security_mini.rsi # Starlight - mini jetpack textures
262262
- type: Clothing
263-
sprite: Objects/Tanks/Jetpacks/security.rsi
263+
sprite: _Starlight/Objects/Tanks/Jetpacks/security_mini.rsi # Starlight - mini jetpack textures
264264

265265
#Filled security
266266
- type: entity
267267
id: JetpackSecurityFilled
268268
parent: JetpackSecurity
269-
name: security jetpack
269+
# name: security jetpack # Starlight - inherit name from parent
270270
suffix: Filled
271271
components:
272272
- type: GasTank
7.3 KB
Loading
1.11 KB
Loading
7.3 KB
Loading
1.11 KB
Loading
1.62 KB
Loading
658 Bytes
Loading
595 Bytes
Loading
583 Bytes
Loading
Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
{
2+
"version": 1,
3+
"license": "CC-BY-SA-3.0",
4+
"copyright": "State based Copyright",
5+
"size": {
6+
"x": 32,
7+
"y": 32
8+
},
9+
"states": [
10+
{
11+
"name": "icon",
12+
"directions": 1,
13+
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/1592a112e3d33eec4a0704b518a138d5a976f455. Security edit by CawsForConcern (GitHub)."
14+
},
15+
{
16+
"name": "icon-on",
17+
"directions": 1,
18+
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/1592a112e3d33eec4a0704b518a138d5a976f455. Security recolor by CawsForConcern (GitHub).",
19+
"delays": [
20+
[
21+
0.5,
22+
0.1,
23+
0.1
24+
]
25+
]
26+
},
27+
{
28+
"name": "inhand-left",
29+
"directions": 4,
30+
"copyright": "Inhand-left and inhand-right by SlamBamActionman (Github). Security recolor by CawsForConcern (GitHub)."
31+
},
32+
{
33+
"name": "inhand-right",
34+
"directions": 4,
35+
"copyright": "Inhand-left and inhand-right by SlamBamActionman (Github). Security recolor by CawsForConcern (GitHub)."
36+
},
37+
{
38+
"name": "equipped-BACKPACK",
39+
"directions": 4,
40+
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/1592a112e3d33eec4a0704b518a138d5a976f455. Security recolor by CawsForConcern (GitHub)."
41+
},
42+
{
43+
"name": "on-equipped-BACKPACK",
44+
"directions": 4,
45+
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/1592a112e3d33eec4a0704b518a138d5a976f455. Security recolor by CawsForConcern (GitHub).",
46+
"delays": [
47+
[
48+
0.5,
49+
0.2,
50+
0.1
51+
],
52+
[
53+
0.5,
54+
0.2,
55+
0.1
56+
],
57+
[
58+
0.5,
59+
0.2,
60+
0.1
61+
],
62+
[
63+
0.5,
64+
0.2,
65+
0.1
66+
]
67+
]
68+
},
69+
{
70+
"name": "equipped-BACKPACK-dog",
71+
"directions": 4,
72+
"copyright": "Dog states modified from base states by Sparlight (GitHub). Security recolor by CawsForConcern (GitHub)."
73+
},
74+
{
75+
"name": "on-equipped-BACKPACK-dog",
76+
"directions": 4,
77+
"copyright": "Dog states modified from base states by Sparlight (GitHub). Security recolor by CawsForConcern (GitHub)."
78+
},
79+
{
80+
"name": "equipped-SUITSTORAGE",
81+
"directions": 4,
82+
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/1592a112e3d33eec4a0704b518a138d5a976f455. Security recolor by CawsForConcern (GitHub)."
83+
},
84+
{
85+
"name": "on-equipped-SUITSTORAGE",
86+
"directions": 4,
87+
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/1592a112e3d33eec4a0704b518a138d5a976f455. Security recolor by CawsForConcern (GitHub).",
88+
"delays": [
89+
[
90+
0.5,
91+
0.2,
92+
0.1
93+
],
94+
[
95+
0.5,
96+
0.2,
97+
0.1
98+
],
99+
[
100+
0.5,
101+
0.2,
102+
0.1
103+
],
104+
[
105+
0.5,
106+
0.2,
107+
0.1
108+
]
109+
]
110+
},
111+
{
112+
"name": "equipped-SUITSTORAGE-dog",
113+
"directions": 4,
114+
"copyright": "Dog states modified from base states by Sparlight (GitHub). Security recolor by CawsForConcern (GitHub)."
115+
},
116+
{
117+
"name": "on-equipped-SUITSTORAGE-dog",
118+
"directions": 4,
119+
"copyright": "Dog states modified from base states by Sparlight (GitHub). Security recolor by CawsForConcern (GitHub)."
120+
}
121+
]
122+
}

0 commit comments

Comments
 (0)