From dd8740d3df27e35c02d2239b1501f5c79ad2d04b Mon Sep 17 00:00:00 2001 From: Certhic Date: Fri, 4 Sep 2020 13:47:16 +0200 Subject: [PATCH 1/3] chameleon flag fix --- code/game/objects/items/flag.dm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm index 14bb468e049..eafe218ad7d 100644 --- a/code/game/objects/items/flag.dm +++ b/code/game/objects/items/flag.dm @@ -251,6 +251,7 @@ message_admins("[key_name_admin(user)] has lit the [src] trapped with [boobytrap] by [key_name_admin(trapper)] at [A.name] (JMP).") log_game("[key_name_admin(user)] has lit the [src] trapped with [boobytrap] by [key_name_admin(trapper)] at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).") investigate_log("[key_name_admin(user)] has lit the [src] trapped with [boobytrap] by [key_name_admin(trapper)] at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).", INVESTIGATE_BOMB) + burn() else return ..() @@ -267,8 +268,13 @@ /obj/item/flag/chameleon/burn() if(boobytrap) - boobytrap.prime() - ..() + fire_act() + spawn(boobytrap.det_time) + boobytrap.loc = get_turf(loc) + boobytrap.prime() + ..() + else + ..() /obj/item/flag/chameleon/updateFlagIcon() icon_state = updated_icon_state From 720a16e7e18c9cb317504fe808026705c407555d Mon Sep 17 00:00:00 2001 From: Certhic Date: Sun, 6 Sep 2020 12:15:50 +0200 Subject: [PATCH 2/3] replaced spawn with addtimer --- code/game/objects/items/flag.dm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm index eafe218ad7d..f33e504a3e6 100644 --- a/code/game/objects/items/flag.dm +++ b/code/game/objects/items/flag.dm @@ -269,13 +269,16 @@ /obj/item/flag/chameleon/burn() if(boobytrap) fire_act() - spawn(boobytrap.det_time) - boobytrap.loc = get_turf(loc) - boobytrap.prime() - ..() + addtimer(CALLBACK(src, .proc/prime_boobytrap), boobytrap.det_time) else ..() +/obj/item/flag/chameleon/proc/prime_boobytrap() + boobytrap.forceMove(get_turf(loc)) + boobytrap.prime() + boobytrap = null + burn() + /obj/item/flag/chameleon/updateFlagIcon() icon_state = updated_icon_state From 070904dd7b9fd7cc819b0692d5473488630f1274 Mon Sep 17 00:00:00 2001 From: Certhic Date: Sun, 6 Sep 2020 12:16:05 +0200 Subject: [PATCH 3/3] smoke bomb runtime fix --- code/game/objects/items/weapons/grenades/smokebomb.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/grenades/smokebomb.dm b/code/game/objects/items/weapons/grenades/smokebomb.dm index 6dd07485f5b..53061e5fa61 100644 --- a/code/game/objects/items/weapons/grenades/smokebomb.dm +++ b/code/game/objects/items/weapons/grenades/smokebomb.dm @@ -19,7 +19,7 @@ /obj/item/grenade/smokebomb/prime() playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3) - src.smoke.set_up(10, 0, usr.loc) + smoke.set_up(10, 0) spawn(0) src.smoke.start() sleep(10)