diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index db986ec5f5e..a0cb70c9e01 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -54,13 +54,18 @@ /obj/machinery/suit_storage_unit/captain suit_type = /obj/item/clothing/suit/space/hardsuit/swat/captain - mask_type = /obj/item/clothing/mask/gas/sechailer + mask_type = /obj/item/clothing/mask/gas/atmos/captain storage_type = /obj/item/tank/jetpack/oxygen/captain /obj/machinery/suit_storage_unit/engine suit_type = /obj/item/clothing/suit/space/hardsuit/engine mask_type = /obj/item/clothing/mask/breath +/obj/machinery/suit_storage_unit/atmos + suit_type = /obj/item/clothing/suit/space/hardsuit/engine/atmos + mask_type = /obj/item/clothing/mask/gas/atmos + storage_type = /obj/item/watertank/atmos + /obj/machinery/suit_storage_unit/ce suit_type = /obj/item/clothing/suit/space/hardsuit/engine/elite mask_type = /obj/item/clothing/mask/breath @@ -75,11 +80,6 @@ mask_type = /obj/item/clothing/mask/gas/sechailer storage_type = /obj/item/tank/internals/oxygen -/obj/machinery/suit_storage_unit/atmos - suit_type = /obj/item/clothing/suit/space/hardsuit/engine/atmos - mask_type = /obj/item/clothing/mask/gas - storage_type = /obj/item/watertank/atmos - /obj/machinery/suit_storage_unit/mining suit_type = /obj/item/clothing/suit/hooded/explorer mask_type = /obj/item/clothing/mask/gas/explorer diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm index e7ead993e30..2598fc8f83c 100644 --- a/code/game/objects/items/tanks/jetpack.dm +++ b/code/game/objects/items/tanks/jetpack.dm @@ -147,7 +147,7 @@ w_class = WEIGHT_CLASS_NORMAL /obj/item/tank/jetpack/oxygen/captain - name = "\improper Captain's jetpack" + name = "captain's jetpack" desc = "A compact, lightweight jetpack containing a high amount of compressed oxygen." icon_state = "jetpack-captain" item_state = "jetpack-captain" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 1581fccbbda..5e017fcba3e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -91,10 +91,10 @@ new /obj/item/pipe_dispenser(src) new /obj/item/storage/toolbox/mechanical(src) new /obj/item/tank/internals/emergency_oxygen/engi(src) - new /obj/item/analyzer(src) new /obj/item/holosign_creator/atmos(src) new /obj/item/watertank/atmos(src) new /obj/item/clothing/suit/fire/atmos(src) + new /obj/item/clothing/mask/gas/atmos(src) new /obj/item/clothing/head/hardhat/atmos(src) new /obj/item/clothing/glasses/meson/engine/tray(src) new /obj/item/extinguisher/advanced(src) diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 3c26154a4fa..0064430cd92 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -11,6 +11,24 @@ flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH | PEPPERPROOF resistance_flags = NONE +/obj/item/clothing/mask/gas/atmos + name = "atmospheric gas mask" + desc = "Improved gas mask utilized by atmospheric technicians. Still not very good at blocking gas flow, but it's flameproof!" + icon_state = "gas_atmos" + item_state = "gas_atmos" + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 20, "acid" = 10) + w_class = WEIGHT_CLASS_SMALL + gas_transfer_coefficient = 0.001 //cargo cult time, this var does nothing but just in case someone actually makes it do something + permeability_coefficient = 0.001 + resistance_flags = FIRE_PROOF + +/obj/item/clothing/mask/gas/atmos/captain + name = "captain's gas mask" + desc = "Nanotrasen cut corners and repainted a spare atmospheric gas mask, but don't tell anyone." + icon_state = "gas_cap" + item_state = "gas_cap" + resistance_flags = FIRE_PROOF | ACID_PROOF + // **** Welding gas mask **** /obj/item/clothing/mask/gas/welding diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 3643add9219..4f9eeaf2059 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -539,7 +539,7 @@ desc = "A tactical SWAT helmet MK.II." armor = list("melee" = 40, "bullet" = 50, "laser" = 50, "energy" = 25, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 100, "acid" = 100) resistance_flags = FIRE_PROOF | ACID_PROOF - flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR //we want to see the mask + flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR //we want to see the mask //this makes the hardsuit not fireproof you genius heat_protection = HEAD max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT actions_types = list() @@ -548,7 +548,7 @@ /obj/item/clothing/suit/space/hardsuit/swat name = "\improper MK.II SWAT Suit" - desc = "A MK.II SWAT suit with streamlined joints and armor made out of superior materials, insulated against intense heat. The most advanced tactical armor available." + desc = "A MK.II SWAT suit with streamlined joints and armor made out of superior materials, insulated against intense heat if worn with the complementary gas mask. The most advanced tactical armor available." icon_state = "swat2" item_state = "swat2" armor = list("melee" = 40, "bullet" = 50, "laser" = 50, "energy" = 25, "bomb" = 50, "bio" = 100, "rad" = 50, "fire" = 100, "acid" = 100) @@ -563,14 +563,14 @@ //Captain /obj/item/clothing/head/helmet/space/hardsuit/swat/captain - name = "captain's hardsuit helmet" + name = "captain's SWAT helmet" icon_state = "capspace" item_state = "capspacehelmet" - desc = "A tactical MK.II SWAT helmet boasting better protection and a horrible fashion sense." + desc = "A tactical MK.II SWAT helmet boasting better protection and a reasonable fashion sense." /obj/item/clothing/suit/space/hardsuit/swat/captain name = "captain's SWAT suit" - desc = "A MK.II SWAT suit with streamlined joints and armor made out of superior materials, insulated against intense heat. The most advanced tactical armor available. Usually reserved for heavy hitter corporate security, this one has a regal finish in Nanotrasen company colors. Better not let the assistants get a hold of it." + desc = "A MK.II SWAT suit with streamlined joints and armor made out of superior materials, insulated against intense heat with the complementary gas mask. The most advanced tactical armor available. Usually reserved for heavy hitter corporate security, this one has a regal finish in Nanotrasen company colors. Better not let the assistants get a hold of it." icon_state = "caparmor" item_state = "capspacesuit" helmettype = /obj/item/clothing/head/helmet/space/hardsuit/swat/captain diff --git a/code/modules/jobs/job_types/atmospheric_technician.dm b/code/modules/jobs/job_types/atmospheric_technician.dm index dd2c1f5a284..b698ac6672e 100644 --- a/code/modules/jobs/job_types/atmospheric_technician.dm +++ b/code/modules/jobs/job_types/atmospheric_technician.dm @@ -40,7 +40,7 @@ /datum/outfit/job/atmos/rig name = "Atmospheric Technician (Hardsuit)" - mask = /obj/item/clothing/mask/gas + mask = /obj/item/clothing/mask/gas/atmos suit = /obj/item/clothing/suit/space/hardsuit/engine/atmos suit_store = /obj/item/tank/internals/oxygen internals_slot = SLOT_S_STORE diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index 41b6b67032d..99a0be0cd2d 100755 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -60,6 +60,6 @@ /datum/outfit/job/captain/hardsuit name = "Captain (Hardsuit)" - mask = /obj/item/clothing/mask/gas/sechailer + mask = /obj/item/clothing/mask/gas/atmos/captain suit = /obj/item/clothing/suit/space/hardsuit/swat/captain suit_store = /obj/item/tank/internals/oxygen diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi index 3ebe186bfce..d8193711314 100644 Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 48cd5d8c7ea..ede43651c95 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