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

Salvage Hardsuit Repsrite #1869

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
65 changes: 39 additions & 26 deletions Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,13 @@
description: A special helmet designed for work in a hazardous, low pressure environment. Has reinforced plating for wildlife encounters and dual floodlights.
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/salvage.rsi
#SS220-Salvage Hardsuit Resprite-Begin
sprite: SS220/Clothing/Head/Hardsuits/salvage.rsi
#SS220-Salvage Hardsuit Resprite-End
- type: Clothing
sprite: Clothing/Head/Hardsuits/salvage.rsi
#SS220-Salvage Hardsuit Resprite-Begin
sprite: SS220/Clothing/Head/Hardsuits/salvage.rsi
#SS220-Salvage Hardsuit Resprite-End
- type: PressureProtection
highPressureMultiplier: 0.525
lowPressureMultiplier: 1000
Expand Down Expand Up @@ -344,9 +348,13 @@
description: A refurbished mining hardsuit helmet, fitted with satin cushioning and an extra (non-functioning) antenna, because you're that extra.
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/luxury.rsi
#SS220-Salvage Hardsuit Resprite-Begin
sprite: SS220/Clothing/Head/Hardsuits/luxury.rsi
#SS220-Salvage Hardsuit Resprite-End
- type: Clothing
sprite: Clothing/Head/Hardsuits/luxury.rsi
#SS220-Salvage Hardsuit Resprite-Begin
sprite: SS220/Clothing/Head/Hardsuits/luxury.rsi
#SS220-Salvage Hardsuit Resprite-End
- type: PressureProtection
highPressureMultiplier: 0.525
lowPressureMultiplier: 1000
Expand All @@ -363,28 +371,33 @@
description: A heavily armored helmet designed for work in special operations. Property of Gorlex Marauders.
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/spatiohelm.rsi
layers:
- state: icon
- state: icon-unshaded
shader: unshaded
- state: light-overlay
visible: false
shader: unshaded
map: [ "light" ]
- type: HandheldLight
addPrefix: false
- type: ToggleableLightVisuals
clothingVisuals:
head:
- state: equipped-head-light
shader: unshaded
- type: Clothing
clothingVisuals:
head:
- state: equipped-head
- state: equipped-head-unshaded
shader: unshaded
sprite: SS220/Clothing/Head/Hardsuits/spatio.rsi #SS220-Salvage Hardsuit Resprite
#SS220-Salvage Hardsuit Resprite-Begin
# layers:
# - state: icon
# - state: icon-unshaded
# shader: unshaded
# - state: light-overlay
# visible: false
# shader: unshaded
# map: [ "light" ]
# - type: HandheldLight
# addPrefix: false
# - type: ToggleableLightVisuals
# clothingVisuals:
# head:
# - state: equipped-head-light
# shader: unshaded
#SS220-Salvage Hardsuit Resprite-End
- type: Clothing
sprite: SS220/Clothing/Head/Hardsuits/spatio.rsi #SS220-Salvage Hardsuit Resprite
#SS220-Salvage Hardsuit Resprite-Begin
# clothingVisuals:
# head:
# - state: equipped-head
# - state: equipped-head-unshaded
# shader: unshaded
#SS220-Salvage Hardsuit Resprite-End
- type: PressureProtection
highPressureMultiplier: 0.72
lowPressureMultiplier: 10000
Expand Down
33 changes: 27 additions & 6 deletions Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,16 @@
description: A lightweight hardsuit designed for industrial EVA in zero gravity.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/spatio.rsi
sprite: SS220/Clothing/OuterClothing/Hardsuits/spatio.rsi #SS220-Salvage Hardsuit Resprite
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/spatio.rsi
#SS220-Salvage Hardsuit Resprite-Begin
sprite: SS220/Clothing/OuterClothing/Hardsuits/spatio.rsi
# clothingVisuals:
# outerClothing:
# - state: equipped-OUTERCLOTHING
# - state: equipped-OUTERCLOTHING-unshaded
# shader: unshaded
#SS220-Salvage Hardsuit Resprite-End
- type: PressureProtection
highPressureMultiplier: 0.7
lowPressureMultiplier: 1000
Expand Down Expand Up @@ -146,9 +153,16 @@
description: A special suit that protects against hazardous, low pressure environments. Has reinforced plating for wildlife encounters.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/salvage.rsi
sprite: SS220/Clothing/OuterClothing/Hardsuits/salvage.rsi #SS220-Salvage Hardsuit Resprite
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/salvage.rsi
#SS220-Salvage Hardsuit Resprite-Begin
sprite: SS220/Clothing/OuterClothing/Hardsuits/salvage.rsi
# clothingVisuals:
# outerClothing:
# - state: equipped-OUTERCLOTHING
# - state: equipped-OUTERCLOTHING-unshaded
# shader: unshaded
#SS220-Salvage Hardsuit Resprite-End
- type: PressureProtection
highPressureMultiplier: 0.5
lowPressureMultiplier: 1000
Expand Down Expand Up @@ -486,9 +500,16 @@
description: A refurbished mining hardsuit, fashioned after the Quartermaster's colors. Graphene lining provides less protection, but is much easier to move.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/luxury.rsi
sprite: SS220/Clothing/OuterClothing/Hardsuits/luxury.rsi #SS220-Salvage Hardsuit Resprite
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/luxury.rsi
#SS220-Salvage Hardsuit Resprite-Begin
sprite: SS220/Clothing/OuterClothing/Hardsuits/luxury.rsi
# clothingVisuals:
# outerClothing:
# - state: equipped-OUTERCLOTHING
# - state: equipped-OUTERCLOTHING-unshaded
# shader: unshaded
#SS220-Salvage Hardsuit Resprite-End
- type: PressureProtection
highPressureMultiplier: 0.5
lowPressureMultiplier: 1000
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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"version": 1,
"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
"copyright": "Made by Kit0vras (Github/Discord) for SS220",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "icon-flash"
},
{
"name": "off-equipped-HELMET",
"directions": 4
},
{
"name": "off-equipped-HELMET-vox",
"directions": 4
},
{
"name": "on-equipped-HELMET",
"directions": 4
},
{
"name": "on-equipped-HELMET-vox",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@

{
"version": 1,
"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
"copyright": "Made by Kit0vras (Github/Discord) for SS220",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "icon-flash"
},
{
"name": "off-equipped-HELMET",
"directions": 4
},
{
"name": "off-equipped-HELMET-vox",
"directions": 4
},
{
"name": "on-equipped-HELMET",
"directions": 4
},
{
"name": "on-equipped-HELMET-vox",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@

{
"version": 1,
"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
"copyright": "Made by Kit0vras (Github/Discord) for SS220",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "icon-flash"
},
{
"name": "off-equipped-HELMET",
"directions": 4
},
{
"name": "off-equipped-HELMET-vox",
"directions": 4
},
{
"name": "on-equipped-HELMET",
"directions": 4
},
{
"name": "on-equipped-HELMET-vox",
"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.
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,32 @@

{
"version": 1,
"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
"copyright": "Made by Kit0vras (Github/Discord) for SS220",

"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-unshaded",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-vox",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-unshaded-vox",
"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,32 @@

{
"version": 1,
"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
"copyright": "Made by Kit0vras (Github/Discord) for SS220",

"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-unshaded",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-vox",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-unshaded-vox",
"directions": 4
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@

{
"version": 1,
"license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
"copyright": "Made by Kit0vras (Github/Discord) for SS220",

"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-unshaded",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-vox",
"directions": 4
},
{
"name": "equipped-OUTERCLOTHING-unshaded-vox",
"directions": 4
}
]
}
Loading