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

[Resprite] Security trooper's uniform #2465

Merged
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
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@
description: A campaign hat for the Nanotrasen Troopers, comes with a case too, but you lost it.
components:
- type: Sprite
sprite: Clothing/Head/Hats/security_trooper_hat.rsi
sprite: SS220/Clothing/Head/Hats/security_trooper_hat.rsi #SS220-resprite-trooper-uniform
- type: Clothing
sprite: Clothing/Head/Hats/security_trooper_hat.rsi
sprite: SS220/Clothing/Head/Hats/security_trooper_hat.rsi #SS220-resprite-trooper-uniform
- type: Tag
tags:
- ClothMade
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -656,9 +656,9 @@
description: A formal uniform issued to the Nanotrasen Troopers, usually it comes with a car.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/security_trooper.rsi
sprite: SS220/Clothing/Uniforms/Jumpsuit/security_trooper.rsi #SS220-resprite-trooper-uniform
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/security_trooper.rsi
sprite: SS220/Clothing/Uniforms/Jumpsuit/security_trooper.rsi #SS220-resprite-trooper-uniform

- type: entity
parent: [ClothingUniformBase]
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,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprites made by @prazat911",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"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": "Sprites made by @prazat911",
"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