diff --git a/code/modules/mob/abstract/new_player/sprite_accessories.dm b/code/modules/mob/abstract/new_player/sprite_accessories.dm index 94408c72f1c..dab9d6b7969 100644 --- a/code/modules/mob/abstract/new_player/sprite_accessories.dm +++ b/code/modules/mob/abstract/new_player/sprite_accessories.dm @@ -658,6 +658,18 @@ Follow by example and make good judgement based on length which list to include length = 3 chatname = "long hair" +/datum/sprite_accessory/hair/gentle3 + name = "Gentle 3" + icon_state = "hair_gentle3" + length = 3 + chatname = "long hair" + +/datum/sprite_accessory/hair/gentle3_alt + name = "Gentle 3, Alt" + icon_state = "hair_gentle3_alt" + length = 3 + chatname = "long hair" + /datum/sprite_accessory/hair/glossy name = "Glossy" icon_state = "hair_glossy" @@ -789,6 +801,12 @@ Follow by example and make good judgement based on length which list to include length = 4 chatname = "very long hair" +/datum/sprite_accessory/hair/long_wavy + name = "Long Hair, Wavy" + icon_state = "hair_long_wavy" + length = 3 + chatname = "long hair" + /datum/sprite_accessory/hair/macaw name = "Macaw" icon_state = "hair_macaw" @@ -1468,6 +1486,12 @@ Follow by example and make good judgement based on length which list to include length = 3 chatname = "long hair" +/datum/sprite_accessory/hair/surfer + name = "Surfer" + icon_state = "hair_surfer" + length = 2 + chatname = "short hair" + /datum/sprite_accessory/hair/thinning name = "Thinning" icon_state = "hair_thinning" @@ -1576,6 +1600,18 @@ Follow by example and make good judgement based on length which list to include icon_state = "hair_wheeler" chatname = "short hair" +/datum/sprite_accessory/hair/wolfcut + name = "Wolfcut" + icon_state = "hair_wolfcut" + length = 3 + chatname = "long hair" + +/datum/sprite_accessory/hair/wolfcut_alt + name = "Wolfcut, Alt" + icon_state = "hair_wolfcut_alt" + length = 3 + chatname = "long hair" + /datum/sprite_accessory/hair/fingerwave name = "Fingerwave" icon_state = "hair_fingercurl" diff --git a/html/changelogs/CometBlaze-hair.yml b/html/changelogs/CometBlaze-hair.yml new file mode 100644 index 00000000000..a8b125079ae --- /dev/null +++ b/html/changelogs/CometBlaze-hair.yml @@ -0,0 +1,58 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: CometBlaze + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Added 6 new hairstyles to the game: Gentle 3, Gentle 3(Alt), Long Hair(Wavy), Surfer, Wolfcut and Wolfcut(Alt)" diff --git a/icons/mob/human_face/hair.dmi b/icons/mob/human_face/hair.dmi index f11e2c3deff..0d79db33724 100644 Binary files a/icons/mob/human_face/hair.dmi and b/icons/mob/human_face/hair.dmi differ