Quartermaster Drip (#24341)

* quartermasterdrip

* Update code/modules/clothing/head/job_hats.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

code/datums/dog_fashion.dm

@@ -261,3 +261,7 @@
 /datum/dog_fashion/head/roman
 	name = "Imperator REAL_NAME"
 	desc = "For the Senate and the people of Rome!"
+
+/datum/dog_fashion/head/qm
+	name = "Supplymaster REAL_NAME"
+	desc = "A loyal watchdog for the most secure transportation."

code/game/jobs/job/support.dm

@@ -37,8 +37,9 @@
 	name = "Quartermaster"
 	jobtype = /datum/job/qm
 
-	uniform = /obj/item/clothing/under/rank/cargo/quartermaster
+	uniform = /obj/item/clothing/under/rank/cargo/qm
 	shoes = /obj/item/clothing/shoes/workboots/mining
+	head = /obj/item/clothing/head/qm
 	l_ear = /obj/item/radio/headset/heads/qm
 	glasses = /obj/item/clothing/glasses/sunglasses
 	mask = /obj/item/clothing/mask/cigarette/cigar/cohiba

code/game/objects/items/weapons/storage/garment.dm

@@ -196,16 +196,18 @@
 	desc = "A bag for storing extra clothes and shoes. This one belongs to the quartermaster."
 
 /obj/item/storage/bag/garment/quartermaster/populate_contents()
-	new /obj/item/clothing/under/rank/cargo/quartermaster(src)
-	new /obj/item/clothing/under/rank/cargo/quartermaster/skirt(src)
+	new /obj/item/clothing/under/rank/cargo/qm(src)
+	new /obj/item/clothing/under/rank/cargo/qm/skirt(src)
+	new /obj/item/clothing/under/rank/cargo/qm/dress(src)
+	new /obj/item/clothing/under/rank/cargo/qm/formal(src)
+	new /obj/item/clothing/under/rank/cargo/qm/whimsy(src)
 	new /obj/item/clothing/shoes/brown(src)
-	new /obj/item/clothing/suit/hooded/wintercoat/cargo(src)
-	new /obj/item/clothing/suit/hooded/wintercoat/miner(src)
-	new /obj/item/clothing/suit/jacket/cargobomber(src)
-	new /obj/item/clothing/suit/jacket/miningbomber(src)
+	new /obj/item/clothing/head/qm(src)
+	new /obj/item/clothing/head/qm/beret(src)
 	new /obj/item/clothing/head/hardhat/orange(src)
+	new /obj/item/clothing/suit/qmcoat(src)
+	new /obj/item/clothing/suit/mantle/qm(src)
 	new /obj/item/clothing/suit/storage/hazardvest(src)
-	new /obj/item/clothing/head/soft(src)
 	new /obj/item/clothing/gloves/color/black(src)
 	new /obj/item/tank/internals/emergency_oxygen/double(src)
 

code/modules/client/preference/character.dm

@@ -1087,7 +1087,7 @@
 				clothes_s.Blend(new /icon('icons/mob/clothing/hands.dmi', "bgloves"), ICON_OVERLAY)
 				has_gloves = TRUE
 				if(prob(1))
-					clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "poncho"), ICON_OVERLAY)
+					clothes_s.Blend(new /icon('icons/mob/clothing/suit.dmi', "qmcoat"), ICON_OVERLAY)
 				switch(backbag)
 					if(2)
 						clothes_s.Blend(new /icon('icons/mob/clothing/back.dmi', "backpack"), ICON_OVERLAY)

code/modules/client/preference/loadout/loadout_hat.dm

@@ -197,6 +197,11 @@
 	path = /obj/item/clothing/head/hop/beret
 	allowed_roles = list("Head of Personnel")
 
+/datum/gear/hat/beret_job/qm
+	display_name = "Beret, quartermaster"
+	path = /obj/item/clothing/head/qm/beret
+	allowed_roles = list("Quartermaster")
+
 /datum/gear/hat/beret_job/sci
 	display_name = "Beret, science"
 	path = /obj/item/clothing/head/beret/sci

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

@@ -184,8 +184,8 @@
 	allowed_roles = list("Quartermaster","Cargo Technician")
 
 /datum/gear/uniform/skirt/job/qm
-	display_name = "Skirt, QM"
-	path = /obj/item/clothing/under/rank/cargo/quartermaster/skirt
+	display_name = "Skirt, quartermaster"
+	path = /obj/item/clothing/under/rank/cargo/qm/skirt
 	allowed_roles = list("Quartermaster")
 
 /datum/gear/uniform/skirt/job/warden

code/modules/clothing/head/job_hats.dm

@@ -72,6 +72,28 @@
 		"Drask" = 'icons/mob/clothing/species/drask/head.dmi',
 		)
 
