diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index f5411986787..8b420ffcafe 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -196,10 +196,6 @@ name = "Bedhead 2" icon_state = "hair_bedheadv2" - bedhead3 - name = "Bedhead 3" - icon_state = "hair_bedheadv3" - beehive name = "Beehive" icon_state = "hair_beehive" @@ -248,11 +244,6 @@ icon_state = "hair_combover" gender = MALE - father - name = "Father" - icon_state = "hair_father" - gender = MALE - reversemohawk name = "Reverse Mohawk" icon_state = "hair_reversemohawk" @@ -334,11 +325,6 @@ icon_state = "hair_hitop" gender = MALE - mohawk - name = "Mohawk" - icon_state = "hair_d" - species_allowed = list("Human","Unathi") - jensen name = "Adam Jensen Hair" icon_state = "hair_jensen" @@ -710,6 +696,42 @@ name = "Donut Bun" icon_state = "hair_donutbun" + gentle2alt + name = "Gentle 2, Alternative" + icon_state = "hair_gentle2alt" + + gentle2longalt + name = "Gentle 2, Alternative (Long)" + icon_state = "hair_gentle2longalt" + + neat + name = "Neat" + icon_state = "hair_neat" + gender = FEMALE + + neatlong + name = "Neat (Long)" + icon_state = "hair_neatlong" + gender = FEMALE + + bobcuteven + name = "Shoulder Bob" + icon_state = "hair_bobcuteven" + gender = FEMALE + + shortmess + name = "Messy" + icon_state = "hair_shortmess" + + remohawk + name = "Mohawk" + icon_state = "hair_mohawk" + + celes + name = "Drills, Side" + icon_state = "hair_celes" + + // TG-format hair - uses ICON_MULTIPLY instead of ICON_ADD uniter icon = 'icons/mob/human_face/hair_multiply.dmi' @@ -985,6 +1007,10 @@ name = "Unathi Side Frills" icon_state = "unathi_sidefrills" + una_mohawk + name = "Unathi Mohawk" + icon_state = "hair_d" + //skrell tentacles skr_tentacle_m diff --git a/html/changelogs/VTCobaltblood - hairy_monkeys.yml b/html/changelogs/VTCobaltblood - hairy_monkeys.yml new file mode 100644 index 00000000000..14fae6d8c40 --- /dev/null +++ b/html/changelogs/VTCobaltblood - hairy_monkeys.yml @@ -0,0 +1,39 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: VTCobaltblood + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Tweaks a lot of hairstyles: Bobcut, One Shoulder, Short Hair 3, Tress Shoulder, Very Short Overeye, Very Long, Volaju, Beehive 2, Ombre, Ponytail 4, Ponytail 7, Mohawk, Wavy Shoulder (Ponytail), Wavy Shoulder (Down), Floofy (Short)." + - rscadd: "Adds alternative versions of Gentle 2 and four new hairstyles: Neat, Neat (Long), Shoulder Bob, Messy and Drills, Side. Neat replaced Bedhead 3." + - rscdel: "Removes the Father hairstyle." \ No newline at end of file diff --git a/icons/mob/human_face/hair.dmi b/icons/mob/human_face/hair.dmi index ec202b28a4d..3508f439644 100644 Binary files a/icons/mob/human_face/hair.dmi and b/icons/mob/human_face/hair.dmi differ diff --git a/icons/mob/human_face/hair_multiply.dmi b/icons/mob/human_face/hair_multiply.dmi index 6d35f96b6b1..433cd90d2de 100644 Binary files a/icons/mob/human_face/hair_multiply.dmi and b/icons/mob/human_face/hair_multiply.dmi differ