From 79e1bcf6514157594a5fa12eb1d1b5555d6f5513 Mon Sep 17 00:00:00 2001 From: SerynEngi Date: Fri, 13 Dec 2024 18:50:26 -0800 Subject: [PATCH] Alright Telescreen variables theoretically fixed --- _maps/map_files/Atlas/atlas.dmm | 17 +++++++++-------- _maps/map_files/Tycoon/Tycoon2.dmm | 14 +++++++++++--- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/_maps/map_files/Atlas/atlas.dmm b/_maps/map_files/Atlas/atlas.dmm index 0067bff29ea..403be80c7ee 100644 --- a/_maps/map_files/Atlas/atlas.dmm +++ b/_maps/map_files/Atlas/atlas.dmm @@ -674,10 +674,6 @@ /obj/item/stack/tile/plasteel{ amount = 50 }, -/obj/machinery/camera{ - network = list("ss13","eng"); - name = "Deck 2 DC" - }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/primary) "cl" = ( @@ -5879,7 +5875,6 @@ }, /area/maintenance/nsv/deck2/starboard) "rU" = ( -/obj/machinery/camera/autoname, /obj/structure/closet/firecloset, /obj/item/clothing/suit/fire/firefighter, /obj/item/clothing/suit/fire/firefighter, @@ -5895,6 +5890,10 @@ /obj/item/extinguisher, /obj/machinery/airalarm/directional/north, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/camera{ + network = list("ss13","eng"); + name = "Deck 2 DC" + }, /turf/open/floor/monotile/steel, /area/hallway/nsv/deck2/primary) "rV" = ( @@ -6765,11 +6764,13 @@ }, /obj/effect/turf_decal/tile/yellow, /obj/machinery/firealarm/directional/east, -/obj/machinery/computer/camera_advanced{ - network = list("eng"); +/obj/machinery/computer/security/telescreen{ + desc = "Used for watching critical engineering areas"; name = "Engineering Critical Monitoring"; - dir = 8 + network = list("eng"); + pixel_y = 2 }, +/obj/structure/table, /turf/open/floor/monotile/steel, /area/nsv/engine/dcc) "ux" = ( diff --git a/_maps/map_files/Tycoon/Tycoon2.dmm b/_maps/map_files/Tycoon/Tycoon2.dmm index 3868488dc6c..fbc11be05f9 100644 --- a/_maps/map_files/Tycoon/Tycoon2.dmm +++ b/_maps/map_files/Tycoon/Tycoon2.dmm @@ -12882,6 +12882,12 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/machinery/computer/security/telescreen{ + desc = "Used for watching critical engineering areas"; + name = "Engineering Critical Monitoring"; + network = list("eng"); + pixel_y = 2 + }, /turf/open/floor/monotile/steel, /area/nsv/engine/dcc) "aLl" = ( @@ -42535,11 +42541,13 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/computer/camera_advanced{ - network = list("eng"); +/obj/machinery/computer/security/telescreen{ + desc = "Used for watching critical engineering areas"; name = "Engineering Critical Monitoring"; - dir = 4 + network = list("eng"); + pixel_y = 2 }, +/obj/structure/table/reinforced, /turf/open/floor/monotile/steel, /area/nsv/engine/dcc) "ixq" = (