From e6d601ba9fb63b85891ea013b5e9353488d2f59c Mon Sep 17 00:00:00 2001 From: Higgin Date: Mon, 25 Sep 2023 10:45:34 -0700 Subject: [PATCH] Fixes cigarettes smoking on any slot (#78544) ## About The Pull Request #76881 allowed you to put cigarettes in a gas mask but removed the check for, if the thing was a cigarette, making sure it was in your mask slot. What this meant was that standing around with a cigarette in your hand would still make you passively smoke it - although this is somewhat more immersive to me as a former smoker, it also gets obnoxious having to set the cigarette on a table or put it in my bag to avoid racking up the ridiculously easy-to-accumulate nicotine addiction points you otherwise get from even one cigarette in-game. This just readds that check after the checks for gas masks/non-smoker locations (which may also be broken but are beyond me right now - trying to put a cigarette into a gas mask's filter* slot returns 'mask's mouth is covered.') --- code/game/objects/items/cigs_lighters.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 7dca839105e9..c2cadb21e6b1 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -347,6 +347,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(!istype(smoker) || smoker.get_item_by_slot(ITEM_SLOT_MASK) != loc) reagents.remove_any(to_smoke) return + else + if(src != smoker.wear_mask) + reagents.remove_any(to_smoke) + return reagents.expose(smoker, INGEST, min(to_smoke / reagents.total_volume, 1)) var/obj/item/organ/internal/lungs/lungs = smoker.get_organ_slot(ORGAN_SLOT_LUNGS)