diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm index 542a6d74665..f07f6721bf8 100644 --- a/code/game/machinery/vendors/wardrobe_vendors.dm +++ b/code/game/machinery/vendors/wardrobe_vendors.dm @@ -528,6 +528,8 @@ vend_reply = "Thank you for using the CargoDrobe!" products = list(/obj/item/clothing/under/rank/cargo/tech = 6, /obj/item/clothing/under/rank/cargo/tech/skirt = 3, + /obj/item/clothing/under/rank/cargo/deliveryboy = 2, + /obj/item/clothing/head/soft/deliverysoft = 2, /obj/item/clothing/suit/hooded/wintercoat/cargo = 3, /obj/item/clothing/suit/jacket/cargobomber = 3, /obj/item/clothing/suit/storage/hazardvest = 3, @@ -543,6 +545,8 @@ prices = list(/obj/item/clothing/under/rank/cargo/tech = 50, /obj/item/clothing/under/rank/cargo/tech/skirt = 50, + /obj/item/clothing/under/rank/cargo/deliveryboy = 100, + /obj/item/clothing/head/soft/deliverysoft = 50, /obj/item/clothing/suit/hooded/wintercoat/cargo = 75, /obj/item/clothing/suit/jacket/cargobomber = 75, /obj/item/clothing/suit/storage/hazardvest = 50, diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index 75abf216654..0b6734a02cc 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -77,6 +77,11 @@ path = /obj/item/clothing/head/soft/sec allowed_roles = list("Head of Security", "Warden", "Security Officer") +/datum/gear/hat/deliverysoft + display_name = "Cap, delivery boy" + path = /obj/item/clothing/head/soft/deliverysoft + allowed_roles = list("Quartermaster", "Cargo Technician") + /datum/gear/hat/capred display_name = "Cap, red" path = /obj/item/clothing/head/soft/red diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm index 4c1d66890d2..65f4046cfd5 100644 --- a/code/modules/client/preference/loadout/loadout_uniform.dm +++ b/code/modules/client/preference/loadout/loadout_uniform.dm @@ -232,6 +232,14 @@ path = /obj/item/clothing/under/rank/medical/scrubs/green allowed_roles = list("Chief Medical Officer", "Medical Doctor") +/datum/gear/uniform/cargo + main_typepath = /datum/gear/uniform/cargo + +/datum/gear/uniform/cargo/delivery + display_name = "Uniform, delivery boy" + path = /obj/item/clothing/under/rank/cargo/deliveryboy + allowed_roles = list("Quartermaster", "Cargo Technician") + /datum/gear/uniform/sec main_typepath = /datum/gear/uniform/sec diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index f4069754b79..dc945036e10 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -8,7 +8,10 @@ actions_types = list(/datum/action/item_action/flip_cap) dog_fashion = /datum/dog_fashion/head/cargo_tech sprite_sheets = list( - "Vox" = 'icons/mob/clothing/species/vox/head.dmi' + "Human" = 'icons/mob/clothing/head.dmi', + "Vox" = 'icons/mob/clothing/species/vox/head.dmi', + "Drask" = 'icons/mob/clothing/species/drask/head.dmi', + "Grey" = 'icons/mob/clothing/species/grey/head.dmi' ) dyeable = TRUE @@ -103,6 +106,13 @@ item_color = "rainbow" dog_fashion = /datum/dog_fashion/head/softcap +/obj/item/clothing/head/soft/deliverysoft + name = "delivery boy cap" + desc = "It's a baseball hat that is part of the delivery boy uniform." + icon_state = "deliverysoft" + item_color = "delivery" + 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/cargo.dm b/code/modules/clothing/under/jobs/cargo.dm index 9fe9cf4cbbf..321a5c22637 100644 --- a/code/modules/clothing/under/jobs/cargo.dm +++ b/code/modules/clothing/under/jobs/cargo.dm @@ -16,6 +16,13 @@ item_state = "lb_suit" item_color = "qm" +/obj/item/clothing/under/rank/cargo/deliveryboy + name = "delivery boy uniform" + desc = "It's a jumpsuit worn by the cargo delivery boy." + icon_state = "delivery" + 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." diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 94dd6f77f3d..a8f0f7ff401 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/head.dmi b/icons/mob/clothing/species/drask/head.dmi index 3ee29de8f1d..d357beb1c4d 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/under/cargo.dmi b/icons/mob/clothing/species/drask/under/cargo.dmi index fffc66c5f0c..5418aaca38f 100644 Binary files a/icons/mob/clothing/species/drask/under/cargo.dmi and b/icons/mob/clothing/species/drask/under/cargo.dmi differ diff --git a/icons/mob/clothing/species/grey/head.dmi b/icons/mob/clothing/species/grey/head.dmi index 9fae8b6443c..57fda15c471 100644 Binary files a/icons/mob/clothing/species/grey/head.dmi and b/icons/mob/clothing/species/grey/head.dmi differ diff --git a/icons/mob/clothing/species/grey/under/cargo.dmi b/icons/mob/clothing/species/grey/under/cargo.dmi index b54abf4fe76..affe121626a 100644 Binary files a/icons/mob/clothing/species/grey/under/cargo.dmi and b/icons/mob/clothing/species/grey/under/cargo.dmi differ diff --git a/icons/mob/clothing/species/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi index 45ca6bd8137..8b3513f28ae 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/under/cargo.dmi b/icons/mob/clothing/species/vox/under/cargo.dmi index 6752f983996..bbe39935b0e 100644 Binary files a/icons/mob/clothing/species/vox/under/cargo.dmi and b/icons/mob/clothing/species/vox/under/cargo.dmi differ diff --git a/icons/mob/clothing/under/cargo.dmi b/icons/mob/clothing/under/cargo.dmi index 9cb280078b3..ebf8820bb35 100644 Binary files a/icons/mob/clothing/under/cargo.dmi and b/icons/mob/clothing/under/cargo.dmi differ diff --git a/icons/mob/corgi_head.dmi b/icons/mob/corgi_head.dmi index 7aae7bdc9a3..4ea3ac1a1d4 100644 Binary files a/icons/mob/corgi_head.dmi and b/icons/mob/corgi_head.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 1b5ec49ae12..a2ccf0be881 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/under/cargo.dmi b/icons/obj/clothing/under/cargo.dmi index 2dfc494ab60..a02af29d10b 100644 Binary files a/icons/obj/clothing/under/cargo.dmi and b/icons/obj/clothing/under/cargo.dmi differ