From 8d17e82c728f7ffb47fc6b926a64c28b95593ed3 Mon Sep 17 00:00:00 2001
From: Henri215 <77684085+Henri215@users.noreply.github.com>
Date: Wed, 15 Feb 2023 01:42:11 -0300
Subject: [PATCH] Television version of the entertainment monitor is now a
 proper item (#20224)

* Television version of the entertainment monitor is now a proper item

* unfasten for the tv

* missing line
---
 _maps/map_files/cyberiad/cyberiad.dmm         | 13 ++----------
 .../game/machinery/computer/camera_console.dm | 21 +++++++++++++++++--
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
index f78bbcc10f0..53ef1576f15 100644
--- a/_maps/map_files/cyberiad/cyberiad.dmm
+++ b/_maps/map_files/cyberiad/cyberiad.dmm
@@ -73089,11 +73089,7 @@
 	},
 /area/assembly/chargebay)
 "iPb" = (
-/obj/machinery/computer/security/telescreen/entertainment{
-	icon_screen = "detective_tv";
-	icon_state = "television";
-	name = "old TV"
-	},
+/obj/machinery/computer/security/telescreen/entertainment/television,
 /obj/effect/decal/cleanable/dirt,
 /turf/simulated/floor/carpet,
 /area/maintenance/asmaint)
@@ -79319,12 +79315,7 @@
 	},
 /area/toxins/mixing)
 "nMT" = (
-/obj/machinery/computer/security/telescreen/entertainment{
-	icon_state = "television";
-	icon_screen = "detective_tv";
-	name = "television";
-	desc = "A relic of a bygone age."
-	},
+/obj/machinery/computer/security/telescreen/entertainment/television,
 /turf/simulated/floor/wood,
 /area/maintenance/apmaint)
 "nMU" = (
diff --git a/code/game/machinery/computer/camera_console.dm b/code/game/machinery/computer/camera_console.dm
index d3b4d9d6319..9e16ae32ee5 100644
--- a/code/game/machinery/computer/camera_console.dm
+++ b/code/game/machinery/computer/camera_console.dm
@@ -220,6 +220,8 @@
 	network = list("news")
 	luminosity = 0
 	circuit = null
+	/// Icon utilised when feeds_on is true
+	var/icon_screen_on = "entertainment"
 	/// Used to detect how many video cameras are active
 	var/feeds_on = 0
 
@@ -229,9 +231,9 @@
 
 /obj/machinery/computer/security/telescreen/entertainment/update_overlays()
 	if(feeds_on)
-		icon_screen = "entertainment"
+		icon_screen = icon_screen_on
 	else
-		icon_screen = "entertainment_off"
+		icon_screen = initial(icon_screen)
 	return ..()
 
 /obj/machinery/computer/security/telescreen/entertainment/power_change()
@@ -254,6 +256,21 @@
 	. = ..()
 	new /obj/item/mounted/frame/display/entertainment_frame(drop_location())
 
+/obj/machinery/computer/security/telescreen/entertainment/television
+	name = "television"
+	desc = "A relic of a bygone age."
+	icon_state = "television"
+	icon_screen = null
+	icon_screen_on = "detective_tv"
+	density = TRUE
+
+/obj/machinery/computer/security/telescreen/entertainment/television/wrench_act(mob/living/user, obj/item/I)
+	if(default_unfasten_wrench(user, I, time = 4 SECONDS))
+		return TRUE
+
+/obj/machinery/computer/security/telescreen/entertainment/television/on_deconstruction()
+	return
+
 /obj/machinery/computer/security/wooden_tv
 	name = "security camera monitor"
 	desc = "An old TV hooked into the station's camera network."