diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm
index b51c020a03..ae938f18ce 100644
--- a/code/datums/wires/wires.dm
+++ b/code/datums/wires/wires.dm
@@ -1,184 +1,139 @@
-#define MAXIMUM_EMP_WIRES 3
-
-/proc/is_wire_tool(obj/item/I)
-	if(istype(I, /obj/item/device/multitool))
-		return TRUE
-	if(istype(I, /obj/item/wirecutters))
-		return TRUE
-	if(istype(I, /obj/item/device/assembly))
-		var/obj/item/device/assembly/A = I
-		if(A.attachable)
-			return TRUE
-	return
-
-/atom
-	var/datum/wires/wires = null
-
-/datum/wires
-	var/atom/holder = null // The holder (atom that contains these wires).
-	var/holder_type = null // The holder's typepath (used to make wire colors common to all holders).
-	var/proper_name = "Unknown" // The display name for the wire set shown in station blueprints. Not used if randomize is true or it's an item NT wouldn't know about (Explosives/Nuke)
-
-	var/list/wires = list() // List of wires.
-	var/list/cut_wires = list() // List of wires that have been cut.
-	var/list/colors = list() // Dictionary of colors to wire.
-	var/list/assemblies = list() // List of attached assemblies.
-	var/randomize = 0 // If every instance of these wires should be random.
-					  // Prevents wires from showing up in station blueprints
-
-/datum/wires/New(atom/holder)
-	..()
-	if(!istype(holder, holder_type))
-		CRASH("Wire holder is not of the expected type!")
-		return
-
-	src.holder = holder
-	if(randomize)
-		randomize()
-	else
-		if(!GLOB.wire_color_directory[holder_type])
-			randomize()
-			GLOB.wire_color_directory[holder_type] = colors
-			GLOB.wire_name_directory[holder_type] = proper_name
-		else
-			colors = GLOB.wire_color_directory[holder_type]
-
-/datum/wires/Destroy()
-	holder = null
-	assemblies = list()
-	return ..()
-
-/datum/wires/proc/add_duds(duds)
-	while(duds)
-		var/dud = WIRE_DUD_PREFIX + "[--duds]"
-		if(dud in wires)
-			continue
-		wires += dud
-
-/datum/wires/proc/randomize()
-	var/static/list/possible_colors = list(
-	"blue",
-	"brown",
-	"crimson",
-	"cyan",
-	"gold",
-	"grey",
-	"green",
-	"magenta",
-	"orange",
-	"pink",
-	"purple",
-	"red",
-	"silver",
-	"violet",
-	"white",
-	"yellow"
-	)
-	
-	var/list/my_possible_colors = possible_colors.Copy()
-
-	for(var/wire in shuffle(wires))
-		colors[pick_n_take(my_possible_colors)] = wire
-
-/datum/wires/proc/shuffle_wires()
-	colors.Cut()
-	randomize()
-
-/datum/wires/proc/repair()
-	cut_wires.Cut()
-
-/datum/wires/proc/get_wire(color)
-	return colors[color]
-
-/datum/wires/proc/get_attached(color)
-	if(assemblies[color])
-		return assemblies[color]
-	return null
-
-/datum/wires/proc/is_attached(color)
-	if(assemblies[color])
-		return TRUE
-
-/datum/wires/proc/is_cut(wire)
-	return (wire in cut_wires)
-
-/datum/wires/proc/is_color_cut(color)
-	return is_cut(get_wire(color))
-
-/datum/wires/proc/is_all_cut()
-	if(cut_wires.len == wires.len)
-		return TRUE
-
-/datum/wires/proc/cut(wire)
-	if(is_cut(wire))
-		cut_wires -= wire
-		on_cut(wire, mend = TRUE)
-	else
-		cut_wires += wire
-		on_cut(wire, mend = FALSE)
-
-/datum/wires/proc/cut_color(color)
-	cut(get_wire(color))
-
-/datum/wires/proc/cut_random()
-	cut(wires[rand(1, wires.len)])
-
-/datum/wires/proc/cut_all()
-	for(var/wire in wires)
-		cut(wire)
-
+#define MAXIMUM_EMP_WIRES 3
+
+/proc/is_wire_tool(obj/item/I)
+	if(istype(I, /obj/item/device/multitool))
+		return TRUE
+	if(istype(I, /obj/item/wirecutters))
+		return TRUE
+	if(istype(I, /obj/item/device/assembly))
+		var/obj/item/device/assembly/A = I
+		if(A.attachable)
+			return TRUE
+	return
+
+/atom
+	var/datum/wires/wires = null
+
+/datum/wires
+	var/atom/holder = null // The holder (atom that contains these wires).
+	var/holder_type = null // The holder's typepath (used to make wire colors common to all holders).
+	var/proper_name = "Unknown" // The display name for the wire set shown in station blueprints. Not used if randomize is true or it's an item NT wouldn't know about (Explosives/Nuke)
+
+	var/list/wires = list() // List of wires.
+	var/list/cut_wires = list() // List of wires that have been cut.
+	var/list/colors = list() // Dictionary of colors to wire.
+	var/list/assemblies = list() // List of attached assemblies.
+	var/randomize = 0 // If every instance of these wires should be random.
+					  // Prevents wires from showing up in station blueprints
+
+/datum/wires/New(atom/holder)
+	..()
+	if(!istype(holder, holder_type))
+		CRASH("Wire holder is not of the expected type!")
+		return
+
+	src.holder = holder
+	if(randomize)
+		randomize()
+	else
+		if(!GLOB.wire_color_directory[holder_type])
+			randomize()
+			GLOB.wire_color_directory[holder_type] = colors
+			GLOB.wire_name_directory[holder_type] = proper_name
+		else
+			colors = GLOB.wire_color_directory[holder_type]
+
+/datum/wires/Destroy()
+	holder = null
+	assemblies = list()
+	return ..()
+
+/datum/wires/proc/add_duds(duds)
+	while(duds)
+		var/dud = WIRE_DUD_PREFIX + "[--duds]"
+		if(dud in wires)
+			continue
+		wires += dud
+
+/datum/wires/proc/randomize()
+	var/static/list/possible_colors = list(
+	"blue",
+	"brown",
+	"crimson",
+	"cyan",
+	"gold",
+	"grey",
+	"green",
+	"magenta",
+	"orange",
+	"pink",
+	"purple",
+	"red",
+	"silver",
+	"violet",
+	"white",
+	"yellow"
+	)
+	
+	var/list/my_possible_colors = possible_colors.Copy()
+
+	for(var/wire in shuffle(wires))
+		colors[pick_n_take(my_possible_colors)] = wire
+
+/datum/wires/proc/shuffle_wires()
+	colors.Cut()
+	randomize()
+
+/datum/wires/proc/repair()
+	cut_wires.Cut()
+
+/datum/wires/proc/get_wire(color)
+	return colors[color]
+
+/datum/wires/proc/get_attached(color)
+	if(assemblies[color])
+		return assemblies[color]
+	return null
+
+/datum/wires/proc/is_attached(color)
+	if(assemblies[color])
+		return TRUE
+
+/datum/wires/proc/is_cut(wire)
+	return (wire in cut_wires)
+
+/datum/wires/proc/is_color_cut(color)
+	return is_cut(get_wire(color))
+
+/datum/wires/proc/is_all_cut()
+	if(cut_wires.len == wires.len)
+		return TRUE
+
+/datum/wires/proc/cut(wire)
+	if(is_cut(wire))
+		cut_wires -= wire
+		on_cut(wire, mend = TRUE)
+	else
+		cut_wires += wire
+		on_cut(wire, mend = FALSE)
+
+/datum/wires/proc/cut_color(color)
+	cut(get_wire(color))
+
+/datum/wires/proc/cut_random()
+	cut(wires[rand(1, wires.len)])
+
+/datum/wires/proc/cut_all()
+	for(var/wire in wires)
+		cut(wire)
+
 /datum/wires/proc/pulse(wire, user)
