updates fork

code/modules/power/singularity/containment_field.dm

@@ -56,12 +56,14 @@
 	else
 		..()
 
-/obj/machinery/field/containment/Crossed(mob/mover)
-	if(isliving(mover))
-		shock(mover)
+/obj/machinery/field/containment/Crossed(atom/movable/AM)
+	. = ..()
+	if(isliving(AM))
+		shock(AM)
+
+	if(ismachinery(AM) || isstructure(AM) || ismecha(AM))
+		bump_field(AM)
 
-	if(ismachinery(mover) || isstructure(mover) || ismecha(mover))
-		bump_field(mover)
 
 /obj/machinery/field/containment/proc/set_master(master1,master2)
 	if(!master1 || !master2)

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

@@ -44,6 +44,7 @@
 			movement_range = 0
 
 /obj/effect/accelerated_particle/Crossed(atom/A)
+	. = ..()
 	if(isliving(A))
 		toxmob(A)