From 0efad2279594993bef79753a699650f6841cb7da Mon Sep 17 00:00:00 2001 From: "VivianFoxfoot@gmail.com" Date: Tue, 28 Feb 2012 23:14:25 +0000 Subject: [PATCH] Changes a & to an && from last commit Raises the loopsanity variable in /turf/entered from 10 to 100. Having the value so low means it generally evaluates the nine surrounding turfs and then the area, and no objects. Raising the value makes proximity-based items work again. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3212 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/machinery/door_control.dm | 2 +- code/game/turf.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm index 5fee9ffada1..402efeb4be8 100644 --- a/code/game/machinery/door_control.dm +++ b/code/game/machinery/door_control.dm @@ -30,7 +30,7 @@ if(stat & (NOPOWER|BROKEN)) return - if(!allowed(user) & (wires & 1)) + if(!allowed(user) && (wires & 1)) flick("doorctrl-denied",src) return diff --git a/code/game/turf.dm b/code/game/turf.dm index 46bb078b13a..4cf72f09851 100644 --- a/code/game/turf.dm +++ b/code/game/turf.dm @@ -80,7 +80,7 @@ /turf/Entered(atom/movable/M as mob|obj) - var/loopsanity = 10 + var/loopsanity = 100 if(ismob(M)) if(!M:lastarea) M:lastarea = get_area(M.loc)