-	if(is_cut(wire))
-		return
+	if(is_cut(wire))
+		return
 	on_pulse(wire, user)
-
+
 /datum/wires/proc/pulse_color(color, mob/living/user)
 	pulse(get_wire(color), user)
-<<<<<<< HEAD
-
-/datum/wires/proc/pulse_assembly(obj/item/device/assembly/S)
-	for(var/color in assemblies)
-		if(S == assemblies[color])
-			pulse_color(color)
-			return TRUE
-
-/datum/wires/proc/attach_assembly(color, obj/item/device/assembly/S)
-	if(S && istype(S) && S.attachable && !is_attached(color))
-		assemblies[color] = S
-		S.loc = holder
-		S.connected = src
-		return S
-
-/datum/wires/proc/detach_assembly(color)
-	var/obj/item/device/assembly/S = get_attached(color)
-	if(S && istype(S))
-		assemblies -= color
-		S.connected = null
-		S.loc = holder.loc
-		return S
-
-/datum/wires/proc/emp_pulse()
-	var/list/possible_wires = shuffle(wires)
-	var/remaining_pulses = MAXIMUM_EMP_WIRES
-
-	for(var/wire in possible_wires)
-		if(prob(33))
-			pulse(wire)
-		remaining_pulses--
-		if(remaining_pulses >= 0)
-			break
-
-// Overridable Procs
-/datum/wires/proc/interactable(mob/user)
-	return TRUE
-
-/datum/wires/proc/get_status()
-	return list()
-
-/datum/wires/proc/on_cut(wire, mend = FALSE)
-	return
-
-=======
 
 /datum/wires/proc/pulse_assembly(obj/item/device/assembly/S)
 	for(var/color in assemblies)
