From 1a0eecd09af0768b90c637a992f391dceb12050f Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 2 Dec 2015 09:29:31 +1030 Subject: [PATCH] Runtime fixes. --- code/game/turfs/turf.dm | 2 +- code/modules/assembly/infrared.dm | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index ef83dd53646..e6612a867f0 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -140,7 +140,7 @@ var/const/enterloopsanity = 100 ..() var/objects = 0 if(A && (A.flags & PROXMOVE)) - for(var/atom/thing as mob|obj|turf|area in range(1)) + for(var/atom/movable/thing in range(1)) if(objects > enterloopsanity) break objects++ spawn(0) diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm index b03c148026c..f448ce35a11 100644 --- a/code/modules/assembly/infrared.dm +++ b/code/modules/assembly/infrared.dm @@ -187,13 +187,10 @@ return /obj/effect/beam/i_beam/process() - //world << "i_beam \ref[src] : process" - if((loc.density || !(master))) - // world << "beam hit loc [loc] or no master [master], deleting" + if((loc && loc.density) || !master) qdel(src) return - //world << "proccess: [src.left] left" if(left > 0) left--