cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a cigarette message. (#32462)

Browse Source
This commit is contained in:
Alan
2026-08-23 14:04:58 +00:00
committed by GitHub
parent c7649f0acd
commit d55711bad9
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/cigs.dm
+15 -11
View File
@@ -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))