Skip to content

Commit

Permalink
Resprites some of security items to before upstream's space-wizards#2…
Browse files Browse the repository at this point in the history
  • Loading branch information
Merrokitsune committed Dec 5, 2024
1 parent e5179a4 commit 860b8c4
Show file tree
Hide file tree
Showing 22 changed files with 129 additions and 35 deletions.
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Head/helmets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
description: Standard security gear. Protects the head from impacts.
components:
- type: Sprite
sprite: Clothing/Head/Helmets/security.rsi
sprite: Ronstation/Clothing/Head/Helmets/security.rsi
- type: Clothing
sprite: Clothing/Head/Helmets/security.rsi
sprite: Ronstation/Clothing/Head/Helmets/security.rsi
- type: Tag
tags:
- WhitelistChameleon
Expand Down
36 changes: 18 additions & 18 deletions Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -388,23 +388,23 @@
description: A jumpskirt made of strong material, providing robust protection.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpskirt/security.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpskirt/security.rsi
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- state: overlay-inhand-left
sprite: Clothing/Uniforms/Jumpsuit/security.rsi
right:
- state: inhand-right
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpskirt/color.rsi
- state: overlay-inhand-right
sprite: Clothing/Uniforms/Jumpsuit/security.rsi
sprite: Ronstation/Clothing/Uniforms/Jumpskirt/security.rsi
- type: Clothing
sprite: Ronstation/Clothing/Uniforms/Jumpskirt/security.rsi
#- type: Item
# inhandVisuals:
# left:
# - state: inhand-left
# color: "#C12D30"
# sprite: Clothing/Uniforms/Jumpskirt/color.rsi
# - state: overlay-inhand-left
# sprite: Clothing/Uniforms/Jumpsuit/security.rsi
# right:
# - state: inhand-right
# color: "#C12D30"
# sprite: Clothing/Uniforms/Jumpskirt/color.rsi
# - state: overlay-inhand-right
# sprite: Clothing/Uniforms/Jumpsuit/security.rsi


- type: entity
Expand Down Expand Up @@ -898,4 +898,4 @@
- type: Tag
tags:
- ClownSuit
- WhitelistChameleon
- WhitelistChameleon
30 changes: 15 additions & 15 deletions Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -596,21 +596,21 @@
description: A jumpsuit made of strong material, providing robust protection.
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/security.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/security.rsi
- type: Item
inhandVisuals:
left:
- state: inhand-left
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- state: overlay-inhand-left
right:
- state: inhand-right
color: "#C12D30"
sprite: Clothing/Uniforms/Jumpsuit/color.rsi
- state: overlay-inhand-right
sprite: Ronstation/Clothing/Uniforms/Jumpsuit/security.rsi
- type: Clothing
sprite: Ronstation/Clothing/Uniforms/Jumpsuit/security.rsi
#- type: Item
# inhandVisuals:
# left:
# - state: inhand-left
# color: "#C12D30"
# sprite: Clothing/Uniforms/Jumpsuit/color.rsi
# - state: overlay-inhand-left
# right:
# - state: inhand-right
# color: "#C12D30"
# sprite: Clothing/Uniforms/Jumpsuit/color.rsi
# - state: overlay-inhand-right

- 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.
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,34 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "light-equipped-HELMET",
"directions": 4
},
{
"name": "lighton-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": "Original sec jumpsuit from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039, jumpskirt sprite made by Flareguy for SS14. In hand sprite scaled down by potato1234_x, monkey derivative made by brainfood1183 (github) for ss14",
"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. equipped-INNERCLOTHING edited by Dutch-VanDerLinde (github).",
"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
}
]
}

0 comments on commit 860b8c4

Please sign in to comment.