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

Adds station guard uniform jumpsuit and skirt #803

Merged
merged 3 commits into from
Jan 1, 2024
Merged
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
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -795,6 +795,8 @@
- ClothingUniformJumpskirtBrigmedic
- ClothingUniformJumpsuitWarden
- ClothingUniformJumpskirtWarden
- ClothingUniformJumpsuitSecStationGuard #Frontier
- ClothingUniformJumpskirtSecStationGuard #Frontier
- ClothingOuterWinterCap
- ClothingOuterWinterCE
- ClothingOuterWinterCMO
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpskirts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,13 @@
- type: Clothing
sprite: _NF/Clothing/Uniforms/Jumpskirt/mercenary.rsi

- type: entity
parent: ClothingUniformSkirtBase
id: ClothingUniformJumpskirtSecStationGuard
name: station guard jumpskirt
description: A specialized uniform for a Frontier Outpost guard. Crisp and official to let dock loiterers know you mean business.
components:
- type: Sprite
sprite: _NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi
- type: Clothing
sprite: _NF/Clothing/Uniforms/Jumpskirt/security_stationguard.rsi
11 changes: 11 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,14 @@
sprite: _NF/Clothing/Uniforms/Jumpsuit/chaplain-pilgrim.rsi
- type: Clothing
sprite: _NF/Clothing/Uniforms/Jumpsuit/chaplain-pilgrim.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitSecStationGuard
name: station guard jumpsuit
description: A specialized uniform for a Frontier Outpost guard. Crisp and official to let dock loiterers know you mean business.
components:
- type: Sprite
sprite: _NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi
- type: Clothing
sprite: _NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi
14 changes: 14 additions & 0 deletions Resources/Prototypes/_NF/Recipes/Construction/clothing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,17 @@
description: A quiver to hold crossbow bolts.
icon: { sprite: _NF/Objects/Clothing/Belt/crossbow_quiver.rsi, state: icon }
objectType: Item

- type: latheRecipe
id: ClothingUniformJumpskirtSecStationGuard
result: ClothingUniformJumpskirtSecStationGuard
completetime: 4
materials:
Cloth: 300

- type: latheRecipe
id: ClothingUniformJumpsuitSecStationGuard
result: ClothingUniformJumpsuitSecStationGuard
completetime: 4
materials:
Cloth: 300
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": "CC-BY-SA-3.0",
"copyright": "made by @mureixlol, for monkey @hem0mancer, recolored by MagnusCrowe",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand sprite scaled down by potato1234_x, monkey made by brainfood1183 (github) for ss14, recolored by MagnusCrowe",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading