Janitorial Drip

code/game/machinery/vendors/wardrobe_vendors.dm

@@ -718,16 +718,24 @@
 
 	vend_reply = "Thank you for using the JaniDrobe!"
 	products = list(/obj/item/clothing/under/rank/civilian/janitor = 3,
-					/obj/item/clothing/head/soft/purple = 3,
-					/obj/item/clothing/gloves/color/black = 3,
+					/obj/item/clothing/under/rank/civilian/janitor/skirt = 3,
+					/obj/item/clothing/under/rank/civilian/janitor/overalls = 3,
+					/obj/item/clothing/head/soft/janitorgrey = 3,
+					/obj/item/clothing/head/soft/janitorpurple = 3,
+					/obj/item/clothing/head/beret/janitor = 3,
+					/obj/item/clothing/gloves/janitor = 3,
 					/obj/item/clothing/shoes/galoshes = 3,
 					/obj/item/clothing/accessory/armband/service = 3,
 					/obj/item/storage/belt/janitor = 3)
 
 	contraband = list(/obj/item/toy/figure/crew/janitor = 1)
 
 	prices = list(/obj/item/clothing/under/rank/civilian/janitor = 50,
-					/obj/item/clothing/head/soft/purple = 20,
+					/obj/item/clothing/under/rank/civilian/janitor/skirt = 50,
+					/obj/item/clothing/under/rank/civilian/janitor/overalls = 50,
+					/obj/item/clothing/head/soft/janitorgrey = 20,
+					/obj/item/clothing/head/soft/janitorpurple = 20,
+					/obj/item/clothing/head/beret/janitor = 20,
 					/obj/item/clothing/accessory/armband/service = 20)
 
 	refill_canister = /obj/item/vending_refill/janidrobe

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

@@ -82,6 +82,16 @@
 	path = /obj/item/clothing/head/soft/deliverysoft
 	allowed_roles = list("Quartermaster", "Cargo Technician")
 
+/datum/gear/hat/capjanigrey
+	display_name = "Cap, janitor grey"
+	path = /obj/item/clothing/head/soft/janitorgrey
+	allowed_roles = list("Janitor")
+
+/datum/gear/hat/capjanipurple
+	display_name = "Cap, janitor purple"
+	path = /obj/item/clothing/head/soft/janitorpurple
+	allowed_roles = list("Janitor")
+
 /datum/gear/hat/capred
 	display_name = "Cap, red"
 	path = /obj/item/clothing/head/soft/red
@@ -177,6 +187,11 @@
 	path = /obj/item/clothing/head/beret/sec
 	allowed_roles = list("Head of Security", "Warden", "Security Officer")
 
+/datum/gear/hat/beret_job/jani
+	display_name = "Beret, janitor"
+	path = /obj/item/clothing/head/beret/janitor
+	allowed_roles = list("Janitor")
+
 /datum/gear/hat/beret_job/hop
 	display_name = "Beret, head of personnel"
 	path = /obj/item/clothing/head/hop/beret

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

@@ -213,6 +213,11 @@
 	path = /obj/item/clothing/under/rank/civilian/mime/skirt
 	allowed_roles = list("Mime")
 
+/datum/gear/uniform/skirt/job/janitor
+	display_name = "Skirt, janitor"
+	path = /obj/item/clothing/under/rank/civilian/janitor/skirt
+	allowed_roles = list("Janitor")
+
 /datum/gear/uniform/skirt/job/head_of_personnel
 	display_name = "Skirt, hop"
 	path = /obj/item/clothing/under/rank/civilian/hop/skirt

code/modules/clothing/gloves/misc_gloves.dm

@@ -80,6 +80,24 @@
 	resistance_flags = NONE
 	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 115, ACID = 20)
 
+/obj/item/clothing/gloves/janitor
+	name = "janitorial gloves"
+	desc = "Gloves designed to offer minor protection against messes. The rubber doesn't feel thick enough to protect you from shocks."
+	icon_state = "janitorial"
+	item_state = "janitorial"
+	cold_protection = HANDS
+	min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
+	heat_protection = HANDS
+	max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
+	sprite_sheets = list(
+		"Human" = 'icons/mob/clothing/hands.dmi',
+		"Vox" = 'icons/mob/clothing/species/vox/gloves.dmi',
+		"Drask" = 'icons/mob/clothing/species/drask/gloves.dmi',
+		"Grey" = 'icons/mob/clothing/species/grey/gloves.dmi',
+		"Kidan" = 'icons/mob/clothing/species/kidan/gloves.dmi'
+		)
+
+
 /obj/item/clothing/gloves/handwraps
 	name = "cloth handwraps"
 	desc = "A roll of treated canvas used for wrapping claws or paws."

code/modules/clothing/head/job_hats.dm

@@ -243,6 +243,11 @@
 	desc = "A black beret with a brown robotics insignia emblazoned on it. It smells distinctly like oil."
 	icon_state = "beret_roboticsblack"
 
+/obj/item/clothing/head/beret/janitor
+	name = "janitorial beret"
+	desc = "A purple beret with a mint service insignia emblazoned on it. It smells squeaky clean."
+	icon_state = "beret_janitor"
+
 //Medical
 /obj/item/clothing/head/beret/med
 	name = "medical beret"

code/modules/clothing/head/soft_caps.dm

@@ -116,6 +116,20 @@
 		"Grey" = 'icons/mob/clothing/species/grey/head.dmi'
 		)
 
+/obj/item/clothing/head/soft/janitorgrey
+	name = "grey janitor's cap"
+	desc = "It's a grey baseball hat with a purple custodial shield."
+	icon_state = "janitorgreysoft"
+	item_color = "janitorgrey"
+	dog_fashion = /datum/dog_fashion/head/softcap
+
+/obj/item/clothing/head/soft/janitorpurple
+	name = "purple janitor's cap"
+	desc = "It's a purple baseball hat with a mint service shield."
+	icon_state = "janitorpurplesoft"
+	item_color = "janitorpurple"
+	dog_fashion = /datum/dog_fashion/head/softcap
+
 /obj/item/clothing/head/soft/sec
 	name = "security cap"
 	desc = "It's baseball hat in tasteful red colour."

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

@@ -138,11 +138,25 @@
 	permeability_coefficient = 0.50
 
 /obj/item/clothing/under/rank/civilian/janitor
-	desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards."
 	name = "janitor's jumpsuit"
+	desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards."
 	icon_state = "janitor"
+	item_state = "janitor"
 	item_color = "janitor"
-	armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0)
+
+/obj/item/clothing/under/rank/civilian/janitor/skirt
+	name = "janitor's jumpskirt"
+	desc = "It's the official skirt variant of the janitor's uniform. It has leggings for protection against messes."
+	icon_state = "janitor_skirt"
+	item_state = "janitor_skirt"
+	item_color = "janitor_skirt"
+
+/obj/item/clothing/under/rank/civilian/janitor/overalls
+	name = "janitor's overalls"
+	desc = "Protective overalls designed to protect the wearer against large amounts of viscera."
+	icon_state = "janitor_overalls"
+	item_state = "janitor_overalls"
+	item_color = "janitor_overalls"
 
 /obj/item/clothing/under/rank/civilian/librarian
 	name = "sensible suit"