One runtime fixed, other one didn't turn up.

I put in some stuff for it to be easier to find if it does.

Conflicts:
	code/modules/power/singularity/singularity.dm
This commit is contained in:
Aryn
2014-03-06 09:54:18 -07:00
committed by ZomgPonies
parent 8a5311fd66
commit 5da65951e8
2 changed files with 10 additions and 6 deletions
+8 -4
View File
@@ -91,6 +91,11 @@ atom/movable/New()
opacity = 0
SetOpacity(1)
atom/movable/Del()
if(light) light.Off()
if(opacity) SetOpacity(0)
. = ..()
atom/movable/Move()
var/o = opacity
if(o) SetOpacity(0)
@@ -171,10 +176,9 @@ turf/proc/ResetAllLights()
/turf/space/ResetAllLights()
var/atom/movable/lighting_overlay/overlay = locate() in src
if (overlay)
overlay.loc = null
light_overlay = null
is_outside = 1
if(overlay) overlay.loc = null
light_overlay = null
is_outside = 1
. = ..()
turf/proc/ResetValue()
+2 -2
View File
@@ -28,6 +28,7 @@ light/var/list/lit_turfs
light/var/atom/atom
light/New(atom/atom)
ASSERT(atom)
src.atom = atom
light/proc/Reset()
@@ -48,8 +49,7 @@ light/proc/Off()
lit_turfs = list()
light/proc/CalculateBrightness(turf/T)
if (!atom)
return 0
ASSERT(T)
var/square = get_square_dist(atom.x,atom.y,atom.z,T.x,T.y,T.z)
if(square > (radius+2)*(radius+2)) return 0
//+2 offset gives an ambient light effect.