@@ -222,85 +177,84 @@
 /datum/wires/proc/on_cut(wire, mend = FALSE)
 	return
 
->>>>>>> 8b54685... Cleanup to various loc assignments and nearby code (#31069)
 /datum/wires/proc/on_pulse(wire, user)
-	return
-// End Overridable Procs
-
-/datum/wires/proc/interact(mob/user)
-	if(!interactable(user))
-		return
-	ui_interact(user)
-	for(var/A in assemblies)
-		var/obj/item/I = assemblies[A]
-		if(istype(I) && I.on_found(user))
-			return
-
-/datum/wires/ui_host()
-	return holder
-
-/datum/wires/ui_status(mob/user)
-	if(interactable(user))
-		return ..()
-	return UI_CLOSE
-
+	return
+// End Overridable Procs
+
+/datum/wires/proc/interact(mob/user)
+	if(!interactable(user))
+		return
+	ui_interact(user)
+	for(var/A in assemblies)
+		var/obj/item/I = assemblies[A]
+		if(istype(I) && I.on_found(user))
+			return
+
+/datum/wires/ui_host()
+	return holder
+
+/datum/wires/ui_status(mob/user)
+	if(interactable(user))
+		return ..()
+	return UI_CLOSE
+
 /datum/wires/ui_interact(mob/user, ui_key = "wires", datum/tgui/ui = null, force_open = FALSE, \
-							datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
-	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
-	if (!ui)
-		ui = new(user, src, ui_key, "wires", "[holder.name] wires", 350, 150 + wires.len * 30, master_ui, state)
-		ui.open()
-
-/datum/wires/ui_data(mob/user)
-	var/list/data = list()
-	var/list/payload = list()
-	for(var/color in colors)
-		payload.Add(list(list(
-			"color" = color,
-			"wire" = (IsAdminGhost(user) || (user.is_holding_item_of_type(/obj/item/device/multitool/abductor)) ? get_wire(color) : null),
-			"cut" = is_color_cut(color),
-			"attached" = is_attached(color)
-		)))
-	data["wires"] = payload
-	data["status"] = get_status()
-	return data
-
-/datum/wires/ui_act(action, params)
-	if(..() || !interactable(usr))
-		return
-	var/target_wire = params["wire"]
-	var/mob/living/L = usr
-	var/obj/item/I = L.get_active_held_item()
-	switch(action)
-		if("cut")
-			if(istype(I, /obj/item/wirecutters) || IsAdminGhost(usr))
-				playsound(holder, I.usesound, 20, 1)
-				cut_color(target_wire)
-				. = TRUE
-			else
-				to_chat(L, "<span class='warning'>You need wirecutters!</span>")
-		if("pulse")
-			if(istype(I, /obj/item/device/multitool) || IsAdminGhost(usr))
-				playsound(holder, 'sound/weapons/empty.ogg', 20, 1)
+							datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
+	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
+	if (!ui)
+		ui = new(user, src, ui_key, "wires", "[holder.name] wires", 350, 150 + wires.len * 30, master_ui, state)
+		ui.open()
+
+/datum/wires/ui_data(mob/user)
+	var/list/data = list()
+	var/list/payload = list()
+	for(var/color in colors)
+		payload.Add(list(list(
+			"color" = color,
+			"wire" = (IsAdminGhost(user) || (user.is_holding_item_of_type(/obj/item/device/multitool/abductor)) ? get_wire(color) : null),
+			"cut" = is_color_cut(color),
+			"attached" = is_attached(color)
+		)))
+	data["wires"] = payload
+	data["status"] = get_status()
+	return data
+
+/datum/wires/ui_act(action, params)
+	if(..() || !interactable(usr))
+		return
+	var/target_wire = params["wire"]
+	var/mob/living/L = usr
+	var/obj/item/I = L.get_active_held_item()
+	switch(action)
+		if("cut")
+			if(istype(I, /obj/item/wirecutters) || IsAdminGhost(usr))
+				playsound(holder, I.usesound, 20, 1)
+				cut_color(target_wire)
+				. = TRUE
+			else
+				to_chat(L, "<span class='warning'>You need wirecutters!</span>")
+		if("pulse")
+			if(istype(I, /obj/item/device/multitool) || IsAdminGhost(usr))
+				playsound(holder, 'sound/weapons/empty.ogg', 20, 1)
 				pulse_color(target_wire, L)
-				. = TRUE
-			else
-				to_chat(L, "<span class='warning'>You need a multitool!</span>")
-		if("attach")
-			if(is_attached(target_wire))
-				var/obj/item/O = detach_assembly(target_wire)
-				if(O)
-					L.put_in_hands(O)
-					. = TRUE
-			else
-				if(istype(I, /obj/item/device/assembly))
-					var/obj/item/device/assembly/A = I
-					if(A.attachable)
-						if(!L.drop_item())
-							return
-						attach_assembly(target_wire, A)
-						. = TRUE
-					else
-						to_chat(L, "<span class='warning'>You need an attachable assembly!</span>")
-
-#undef MAXIMUM_EMP_WIRES
+				. = TRUE
+			else
+				to_chat(L, "<span class='warning'>You need a multitool!</span>")
+		if("attach")
+			if(is_attached(target_wire))
+				var/obj/item/O = detach_assembly(target_wire)
+				if(O)
+					L.put_in_hands(O)
+					. = TRUE
+			else
+				if(istype(I, /obj/item/device/assembly))
+					var/obj/item/device/assembly/A = I
+					if(A.attachable)
+						if(!L.drop_item())
+							return
+						attach_assembly(target_wire, A)
+						. = TRUE
+					else
+						to_chat(L, "<span class='warning'>You need an attachable assembly!</span>")
+
+#undef MAXIMUM_EMP_WIRES