diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index 64027447d11..f5411986787 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -698,6 +698,18 @@ name = "Right Sidecut" icon_state = "hair_rightside" + gentle2 + name = "Gentle 2" + icon_state = "hair_gentle2" + + gentle2long + name = "Gentle 2 (Long)" + icon_state = "hair_gentle2long" + + donutbun + name = "Donut Bun" + icon_state = "hair_donutbun" + // TG-format hair - uses ICON_MULTIPLY instead of ICON_ADD uniter icon = 'icons/mob/human_face/hair_multiply.dmi' diff --git a/html/changelogs/VTCobaltblood - MISTAKES_WERE_MADE.yml b/html/changelogs/VTCobaltblood - MISTAKES_WERE_MADE.yml new file mode 100644 index 00000000000..1b48a2da6d2 --- /dev/null +++ b/html/changelogs/VTCobaltblood - MISTAKES_WERE_MADE.yml @@ -0,0 +1,37 @@ +################################ +# 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: + - rscadd: "Ports three hairstyles from Baystation: Gentle 2, Gentle 2 (Long) and Donut Bun." \ No newline at end of file diff --git a/icons/mob/human_face/hair.dmi b/icons/mob/human_face/hair.dmi index 8db2edfb89e..ec202b28a4d 100644 Binary files a/icons/mob/human_face/hair.dmi and b/icons/mob/human_face/hair.dmi differ