Skip to content

Commit

Permalink
Welding tools can be used to light other people's cigarettes (Paradis…
Browse files Browse the repository at this point in the history
…eSS13#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>
  • Loading branch information
4 people authored Mar 1, 2024
1 parent 43b3bb0 commit 0a2669f
Showing 1 changed file with 14 additions and 0 deletions.
14 changes: 14 additions & 0 deletions code/game/objects/items/tools/welder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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("<span class='notice'>[user] holds out [src] out for [M], and casually lights [cig]. What a badass.</span>")
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 = ..()
Expand Down

0 comments on commit 0a2669f

Please sign in to comment.