diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index d7d34c37347..032a7a34ac1 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -178,11 +178,11 @@ Follow by example and make good judgement based on length which list to include name = "Bedhead 3" icon_state = "hair_bedhead3" chatname = "wavy hair" - + bedhead4 name = "Bedhead 4" icon_state = "hair_bedhead4" - length = 3 + length = 4 chatname = "messy locks" beehive @@ -1914,16 +1914,12 @@ Follow by example and make good judgement based on length which list to include name = "Wise Beard" icon_state = "facial_wise" - brokenman + chinstrap2 icon = 'icons/mob/human_face/facial_hair_multiply.dmi' - name = "Broken Man" - icon_state = "facial_brokenman" + name = "Chinstrap, Alt" + icon_state = "facial_chinstrap_ii" icon_blend_mode = ICON_MULTIPLY - chinstrap2 - name = "Chinstrap, Alt" - icon_state = "facial_chinstrap_ii" - stark name = "Stark" icon_state = "facial_stark" diff --git a/html/changelogs/dansemacabre-hairbegone.yml b/html/changelogs/dansemacabre-hairbegone.yml new file mode 100644 index 00000000000..e6f45bb0df2 --- /dev/null +++ b/html/changelogs/dansemacabre-hairbegone.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: DanseMacabre + +# 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: + - rscdel: "Removed the broken man facial hair style." diff --git a/icons/mob/human_face/facial_hair_multiply.dmi b/icons/mob/human_face/facial_hair_multiply.dmi index 5010a2f3257..b1dd35e830a 100644 Binary files a/icons/mob/human_face/facial_hair_multiply.dmi and b/icons/mob/human_face/facial_hair_multiply.dmi differ