From 580a83d3347735269a5b79e75d77ebe702251aab Mon Sep 17 00:00:00 2001
From: SkyMarshal <joehe.inemeyer@gmail.com>
Date: Thu, 21 Jun 2012 02:52:45 -0700
Subject: [PATCH] Fixes for UL bugginess

---
 code/game/mecha/mecha.dm                       |  4 ++--
 code/game/objects/items/weapons/papers_bins.dm | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index c793fba9bb5..2557acede5e 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -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
 
diff --git a/code/game/objects/items/weapons/papers_bins.dm b/code/game/objects/items/weapons/papers_bins.dm
index 48608855433..5d02bc0ae39 100644
--- a/code/game/objects/items/weapons/papers_bins.dm
+++ b/code/game/objects/items/weapons/papers_bins.dm
@@ -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)