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

Personal Protective Equipment - The Polished Version #854

Merged
merged 20 commits into from
Mar 8, 2024
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 @@ -13,4 +13,11 @@
ClothingHandsGlovesLatex: 2
ClothingHeadsetMedical: 2
ClothingOuterWinterChem: 2
ClothingShoesBootsWinterChem: 2 #Delta V: Add departmental winter boots
# DeltaV - Personal Protective Equipment - Add various PPE equipment including new clothings
ClothingUniformJumpsuitChemShirt: 2 # New chemist jumpsuit, formal variant
ClothingNeckTieChem: 2 # Chemist's tie to go along a new variant of their suit
ClothingShoesEnclosedChem: 2 # Realistic chemistry shoes
ClothingOuterApronChemist: 2 # Realistic PPE apron for chemistry
ClothingEyesGlassesChemist: 2 # Safety glasses
ClothingHandsGlovesChemist: 2 # Heavy duty chemistry gloves
# End of modified code
14 changes: 14 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
- type: entity
parent: ClothingEyesBase
id: ClothingEyesGlassesChemist
name: safety glasses
description: Glasses made for chemists and other workers dealing with caustic reagents.
components:
- type: Sprite
sprite: DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi
- type: Clothing
sprite: DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.85
20 changes: 20 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,23 @@
damage:
types:
Blunt: 9.5

- type: entity
parent: ClothingHandsBase
id: ClothingHandsGlovesChemist
name: heavy nitrile gloves
description: A pair of thick gloves that provide some protection from caustic chemicals.
components:
- type: Sprite
sprite: DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi
- type: Clothing
sprite: DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi
- type: Fiber
fiberMaterial: fibers-rubber
fiberColor: fibers-black
- type: Armor
modifiers:
coefficients:
Caustic: 0.95
- type: TemperatureProtection
coefficient: 1
11 changes: 11 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Clothing/Neck/ties.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,14 @@
sprite: DeltaV/Clothing/Neck/Ties/greentie.rsi
- type: Clothing
sprite: DeltaV/Clothing/Neck/Ties/greentie.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckTieChem
name: chemistry tie
description: An safety-orange tie.
components:
- type: Sprite
sprite: DeltaV/Clothing/Neck/Ties/chemtie.rsi
- type: Clothing
sprite: DeltaV/Clothing/Neck/Ties/chemtie.rsi
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
- type: entity
parent: ClothingOuterStorageBase
id: ClothingOuterApronChemist
name: chemical resistant apron
suffix: Chemistry
description: Made out of thick rubber, the color of this apron still leaves you perplexed.
components:
- type: Sprite
sprite: DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi
- type: Clothing
sprite: DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.25
- type: TemperatureProtection
coefficient: 1
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
- type: entity
parent: ClothingShoesBase
id: ClothingShoesEnclosedChem
name: enclosed shoes
description: Those shoes will protect you from melting your feet while working.
components:
- type: Sprite
sprite: DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi
- type: Clothing
sprite: DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi
- type: Armor
modifiers:
coefficients:
Caustic: 0.95
Original file line number Diff line number Diff line change
Expand Up @@ -242,4 +242,15 @@
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitChemShirt
name: formal chemistry suit
description: There's still some odd stains on this suit. Hm.
components:
- type: Sprite
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi
- type: Clothing
sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi
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": "Sprited by BriBrooo (Discord) for DeltaV-Station",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-EYES",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprited by bribrooo (Discord), original from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HAND",
"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/5a73e8f825ff279e82949b9329783a9e3070e2da, edited by Flareguy for Space Station 14 | In hand sprites sprited by PuroSlavKing (Github) for Space Station 14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "equipped-NECK",
"directions": 4
},
{
"name": "equipped-NECK-hamster",
"directions": 4
},
{
"name": "icon"
},
{
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprited by BriBrooo (Discord), original from tgstation at commit https://github.com/tgstation/tgstation/commit/4f6190e2895e09116663ef282d3ce1d8b35c032e",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d672aade35db25affc6ed5e1c7aa0b640f118d4c",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-FEET",
"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.
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprited by BriBrooo. Originally from tgstation at commit https://github.com/tgstation/tgstation/commit/c838ba21dae97db345e0113f99596decd1d66039. In hand original sprite scaled down by potato1234_x, original monkey sprite 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