mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-14 00:23:29 +01:00
Made lighting the match happen after the message, and do nothing if it's a burnt one
This commit is contained in:
@@ -458,10 +458,12 @@ BLIND // can't see anything
|
||||
/obj/item/clothing/shoes/attackby(obj/item/I, mob/user, params)
|
||||
if(istype(I, /obj/item/match) && src.loc == user)
|
||||
var/obj/item/match/M = I
|
||||
if(M.matchignite()) // Match isn't lit, but isn't burnt.
|
||||
if(!M.lit && !M.burnt) // Match isn't lit, but isn't burnt.
|
||||
user.visible_message("<span class='warning'>[user] strikes a [M] on the bottom of [src], lighting it.</span>","<span class='warning'>You strike [M] on the bottom of [src] to light it.</span>")
|
||||
M.matchignite()
|
||||
playsound(user.loc, 'sound/goonstation/misc/matchstick_light.ogg', 50, 1)
|
||||
else
|
||||
return
|
||||
if(M.lit && !M.burnt)
|
||||
user.visible_message("<span class='warning'>[user] crushes [M] into the bottom of [src], extinguishing it.</span>","<span class='warning'>You crush [M] into the bottom of [src], extinguishing it.</span>")
|
||||
M.dropped()
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user