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.

Sign up for GitHub

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

Jump to bottom

Ombre and Crewcut haircuts classic variants #402

Merged
merged 2 commits into from
Nov 6, 2023
Merged

Ombre and Crewcut haircuts classic variants #402

merged 2 commits into from
Nov 6, 2023

Conversation

FluffiestFloof
Copy link
Contributor

About the PR

Re-adds the old version of Ombre and Crewcut haircuts.

Why / Balance

Per request.

Technical details

closes #399

Media

ss (2023-11-05 at 07 39 26)
ss (2023-11-05 at 07 39 35)

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

Breaking changes

Changelog

@github-actions github-actions bot added S: Needs Review Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files labels Nov 5, 2023
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Nov 5, 2023 •
edited
Loading

RSI Diff Bot; head commit 03a775e merging into 617b24c
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

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

State Old New Status
classic_crewcut Added
classic_ombre Added

Edit: diff updated after 03a775e

@UnicornOnLSD
Copy link
Contributor

god speed Floofers o7

@Colin-Tel
Update hair.ftl
03a775e 
untouched line

Signed-off-by: Colin-Tel <[email protected]>
Colin-Tel
Colin-Tel approved these changes Nov 6, 2023
View reviewed changes
Copy link
Contributor

@Colin-Tel Colin-Tel left a comment

Choose a reason for hiding this comment

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

No upstream files touched, corrected the random whitespace in the hair.ftl file, checked it out in-game, all looks good!

@Colin-Tel Colin-Tel enabled auto-merge (squash) November 6, 2023 15:16
@Colin-Tel Colin-Tel merged commit 17ff511 into DeltaV-Station:master Nov 6, 2023
12 checks passed
DebugOk pushed a commit to DebugOk/Delta-v that referenced this pull request Jan 20, 2024
@FluffiestFloof @DebugOk
Ombre and Crewcut haircuts classic variants (DeltaV-Station#402)
0ce128e 
* Ombre and Crewcut

* Update hair.ftl

untouched line

Signed-off-by: Colin-Tel <[email protected]>

---------

Signed-off-by: Colin-Tel <[email protected]>
Co-authored-by: Colin-Tel <[email protected]>
(cherry picked from commit 17ff511)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Colin-Tel Colin-Tel Colin-Tel approved these changes

@DebugOk DebugOk Awaiting requested review from DebugOk

Assignees
No one assigned
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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add "old" versions of reworked haircuts as variants
3 participants
@FluffiestFloof @UnicornOnLSD @Colin-Tel