From cbd37b6e77243835607dbafad4685ba6ab65bebb Mon Sep 17 00:00:00 2001 From: Bjorn Neergaard Date: Tue, 9 Feb 2016 23:04:58 -0600 Subject: [PATCH] Fix gravity generator runtime Checking turf Z is silly when mob checks make more sense The following runtime has occured 53 time(s). runtime error: Cannot read null.z proc name: shake everyone (/obj/machinery/gravity_generator/main/proc/shake_everyone) source file: gravitygenerator.dm,360 usr: null src: the gravitational generator (/obj/machinery/gravity_generator/main/station) --- code/modules/power/gravitygenerator.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index c720875aeb9..721058952b9 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -354,14 +354,14 @@ var/const/GRAV_NEEDS_WRENCH = 3 // Shake everyone on the z level to let them know that gravity was enagaged/disenagaged. /obj/machinery/gravity_generator/main/proc/shake_everyone() - var/turf/our_turf = get_turf(src) + var/turf/T = get_turf(src) for(var/mob/M in mob_list) - var/turf/their_turf = get_turf(M) - if(their_turf.z == our_turf.z) - M.update_gravity(M.mob_has_gravity()) - if(M.client) - shake_camera(M, 15, 1) - M.playsound_local(our_turf, 'sound/effects/alert.ogg', 100, 1, 0.5) + if(M.z != z) + continue + M.update_gravity(M.mob_has_gravity()) + if(M.client) + shake_camera(M, 15, 1) + M.playsound_local(T, 'sound/effects/alert.ogg', 100, 1, 0.5) /obj/machinery/gravity_generator/main/proc/gravity_in_level() var/turf/T = get_turf(src)