cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

New chem dispenser interface, by Tobba. Some sanity checking in power.dm, by Tobba.

Browse Source 
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-20 10:24:17 +02:00
committed by Albert Iordache
parent 8f734c9bc6
commit fcddc199ff
7 changed files with 447 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/power.dm
+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)