diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm
index af9350f38c7..be86f419a38 100644
--- a/code/game/objects/items/devices/radio/electropack.dm
+++ b/code/game/objects/items/devices/radio/electropack.dm
@@ -9,6 +9,7 @@
 	materials = list(MAT_METAL = 10000, MAT_GLASS = 2500)
 	/// The integrated signaler
 	var/obj/item/assembly/signaler/electropack/integrated_signaler
+	new_attack_chain = TRUE
 
 /obj/item/electropack/Initialize(mapload)
 	. = ..()
@@ -20,11 +21,11 @@
 
 	if(istype(loc, /obj/item/assembly/shock_kit))
 		var/obj/item/assembly/shock_kit/S = loc
-		if(S.part1 == src)
-			S.part1 = null
+		if(S.attached_helmet == src)
+			S.attached_helmet = null
 
-		else if(S.part2 == src)
-			S.part2 = null
+		else if(S.attached_electropack == src)
+			S.attached_electropack = null
 
 		master = null
 
@@ -37,33 +38,51 @@
 
 	..()
 
-/obj/item/electropack/attack_self__legacy__attackchain(mob/user)
+/obj/item/electropack/activate_self(mob/user)
+	if(..())
+		return ITEM_INTERACT_COMPLETE
 	ui_interact(user)
+	add_fingerprint(user)
+	return ITEM_INTERACT_COMPLETE
 
-/obj/item/electropack/attackby__legacy__attackchain(obj/item/W, mob/user, params)
-	..()
+/obj/item/electropack/item_interaction(mob/living/user, obj/item/used, list/modifiers)
+	if(!istype(used, /obj/item/clothing/head/helmet))
+		return ..()
 
-	if(istype(W, /obj/item/clothing/head/helmet))
-		var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit(user)
-		A.icon = 'icons/obj/assemblies.dmi'
+	attach_helmet(used, user)
+	return ITEM_INTERACT_COMPLETE
 
-		if(!user.unequip(W))
-			to_chat(user, SPAN_NOTICE("\the [W] is stuck to your hand, you cannot attach it to \the [src]!"))
-			return
+/obj/item/electropack/interact_with_atom(atom/target, mob/living/user, list/modifiers)
+	if(!istype(target, /obj/item/clothing/head/helmet))
+		return ..()
 
-		W.forceMove(A)
-		W.master = A
-		A.part1 = W
+	attach_helmet(target, user)
+	return ITEM_INTERACT_COMPLETE
 
-		user.transfer_item_to(src, A)
-		master = A
-		A.part2 = src
+/obj/item/electropack/proc/attach_helmet(obj/item/clothing/head/helmet/used, mob/living/user)
+	if(!istype(used))
+		return FALSE
 
-		user.put_in_hands(A)
-		A.add_fingerprint(user)
-		if(src.flags & NODROP)
-			A.set_nodrop(TRUE)
+	var/obj/item/assembly/shock_kit/kit = new /obj/item/assembly/shock_kit(user)
+	kit.icon = 'icons/obj/assemblies.dmi'
 
+	if(!user.unequip(used))
+		to_chat(user, SPAN_WARNING("[used] is stuck to your hand, you cannot attach it to [src]!"))
+		return FALSE
+
+	used.forceMove(kit)
+	used.master = kit
+	kit.attached_helmet = used
+
+	user.transfer_item_to(src, kit)
+	master = kit
+	kit.attached_electropack = src
+
+	user.put_in_hands(kit)
+	kit.add_fingerprint(user)
+	if(src.flags & NODROP)
+		kit.set_nodrop(TRUE)
+	return TRUE
 
 /obj/item/electropack/proc/handle_shock()
 	if(istype(master, /obj/item/assembly/shock_kit))
@@ -79,7 +98,7 @@
 
 // This should honestly just proxy the UI to the internal signaler
 /obj/item/electropack/ui_state(mob/user)
-	return GLOB.inventory_state
+	return GLOB.deep_inventory_state
 
 /obj/item/electropack/ui_interact(mob/user, datum/tgui/ui = null)
 	ui = SStgui.try_update_ui(user, src, ui)
diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm
index 3bc1b0e73cc..b6449403c26 100644
--- a/code/game/objects/structures/electricchair.dm
+++ b/code/game/objects/structures/electricchair.dm
@@ -3,7 +3,7 @@
 	desc = "Looks absolutely SHOCKING!"
 	icon_state = "echair0"
 	item_chair = null
