Merge remote-tracking branch 'remotes/git-svn' (r4527) into bs12_with_tgport

Conflicts:
	baystation12.dme
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/objects/devices/uplinks.dm
	code/game/objects/weapons.dm
	code/modules/mining/mine_items.dm
	html/changelog.html
	icons/obj/chemical.dmi
	maps/tgstation.2.0.9.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/modules/power/lighting.dm

@@ -543,6 +543,14 @@
 	status = LIGHT_BROKEN
 	update()
 
+/obj/machinery/light/proc/fix()
+	if(status == LIGHT_OK)
+		return
+	status = LIGHT_OK
+	brightness = initial(brightness)
+	on = 1
+	update()
+
 // explosion effect
 // destroy the whole light fixture or just shatter it
 
@@ -599,16 +607,6 @@
 		sleep(1)
 		del(src)
 
-
-
-
-
-
-
-
-
-
-
 // the light item
 // can be tube or bulb subtypes
 // will fit into empty /obj/machinery/light of the corresponding type

code/modules/power/singularity/singularity.dm

@@ -417,7 +417,7 @@ var/global/list/uneatable = list(
 
 /obj/machinery/singularity/proc/mezzer()
 	for(var/mob/living/carbon/M in oviewers(8, src))
-		if(istype(M,/mob/living/carbon/human))
+		if(istype(M,/mob/living/carbon/human) && M.stat == CONSCIOUS)
 			if(istype(M:glasses,/obj/item/clothing/glasses/meson))
 				M << "\blue You look directly into The [src.name], good thing you had your protective eyewear on!"
 				return