Adds three new hair flower pins - yellow, blue, and pink.

All three have the same on-ear/head sprite as the current red hair flower pin, but a different in hand sprite.
The red flower pin should remain untouched and is still "hairflower", with the new colours being subtypes.

Manually merges the dmis by hand.

Conflicts:
	code/datums/supplypacks.dm
	code/modules/client/preferences_gear.dm

code/datums/supplypacks.dm

@@ -1491,6 +1491,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,
@@ -2177,4 +2180,4 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 	cost = 10
 	containertype = /obj/structure/closet/crate
 	containername = "\improper Chaplain equipment crate"
-	group = "Miscellaneous"
+	group = "Miscellaneous"

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)

code/modules/client/preference_setup/loadout/loadout_head.dm

@@ -102,6 +102,18 @@
 	display_name = "hair flower pin, red"
 	path = /obj/item/clothing/head/hairflower
 
+/datum/gear/head/hairflower/yellow
+	display_name = "hair flower pin, yellow"
+	path = /obj/item/clothing/head/hairflower/yellow
+
+/datum/gear/head/hairflower/pink
+	display_name = "hair flower pin, pink"
+	path = /obj/item/clothing/head/hairflower/pink
+
+/datum/gear/head/hairflower/blue
+	display_name = "hair flower pin, blue"
+	path = /obj/item/clothing/head/hairflower/blue
+
 /datum/gear/head/hardhat
 	display_name = "hardhat, yellow"
 	path = /obj/item/clothing/head/hardhat

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."