From e1f815c5c636bb345ee16d1f0d0dd559a5c82afb Mon Sep 17 00:00:00 2001 From: Xhuis Date: Wed, 30 Sep 2015 13:19:05 -0400 Subject: [PATCH 1/3] Optimizes radiation pulse calculation --- code/game/objects/radiation.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/objects/radiation.dm b/code/game/objects/radiation.dm index 2498b6fe825..d82903f15d3 100644 --- a/code/game/objects/radiation.dm +++ b/code/game/objects/radiation.dm @@ -1,5 +1,5 @@ /proc/radiation_pulse(turf/epicenter, heavy_range, light_range, severity, log=0) - if(!epicenter) return + if(!epicenter || !severity) return if(!istype(epicenter, /turf)) epicenter = get_turf(epicenter.loc) @@ -11,6 +11,7 @@ if(heavy_range > light_range) light_range = heavy_range + var/light_severity = severity / 2 for(var/atom/T in range(light_range, epicenter)) var/distance = get_dist(epicenter, T) if(distance < 0) @@ -21,9 +22,9 @@ if(prob(50)) T.rad_act(severity) else - T.rad_act(severity / 2) + T.rad_act(light_severity) else if(distance <= light_range) - T.rad_act(severity / 2) + T.rad_act(light_severity) return 1 /atom/proc/rad_act(var/severity) From 8f5a3a268848290a95299788df733ffb5f1bf25b Mon Sep 17 00:00:00 2001 From: Xhuis Date: Wed, 30 Sep 2015 13:25:31 -0400 Subject: [PATCH 2/3] they literally do the same thing --- code/game/objects/radiation.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/radiation.dm b/code/game/objects/radiation.dm index d82903f15d3..0016fdae514 100644 --- a/code/game/objects/radiation.dm +++ b/code/game/objects/radiation.dm @@ -11,7 +11,7 @@ if(heavy_range > light_range) light_range = heavy_range - var/light_severity = severity / 2 + var/light_severity = severity * 0.5 for(var/atom/T in range(light_range, epicenter)) var/distance = get_dist(epicenter, T) if(distance < 0) From 6c2edbec559215b4843a43bc7aac08b234fc20ca Mon Sep 17 00:00:00 2001 From: Xhuis Date: Wed, 30 Sep 2015 13:39:10 -0400 Subject: [PATCH 3/3] Disables gravgen rad pulses showing up in asay/logs --- code/modules/power/gravitygenerator.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index 104a437c2f2..c720875aeb9 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -350,7 +350,7 @@ var/const/GRAV_NEEDS_WRENCH = 3 /obj/machinery/gravity_generator/main/proc/pulse_radiation() - radiation_pulse(get_turf(src), 3, 7, 20, 1) + radiation_pulse(get_turf(src), 3, 7, 20) // Shake everyone on the z level to let them know that gravity was enagaged/disenagaged. /obj/machinery/gravity_generator/main/proc/shake_everyone()