From ab33e72232113d5a90c3298faccacd6d3a118675 Mon Sep 17 00:00:00 2001 From: CHOMPStation2StaffMirrorBot <94713762+CHOMPStation2StaffMirrorBot@users.noreply.github.com> Date: Tue, 9 Sep 2025 04:24:10 -0700 Subject: [PATCH] [MIRROR] Add gas masks to the loadout options (#11586) Co-authored-by: nesquik <24830358+lbnesquik@users.noreply.github.com> Co-authored-by: Cameron Lennox --- .../client/preference_setup/loadout/loadout_mask.dm | 10 ++++++++++ .../client/preference_setup/loadout/loadout_mask.dm | 11 ----------- vorestation.dme | 1 - 3 files changed, 10 insertions(+), 12 deletions(-) delete mode 100644 modular_chomp/code/modules/client/preference_setup/loadout/loadout_mask.dm diff --git a/code/modules/client/preference_setup/loadout/loadout_mask.dm b/code/modules/client/preference_setup/loadout/loadout_mask.dm index 4ed50e6810..b5c36a3174 100644 --- a/code/modules/client/preference_setup/loadout/loadout_mask.dm +++ b/code/modules/client/preference_setup/loadout/loadout_mask.dm @@ -33,6 +33,16 @@ display_name = "cloth face mask" path = /obj/item/clothing/mask/surgical/cloth +/datum/gear/mask/gas + display_name = "gas mask" + path = /obj/item/clothing/mask/gas + cost = 3 ///Because it functions as a gas mask, and therefore has a mechanical advantage. + +/datum/gear/mask/gas/clear + display_name = "transparent gas mask" + path = /obj/item/clothing/mask/gas/clear + cost = 3 ///Because it functions as a gas mask, and therefore has a mechanical advantage. + /datum/gear/mask/plaguedoctor display_name = "plague doctor's mask" path = /obj/item/clothing/mask/gas/plaguedoctor diff --git a/modular_chomp/code/modules/client/preference_setup/loadout/loadout_mask.dm b/modular_chomp/code/modules/client/preference_setup/loadout/loadout_mask.dm deleted file mode 100644 index 05026508e5..0000000000 --- a/modular_chomp/code/modules/client/preference_setup/loadout/loadout_mask.dm +++ /dev/null @@ -1,11 +0,0 @@ -/datum/gear/mask/gas //Greytide Worldwide - display_name = "Gas Mask" - description = "A dangerous gas filtering gas mask. Also conseals your face. Assistant's favorite." - path = /obj/item/clothing/mask/gas - cost = 3 //Plague Doctor's costs 3 due to mechanical advantage, so I'll use that here - -/datum/gear/mask/gas_clear - display_name = "Gas Mask, Clear" - description = "A dangerous gas filtering gas mask. Doesn't conseal your face." - path = /obj/item/clothing/mask/gas/clear - cost = 3 diff --git a/vorestation.dme b/vorestation.dme index 38c4b885dc..a280bfadb8 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -5077,7 +5077,6 @@ #include "modular_chomp\code\modules\client\preference_setup\loadout\loadout_general.dm" #include "modular_chomp\code\modules\client\preference_setup\loadout\loadout_gloves_ch.dm" #include "modular_chomp\code\modules\client\preference_setup\loadout\loadout_head.dm" -#include "modular_chomp\code\modules\client\preference_setup\loadout\loadout_mask.dm" #include "modular_chomp\code\modules\client\preference_setup\loadout\loadout_shoes.dm" #include "modular_chomp\code\modules\client\preference_setup\loadout\loadout_suit.dm" #include "modular_chomp\code\modules\client\preferences\types\misc.dm"