diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 12db667cb4d..4ab06f4c60c 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1413,6 +1413,9 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /obj/item/clothing/head/hasturhood, /obj/item/clothing/head/powdered_wig, /obj/item/clothing/head/hairflower, + /obj/item/clothing/head/hairflower/yellow, + /obj/item/clothing/head/hairflower/blue, + /obj/item/clothing/head/hairflower/pink, /obj/item/clothing/mask/gas/owl_mask, /obj/item/clothing/mask/gas/monkeymask, /obj/item/clothing/head/helmet/gladiator, @@ -1500,4 +1503,4 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee /obj/item/device/kit/paint/gygax/darkgygax, /obj/item/device/kit/paint/gygax/recitence ) - name = "Random Gygax exosuit modkit" + name = "Random Gygax exosuit modkit" diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index f67eda7dd9d..8e18901410d 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -21,6 +21,9 @@ new /obj/item/device/radio/headset/headset_service(src) new /obj/item/device/radio/headset/headset_service(src) new /obj/item/clothing/head/hairflower + new /obj/item/clothing/head/hairflower/pink + new /obj/item/clothing/head/hairflower/yellow + new /obj/item/clothing/head/hairflower/blue new /obj/item/clothing/under/sl_suit(src) new /obj/item/clothing/under/sl_suit(src) new /obj/item/clothing/under/rank/bartender(src) diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 26db831c68e..c159406d313 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -196,12 +196,30 @@ var/global/list/gear_datums = list() cost = 1 slot = slot_head -/datum/gear/hairflower - display_name = "hair flower pin" +/datum/gear/rhairflower + display_name = "hair flower pin, red" path = /obj/item/clothing/head/hairflower cost = 1 slot = slot_head +/datum/gear/yhairflower + display_name = "hair flower pin, yellow" + path = /obj/item/clothing/head/hairflower/yellow + cost = 1 + slot = slot_head + +/datum/gear/ghairflower + display_name = "hair flower pin, pink" + path = /obj/item/clothing/head/hairflower/pink + cost = 1 + slot = slot_head + +/datum/gear/bhairflower + display_name = "hair flower pin, blue" + path = /obj/item/clothing/head/hairflower/blue + cost = 1 + slot = slot_head + /datum/gear/dbhardhat display_name = "hardhat, blue" path = /obj/item/clothing/head/hardhat/dblue diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 47740ff55e5..8060f29b191 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -18,6 +18,15 @@ slot_flags = SLOT_HEAD | SLOT_EARS body_parts_covered = 0 +/obj/item/clothing/head/hairflower/blue + icon_state = "hairflower_blue" + +/obj/item/clothing/head/hairflower/pink + icon_state = "hairflower_pink" + +/obj/item/clothing/head/hairflower/yellow + icon_state = "hairflower_yellow" + /obj/item/clothing/head/powdered_wig name = "powdered wig" desc = "A powdered wig." @@ -243,7 +252,7 @@ ) flags_inv = BLOCKHAIR siemens_coefficient = 2.0 //why is it so conductive?! - body_parts_covered = 0 + body_parts_covered = 0 /obj/item/clothing/head/orangebandana //themij: Taryn Kifer name = "orange bandana" diff --git a/icons/mob/ears.dmi b/icons/mob/ears.dmi index cc0869939e7..4e61bb1c428 100644 Binary files a/icons/mob/ears.dmi and b/icons/mob/ears.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index 921e93d93d1..43d8755679f 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index dccc44c8e1c..5a59efa5394 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