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

Scar and Tattoo Fixes #1889

Merged
merged 14 commits into from
Oct 30, 2024
Merged

Scar and Tattoo Fixes #1889

merged 14 commits into from
Oct 30, 2024

Conversation

Aikakakah
Copy link
Contributor

About the PR

Fixed the issue of chest tattoos showing through clothes. Includes a fix for the back of the Nightling chest tattoo showing on the back of the neck on males and all chest tattoos and scars showing through clothing on females.

Why / Balance

I saw it. It annoyed me. I fixed it.

Technical details

Added male and female variations of affected scars/tattoos.

Media

Green Nightling tattoo on female.
image

Requirements

Breaking changes

Changelog

🆑

  • fix: Fixed tattoos and scars showing through clothing.

Fixes chest tattoos showing through clothes on females. 

Signed-off-by: Aikakakah <[email protected]>
Fixes the chest scar showing through clothes on females. 

Signed-off-by: Aikakakah <[email protected]>
Signed-off-by: Aikakakah <[email protected]>
Signed-off-by: Aikakakah <[email protected]>
Signed-off-by: Aikakakah <[email protected]>
Signed-off-by: Aikakakah <[email protected]>
Signed-off-by: Aikakakah <[email protected]>
Signed-off-by: Aikakakah <[email protected]>
@Aikakakah Aikakakah requested review from IamVelcroboy and a team as code owners September 21, 2024 19:31
@github-actions github-actions bot added S: Needs Review Changes: YML Changes any yml files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi labels Sep 21, 2024
Copy link
Contributor

github-actions bot commented Sep 21, 2024

RSI Diff Bot; head commit 37ff78f merging into 02f8188
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/DeltaV/Mobs/Customization/scars.rsi

State Old New Status
scar_chest_female Added

Resources/Textures/DeltaV/Mobs/Customization/tattoos.rsi

State Old New Status
tattoo_hive_chest_female Added
tattoo_nightling Added
tattoo_nightling_female Added

Edit: diff updated after 37ff78f

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

All this looks like is splitting of the markings - most of which touches upstream files. I'd say maybe go fix this in an upstream PR (at space-wizards/space-station-14), - that might take a while though. If you wanna get this accepted here though, you're gonna have to like heavily split it so that things are either DeltaV commented or make a few DeltaV files for tattoos.

@Aikakakah
Copy link
Contributor Author

Edited it further to keep all original files in their respective folder, new changes are in the DeltaV folder.

Copy link
Member

@MilonPL MilonPL left a comment

Choose a reason for hiding this comment

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

forgor

@MilonPL MilonPL merged commit 2838a5f into DeltaV-Station:master Oct 30, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants