From 4ccbc2406b64906b7e3cf0b750c28d9b38da7964 Mon Sep 17 00:00:00 2001
From: Drathek <76988376+Drulikar@users.noreply.github.com>
Date: Tue, 30 Jul 2024 13:31:08 -0700
Subject: [PATCH] Remove electric chair (#6817)

# About the pull request

I was made aware this exists; it should not.

# Explain why it's good for the game

Admin only; and I don't want any admins using this.

# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>

Put screenshots and videos here with an empty line between the
screenshots and the `<details>` tags.

</details>


# Changelog

No player facing changes.
---
 code/game/objects/structures/electricchair.dm | 47 -------------------
 colonialmarines.dme                           |  1 -
 2 files changed, 48 deletions(-)
 delete mode 100644 code/game/objects/structures/electricchair.dm

diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm
deleted file mode 100644
index 239df3c05973..000000000000
--- a/code/game/objects/structures/electricchair.dm
+++ /dev/null
@@ -1,47 +0,0 @@
-/obj/structure/bed/chair/e_chair
-	name = "electric chair"
-	desc = "Looks absolutely SHOCKING!"
-	icon_state = "echair1"
-	var/last_time = 1
-
-/obj/structure/bed/chair/e_chair/New()
-	..()
-	overlays += image('icons/obj/objects.dmi', src, "echair_over", MOB_LAYER + 1, dir)
-
-
-/obj/structure/bed/chair/e_chair/rotate()
-	..()
-	overlays.Cut()
-	overlays += image('icons/obj/objects.dmi', src, "echair_over", MOB_LAYER + 1, dir) //there's probably a better way of handling this, but eh. -Pete
-	return
-
-/obj/structure/bed/chair/e_chair/proc/shock()
-	if(last_time + 50 > world.time)
-		return
-	last_time = world.time
-
-	// special power handling
-	var/area/A = get_area(src)
-	if(!isarea(A))
-		return
-	if(!A.powered(POWER_CHANNEL_EQUIP))
-		return
-	A.use_power(5000)
-	var/light = A.power_light
-	A.updateicon()
-
-	flick("echair1", src)
-	var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
-	s.set_up(12, 1, src)
-	s.start()
-	if(buckled_mob)
-		buckled_mob.burn_skin(85)
-		to_chat(buckled_mob, SPAN_DANGER("You feel a deep shock course through your body!"))
-		sleep(1)
-		buckled_mob.burn_skin(85)
-		buckled_mob.apply_effect(600, STUN)
-	visible_message(SPAN_DANGER("The electric chair went off!"), SPAN_DANGER("You hear a deep sharp shock!"))
-
-	A.power_light = light
-	A.updateicon()
-	return
diff --git a/colonialmarines.dme b/colonialmarines.dme
index e1fb24e505ad..6c234b764d0b 100644
--- a/colonialmarines.dme
+++ b/colonialmarines.dme
@@ -1282,7 +1282,6 @@
 #include "code\game\objects\structures\curtains.dm"
 #include "code\game\objects\structures\desertdam.dm"
 #include "code\game\objects\structures\displaycase.dm"
-#include "code\game\objects\structures\electricchair.dm"
 #include "code\game\objects\structures\extinguisher.dm"
 #include "code\game\objects\structures\fence.dm"
 #include "code\game\objects\structures\flora.dm"