diff --git a/aurorastation.dme b/aurorastation.dme
index 20d58527a9a..d7c309f5d53 100644
--- a/aurorastation.dme
+++ b/aurorastation.dme
@@ -1311,7 +1311,6 @@
#include "code\modules\assembly\infrared.dm"
#include "code\modules\assembly\mousetrap.dm"
#include "code\modules\assembly\proximity.dm"
-#include "code\modules\assembly\shock_kit.dm"
#include "code\modules\assembly\signaler.dm"
#include "code\modules\assembly\timer.dm"
#include "code\modules\assembly\voice.dm"
diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm
index 3d254cb59ee..a2e67bd4bb8 100644
--- a/code/game/objects/items/devices/radio/electropack.dm
+++ b/code/game/objects/items/devices/radio/electropack.dm
@@ -18,26 +18,6 @@
return
..()
-/obj/item/device/radio/electropack/attackby(obj/item/W as obj, mob/user as mob)
- ..()
- if(istype(W, /obj/item/clothing/head/helmet))
- if(!b_stat)
- to_chat(user, "[src] is not ready to be attached!")
- return
- var/obj/item/assembly/shock_kit/A = new /obj/item/assembly/shock_kit( user )
- A.icon = 'icons/obj/assemblies.dmi'
-
- user.drop_from_inventory(W,A)
- W.master = A
- A.part1 = W
-
- user.drop_from_inventory(src,A)
- master = A
- A.part2 = src
-
- user.put_in_hands(A)
- A.add_fingerprint(user)
-
/obj/item/device/radio/electropack/Topic(href, href_list)
//..()
if(usr.stat || usr.restrained())
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index 22cd9876529..d6a989096a8 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -73,9 +73,6 @@
/obj/item/tank/attackby(obj/item/W as obj, mob/user as mob)
..()
- if (istype(src.loc, /obj/item/assembly))
- icon = src.loc
-
if ((istype(W, /obj/item/device/analyzer)) && get_dist(user, src) <= 1)
var/obj/item/device/analyzer/A = W
A.analyze_gases(src, user)
diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm
index aef6ce0a692..6f69f381003 100644
--- a/code/game/objects/random/random.dm
+++ b/code/game/objects/random/random.dm
@@ -781,7 +781,6 @@
icon = 'icons/obj/items.dmi'
icon_state = "gift3"
problist = list(
- /obj/item/assembly/shock_kit = 0.1,
/obj/item/bluespace_crystal/artificial = 0.1,
/obj/item/bodybag = 0.7,
/obj/item/clothing/accessory/storage/knifeharness = 0.3,
diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
index c2d63f1f0bb..0d2f29a1210 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -12,21 +12,6 @@
obj_flags = OBJ_FLAG_ROTATABLE_ANCHORED
var/propelled = 0 // Check for fire-extinguisher-driven chairs
-/obj/structure/bed/chair/attackby(obj/item/W as obj, mob/user as mob)
- ..()
- if(!padding_material && istype(W, /obj/item/assembly/shock_kit))
- var/obj/item/assembly/shock_kit/SK = W
- if(!SK.status)
- to_chat(user, "\The [SK] is not ready to be attached!")
- return
- var/obj/structure/bed/chair/e_chair/E = new (src.loc, material.name)
- playsound(src.loc, 'sound/items/Deconstruct.ogg', 50, 1)
- E.set_dir(dir)
- E.part = SK
- user.drop_from_inventory(SK,E)
- SK.master = E
- qdel(src)
-
/obj/structure/bed/chair/do_simple_ranged_interaction(var/mob/user)
if(!buckled && user)
rotate(user)
diff --git a/code/game/objects/structures/therapy.dm b/code/game/objects/structures/therapy.dm
index 90a3220cf0b..4bf515ecebb 100644
--- a/code/game/objects/structures/therapy.dm
+++ b/code/game/objects/structures/therapy.dm
@@ -1,78 +1,3 @@
-/obj/structure/bed/chair/e_chair
- name = "electric chair"
- desc = "Looks absolutely SHOCKING!"
- icon_state = "echair0"
- var/on = 0
- var/obj/item/assembly/shock_kit/part = null
- var/last_time = 0
-
-/obj/structure/bed/chair/e_chair/update_icon()
- return
-
-/obj/structure/bed/chair/e_chair/Initialize()
- . = ..()
- add_overlay(image('icons/obj/furniture.dmi', src, "echair_over", MOB_LAYER + 1))
- if(!part)
- part = new /obj/item/assembly/shock_kit(src)
- part.master = src
- part.part1 = new /obj/item/clothing/head/helmet(part)
- part.part2 = new /obj/item/device/radio/electropack(part)
- part.part1.master = part
- part.part2.master = part
-
-/obj/structure/bed/chair/e_chair/Destroy()
- if (part)
- part.master = null
- part = null
-
- . = ..()
-
-/obj/structure/bed/chair/e_chair/attackby(obj/item/W as obj, mob/user as mob)
- if(W.iswrench())
- var/obj/structure/bed/chair/C = new /obj/structure/bed/chair(loc)
- playsound(loc, W.usesound, 50, 1)
- C.set_dir(dir)
- part.forceMove(get_turf(src))
- part.master = null
- part = null
- qdel(src)
-
-/obj/structure/bed/chair/e_chair/verb/toggle()
- set name = "Toggle Electric Chair"
- set category = "Object"
- set src in oview(1)
-
- if(usr.stat || usr.paralysis || usr.stunned || usr.weakened || usr.lying || usr.restrained() || usr.buckled_to)
- return
-
- if(on)
- on = 0
- icon_state = "echair0"
- else
- on = 1
- shock()
- icon_state = "echair1"
- to_chat(usr, "You switch [on ? "on" : "off"] [src].")
-
-/obj/structure/bed/chair/e_chair/proc/shock()
- if(!on)
- return
-
- var/obj/structure/cable/C = locate(/obj/structure/cable, get_turf(src))
- var/datum/powernet/PN = C.powernet
- flick("echair1", src)
- spark(src, 12, alldirs)
- if(istype(buckled, /mob/living) && istype(C))
- var/mob/living/M = buckled
- if(electrocute_mob(M, C, src, 1.25, BP_HEAD))
- to_chat(M, "You feel a deep shock course through your body!")
- sleep(1)
- if(electrocute_mob(M, C, src, 1.25, BP_HEAD))
- M.Stun(PN.get_electrocute_damage()*10)
- visible_message("The electric chair goes off!", "You hear an electrical discharge!")
-
- return
-
/obj/item/pocketwatch
name = "pocketwatch"
desc = "A watch that goes in your pocket."
diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm
deleted file mode 100644
index cbe84144c9d..00000000000
--- a/code/modules/assembly/shock_kit.dm
+++ /dev/null
@@ -1,44 +0,0 @@
-/obj/item/assembly/shock_kit
- name = "electrohelmet assembly"
- desc = "This appears to be made from both an electropack and a helmet."
- icon_state = "shock_kit"
- var/obj/item/clothing/head/helmet/part1 = null
- var/obj/item/device/radio/electropack/part2 = null
- var/status = FALSE
- w_class = ITEMSIZE_HUGE
- flags = CONDUCT
-
-/obj/item/assembly/shock_kit/Destroy()
- qdel(part1)
- qdel(part2)
- return ..()
-
-/obj/item/assembly/shock_kit/attackby(obj/item/W, mob/user)
- if(W.iswrench() && !status)
- var/turf/T = loc
- if(ismob(T))
- T = T.loc
- part1.forceMove(T)
- part2.forceMove(T)
- part1.master = null
- part2.master = null
- part1 = null
- part2 = null
- qdel(src)
- return
- if(W.isscrewdriver())
- status = !status
- var/msg = "[src] is now [status ? "secured" : "unsecured"]!"
- to_chat(user, SPAN_NOTICE(msg))
- add_fingerprint(user)
- return
-
-/obj/item/assembly/shock_kit/attack_self(mob/user)
- part1.attack_self(user, status)
- part2.attack_self(user, status)
- add_fingerprint(user)
-
-/obj/item/assembly/shock_kit/receive_signal()
- if(istype(loc, /obj/structure/bed/chair/e_chair))
- var/obj/structure/bed/chair/e_chair/C = loc
- C.shock()
\ No newline at end of file
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index da66a124cce..f91f1360531 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -239,7 +239,7 @@ default behaviour is:
return
-//sort of a legacy burn method for /electrocute, /shock, and the e_chair
+//sort of a legacy burn method for /electrocute, /shock
/mob/living/proc/burn_skin(burn_amount)
if(istype(src, /mob/living/carbon/human))
if(mShock in src.mutations) //shockproof
diff --git a/html/changelogs/Doxxmedearly - echair_removal.yml b/html/changelogs/Doxxmedearly - echair_removal.yml
new file mode 100644
index 00000000000..3b302c6eb97
--- /dev/null
+++ b/html/changelogs/Doxxmedearly - echair_removal.yml
@@ -0,0 +1,6 @@
+author: Doxxmedearly
+
+delete-after: True
+
+changes:
+ - rscdel: "Removed the electric chair and electrohelmet assembly."
diff --git a/icons/obj/assemblies.dmi b/icons/obj/assemblies.dmi
index 42968a16a22..a2dcfed7963 100644
Binary files a/icons/obj/assemblies.dmi and b/icons/obj/assemblies.dmi differ
diff --git a/maps/templates/sol.dmm b/maps/templates/sol.dmm
index 92d800c6140..3583000d6f1 100644
--- a/maps/templates/sol.dmm
+++ b/maps/templates/sol.dmm
@@ -290,7 +290,6 @@
/turf/simulated/floor/tiled/dark,
/area/derelict/ship)
"aS" = (
-/obj/structure/bed/chair/e_chair,
/turf/simulated/floor/tiled/dark,
/area/derelict/ship)
"aT" = (