diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 72bd4a0817..cdf51e8063 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -154,6 +154,14 @@ display_name = "hair flower pin, orange" path = /obj/item/clothing/head/hairflower/orange +/datum/gear/head/hairflower/white + display_name = "hair flower pin" + path = /obj/item/clothing/head/hairflower/white + +/datum/gear/head/hairflower/white/New() + ..() + gear_tweaks = list(gear_tweak_free_color_choice) + /datum/gear/head/hardhat display_name = "hardhat, yellow" path = /obj/item/clothing/head/hardhat @@ -233,6 +241,14 @@ ..() gear_tweaks = list(gear_tweak_free_color_choice) +/datum/gear/head/taqiyah + display_name = "taqiyah" + path = /obj/item/clothing/head/taqiyah + +/datum/gear/head/taqiyah/New() + ..() + gear_tweaks = list(gear_tweak_free_color_choice) + /datum/gear/head/beanie display_name = "beanie" path = /obj/item/clothing/head/beanie diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 8519a36410..2d398cb32f 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -32,6 +32,9 @@ /obj/item/clothing/head/hairflower/orange icon_state = "hairflower_orange" +/obj/item/clothing/head/hairflower/white + icon_state = "hairflower_white" + /obj/item/clothing/head/hairflower/bow icon_state = "bow" name = "hair bow" @@ -305,6 +308,12 @@ body_parts_covered = 0 flags_inv = BLOCKHEADHAIR +/obj/item/clothing/head/taqiyah + name = "taqiyah" + desc = "A short, rounded skullcap usually worn for religious purposes." + icon_state = "taqiyah" + item_state_slots = list(slot_r_hand_str = "taq", slot_l_hand_str = "taq") + /obj/item/clothing/head/beanie name = "beanie" desc = "A head-hugging brimless winter cap. This one is tight." diff --git a/html/changelogs/RedStryker - Hats.yml b/html/changelogs/RedStryker - Hats.yml new file mode 100644 index 0000000000..ed7c74ae87 --- /dev/null +++ b/html/changelogs/RedStryker - Hats.yml @@ -0,0 +1,38 @@ +################################ +# 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 +################################# + +# Your name. +author: RedStryker + +# 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: "Added a colorable hairflower to the loadout." + - rscadd: "Added a taqiyah to the loadout that can be colored with the color datum." + - tweak: "Fixed the sprite for the red Security Hat backwards sprite so that the 'N' on it is no longer backwards." diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index d3aca8ff63..a648286163 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/items/lefthand_hats.dmi b/icons/mob/items/lefthand_hats.dmi index 6560a6b2f2..d869b2a476 100644 Binary files a/icons/mob/items/lefthand_hats.dmi and b/icons/mob/items/lefthand_hats.dmi differ diff --git a/icons/mob/items/righthand_hats.dmi b/icons/mob/items/righthand_hats.dmi index 8697b80ba2..113a64ca89 100644 Binary files a/icons/mob/items/righthand_hats.dmi and b/icons/mob/items/righthand_hats.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index a1b7ad85de..9101a46a97 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