Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765

code/datums/wires/_wires.dm

@@ -11,9 +11,6 @@
 		if(A.attachable)
 			return TRUE
 
-/atom
-	var/datum/wires/wires = null
-
 /atom/proc/attempt_wire_interaction(mob/user)
 	if(!wires)
 		return WIRE_INTERACTION_FAIL

code/datums/wires/apc.dm

@@ -30,6 +30,7 @@
 		if(WIRE_POWER1, WIRE_POWER2) // Short for a long while.
 			if(!A.shorted)
 				A.shorted = TRUE
+				A.update()
 				addtimer(CALLBACK(A, /obj/machinery/power/apc.proc/reset, wire), 1200)
 		if(WIRE_IDSCAN) // Unlock for a little while.
 			A.locked = FALSE
@@ -49,6 +50,7 @@
 			else
 				A.shorted = TRUE
 				A.shock(usr, 50)
+			A.update()
 		if(WIRE_AI) // Disable AI control.
 			if(mend)
 				A.aidisabled = FALSE