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

Security Hardsuit Resprite #2518

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
24 changes: 12 additions & 12 deletions Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,11 @@
description: Armored hardsuit helmet for security needs.
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/security.rsi
sprite: SS220/Clothing/Head/Hardsuits/security.rsi #ss220-security-hardsuit-resprite
- type: Clothing
sprite: Clothing/Head/Hardsuits/security.rsi
sprite: SS220/Clothing/Head/Hardsuits/security.rsi #ss220-security-hardsuit-resprite
- type: PointLight
color: "#ffeead"
color: "#facb3e" #ss220-security-hardsuit-resprite
- type: PressureProtection
highPressureMultiplier: 0.525
lowPressureMultiplier: 1000
Expand All @@ -188,11 +188,11 @@
components:
- type: BreathMask #ss-220 fix
- type: Sprite
sprite: Clothing/Head/Hardsuits/security-red.rsi
sprite: SS220/Clothing/Head/Hardsuits/security-red.rsi #ss220-security-hardsuit-resprite
- type: Clothing
sprite: Clothing/Head/Hardsuits/security-red.rsi
sprite: SS220/Clothing/Head/Hardsuits/security-red.rsi #ss220-security-hardsuit-resprite
- type: PointLight
color: "#ffeead"
color: "#facb3e" #ss220-security-hardsuit-resprite
- type: PressureProtection
highPressureMultiplier: 0.45
lowPressureMultiplier: 10000
Expand All @@ -210,11 +210,11 @@
description: The lightweight helmet of the brigmedic hardsuit. Protects against viruses, and clowns.
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/brigmedic.rsi
sprite: SS220/Clothing/Head/Hardsuits/brigmedic.rsi #ss220-security-hardsuit-resprite
- type: Clothing
sprite: Clothing/Head/Hardsuits/brigmedic.rsi
sprite: SS220/Clothing/Head/Hardsuits/brigmedic.rsi #ss220-security-hardsuit-resprite
- type: PointLight
color: "#00FFFF"
color: "#39acc6" #ss220-security-hardsuit-resprite
- type: Armor
modifiers:
coefficients:
Expand All @@ -235,11 +235,11 @@
description: A modified riot helmet. Oddly comfortable.
components:
- type: Sprite
sprite: Clothing/Head/Hardsuits/security-warden.rsi
sprite: SS220/Clothing/Head/Hardsuits/security-warden.rsi #ss220-security-hardsuit-resprite
- type: Clothing
sprite: Clothing/Head/Hardsuits/security-warden.rsi
sprite: SS220/Clothing/Head/Hardsuits/security-warden.rsi #ss220-security-hardsuit-resprite
- type: PointLight
color: "#ffeead"
color: "#facb3e" #ss220-security-hardsuit-resprite
- type: PressureProtection
highPressureMultiplier: 0.525
lowPressureMultiplier: 1000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,9 @@
description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/security.rsi
sprite: SS220/Clothing/OuterClothing/Hardsuits/security.rsi #ss220-security-hardsuit-resprite
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/security.rsi
sprite: SS220/Clothing/OuterClothing/Hardsuits/security.rsi #ss220-security-hardsuit-resprite
- type: PressureProtection
highPressureMultiplier: 0.5
lowPressureMultiplier: 1000
Expand Down Expand Up @@ -255,9 +255,9 @@
description: Special hardsuit of the guardian angel of the brig. It is the medical version of the security hardsuit.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/brigmedic.rsi
sprite: SS220/Clothing/OuterClothing/Hardsuits/brigmedic.rsi #ss220-security-hardsuit-resprite
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/brigmedic.rsi
sprite: SS220/Clothing/OuterClothing/Hardsuits/brigmedic.rsi #ss220-security-hardsuit-resprite
- type: PressureProtection
highPressureMultiplier: 0.3
lowPressureMultiplier: 1000
Expand Down Expand Up @@ -287,9 +287,9 @@
description: A specialized riot suit geared to combat low pressure environments.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/security-warden.rsi
sprite: SS220/Clothing/OuterClothing/Hardsuits/security-warden.rsi #ss220-security-hardsuit-resprite
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/security-warden.rsi
sprite: SS220/Clothing/OuterClothing/Hardsuits/security-warden.rsi #ss220-security-hardsuit-resprite
- type: PressureProtection
highPressureMultiplier: 0.5
lowPressureMultiplier: 1000
Expand Down Expand Up @@ -468,9 +468,9 @@
description: A special suit that protects against hazardous, low pressure environments. Has an additional layer of armor.
components:
- type: Sprite
sprite: Clothing/OuterClothing/Hardsuits/security-red.rsi
sprite: SS220/Clothing/OuterClothing/Hardsuits/security-red.rsi #ss220-security-hardsuit-resprite
- type: Clothing
sprite: Clothing/OuterClothing/Hardsuits/security-red.rsi
sprite: SS220/Clothing/OuterClothing/Hardsuits/security-red.rsi #ss220-security-hardsuit-resprite
- type: PressureProtection
highPressureMultiplier: 0.45
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,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,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": "on-equipped-HELMET",
"directions": 4
},
{
"name": "off-equipped-HELMET-vox",
"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,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": "on-equipped-HELMET",
"directions": 4
},
{
"name": "off-equipped-HELMET-vox",
"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.
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
}
]
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e modified by MrALPAKA, Surani, off-equipped-HELMET-vox and on-equipped-HELMET-vox sprited by Estkemran (Github) for SS220",
"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
Expand All @@ -21,29 +21,13 @@
"name": "off-equipped-HELMET-vox",
"directions": 4
},
{
"name": "off-inhand-left",
"directions": 4
},
{
"name": "off-inhand-right",
"directions": 4
},
{
"name": "on-equipped-HELMET",
"directions": 4
},
{
"name": "on-equipped-HELMET-vox",
"directions": 4
},
{
"name": "on-inhand-left",
"directions": 4
},
{
"name": "on-inhand-right",
"directions": 4
}
]
}
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"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-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"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-vox",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Loading