Merge remote-tracking branch 'upstream/master' into traymesons

Conflicts:
	code/modules/research/designs.dm
	icons/mob/eyes.dmi
	icons/obj/clothing/glasses.dmi

code/modules/power/singularity/collector.dm

@@ -51,7 +51,7 @@ var/global/list/rad_collectors = list()
 ..()
 
 
-/obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user)
+/obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/device/multitool))
 		user << "<span class='notice'>The [W.name] detects that [last_power]W were recently produced.</span>"
 		return 1

code/modules/power/singularity/emitter.dm

@@ -148,7 +148,7 @@
 		A.fire()
 
 
-/obj/machinery/power/emitter/attackby(obj/item/W, mob/user)
+/obj/machinery/power/emitter/attackby(obj/item/W, mob/user, params)
 
 	if(istype(W, /obj/item/weapon/wrench))
 		if(active)

code/modules/power/singularity/field_generator.dm

@@ -94,7 +94,7 @@ field_generator power level display
 		return
 
 
-/obj/machinery/field/generator/attackby(obj/item/W, mob/user)
+/obj/machinery/field/generator/attackby(obj/item/W, mob/user, params)
 	if(active)
 		user << "The [src] needs to be off."
 		return

code/modules/power/singularity/generator.dm

@@ -15,7 +15,7 @@
 		new /obj/singularity/(T, 50)
 		if(src) qdel(src)
 
-/obj/machinery/the_singularitygen/attackby(obj/item/W, mob/user)
+/obj/machinery/the_singularitygen/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/weapon/wrench))
 
 		if(!anchored && !isinspace())

code/modules/power/singularity/particle_accelerator/particle_accelerator.dm

@@ -129,7 +129,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
 	..()
 
 
-/obj/structure/particle_accelerator/attackby(obj/item/W, mob/user)
+/obj/structure/particle_accelerator/attackby(obj/item/W, mob/user, params)
 	if(istool(W))
 		if(src.process_tool_hit(W,user))
 			return
@@ -308,7 +308,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
 	..()
 
 
-/obj/machinery/particle_accelerator/attackby(obj/item/W, mob/user)
+/obj/machinery/particle_accelerator/attackby(obj/item/W, mob/user, params)
 	if(istool(W))
 		if(src.process_tool_hit(W,user))
 			return

code/modules/power/singularity/singularity.dm

@@ -32,7 +32,7 @@
 
 	src.energy = starting_energy
 	..()
-	SSobj.processing.Add(src)
+	SSobj.processing |= src
 	for(var/obj/machinery/power/singularity_beacon/singubeacon in world)
 		if(singubeacon.active)
 			target = singubeacon