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

Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/machinery/computer/law.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/food/recipes_microwave.dm
	html/changelog.html
	icons/effects/effects.dmi

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

code/modules/power/singularity/collector.dm

@@ -1,5 +1,5 @@
 //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33
-
+var/global/list/rad_collectors = list()
 
 /obj/machinery/power/rad_collector
 	name = "Radiation Collector Array"
@@ -17,6 +17,14 @@
 	var/locked = 0
 	var/drainratio = 1
 
+/obj/machinery/power/rad_collector/New()
+	..()
+	rad_collectors += src
+
+/obj/machinery/power/rad_collector/Del()
+	rad_collectors -= src
+	..()
+
 /obj/machinery/power/rad_collector/process()
 	if(P)
 		if(P.air_contents.toxins <= 0)
@@ -56,7 +64,7 @@
 		user.drop_item()
 		src.P = W
 		W.loc = src
-		updateicon()
+		update_icons()
 	else if(istype(W, /obj/item/weapon/crowbar))
 		if(P && !src.locked)
 			eject()
@@ -108,7 +116,7 @@
 	if(active)
 		toggle_power()
 	else
-		updateicon()
+		update_icons()
 
 /obj/machinery/power/rad_collector/proc/receive_pulse(var/pulse_strength)
 	if(P && active)
@@ -120,7 +128,7 @@
 	return
 
 
-/obj/machinery/power/rad_collector/proc/updateicon()
+/obj/machinery/power/rad_collector/proc/update_icons()
 	overlays = null
 	if(P)
 		overlays += image('icons/obj/singularity.dmi', "ptank")
@@ -138,6 +146,6 @@
 	else
 		icon_state = "ca"
 		flick("ca_deactive", src)
-	updateicon()
+	update_icons()
 	return
 

code/modules/power/singularity/singularity.dm

@@ -435,8 +435,9 @@ var/global/list/uneatable = list(
 
 
 /obj/machinery/singularity/proc/pulse()
-	for(var/obj/machinery/power/rad_collector/R in orange(15,src))
-		if(istype(R,/obj/machinery/power/rad_collector))
+
+	for(var/obj/machinery/power/rad_collector/R in rad_collectors)
+		if(get_dist(R, src) <= 15) // Better than using orange() every process
 			R.receive_pulse(energy)
 	return