Merge pull request #4384 from Belsima/maid

Adds maid bonnet, more hair pins, and adds maid uniform to locker.

code/datums/supplypacks/costumes.dm

@@ -134,10 +134,12 @@ datum/supply_packs/costumes/witch
 			/obj/item/clothing/head/pirate,
 			/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/head/pin/flower,
+			/obj/item/clothing/head/pin/flower/yellow,
+			/obj/item/clothing/head/pin/flower/blue,
+			/obj/item/clothing/head/pin/flower/pink,
+			/obj/item/clothing/head/pin/clover,
+			/obj/item/clothing/head/pin/butterfly,
 			/obj/item/clothing/mask/gas/owl_mask,
 			/obj/item/clothing/mask/gas/monkeymask,
 			/obj/item/clothing/head/helmet/gladiator,

code/game/objects/structures/crates_lockers/closets/job_closets.dm

@@ -20,10 +20,12 @@
 	new /obj/item/clothing/head/that(src)
 	new /obj/item/device/radio/headset/headset_service(src)
 	new /obj/item/device/radio/headset/headset_service(src)
-	new /obj/item/clothing/head/hairflower(src)
-	new /obj/item/clothing/head/hairflower/pink(src)
-	new /obj/item/clothing/head/hairflower/yellow(src)
-	new /obj/item/clothing/head/hairflower/blue(src)
+	new /obj/item/clothing/head/pin/flower(src)
+	new /obj/item/clothing/head/pin/flower/pink(src)
+	new /obj/item/clothing/head/pin/flower/yellow(src)
+	new /obj/item/clothing/head/pin/flower/blue(src)
+	new /obj/item/clothing/head/pin/pink(src)
+	new /obj/item/clothing/head/pin/magnetic(src)
 	new /obj/item/clothing/under/sl_suit(src)
 	new /obj/item/clothing/under/sl_suit(src)
 	new /obj/item/clothing/under/rank/bartender(src)
