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

Conversation

Bribrooo
Copy link
Contributor

About the PR

This PR adds six new items promoting personal protective equipment and updates the ChemDrobe, because we do not joke about safety in the lab!

(All sprites were "okay" by Phil's standards before he quit his position of Art Lead, and was also okay for most people after I asked for feedbacks about the sprites, so it shouldn't be a problem on that part I hope...)

Why / Balance

It adds a nice touch of realism and roleplay, like if you're wearing glasses while somebody tries to spray lemon juice on you, you'd be protected and so forth.

Technical details

None.

Media

iconsppe
theguyppe
protecguyppe
thestoreppe

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Not groundbreaking changes...

Changelog
add: Six new clothes for chemists to wear.
tweak: The ChemDrobe was updated to follow with the new outfits available.

@github-actions github-actions bot added Status: Needs Review Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files labels Feb 18, 2024
Copy link
Contributor

github-actions bot commented Feb 18, 2024

RSI Diff Bot; head commit 866a53f merging into 813db18
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi

State Old New Status
equipped-EYES Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi

State Old New Status
equipped-HAND Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi

State Old New Status
equipped-NECK-hamster Added
equipped-NECK Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi

State Old New Status
equipped-FEET Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi

State Old New Status
equipped-INNERCLOTHING-monkey Added
equipped-INNERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after 866a53f

Copy link
Contributor

@FluffiestFloof FluffiestFloof left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mostly a suggestion since I have no real power but you don't need to add DeltaV markers in DeltaV files and you could just batch all the upstream changes into one marker so it looks tidier/easier to manage.

@Bribrooo
Copy link
Contributor Author

Everything is tidier / easier to manage now @FluffiestFloof !

VMSolidus
VMSolidus previously approved these changes Feb 24, 2024
Copy link
Contributor

@VMSolidus VMSolidus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These look pretty great. It'll be fun to in-character insist on chemists wearing their PPE.

DebugOk
DebugOk previously approved these changes Mar 7, 2024
Copy link
Contributor

@DebugOk DebugOk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't fully read into it, but just glancing over it, it looks fine

@Timemaster99
Copy link
Contributor

The chemical resistant apron is mispelled as "Resistand"

Signed-off-by: VMSolidus <[email protected]>
@VMSolidus VMSolidus dismissed stale reviews from DebugOk and themself via 3cac874 March 8, 2024 03:30
Touching up descriptions

Signed-off-by: VMSolidus <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
@VMSolidus
Copy link
Contributor

I've touched up the descriptions a little. These look good. It'll merge if the tests pass.

@VMSolidus VMSolidus enabled auto-merge (squash) March 8, 2024 03:34
@VMSolidus VMSolidus merged commit 29a7e25 into DeltaV-Station:master Mar 8, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files Status: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants