From 39fec221075b256634fb8d41b21185c097cebd1d Mon Sep 17 00:00:00 2001 From: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Date: Mon, 5 Sep 2022 22:22:19 -0500 Subject: [PATCH] Adds an examine hint to explorer gas masks (#69646) * Gives examine text to unfolded gas masks that folded ones fit in bags. --- code/game/objects/items/storage/boxes.dm | 2 +- code/modules/mining/equipment/explorer_gear.dm | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 3e3ecd1003d..b2ccac719a3 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -147,7 +147,7 @@ // Mining survival box /obj/item/storage/box/survival/mining - mask_type = /obj/item/clothing/mask/gas/explorer + mask_type = /obj/item/clothing/mask/gas/explorer/folded /obj/item/storage/box/survival/mining/PopulateContents() ..() diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index 2610bf8d55a..b590685fc7e 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -63,8 +63,18 @@ adjustmask(user) /obj/item/clothing/mask/gas/explorer/adjustmask(user) - ..() - w_class = mask_adjusted ? WEIGHT_CLASS_NORMAL : WEIGHT_CLASS_SMALL + . = ..() + // adjusted = out of the way = smaller = can fit in boxes + w_class = mask_adjusted ? WEIGHT_CLASS_SMALL : WEIGHT_CLASS_NORMAL + +/obj/item/clothing/mask/gas/explorer/examine(mob/user) + . = ..() + if(mask_adjusted || w_class == WEIGHT_CLASS_SMALL) + return + . += span_notice("You could fit this into a box if you adjusted it.") + +/obj/item/clothing/mask/gas/explorer/folded + w_class = WEIGHT_CLASS_SMALL /obj/item/clothing/mask/gas/explorer/folded/Initialize(mapload) . = ..()