@@ -34,6 +36,7 @@
 	new /obj/item/clothing/accessory/wcoat(src)
 	new /obj/item/clothing/shoes/black(src)
 	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/laceup(src)
 
 /*
  * Chef
@@ -70,6 +73,7 @@
 /obj/structure/closet/jcloset/New()
 	..()
 	new /obj/item/clothing/under/rank/janitor(src)
+	new /obj/item/clothing/under/dress/maid/janitor(src)
 	new /obj/item/device/radio/headset/headset_service(src)
 	new /obj/item/weapon/cartridge/janitor(src)
 	new /obj/item/clothing/gloves/black(src)

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

@@ -159,12 +159,24 @@
 
 /datum/gear/head/hairflower
 	display_name = "hair flower pin (colorable)"
-	path = /obj/item/clothing/head/hairflower/white
+	path = /obj/item/clothing/head/pin/flower/white
 
 /datum/gear/head/hairflower/New()
 	..()
 	gear_tweaks = list(gear_tweak_free_color_choice)
 
+/datum/gear/head/pin
+	display_name = "pin selection"
+	path = /obj/item/clothing/head/pin
+
+/datum/gear/head/pin/New()
+	..()
+	var/list/pins = list()
+	for(var/pin in typesof(/obj/item/clothing/head/pin))
+		var/obj/item/clothing/head/pin/pin_type = pin
+		pins[initial(pin_type.name)] = pin_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pins))
+
 /datum/gear/head/hardhat
 	display_name = "hardhat selection"
 	path = /obj/item/clothing/head/hardhat
@@ -295,11 +307,11 @@
 	..()
 	gear_tweaks = list(gear_tweak_free_color_choice)
 
-/datum/gear/head/bow
-	display_name = "hair bow"
-	path = /obj/item/clothing/head/hairflower/bow
+/datum/gear/head/bow/small
+	display_name = "hair bow, small (colorable)"
+	path = /obj/item/clothing/head/pin/bow
 
-/datum/gear/head/bow/New()
+/datum/gear/head/bow/small/New()
 	..()
 	gear_tweaks = list(gear_tweak_free_color_choice)
 

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

@@ -363,13 +363,17 @@
 	display_name = "red evening gown"
 	path = /obj/item/clothing/under/dress/redeveninggown
 
-/datum/gear/uniform/dresses/janimaid
-	display_name = "maid uniform"
-	path = /obj/item/clothing/under/dress/janimaid
+/datum/gear/uniform/dresses/maid
+	display_name = "maid uniform selection"
+	path = /obj/item/clothing/under/dress/maid
 
-/datum/gear/uniform/dresses/sexymaid
-	display_name = "sexy maid uniform"
-	path = /obj/item/clothing/under/dress/sexymaid
+/datum/gear/uniform/dresses/maid/New()
+	..()
+	var/list/maids = list()
+	for(var/maid in typesof(/obj/item/clothing/under/dress/maid))
+		var/obj/item/clothing/under/dress/maid/maid_type = maid
+		maids[initial(maid_type.name)] = maid_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(maids))
 
 /datum/gear/uniform/utility
 	display_name = "utility, black"

code/modules/clothing/head/hardhat.dm

@@ -13,6 +13,7 @@
 
 /obj/item/clothing/head/hardhat/orange
 	icon_state = "hardhat0_orange"
+	name = "orange hard hat"
 
 /obj/item/clothing/head/hardhat/red
 	icon_state = "hardhat0_red"
@@ -23,9 +24,11 @@
 
 /obj/item/clothing/head/hardhat/white
 	icon_state = "hardhat0_white"
+	name = "sleek hard hat"
 	item_flags = STOPPRESSUREDAMAGE
 	heat_protection = HEAD
 	max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
 
 /obj/item/clothing/head/hardhat/dblue
+	name = "blue hard hat"
 	icon_state = "hardhat0_dblue"

code/modules/clothing/head/misc.dm

@@ -10,39 +10,79 @@
 	desc = "A formal hat for SolGov Customs Officers."
 	icon_state = "customshat"
 
-/obj/item/clothing/head/hairflower
-	name = "hair flower pin"
-	icon_state = "hairflower"
-	desc = "Smells nice."
+/obj/item/clothing/head/pin
+	icon_state = "pin"
+	addblends = "pin_a"
+	name = "hair pin"
+	desc = "A nice hair pin."
 	slot_flags = SLOT_HEAD | SLOT_EARS
 	body_parts_covered = 0
 
-/obj/item/clothing/head/hairflower/blue
+/obj/item/clothing/head/pin/pink
+	icon_state = "pinkpin"
+	name = "pink hair hat"
+
+/obj/item/clothing/head/pin/clover
+	icon_state = "cloverpin"
+	name = "clover pin"
+	desc = "A hair pin in the shape of a clover leaf."
+
+/obj/item/clothing/head/pin/butterfly
+	icon_state = "butterflypin"
+	name = "butterfly pin"
+	desc = "A hair pin in the shape of a bright blue butterfly."
+
+/obj/item/clothing/head/pin/magnetic
+	icon_state = "magnetpin"
+	name = "magnetic 'pin'"
+	desc = "Finally, a hair pin even a Morpheus chassis can use."
+	matter = list(DEFAULT_WALL_MATERIAL = 10)
+
+/obj/item/clothing/head/pin/flower
+	name = "red flower pin"
+	icon_state = "hairflower"
+	desc = "Smells nice."
+
+/obj/item/clothing/head/pin/flower/blue
 	icon_state = "hairflower_blue"
+	name = "blue flower pin"
 
-/obj/item/clothing/head/hairflower/pink
+/obj/item/clothing/head/pin/flower/pink
 	icon_state = "hairflower_pink"
+	name = "pink flower pin"
 
-/obj/item/clothing/head/hairflower/yellow
+/obj/item/clothing/head/pin/flower/yellow
 	icon_state = "hairflower_yellow"
+	name = "yellow flower pin"
 
-/obj/item/clothing/head/hairflower/violet
+/obj/item/clothing/head/pin/flower/violet
 	icon_state = "hairflower_violet"
+	name = "violet flower pin"
 
-/obj/item/clothing/head/hairflower/orange
+/obj/item/clothing/head/pin/flower/orange
 	icon_state = "hairflower_orange"
+	name = "orange flower pin"
 
-/obj/item/clothing/head/hairflower/white
+/obj/item/clothing/head/pin/flower/white
 	icon_state = "hairflower_white"
 	addblends = "hairflower_white_a"
+	name = "flower pin"
 
-/obj/item/clothing/head/hairflower/bow
+/obj/item/clothing/head/pin/bow
 	icon_state = "bow"
 	addblends = "bow_a"
 	name = "hair bow"
 	desc = "A ribbon tied into a bow with a clip on the back to attach to hair."
 	item_state_slots = list(slot_r_hand_str = "pill", slot_l_hand_str = "pill")
 
+/obj/item/clothing/head/pin/bow/big
+	icon_state = "whiteribbon"
+	name = "ribbon"
+
+/obj/item/clothing/head/pin/bow/big/red
+	icon_state = "redribbon"
+	name = "red ribbon"
+
 /obj/item/clothing/head/powdered_wig
 	name = "powdered wig"
 	desc = "A powdered wig."
@@ -356,4 +396,10 @@
 	name = "sombrero"
 	desc = "A wide-brimmed hat popularly worn in Mexico."
 	icon_state = "sombrero"
+	body_parts_covered = 0
+
+/obj/item/clothing/head/headband/maid
+	name = "maid headband"
+	desc = "Keeps hair out of the way for important... jobs."
+	icon_state = "maid"
 	body_parts_covered = 0

code/modules/clothing/under/miscellaneous.dm

@@ -320,13 +320,13 @@
 	desc = "Maid in China."
 	icon_state = "maid"
 
-/obj/item/clothing/under/dress/janimaid
+/obj/item/clothing/under/dress/maid/janitor
 	name = "maid uniform"
 	desc = "A simple maid uniform for housekeeping."
 	icon_state = "janimaid"
 
-/obj/item/clothing/under/dress/sexymaid
-	name = "sexy maid uniform"
+/obj/item/clothing/under/dress/maid/sexy
+	name = "sexy maid costume"
 	desc = "You must be a bit risque teasing all of them in a maid uniform!"
 	icon_state = "sexymaid"