diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm index 060302d573d..62318c25b8b 100644 --- a/code/game/machinery/vendors/wardrobe_vendors.dm +++ b/code/game/machinery/vendors/wardrobe_vendors.dm @@ -487,10 +487,13 @@ vend_reply = "Thank you for using the EngiDrobe!" products = list(/obj/item/clothing/under/rank/engineering/engineer = 6, /obj/item/clothing/under/rank/engineering/engineer/skirt = 3, + /obj/item/clothing/under/rank/engineering/engineer/overalls = 3, + /obj/item/clothing/under/rank/engineering/engineer/corporate = 3, /obj/item/clothing/suit/hooded/wintercoat/engineering = 3, /obj/item/clothing/suit/jacket/bomber/engi = 3, /obj/item/clothing/suit/storage/hazardvest/staff = 3, /obj/item/clothing/head/beret/eng = 3, + /obj/item/clothing/head/soft/engineer = 3, /obj/item/clothing/head/hardhat = 2, /obj/item/clothing/head/hardhat/orange = 2, /obj/item/clothing/head/hardhat/dblue = 2, @@ -510,10 +513,13 @@ prices = list(/obj/item/clothing/under/rank/engineering/engineer = 50, /obj/item/clothing/under/rank/engineering/engineer/skirt = 50, + /obj/item/clothing/under/rank/engineering/engineer/overalls = 50, + /obj/item/clothing/under/rank/engineering/engineer/corporate = 50, /obj/item/clothing/suit/hooded/wintercoat/engineering = 75, /obj/item/clothing/suit/jacket/bomber/engi = 75, /obj/item/clothing/suit/storage/hazardvest/staff = 50, /obj/item/clothing/head/beret/eng = 20, + /obj/item/clothing/head/soft/engineer = 20, /obj/item/clothing/head/hardhat = 20, /obj/item/clothing/head/hardhat/orange = 30, /obj/item/clothing/head/hardhat/dblue = 30, @@ -544,10 +550,13 @@ vend_reply = "Thank you for using the AtmosDrobe!" products = list(/obj/item/clothing/under/rank/engineering/atmospheric_technician = 6, /obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt = 3, + /obj/item/clothing/under/rank/engineering/atmospheric_technician/overalls = 3, + /obj/item/clothing/under/rank/engineering/atmospheric_technician/corporate = 3, /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 3, /obj/item/clothing/suit/jacket/bomber/atmos = 3, /obj/item/clothing/suit/storage/hazardvest/staff = 3, /obj/item/clothing/head/beret/atmos = 3, + /obj/item/clothing/head/soft/atmos = 3, /obj/item/clothing/head/hardhat = 2, /obj/item/clothing/head/hardhat/red = 2, /obj/item/clothing/head/hardhat/orange = 2, @@ -567,10 +576,13 @@ prices = list(/obj/item/clothing/under/rank/engineering/atmospheric_technician = 50, /obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt = 50, + /obj/item/clothing/under/rank/engineering/atmospheric_technician/overalls = 50, + /obj/item/clothing/under/rank/engineering/atmospheric_technician/corporate = 50, /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 75, /obj/item/clothing/suit/jacket/bomber/atmos = 75, /obj/item/clothing/suit/storage/hazardvest/staff = 50, /obj/item/clothing/head/beret/atmos = 20, + /obj/item/clothing/head/soft/atmos = 20, /obj/item/clothing/head/hardhat = 20, /obj/item/clothing/head/hardhat/red = 30, /obj/item/clothing/head/hardhat/orange = 30, diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index 7f128ca5c87..f0419a629b6 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -97,6 +97,16 @@ path = /obj/item/clothing/head/soft/hydroponics_alt allowed_roles = list("Botanist") +/datum/gear/hat/capengi + display_name = "Cap, engineer" + path = /obj/item/clothing/head/soft/engineer + allowed_roles = list("Chief Engineer, Station Engineer") + +/datum/gear/hat/capatmos + display_name = "Cap, atmospheric technician" + path = /obj/item/clothing/head/soft/atmos + allowed_roles = list("Chief Engineer, Life Support Specialist") + /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 e7384f9b2fc..f8677ab473f 100644 --- a/code/modules/client/preference/loadout/loadout_uniform.dm +++ b/code/modules/client/preference/loadout/loadout_uniform.dm @@ -240,6 +240,21 @@ subtype_selection_cost = FALSE //Engineering + +/datum/gear/uniform/eng + main_typepath = /datum/gear/uniform/eng + +/datum/gear/uniform/eng/eng_alt + display_name = "Uniform, engineering corporate" + path = /obj/item/clothing/under/rank/engineering/engineer/corporate + allowed_roles = list("Chief Engineer", "Station Engineer") + +/datum/gear/uniform/eng/atmos_alt + display_name = "Uniform, atmos corporate" + path = /obj/item/clothing/under/rank/engineering/atmospheric_technician/corporate + allowed_roles = list("Chief Engineer", "Life Support Specialist") + + /datum/gear/uniform/skirt/job/atmos display_name = "Skirt, atmos" path = /obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt @@ -496,6 +511,16 @@ path = /obj/item/clothing/under/rank/cargo/expedition/overalls allowed_roles = list("Quartermaster", "Explorer") +/datum/gear/uniform/overalls/job/atmos + display_name = "Overalls, atmos" + path = /obj/item/clothing/under/rank/engineering/atmospheric_technician/overalls + allowed_roles = list("Chief Engineer", "Life Support Specialist") + +/datum/gear/uniform/overalls/job/eng + display_name = "Overalls, engineer" + path = /obj/item/clothing/under/rank/engineering/engineer/overalls + allowed_roles = list("Chief Engineer", "Station Engineer") + /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 0cb3b085d6e..3231e891b43 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -108,6 +108,16 @@ icon_state = "smith" dog_fashion = /datum/dog_fashion/head/smith +/obj/item/clothing/head/soft/engineer + name = "engineer's cap" + desc = "It's a yellow baseball hat with an orange engineering shield." + icon_state = "engineer" + +/obj/item/clothing/head/soft/atmos + name = "atmospheric technician's cap" + desc = "It's a yellow baseball hat with a blue engineering shield." + icon_state = "atmos" + /obj/item/clothing/head/soft/janitorgrey name = "grey janitor's cap" desc = "It's a grey baseball hat with a purple custodial shield." diff --git a/code/modules/clothing/under/jobs/engineering_jumpsuits.dm b/code/modules/clothing/under/jobs/engineering_jumpsuits.dm index 42fee328a26..5da39d286d8 100644 --- a/code/modules/clothing/under/jobs/engineering_jumpsuits.dm +++ b/code/modules/clothing/under/jobs/engineering_jumpsuits.dm @@ -69,6 +69,16 @@ icon_state = "atmos_skirt" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS +/obj/item/clothing/under/rank/engineering/atmospheric_technician/overalls + name = "atmospheric technician's overalls" + desc = "A yellow set of overalls over a blue turtleneck, for the dedicated plumber look." + icon_state = "atmos_overalls" + +/obj/item/clothing/under/rank/engineering/atmospheric_technician/corporate + name = "firefighter's jumpsuit" + desc = "An industrial high visibility jumpsuit worn by atmospheric technicians, for the dedicated firefighter look. Does not provide any protection against fire." + icon_state = "atmos_corporate" + /obj/item/clothing/under/rank/engineering/engineer name = "engineer's jumpsuit" desc = "It's an orange high visibility jumpsuit worn by engineers. It has minor radiation shielding." @@ -85,3 +95,13 @@ desc = "It's an orange high visibility jumpskirt worn by engineers. It has minor radiation shielding." icon_state = "engineer_skirt" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + +/obj/item/clothing/under/rank/engineering/engineer/overalls + name = "engineer's overalls" + desc = "A yellow set of overalls over an orange turtleneck. It has minor radiation shielding." + icon_state = "engi_overalls" + +/obj/item/clothing/under/rank/engineering/engineer/corporate + name = "electrician's jumpsuit" + desc = "An industrial high visibility jumpsuit worn by engineers. It has minor radiation shielding." + icon_state = "engi_corporate" diff --git a/icons/mob/clothing/head/softcap.dmi b/icons/mob/clothing/head/softcap.dmi index 38d717d7bc7..e767890c071 100644 Binary files a/icons/mob/clothing/head/softcap.dmi and b/icons/mob/clothing/head/softcap.dmi differ diff --git a/icons/mob/clothing/species/drask/under/engineering.dmi b/icons/mob/clothing/species/drask/under/engineering.dmi index 9b849ce6d92..0741d346f66 100644 Binary files a/icons/mob/clothing/species/drask/under/engineering.dmi and b/icons/mob/clothing/species/drask/under/engineering.dmi differ diff --git a/icons/mob/clothing/species/grey/under/engineering.dmi b/icons/mob/clothing/species/grey/under/engineering.dmi index bef5dfec65c..45ccc978401 100644 Binary files a/icons/mob/clothing/species/grey/under/engineering.dmi and b/icons/mob/clothing/species/grey/under/engineering.dmi differ diff --git a/icons/mob/clothing/species/kidan/head/softcap.dmi b/icons/mob/clothing/species/kidan/head/softcap.dmi index c193eb2a301..65a7ab5695c 100644 Binary files a/icons/mob/clothing/species/kidan/head/softcap.dmi and b/icons/mob/clothing/species/kidan/head/softcap.dmi differ diff --git a/icons/mob/clothing/species/kidan/under/engineering.dmi b/icons/mob/clothing/species/kidan/under/engineering.dmi index d5f61a9029d..8475c8bd6e6 100644 Binary files a/icons/mob/clothing/species/kidan/under/engineering.dmi and b/icons/mob/clothing/species/kidan/under/engineering.dmi differ diff --git a/icons/mob/clothing/species/vox/head/softcap.dmi b/icons/mob/clothing/species/vox/head/softcap.dmi index 53baf7be3aa..7a50410add1 100644 Binary files a/icons/mob/clothing/species/vox/head/softcap.dmi and b/icons/mob/clothing/species/vox/head/softcap.dmi differ diff --git a/icons/mob/clothing/species/vox/under/engineering.dmi b/icons/mob/clothing/species/vox/under/engineering.dmi index a67dc8f1488..238a4a9656c 100644 Binary files a/icons/mob/clothing/species/vox/under/engineering.dmi and b/icons/mob/clothing/species/vox/under/engineering.dmi differ diff --git a/icons/mob/clothing/under/engineering.dmi b/icons/mob/clothing/under/engineering.dmi index 585c2be93bf..e69ab6b0e84 100644 Binary files a/icons/mob/clothing/under/engineering.dmi and b/icons/mob/clothing/under/engineering.dmi differ diff --git a/icons/obj/clothing/head/softcap.dmi b/icons/obj/clothing/head/softcap.dmi index d3917c0b76e..e4240c3df53 100644 Binary files a/icons/obj/clothing/head/softcap.dmi and b/icons/obj/clothing/head/softcap.dmi differ diff --git a/icons/obj/clothing/under/engineering.dmi b/icons/obj/clothing/under/engineering.dmi index 7dc68e20a9c..156c690e1d8 100644 Binary files a/icons/obj/clothing/under/engineering.dmi and b/icons/obj/clothing/under/engineering.dmi differ