From d55711bad96d832dd937263b8056262ba2d4aa22 Mon Sep 17 00:00:00 2001 From: Alan Date: Sun, 23 Aug 2026 14:04:58 +0000 Subject: [PATCH] Fix a cigarette message. (#32462) --- code/game/objects/items/cigs.dm | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/code/game/objects/items/cigs.dm b/code/game/objects/items/cigs.dm index f6120929336..ba277bc216e 100644 --- a/code/game/objects/items/cigs.dm +++ b/code/game/objects/items/cigs.dm @@ -144,17 +144,21 @@ LIGHTERS ARE IN LIGHTERS.DM // If the target has no cig, try to give them the cig. var/mob/living/carbon_target = target - if(user.zone_selected == "mouth" && !carbon_target.wear_mask && user.a_intent == INTENT_HELP) - user.drop_item_to_ground(src, force = TRUE) - carbon_target.equip_to_slot_if_possible(src, ITEM_SLOT_MASK) - if(target != user) - user.visible_message( - SPAN_NOTICE("[user] slips \a [name] into the mouth of [carbon_target]."), - SPAN_NOTICE("You slip [src] into the mouth of [carbon_target].") - ) - else - to_chat(user, SPAN_NOTICE("You put [src] into your mouth.")) - return FINISH_ATTACK + if(user.zone_selected == "mouth" && user.a_intent == INTENT_HELP) + if(!carbon_target.wear_mask) + user.drop_item_to_ground(src, force = TRUE) + carbon_target.equip_to_slot_if_possible(src, ITEM_SLOT_MASK) + if(target != user) + user.visible_message( + SPAN_NOTICE("[user] slips \a [name] into the mouth of [carbon_target]."), + SPAN_NOTICE("You slip [src] into the mouth of [carbon_target].") + ) + else + to_chat(user, SPAN_NOTICE("You put [src] into your mouth.")) + return FINISH_ATTACK + if(!lit) + to_chat(user, SPAN_WARNING("You can't put [src] in [carbon_target]'s mouth with [carbon_target.wear_mask] in the way!")) + return FINISH_ATTACK // If they DO have a cig, try to light it with your own cig. if(cigarette_lighter_act(user, carbon_target))