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

Further Resprites #164

Merged
merged 2 commits into from
Oct 13, 2023
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
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@
ClothingShoesBootsLaceup: 2
ClothingHeadsetService: 2
ClothingNeckLawyerbadge: 2
ClothingOuterCoatOvercoat: 2 # DeltaV - add overcoat to LawDrobe
emaggedInventory:
CyberPen: 1
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
ClothingUniformJumpsuitSec: 3
ClothingShoesBootsJack: 3
ClothingHeadHatBeretSecurity: 3
ClothingHeadHatSecsoft: 3
## ClothingHeadHatSecsoft: 3 # DeltaV - removed from SecDrobe due to inconsistency with art direction
ClothingHeadBandRed: 3
ClothingHandsGlovesColorBlack: 3
ClothingHandsGlovesFingerless: 3
Expand Down
20 changes: 10 additions & 10 deletions Resources/Prototypes/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@
description: A black beret with a commander's rank emblem. For officers that are more inclined towards style than safety.
components:
- type: Sprite
sprite: Clothing/Head/Hats/beret_hos.rsi
sprite: DeltaV/Clothing/Head/Hats/beret_hos.rsi # DeltaV - resprite
- type: Clothing
sprite: Clothing/Head/Hats/beret_hos.rsi
sprite: DeltaV/Clothing/Head/Hats/beret_hos.rsi # DeltaV - resprite
- type: Tag
tags:
- ClothMade
Expand All @@ -104,12 +104,12 @@
parent: ClothingHeadBase
id: ClothingHeadHatBeretWarden
name: warden's beret
description: A corporate blue beret with a warden's rank emblem. For officers that are more inclined towards style than safety.
description: A black beret with a warden's rank emblem. For officers that are more inclined towards style than safety. # DeltaV - changed description to match sprite
components:
- type: Sprite
sprite: Clothing/Head/Hats/beret_warden.rsi
sprite: DeltaV/Clothing/Head/Hats/beret_warden.rsi # DeltaV - resprite
- type: Clothing
sprite: Clothing/Head/Hats/beret_warden.rsi
sprite: DeltaV/Clothing/Head/Hats/beret_warden.rsi # DeltaV - resprite

- type: entity
parent: ClothingHeadBase
Expand Down Expand Up @@ -272,9 +272,9 @@
description: "There's a new sheriff in station."
components:
- type: Sprite
sprite: Clothing/Head/Hats/hoshat.rsi
sprite: DeltaV/Clothing/Head/Hats/hoshat.rsi # DeltaV - resprite
- type: Clothing
sprite: Clothing/Head/Hats/hoshat.rsi
sprite: DeltaV/Clothing/Head/Hats/hoshat.rsi # DeltaV - resprite
- type: Tag
tags:
- ClothMade
Expand Down Expand Up @@ -463,12 +463,12 @@
parent: ClothingHeadBase
id: ClothingHeadHatWarden
name: warden's cap
description: A police officer's Hat. This hat emphasizes that you are THE LAW
description: The responsibility weighs heavy, like a barbed crown. # DeltaV - changed description to remove THE LAW
components:
- type: Sprite
sprite: Clothing/Head/Hats/warden.rsi
sprite: Clothing/Head/Hats/warden.rsi # DeltaV - resprite
- type: Clothing
sprite: Clothing/Head/Hats/warden.rsi
sprite: Clothing/Head/Hats/warden.rsi # DeltaV - resprite

- type: entity
parent: ClothingHeadBase
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by TJohnson.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "equipped-HELMET-hamster",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by TJohnson.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"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 cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1. Modified by TJohnson.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "equipped-HELMET-hamster",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e. Modified by TJohnson.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"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