Merge pull request #1336 from SkyMarshal/BugFixes

Fixes for UL bugginess
This commit is contained in:
SkyMarshal
2012-06-21 02:54:58 -07:00
2 changed files with 7 additions and 7 deletions
+2 -2
View File
@@ -942,9 +942,9 @@
return
lights = !lights
if(lights)
ul_SetLuminosity(luminosity + lights_power, luminosity + lights_power, luminosity)
ul_SetLuminosity(LuminosityRed + lights_power, LuminosityGreen + lights_power, LuminosityBlue)
else
ul_SetLuminosity(luminosity - lights_power, luminosity - lights_power, luminosity)
ul_SetLuminosity(LuminosityRed - lights_power, LuminosityGreen - lights_power, LuminosityBlue)
src.log_message("Toggled lights.")
return
@@ -22,6 +22,11 @@ NOTEBOOK
src.overlays += "paper_words"
return
/obj/item/weapon/paper/Del()
if(burning && istype(loc, /mob))
loc.ul_SetLuminosity(loc.LuminosityRed - 8, loc.LuminosityGreen - 6, loc.LuminosityBlue)
..()
/obj/item/weapon/paper/process()
if(iteration < 5)
var/turf/location = src.loc
@@ -35,11 +40,6 @@ NOTEBOOK
else
for(var/mob/M in viewers(5, get_turf(src)))
M << "\red \the [src] burns up."
if(istype(src.loc,/mob))
var/mob/M = src.loc
M.ul_SetLuminosity(M.LuminosityRed - 8, M.LuminosityGreen - 6, M.LuminosityBlue)
else
ul_SetLuminosity(0)
processing_objects.Remove(src)
del(src)