Merge branch 'master' into upstream-merge-32188

code/modules/power/singularity/emitter.dm

@@ -152,11 +152,6 @@
 
 
 /obj/machinery/power/emitter/emp_act(severity)//Emitters are hardened but still might have issues
-//	add_load(1000)
-/*	if((severity == 1)&&prob(1)&&prob(1))
-		if(src.active)
-			src.active = 0
-			src.use_power = IDLE_POWER_USE	*/
 	return 1
 
 

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

@@ -89,7 +89,7 @@
 	if (anchored)
 		to_chat(usr, "It is fastened to the floor!")
 		return 0
-	setDir(turn(dir, 90))
+	setDir(turn(dir, -90))
 	return 1
 
 /obj/structure/particle_accelerator/attackby(obj/item/W, mob/user, params)