From 0a2669f708a6cfc061dbd0ebecb9dd357bcfc3df Mon Sep 17 00:00:00 2001 From: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Date: Fri, 1 Mar 2024 13:29:36 +0000 Subject: [PATCH] Welding tools can be used to light other people's cigarettes (#23987) * Update welder.dm You can light other people's cigarettes with welders wooo! * Update code/game/objects/items/tools/welder.dm Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * Update code/game/objects/items/tools/welder.dm Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> * Fix broken expression * Update code/game/objects/items/tools/welder.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --------- Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --- code/game/objects/items/tools/welder.dm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/code/game/objects/items/tools/welder.dm b/code/game/objects/items/tools/welder.dm index 72f286458d94..5fbbf2187e99 100644 --- a/code/game/objects/items/tools/welder.dm +++ b/code/game/objects/items/tools/welder.dm @@ -146,6 +146,20 @@ return remove_fuel(0.5) +/obj/item/weldingtool/attack(mob/living/carbon/M, mob/living/carbon/user) + // For lighting other people's cigarettes. + var/obj/item/clothing/mask/cigarette/cig = M?.wear_mask + if(!istype(cig) || user.zone_selected != "mouth" || !tool_enabled) + return ..() + + if(M == user) + cig.attackby(src, user) + return + + cig.light("[user] holds out [src] out for [M], and casually lights [cig]. What a badass.") + playsound(src, 'sound/items/lighter/light.ogg', 25, TRUE) + M.update_inv_wear_mask() + /obj/item/weldingtool/use_tool(atom/target, user, delay, amount, volume, datum/callback/extra_checks) target.add_overlay(GLOB.welding_sparks) var/did_thing = ..()