Skip to content

Commit

Permalink
Mirror: new haircut alternative (brought back old one) (#162)
Browse files Browse the repository at this point in the history
## Mirror of PR #25935: [new haircut alternative (brought back old
one)](space-wizards/space-station-14#25935) from
<img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `76db710a1c5fe4c86674a27c282b4f84cb35446b`

PR opened by <img
src="https://avatars.githubusercontent.com/u/149102472?v=4"
width="16"/><a href="https://github.com/UnicornOnLSD"> UnicornOnLSD</a>
at 2024-03-08 21:34:23 UTC
PR merged by <img
src="https://avatars.githubusercontent.com/u/19864447?v=4"
width="16"/><a href="https://github.com/web-flow"> web-flow</a> at
2024-03-12 18:47:29 UTC

---

PR changed 4 files with 12 additions and 0 deletions.

The PR had the following labels:
- No C#
- Changes: Sprites


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
> 
> ## About the PR
> <!-- What did you change in this PR? -->
> added back the 'old' sprite of crew cut haircut as a secondary choice
to the current crew cut.
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
> Both my personnal liking, and, I mean, more customisation is better,
no ?
> ## Technical details
> <!-- If this is a code change, summarize at high level how your new
code works. This makes it easier to review. -->
> nah
> ## Media
> <!-- 
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
> 
> If you're unsure whether your PR will require media, ask a maintainer.
> 
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
> 
> - [ ] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
> 
> ## Breaking changes
> <!--
> List any breaking changes, including namespace, public
class/method/field changes, prototype renames; and provide instructions
for fixing them. This will be pasted in #codebase-changes.
> -->
> 
> **Changelog**
> <!--
> Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
> -->
> 
> 
> 🆑
> - add: brought back the classic crew cut as an alternative to the
current one !
> 


</details>

Co-authored-by: UnicornOnLSD <[email protected]>
  • Loading branch information
SimpleStation14 and UnicornOnLSD committed May 6, 2024
1 parent 40d05b8 commit d032a0f
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 0 deletions.
1 change: 1 addition & 0 deletions Resources/Locale/en-US/accessories/human-hair.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ marking-HumanHairCornrowbun = Cornrow Bun
marking-HumanHairCornrowbraid = Cornrow Braid
marking-HumanHairCornrowtail = Cornrow Tail
marking-HumanHairCrewcut = Crewcut
marking-HumanHairCrewcut2 = Crewcut 2
marking-HumanHairCurls = Curls
marking-HumanHairC = Cut Hair
marking-HumanHairDandypompadour = Dandy Pompadour
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,13 @@
sprites:
- sprite: Mobs/Customization/human_hair.rsi
state: crewcut
- type: marking
id: HumanHairCrewcut2
bodyPart: Hair
markingCategory: Hair
sprites:
- sprite: Mobs/Customization/human_hair.rsi
state: crewcut2
- type: marking
id: HumanHairCurls
bodyPart: Hair
Expand Down
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
Expand Up @@ -235,6 +235,10 @@
"name": "crewcut",
"directions": 4
},
{
"name": "crewcut2",
"directions": 4
},
{
"name": "curls",
"directions": 4
Expand Down

0 comments on commit d032a0f

Please sign in to comment.