New chem dispenser interface, by Tobba.

Some sanity checking in power.dm, by Tobba.

Updated changelog, by PETE YEAAAH.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2532 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2011-11-19 21:18:11 +00:00
parent c5043cdb78
commit 9840c44b4e
8 changed files with 453 additions and 42 deletions
+2 -2
View File
@@ -28,7 +28,7 @@
return 0
var/area/A = src.loc.loc // make sure it's in an area
if(!A || !isarea(A))
if(!A || !isarea(A) || !A.master)
return 0 // if not, then not powered
return A.master.powered(chan) // return power status of the area
@@ -37,7 +37,7 @@
/obj/machinery/proc/use_power(var/amount, var/chan=EQUIP) // defaults to Equipment channel
var/area/A = src.loc.loc // make sure it's in an area
if(!A || !isarea(A))
if(!A || !isarea(A) || !A.master)
return
A.master.use_power(amount, chan)