From f93a9e2b2a03271cc12e0abb3c9a88c80bf56802 Mon Sep 17 00:00:00 2001 From: "n3ophyt3@gmail.com" Date: Mon, 7 Feb 2011 01:57:25 +0000 Subject: [PATCH] APC frames no longer CPU-lock the server when used in an area that hasn't been blueprinted to not being space. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@974 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/items/apc_frame.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/apc_frame.dm b/code/game/objects/items/apc_frame.dm index a9793c46f90..bf71c2bdee5 100644 --- a/code/game/objects/items/apc_frame.dm +++ b/code/game/objects/items/apc_frame.dm @@ -16,12 +16,12 @@ if (!istype(loc, /turf/simulated/floor)) usr << "\red APC cannot be placed on this spot." return + if (A.requires_power == 0 || A.name == "Space") + usr << "\red APC cannot be placed in this area." + return if (A.get_apc()) usr << "\red This area already has APC." return //only one APC per area - if (A.requires_power == 0) - usr << "\red APC cannot be placed in this area." - return for(var/obj/machinery/power/terminal/T in loc) if (T.master) usr << "\red There is another network terminal here."