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

Ombre and Crewcut haircuts classic variants #402

Merged
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
Copy link
Contributor

github-actions bot commented Nov 5, 2023

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

untouched line

Signed-off-by: Colin-Tel <[email protected]>
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
* 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)
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Walls/Windows Resprites!

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Import the changes that i provided to frontier in PR:
new-frontiers-14/frontier-station-14#418 to EE,
including part of this PR:
new-frontiers-14/frontier-station-14#757

Those Walls/Windows LOOK EXTREMLY MORE BETTER then the old TG
walls/windows, Common its 2024!
We need DRIP IN ALL WALLS!

.yml changes are needed for connection to walls/window and prevent
connected from doors, shutters, ect...

---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [x] Import Sprites.
- [x] yml changes

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/28221333-4c14-44d4-8557-697462d676f2)

</p>
</details>

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- tweak: Better wall sprites.
- tweak: Better window sprites.
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Edit/Resprite most of the floors in-game because in all honest TG
Floors... currently... are extremly flat and old... even TG already has
upgraded their floors...
This also changed some minor edits to decals to fit, This PR is
recomended paired with DeltaV-Station#402 and others updated looks PRs

This bring new floors sprites from baystation, paradise station.

---

# TODO

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [x] Import Sprites
- [x] @VMSolidus Edits

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/01a4351c-b72a-446f-9db5-ca50f63f140e)

![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/bde02ff6-38d9-49a5-8594-a53e005a4075)

![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/9e4b508e-9512-481b-8e7e-a2f500a6375c)

![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/34634648-c489-4581-8d5f-ee088744255d)

![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/4e0b666c-ba84-4c5b-ae63-ee2af3c44b96)

</p>
</details>

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- tweak: Floors Looks Updated/Resprited.

---------

Co-authored-by: VMSolidus <[email protected]>
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.

Add "old" versions of reworked haircuts as variants
3 participants