cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source
This commit is contained in:
PsiOmega
2015-09-07 08:01:15 +02:00
parent 97d49df971 dd81250b1b
commit 8dea4d40c0
2 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/power/lighting.dm
View File

@@ -394,8 +394,8 @@
// returns whether this light has power
// true if area has power and lightswitch is on
/obj/machinery/light/proc/has_power()
var/area/A = src.loc.loc
return A.lightswitch && (!A.requires_power || A.power_light)
var/area/A = get_area(src)
return A && A.lightswitch && (!A.requires_power || A.power_light)
/obj/machinery/light/proc/flicker(var/amount = rand(10, 20))
if(flickering) return