From 56e9fcd29c9f179e5e5497f0c52376d2e31afed1 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Sun, 6 May 2018 16:11:36 -0400 Subject: [PATCH 1/2] Merge pull request #37712 from ninjanomnom/dont-step-off-the-edge Fixes a radiation runtime related to going off the map edge --- code/datums/radiation_wave.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/datums/radiation_wave.dm b/code/datums/radiation_wave.dm index 68d8ebc31f..f02d352310 100644 --- a/code/datums/radiation_wave.dm +++ b/code/datums/radiation_wave.dm @@ -29,6 +29,9 @@ /datum/radiation_wave/process() master_turf = get_step(master_turf, move_dir) + if(!master_turf) + qdel(src) + return steps++ var/list/atoms = get_rad_atoms()