diff --git a/code/game/objects/items/lighters.dm b/code/game/objects/items/lighters.dm index 4bf3174ae9a..b1e856fd9de 100644 --- a/code/game/objects/items/lighters.dm +++ b/code/game/objects/items/lighters.dm @@ -256,6 +256,7 @@ origin_tech = "materials=1" attack_verb = null var/is_unathi_fire = FALSE + scatter_distance = 10 /obj/item/match/process() var/turf/location = get_turf(src) @@ -302,6 +303,8 @@ desc = "A match. This one has seen better days." attack_verb = list("flicked") STOP_PROCESSING(SSobj, src) + scatter_atom() + transform = turn(transform, rand(0, 360)) return TRUE /obj/item/match/dropped(mob/user) diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 091fa3cf02d..c2cc121a194 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -192,7 +192,7 @@ new /obj/item/match(src) /obj/item/storage/fancy/matches/attackby__legacy__attackchain(obj/item/match/W, mob/user, params) - if(istype(W, /obj/item/match) && !W.lit) + if(istype(W, /obj/item/match) && (!W.lit && !W.burnt)) W.matchignite() playsound(user.loc, 'sound/goonstation/misc/matchstick_light.ogg', 50, TRUE) return