From 46959e3702b8b136a57e724be943ea5ff419ffb2 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 6 Sep 2022 17:26:00 +0200 Subject: [PATCH] [MIRROR] Adds an examine hint to explorer gas masks [MDB IGNORE] (#16089) * Adds an examine hint to explorer gas masks (#69646) * Gives examine text to unfolded gas masks that folded ones fit in bags. * Adds an examine hint to explorer gas masks Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> --- 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 3ab7f7df073..4af8b64aebf 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -157,7 +157,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 0c19ac49b13..a0aa24dd944 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) . = ..()