Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add turtlenecks for senior officers #2692

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,22 @@
equipment:
jumpsuit: ClothingUniformJumpskirtSecSenior

- type: loadout # DeltaV
id: SeniorSecOfficerTurtlesuit
effects:
- !type:GroupLoadoutEffect
proto: SeniorOfficer
equipment:
jumpsuit: ClothingUniformJumpsuitSecTurtle

- type: loadout # DeltaV
id: SeniorSecOfficerTurtleskirt
effects:
- !type:GroupLoadoutEffect
proto: SeniorOfficer
equipment:
jumpsuit: ClothingUniformJumpskirtSecTurtle

# Back
- type: loadout
id: SecurityBackpack
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Loadouts/loadout_groups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1204,6 +1204,8 @@
- SecurityJumpskirtBlue # DeltaV
# - SeniorOfficerJumpsuit # DeltaV - removed for incongruence
# - SeniorOfficerJumpskirt # DeltaV - removed for incongruence
- SeniorSecOfficerTurtlesuit # DeltaV
- SeniorSecOfficerTurtleskirt # DeltaV
- SeniorSecOfficerJumpsuit # DeltaV
- SeniorSecOfficerJumpskirt # DeltaV

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,24 @@
parent: ClothingUniformFoldableBase
id: ClothingUniformJumpskirtSecSenior
name: senior officer's jumpskirt
description: A tight-fitting tactical jumpsuit, made of light and breathable yet durable material. This one seems to have a skirt stitched to the waist. Curious.
description: A tight-fitting tactical jumpsuit, made of light and breathable yet durable material. Can be worn all year round.
components:
- type: Sprite
sprite: _DV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi
- type: Clothing
sprite: _DV/Clothing/Uniforms/Jumpskirt/seniorofficer.rsi

- type: entity
parent: ClothingUniformFoldableBase
id: ClothingUniformJumpskirtSecTurtle
name: senior officer's turtleneck
description: A comfortable and tight-fitting turtleneck for those with the resolve to reach the position of Senior Officer.
components:
- type: Sprite
sprite: _DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi
- type: Clothing
sprite: _DV/Clothing/Uniforms/Jumpskirt/security_alt.rsi

# Warden alt uniforms

- type: entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,17 @@
- type: Clothing
sprite: _DV/Clothing/Uniforms/Jumpsuit/seniorofficer.rsi

- type: entity
parent: ClothingUniformFoldableBase
id: ClothingUniformJumpsuitSecTurtle
name: senior officer's turtleneck
description: A comfortable and tight-fitting turtleneck for those with the resolve to reach the position of Senior Officer.
components:
- type: Sprite
sprite: _DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi
- type: Clothing
sprite: _DV/Clothing/Uniforms/Jumpsuit/security_alt.rsi

# Warden alt uniforms

- 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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"version": 1,
"license": "CC0-1.0",
"copyright": "Original work by TJohnson.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "rolled-equipped-INNERCLOTHING",
"directions": 4
}
]
}
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,30 @@
{
"version": 1,
"license": "CC0-1.0",
"copyright": "Original work by TJohnson.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "rolled-equipped-INNERCLOTHING",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading