Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch

code/modules/power/singularity/containment_field.dm

@@ -42,7 +42,7 @@
 /obj/machinery/field/containment/blob_act(obj/structure/blob/B)
 	return FALSE
 
-/obj/machinery/field/containment/ex_act(severity, target)
+/obj/machinery/field/containment/ex_act(severity, target, origin)
 	return FALSE
 
 /obj/machinery/field/containment/attack_animal(mob/living/simple_animal/M)

code/modules/power/singularity/narsie.dm

@@ -143,7 +143,7 @@
 		A.narsie_act()
 
 
-/obj/singularity/narsie/ex_act() //No throwing bombs at her either.
+/obj/singularity/narsie/ex_act(severity, target, origin) //No throwing bombs at her either.
 	return
 
 

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

@@ -49,7 +49,7 @@
 		toxmob(A)
 
 
-/obj/effect/accelerated_particle/ex_act(severity, target)
+/obj/effect/accelerated_particle/ex_act(severity, target, origin)
 	qdel(src)
 
 /obj/effect/accelerated_particle/singularity_pull()

code/modules/power/singularity/singularity.dm

@@ -97,7 +97,7 @@
 		return
 	return ..()
 
-/obj/singularity/ex_act(severity, target)
+/obj/singularity/ex_act(severity, target, origin)
 	switch(severity)
 		if(1)
 			if(current_size <= STAGE_TWO)