cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-21 04:48:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ports some more hairstyles from Shiptest (#22487)

Browse Source 
## About PR

Ports some hairstyles from following PRs to replace some of our outdated
hairstyles
- https://github.com/shiptest-ss13/Shiptest/pull/5007
- https://github.com/shiptest-ss13/Shiptest/pull/5343
- https://github.com/shiptest-ss13/Shiptest/pull/5663
- https://github.com/shiptest-ss13/Shiptest/pull/5825

## Images
<img width="768" height="672" alt="image"
src="https://github.com/user-attachments/assets/170bef96-6ee9-424e-a9be-bab0c2f0536a"
/>


### Asset Licenses
The following assets that **have not** been created by myself are
included in this PR:

| Path | Original Author | License |
| --- | --- | --- |
| icons/mob/human_face/hair.dmi (hair_bedhead_short, hair_bob_curl,
hair_bob_wavy, hair_emo_bangs, hair_emo_fringe, hair_feather) |
thearbiber (Shiptest) | CC-BY-SA 3.0 |
This commit is contained in:
Kano
2026-05-23 23:09:33 +03:00
committed by GitHub
parent 0e147df653
commit bce57bf21a
4 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/abstract/new_player/sprite_accessories.dm
+36 -22
View File
@@ -246,17 +246,6 @@ Follow by example and make good judgement based on length which list to include
icon_state = "hair_bob_shoulder"
chatname = "short hair"
/datum/sprite_accessory/hair/bobcurl
name = "Bobcurl"
icon_state = "hair_bobcurl"
species_allowed = list(/datum/species/human,/datum/species/human/offworlder,/datum/species/machine/shell,/datum/species/machine/shell/rogue,/datum/species/zombie)
chatname = "curls"
/datum/sprite_accessory/hair/bobcurl2
name = "Bobcurl 2"
icon_state = "hair_bobcurl2"
chatname = "curls"
/datum/sprite_accessory/hair/bookish
name = "Bookish"
icon_state = "hair_bookish"
@@ -513,11 +502,6 @@ Follow by example and make good judgement based on length which list to include
chatname = "long fringe"
length = 2
/datum/sprite_accessory/hair/emofringe
name = "Emo Fringe"
icon_state = "hair_emofringe"
chatname = "fringe"
/datum/sprite_accessory/hair/emofringe_long
name = "Emo Fringe Long"
icon_state = "hair_emofringe_long"
@@ -594,12 +578,6 @@ Follow by example and make good judgement based on length which list to include
icon_state = "hair_father"
chatname = "short hair"
/datum/sprite_accessory/hair/feather
name = "Feather"
icon_state = "hair_feather"
length = 2
chatname = "short hair"
/datum/sprite_accessory/hair/flat_top
name = "Flat Top"
icon_state = "hair_flattop"
@@ -1733,6 +1711,12 @@ Follow by example and make good judgement based on length which list to include
length = 1
chatname = "balding hair"
/datum/sprite_accessory/hair/balding/bedhead_short
name = "Bedhead, Short"
icon_state = "hair_bedhead_short"
length = 2
chatname = "messy hair"
/datum/sprite_accessory/hair/balding/bangs_light
name = "Bangs, Light"
icon_state = "hair_bangs_light"
@@ -1745,6 +1729,18 @@ Follow by example and make good judgement based on length which list to include
length = 1
chatname = "short hair"
/datum/sprite_accessory/hair/balding/bob_curl
name = "Bob, Curl"
icon_state = "hair_bob_curl"
length = 2
chatname = "short hair"
/datum/sprite_accessory/hair/balding/bob_wavy
name = "Bob, Wavy"
icon_state = "hair_bob_wavy"
length = 2
chatname = "short hair"
/datum/sprite_accessory/hair/balding/braided_tail
name = "Braided, Tail"
icon_state = "hair_braided_tail"
@@ -1811,6 +1807,18 @@ Follow by example and make good judgement based on length which list to include
length = 1
chatname = "choppy hair"
/datum/sprite_accessory/hair/balding/emo_fringe
name = "Emo, Fringe"
icon_state = "hair_emo_fringe"
length = 2
chatname = "fringe"
/datum/sprite_accessory/hair/balding/emo_bangs
name = "Emo, Bangs"
icon_state = "hair_emo_bangs"
length = 2
chatname = "bangs"
/datum/sprite_accessory/hair/balding/fade
name = "Fade"
icon_state = "hair_fade"
@@ -1823,6 +1831,12 @@ Follow by example and make good judgement based on length which list to include
length = 1
chatname = "groomed hair"
/datum/sprite_accessory/hair/balding/feather
name = "Feather"
icon_state = "hair_feather"
length = 2
chatname = "short hair"
/datum/sprite_accessory/hair/balding/floof
name = "Floof"
icon_state = "hair_floof"