From 9ffe119a403a2aea3d80789a891a85f4836e7815 Mon Sep 17 00:00:00 2001 From: Theos Date: Mon, 7 Mar 2022 08:19:44 -0500 Subject: [PATCH 1/2] Resonators can now chain mine faster --- code/modules/mining/equipment/resonator.dm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/code/modules/mining/equipment/resonator.dm b/code/modules/mining/equipment/resonator.dm index 4d8fe05e3aa0..e89b4158ccc5 100644 --- a/code/modules/mining/equipment/resonator.dm +++ b/code/modules/mining/equipment/resonator.dm @@ -71,7 +71,6 @@ transform = matrix()*0.75 animate(src, transform = matrix()*1.5, time = duration) deltimer(timerid) - addtimer(CALLBACK(src, .proc/replicate, get_turf(src), creator, duration), duration, TIMER_STOPPABLE)//yogs: adds field replication timerid = addtimer(CALLBACK(src, .proc/burst), duration, TIMER_STOPPABLE) /obj/effect/temp_visual/resonance/Destroy() @@ -97,6 +96,7 @@ new /obj/effect/temp_visual/resonance_crush(T) if(ismineralturf(T)) var/turf/closed/mineral/M = T + replicate(M) M.gets_drilled(creator) check_pressure(T) playsound(T,'sound/weapons/resonator_blast.ogg',50,1) @@ -117,10 +117,9 @@ transform = matrix()*1.5 animate(src, transform = matrix()*0.1, alpha = 50, time = 4) -/obj/effect/temp_visual/resonance/proc/replicate(turf/closed/mineral/M, creator, timetoburst) //yogs start: adds replication to resonator fields - if(!istype(M)) +/obj/effect/temp_visual/resonance/proc/replicate(turf/closed/mineral/M) //yogs start: adds replication to resonator fields + if(!istype(M) || !M.mineralType) // so we don't end up in the ultimate chain reaction return for(var/turf/closed/mineral/T in orange(1, M)) - if(istype(T)) - if(M.mineralType == T.mineralType && M.mineralType != null) // so we don't end up in the ultimate chain reaction - new /obj/effect/temp_visual/resonance(T, creator, null, timetoburst) //yogs end + if(istype(T) && M.mineralType == T.mineralType) + new /obj/effect/temp_visual/resonance(T, creator, null, burst_time) //yogs end From fdf9739129bbad59154c3561c6d509e8ab67418b Mon Sep 17 00:00:00 2001 From: Theos Date: Mon, 7 Mar 2022 08:30:02 -0500 Subject: [PATCH 2/2] Update resonator.dm --- code/modules/mining/equipment/resonator.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/equipment/resonator.dm b/code/modules/mining/equipment/resonator.dm index e89b4158ccc5..89c86e11d527 100644 --- a/code/modules/mining/equipment/resonator.dm +++ b/code/modules/mining/equipment/resonator.dm @@ -122,4 +122,4 @@ return for(var/turf/closed/mineral/T in orange(1, M)) if(istype(T) && M.mineralType == T.mineralType) - new /obj/effect/temp_visual/resonance(T, creator, null, burst_time) //yogs end + new /obj/effect/temp_visual/resonance(T, creator, null, duration) //yogs end