diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index ac6be5ae2a9..900974cdc17 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -163,6 +163,7 @@ /obj/item/storage/backpack/satchel/eng = 1, /obj/item/storage/backpack/industrial = 1, /obj/item/storage/backpack/messenger/eng = 1, + /obj/item/clothing/suit/atmos_overalls = 3, /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 3, /obj/item/clothing/under/rank/engineering/atmospheric_technician = 3, /obj/item/clothing/shoes/sneakers/black = 3) diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 1f29d198d53..61f293a97fe 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -388,3 +388,35 @@ /obj/item/clothing/suit/jacket/research_director/Initialize(mapload) . = ..() allowed += /obj/item/storage/bag/xeno + +// Atmos +/obj/item/clothing/suit/atmos_overalls + name = "atmospherics overalls" + desc = "A set of fireproof overalls, good for protecting thinner clothes from gas leaks." + icon = 'icons/obj/clothing/suits/utility.dmi' + worn_icon = 'icons/mob/clothing/suits/utility.dmi' + icon_state = "atmos_overalls" + inhand_icon_state = "" + body_parts_covered = CHEST|GROIN|LEGS + resistance_flags = FIRE_PROOF + armor_type = /datum/armor/atmos_overalls + species_exception = list(/datum/species/golem) + allowed = list( + /obj/item/analyzer, + /obj/item/construction/rcd, + /obj/item/fireaxe/metal_h2_axe, + /obj/item/pipe_dispenser, + /obj/item/storage/bag/construction, + /obj/item/t_scanner, + /obj/item/tank/internals/emergency_oxygen, + /obj/item/tank/internals/plasmaman, + ) + +/datum/armor/atmos_overalls + fire = 100 + acid = 50 + +/obj/item/clothing/suit/atmos_overalls/worn_overlays(mutable_appearance/standing, isinhands, icon_file) + . = ..() + if(!isinhands) + . += emissive_appearance(icon_file, "[icon_state]-emissive", src, alpha = src.alpha) diff --git a/code/modules/jobs/job_types/atmospheric_technician.dm b/code/modules/jobs/job_types/atmospheric_technician.dm index 8947a77c508..d016688042a 100644 --- a/code/modules/jobs/job_types/atmospheric_technician.dm +++ b/code/modules/jobs/job_types/atmospheric_technician.dm @@ -44,6 +44,7 @@ id_trim = /datum/id_trim/job/atmospheric_technician uniform = /obj/item/clothing/under/rank/engineering/atmospheric_technician + suit = /obj/item/clothing/suit/atmos_overalls belt = /obj/item/storage/belt/utility/atmostech ears = /obj/item/radio/headset/headset_eng l_pocket = /obj/item/modular_computer/pda/atmos @@ -60,6 +61,7 @@ /datum/outfit/job/atmos/mod name = "Atmospheric Technician (MODsuit)" + suit = null suit_store = /obj/item/tank/internals/oxygen back = /obj/item/mod/control/pre_equipped/atmospheric mask = /obj/item/clothing/mask/gas/atmos diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 44d908ea161..d12f43a880d 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -132,6 +132,7 @@ /obj/item/clothing/accessory/pocketprotector = 3, /obj/item/clothing/under/rank/engineering/atmospheric_technician = 3, /obj/item/clothing/under/rank/engineering/atmospheric_technician/skirt = 3, + /obj/item/clothing/suit/atmos_overalls = 3, /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos = 3, /obj/item/clothing/shoes/sneakers/black = 3, /obj/item/storage/backpack/satchel/eng = 3, diff --git a/icons/mob/clothing/suits/utility.dmi b/icons/mob/clothing/suits/utility.dmi index 86038a5f6d5..40216806f4f 100644 Binary files a/icons/mob/clothing/suits/utility.dmi and b/icons/mob/clothing/suits/utility.dmi differ diff --git a/icons/obj/clothing/suits/utility.dmi b/icons/obj/clothing/suits/utility.dmi index 595746191d3..25fb8fd502a 100644 Binary files a/icons/obj/clothing/suits/utility.dmi and b/icons/obj/clothing/suits/utility.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/suit_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/suit_digi.dmi index a873d24de49..1f6b935b5f0 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/suit_digi.dmi and b/modular_skyrat/master_files/icons/mob/clothing/suit_digi.dmi differ