Merge pull request #6661 from Citadel-Station-13/upstream-merge-37712

[MIRROR] Fixes a radiation runtime related to going off the map edge
2018-05-07 12:46:00 +00:00
parent f15f3ffea4 0393fa91ec
commit 5d38c10581
1 changed files with 3 additions and 0 deletions
@@ -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()