Electric Chair Removal (#11896)

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, "<span class='notice'>[src] is not ready to be attached!</span>")
-			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())

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)

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,

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, "<span class='notice'>\The [SK] is not ready to be attached!</span>")
-			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)

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, "<span class='notice'>You switch [on ? "on" : "off"] [src].</span>")
-
-/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, "<span class='danger'>You feel a deep shock course through your body!</span>")
-			sleep(1)
-			if(electrocute_mob(M, C, src, 1.25, BP_HEAD))
-				M.Stun(PN.get_electrocute_damage()*10)
-	visible_message("<span class='danger'>The electric chair goes off!</span>", "<span class='danger'>You hear an electrical discharge!</span>")
-
-	return
-
 /obj/item/pocketwatch
 	name = "pocketwatch"
 	desc = "A watch that goes in your pocket."