-	var/obj/item/assembly/shock_kit/part = null
+	var/obj/item/assembly/shock_kit/shocker = null
 	var/last_time = 1.0
 	var/delay_time = 50
 	var/shocking = FALSE
@@ -13,17 +13,17 @@
 	update_icon(UPDATE_OVERLAYS)
 
 	if(sk)
-		part = sk
+		shocker = sk
 
-	if(isnull(part)) //This e-chair was not custom built
-		part = new(src)
-		var/obj/item/clothing/head/helmet/part1 = new(part)
-		var/obj/item/electropack/part2 = new(part)
-		part2.integrated_signaler.frequency = 1445
-		part2.integrated_signaler.code = 6
-		part2.master = part
-		part.part1 = part1
-		part.part2 = part2
+	if(isnull(shocker)) // This e-chair was not custom built.
+		shocker = new(src)
+		var/obj/item/clothing/head/helmet/attached_helmet = new(shocker)
+		var/obj/item/electropack/attached_electropack = new(shocker)
+		attached_electropack.integrated_signaler.frequency = 1445
+		attached_electropack.integrated_signaler.code = 6
+		attached_electropack.master = shocker
+		shocker.attached_helmet = attached_helmet
+		shocker.attached_electropack = attached_electropack
 
 /obj/structure/chair/e_chair/examine(mob/user)
 	. = ..()
@@ -34,9 +34,9 @@
 	var/obj/structure/chair/C = new /obj/structure/chair(loc)
 	I.play_tool_sound(src, 50)
 	C.dir = dir
-	part.loc = loc
-	part.master = null
-	part = null
+	shocker.loc = loc
+	shocker.master = null
+	shocker = null
 	visible_message(SPAN_WARNING("[user] deconstructs [src]."))
 	qdel(src)
 
diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm
index acb10867ab2..8e7bbf1b9ed 100644
--- a/code/modules/assembly/shock_kit.dm
+++ b/code/modules/assembly/shock_kit.dm
@@ -3,14 +3,14 @@
 	desc = "This appears to be made from both an electropack and a helmet."
 	icon = 'icons/obj/assemblies.dmi'
 	icon_state = "shock_kit"
-	var/obj/item/clothing/head/helmet/part1 = null
-	var/obj/item/electropack/part2 = null
+	var/obj/item/clothing/head/helmet/attached_helmet = null
+	var/obj/item/electropack/attached_electropack = null
 	var/status = FALSE
 	w_class = WEIGHT_CLASS_HUGE
 
 /obj/item/assembly/shock_kit/Destroy()
-	QDEL_NULL(part1)
-	QDEL_NULL(part2)
+	QDEL_NULL(attached_helmet)
+	QDEL_NULL(attached_electropack)
 	return ..()
 
 /obj/item/assembly/shock_kit/wrench_act(mob/living/user, obj/item/I)
@@ -18,30 +18,34 @@
 		return
 	. = TRUE
 	var/turf/T = get_turf(src)
-	part1?.forceMove(T)
-	part2?.forceMove(T)
-	part1?.master = null
-	part2?.master = null
-	part1 = null
-	part2 = null
+	attached_helmet?.forceMove(T)
+	attached_electropack?.forceMove(T)
+	attached_helmet?.master = null
+	attached_electropack?.master = null
+	attached_helmet = null
+	attached_electropack = null
 	visible_message(SPAN_NOTICE("[user] disassembles [src]."))
 	qdel(src)
 	return TRUE
 
 /obj/item/assembly/shock_kit/screwdriver_act(mob/user, obj/item/I)
 	status = !status
-	to_chat(user, SPAN_NOTICE("[src] is now [status ? "secured" : "unsecured"]!"))
+	if(status)
+		to_chat(user, SPAN_NOTICE("You ready and secure [src]!"))
+	else
+		to_chat(user, SPAN_NOTICE("You unsecure [src] with [I] so it can be attached!"))
 	add_fingerprint(user)
 	return TRUE
 
 /obj/item/assembly/shock_kit/activate_self(mob/user)
 	if(!user)
 		return ..()
-	if(!part1 || !part2)
-		return
-	part1.activate_self(user)
-	part2.attack_self__legacy__attackchain(user, status)
+	if(!attached_helmet || !attached_electropack)
+		return NONE
+	attached_helmet.activate_self(user)
+	attached_electropack.activate_self(user)
 	add_fingerprint(user)
+	return ITEM_INTERACT_COMPLETE
 
 /obj/item/assembly/shock_kit/proc/shock_invoke()
 	if(istype(loc, /obj/structure/chair/e_chair))