+//Quartermaster
+/obj/item/clothing/head/qm
+	name = "quartermaster's cap"
+	desc = "A cap issued to quartermasters. To show the warehouse workers who's boss."
+	icon_state = "qmcap"
+	dog_fashion = /datum/dog_fashion/head/qm
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/clothing/species/vox/head.dmi',
+		"Drask" = 'icons/mob/clothing/species/drask/head.dmi',
+		"Grey" = 'icons/mob/clothing/species/grey/head.dmi'
+	)
+
+/obj/item/clothing/head/qm/beret
+	name = "quartermaster's beret"
+	desc = "A brown beret with a golden cargo insignia emblazoned on it. Rule over Cargonia in style."
+	icon_state = "beret_qm"
+	dog_fashion = /datum/dog_fashion/head/qm
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/clothing/species/vox/head.dmi',
+		"Drask" = 'icons/mob/clothing/species/drask/head.dmi'
+	)
+
 //Nanotrasen Representative
 /obj/item/clothing/head/ntrep
 	name = "Nanotrasen Representative's hat"

code/modules/clothing/suits/job_suits.dm

@@ -280,6 +280,29 @@
 		"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi'
 	)
 
+//Quartermaster
+/obj/item/clothing/suit/mantle/qm
+	name = "quartermaster's mantle"
+	desc = "An armored shawl for the quartermaster. Keeps the breeze from the vents away from your neck."
+	icon_state = "qmmantle"
+	item_state = "qmmantle"
+	allowed = list(/obj/item/paper, /obj/item/clipboard, /obj/item/gun/energy/kinetic_accelerator, /obj/item/melee/baton, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic, /obj/item/melee/knuckleduster, /obj/item/rcs)
+	armor = list(MELEE = 15, BULLET = 10, LASER = 15, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 50)
+
+/obj/item/clothing/suit/qmcoat
+	name = "quartermaster's coat"
+	desc = "A brown trenchcoat to show the station you mean business. Has armor woven within the fabric."
+	icon_state = "qmcoat"
+	item_state = "qmcoat"
+	allowed = list(/obj/item/paper, /obj/item/clipboard, /obj/item/gun/energy/kinetic_accelerator, /obj/item/melee/baton, /obj/item/flashlight/seclite, /obj/item/melee/classic_baton/telescopic, /obj/item/melee/knuckleduster, /obj/item/rcs)
+	armor = list(MELEE = 15, BULLET = 10, LASER = 15, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 50)
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
+		"Drask" = 'icons/mob/clothing/species/drask/suit.dmi',
+		"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
+		"Kidan" = 'icons/mob/clothing/species/kidan/suit.dmi'
+	)
+
 //Dignitaries
 /obj/item/clothing/suit/storage/ntrep
 	name = "\improper Nanotrasen Representative jacket"

code/modules/clothing/under/jobs/cargo.dm

@@ -5,17 +5,46 @@
 		"Human" = 'icons/mob/clothing/under/cargo.dmi',
 		"Vox" = 'icons/mob/clothing/species/vox/under/cargo.dmi',
 		"Drask" = 'icons/mob/clothing/species/drask/under/cargo.dmi',
-		"Grey" = 'icons/mob/clothing/species/grey/under/cargo.dmi'
+		"Grey" = 'icons/mob/clothing/species/grey/under/cargo.dmi',
+		"Kidan" = 'icons/mob/clothing/species/kidan/under/cargo.dmi'
 		)
 
 
-/obj/item/clothing/under/rank/cargo/quartermaster
+/obj/item/clothing/under/rank/cargo/qm
 	name = "quartermaster's jumpsuit"
 	desc = "It's a jumpsuit worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."
 	icon_state = "qm"
-	item_state = "lb_suit"
+	item_state = "qm"
 	item_color = "qm"
 
+/obj/item/clothing/under/rank/cargo/qm/skirt
+	name = "quartermaster's jumpskirt"
+	desc = "It's a jumpskirt worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."
+	icon_state = "qm_skirt"
+	item_state = "qm_skirt"
+	item_color = "qm_skirt"
+
+/obj/item/clothing/under/rank/cargo/qm/dress
+	name = "quartermaster's dress uniform"
+	desc = "An elegant dress for the style conscious quartermaster."
+	icon_state = "qm_dress"
+	item_state = "qm_dress"
+	item_color = "qm_dress"
+
+/obj/item/clothing/under/rank/cargo/qm/formal
+	name = "quartermaster's formal uniform"
+	desc = "A pinstripe suit historically worn by schemers. Perfect for the quartermaster!"
+	icon_state = "qm_formal"
+	item_state = "qm_formal"
+	item_color = "qm_formal"
+
+/obj/item/clothing/under/rank/cargo/qm/whimsy
+	name = "quartermaster's sweater"
+	desc = "A snazzy brown sweater vest and black tie. Warms the core in the cold warehouse."
+	icon_state = "qm_whimsy"
+	item_state = "qm_whimsy"
+	item_color = "qm_whimsy"
+
 /obj/item/clothing/under/rank/cargo/deliveryboy
 	name = "delivery boy uniform"
 	desc = "It's a jumpsuit worn by the cargo delivery boy."
@@ -23,13 +52,6 @@
 	item_state = "lb_suit"
 	item_color = "delivery"
 
-/obj/item/clothing/under/rank/cargo/quartermaster/skirt
-	name = "quartermaster's jumpskirt"
-	desc = "It's a jumpskirt worn by the quartermaster. It's specially designed to prevent back injuries caused by pushing paper."
-	icon_state = "qmf"
-	item_color = "qmf"
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
-
 /obj/item/clothing/under/rank/cargo/tech
 	name = "cargo technician's jumpsuit"
 	desc = "Shooooorts! They're comfy and easy to wear!"