diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm index c6c9ebda4a58..c5a093dacca4 100644 --- a/code/game/machinery/vendors/wardrobe_vendors.dm +++ b/code/game/machinery/vendors/wardrobe_vendors.dm @@ -718,8 +718,12 @@ 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) @@ -727,7 +731,11 @@ 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 diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index 828e88d0992b..e01eb105bdaa 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/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 diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm index 89b461bbcece..60c1aaf5d637 100644 --- a/code/modules/client/preference/loadout/loadout_uniform.dm +++ b/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 diff --git a/code/modules/clothing/gloves/misc_gloves.dm b/code/modules/clothing/gloves/misc_gloves.dm index 87d7c9a2682b..27dae34d50ee 100644 --- a/code/modules/clothing/gloves/misc_gloves.dm +++ b/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." diff --git a/code/modules/clothing/head/job_hats.dm b/code/modules/clothing/head/job_hats.dm index 94d268d41108..05035de0446e 100644 --- a/code/modules/clothing/head/job_hats.dm +++ b/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" diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index ff7401056ca0..c8cdf01e64e1 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/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." diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 9098bfc10978..2f58d9717cd6 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/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" diff --git a/icons/mob/clothing/feet.dmi b/icons/mob/clothing/feet.dmi index af65a580e07f..f5a41a609c04 100644 Binary files a/icons/mob/clothing/feet.dmi and b/icons/mob/clothing/feet.dmi differ diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi index 0c3b6c4540a7..40340ebad781 100644 Binary files a/icons/mob/clothing/hands.dmi and b/icons/mob/clothing/hands.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 0a3c3cba2987..2b23a2110ec2 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/species/drask/gloves.dmi b/icons/mob/clothing/species/drask/gloves.dmi index 688157e1e73d..f3afa516d0c2 100644 Binary files a/icons/mob/clothing/species/drask/gloves.dmi and b/icons/mob/clothing/species/drask/gloves.dmi differ diff --git a/icons/mob/clothing/species/drask/head.dmi b/icons/mob/clothing/species/drask/head.dmi index c344b3195a88..88cd655b063a 100644 Binary files a/icons/mob/clothing/species/drask/head.dmi and b/icons/mob/clothing/species/drask/head.dmi differ diff --git a/icons/mob/clothing/species/drask/shoes.dmi b/icons/mob/clothing/species/drask/shoes.dmi index 5c9a3e1b392d..7becc15ae09f 100644 Binary files a/icons/mob/clothing/species/drask/shoes.dmi and b/icons/mob/clothing/species/drask/shoes.dmi differ diff --git a/icons/mob/clothing/species/drask/under/civilian.dmi b/icons/mob/clothing/species/drask/under/civilian.dmi index b7224cf02404..d03fc488d882 100644 Binary files a/icons/mob/clothing/species/drask/under/civilian.dmi and b/icons/mob/clothing/species/drask/under/civilian.dmi differ diff --git a/icons/mob/clothing/species/grey/gloves.dmi b/icons/mob/clothing/species/grey/gloves.dmi index e69bfd36bcc9..4e4d8c97df9f 100644 Binary files a/icons/mob/clothing/species/grey/gloves.dmi and b/icons/mob/clothing/species/grey/gloves.dmi differ diff --git a/icons/mob/clothing/species/grey/under/civilian.dmi b/icons/mob/clothing/species/grey/under/civilian.dmi index a09f69cdd884..4bd0165eacbf 100644 Binary files a/icons/mob/clothing/species/grey/under/civilian.dmi and b/icons/mob/clothing/species/grey/under/civilian.dmi differ diff --git a/icons/mob/clothing/species/kidan/gloves.dmi b/icons/mob/clothing/species/kidan/gloves.dmi index 24cd2f8fe258..cdf128d74be1 100644 Binary files a/icons/mob/clothing/species/kidan/gloves.dmi and b/icons/mob/clothing/species/kidan/gloves.dmi differ diff --git a/icons/mob/clothing/species/kidan/under/civilian.dmi b/icons/mob/clothing/species/kidan/under/civilian.dmi index c655ec2f6299..e0bef45b7097 100644 Binary files a/icons/mob/clothing/species/kidan/under/civilian.dmi and b/icons/mob/clothing/species/kidan/under/civilian.dmi differ diff --git a/icons/mob/clothing/species/vox/gloves.dmi b/icons/mob/clothing/species/vox/gloves.dmi index cc2c8d1b306c..ea448e59b824 100644 Binary files a/icons/mob/clothing/species/vox/gloves.dmi and b/icons/mob/clothing/species/vox/gloves.dmi differ diff --git a/icons/mob/clothing/species/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi index d9bb7cad94be..41f2af617a7d 100644 Binary files a/icons/mob/clothing/species/vox/head.dmi and b/icons/mob/clothing/species/vox/head.dmi differ diff --git a/icons/mob/clothing/species/vox/shoes.dmi b/icons/mob/clothing/species/vox/shoes.dmi index e362943b6db5..4201015c02f4 100644 Binary files a/icons/mob/clothing/species/vox/shoes.dmi and b/icons/mob/clothing/species/vox/shoes.dmi differ diff --git a/icons/mob/clothing/species/vox/under/civilian.dmi b/icons/mob/clothing/species/vox/under/civilian.dmi index 17c4e4a39971..780fae863340 100644 Binary files a/icons/mob/clothing/species/vox/under/civilian.dmi and b/icons/mob/clothing/species/vox/under/civilian.dmi differ diff --git a/icons/mob/clothing/under/civilian.dmi b/icons/mob/clothing/under/civilian.dmi index c5a920488695..bd115e7ebf1b 100644 Binary files a/icons/mob/clothing/under/civilian.dmi and b/icons/mob/clothing/under/civilian.dmi differ diff --git a/icons/mob/corgi_head.dmi b/icons/mob/corgi_head.dmi index c3db618d381c..0b8ecbb12ea7 100644 Binary files a/icons/mob/corgi_head.dmi and b/icons/mob/corgi_head.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index 184e41c728a2..ac1a022b1b72 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index a50bfbca3f17..15ad6193a60d 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index 419d2260290f..09e846cc22f5 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/icons/obj/clothing/under/civilian.dmi b/icons/obj/clothing/under/civilian.dmi index c6879e99fb2f..3366eecd0f10 100644 Binary files a/icons/obj/clothing/under/civilian.dmi and b/icons/obj/clothing/under/civilian.dmi differ