From 227bdc20ea836116d6cc95b256a1d929e01ea8de Mon Sep 17 00:00:00 2001 From: Henri215 <77684085+Henri215@users.noreply.github.com> Date: Sat, 15 Oct 2022 14:51:51 -0300 Subject: [PATCH] Fixes monitors having the wrong circuit board when deconstructed (#19307) * turns engine monitor into a proper item * fixed the other monitors * Update code/game/machinery/computer/camera.dm Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> * lowercase names Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> --- _maps/map_files/Delta/delta.dmm | 20 +---- _maps/map_files/MetaStation/MetaStation.dmm | 81 +++++-------------- _maps/map_files/cyberiad/cyberiad.dmm | 24 ++---- .../game/machinery/computer/buildandrepair.dm | 36 +++++++++ code/game/machinery/computer/camera.dm | 54 +++++++++++++ 5 files changed, 119 insertions(+), 96 deletions(-) diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index f51754a974b..ee51bcf8eee 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -15555,10 +15555,7 @@ }, /area/security/permabrig) "aTH" = ( -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching Prison Wing holding areas."; - name = "Prison Monitor"; - network = list("Prison"); +/obj/machinery/computer/security/telescreen/prison{ pixel_x = 30 }, /obj/machinery/atmospherics/pipe/simple/hidden, @@ -23454,10 +23451,7 @@ /obj/structure/chair/office/dark{ dir = 8 }, -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching interrogations."; - name = "Interrogation Monitor"; - network = list("Interrogation"); +/obj/machinery/computer/security/telescreen/interrogation{ pixel_y = -30 }, /obj/structure/cable{ @@ -31043,10 +31037,7 @@ /turf/simulated/floor/plasteel/dark, /area/bridge) "bAC" = ( -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching the RD's goons from the safety of his office."; - name = "Research Monitor"; - network = list("Research","Research Outpost","RD"); +/obj/machinery/computer/security/telescreen/rd{ pixel_y = 2 }, /turf/simulated/wall, @@ -69564,10 +69555,7 @@ }, /obj/structure/displaycase/labcage, /obj/effect/decal/warning_stripes/yellow, -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching the RD's goons from the safety of his office."; - name = "Research Monitor"; - network = list("Research","MiniSat","RD"); +/obj/machinery/computer/security/telescreen/rd{ pixel_y = 30 }, /turf/simulated/floor/plasteel, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 5f3e9a438f9..85e97fe0448 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -4178,10 +4178,8 @@ /obj/machinery/porta_turret{ dir = 8 }, -/obj/machinery/computer/security/telescreen{ +/obj/machinery/computer/security/telescreen/minisat{ dir = 4; - name = "MiniSat Monitor"; - network = list("MiniSat","tcomm"); pixel_x = -29 }, /turf/simulated/floor/plasteel{ @@ -10396,14 +10394,11 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/machinery/computer/security/telescreen{ - desc = "A telescreen that connects to the engine's camera network."; +/obj/machinery/computer/security/telescreen/engine{ dir = 8; layer = 4; - name = "Engine Monitor"; - network = list("engine"); pixel_x = 30 - }, + }, /turf/simulated/floor/plasteel, /area/engine/engineering) "aOk" = ( @@ -13919,10 +13914,8 @@ /obj/machinery/porta_turret{ dir = 8 }, -/obj/machinery/computer/security/telescreen{ +/obj/machinery/computer/security/telescreen/minisat{ dir = 8; - name = "MiniSat Monitor"; - network = list("MiniSat","tcomm"); pixel_x = 29 }, /turf/simulated/floor/plasteel{ @@ -15627,11 +15620,8 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching the AI Upload."; +/obj/machinery/computer/security/telescreen/upload{ dir = 4; - name = "AI Upload Monitor"; - network = list("AIUpload"); pixel_x = -29 }, /obj/machinery/turretid/stun{ @@ -15687,11 +15677,8 @@ name = "north bump"; pixel_y = 24 }, -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching areas on the MiniSat."; +/obj/machinery/computer/security/telescreen/minisat{ dir = 8; - name = "MiniSat Monitor"; - network = list("MiniSat","tcomm"); pixel_x = 29 }, /obj/effect/landmark/start/cyborg, @@ -18857,14 +18844,11 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, -/obj/machinery/computer/security/telescreen{ - desc = "A telescreen that connects to the engine's camera network."; +/obj/machinery/computer/security/telescreen/engine{ dir = 8; layer = 4; - name = "Engine Monitor"; - network = list("engine"); pixel_x = 30 - }, + }, /turf/simulated/floor/plasteel{ icon_state = "darkgrey" }, @@ -20815,10 +20799,8 @@ }, /obj/item/storage/secure/briefcase, /obj/item/clothing/mask/cigarette/cigar, -/obj/machinery/computer/security/telescreen{ +/obj/machinery/computer/security/telescreen/minisat{ dir = 1; - name = "MiniSat Monitor"; - network = list("MiniSat","tcomm"); pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -25374,10 +25356,8 @@ /obj/structure/rack, /obj/item/aicard, /obj/item/radio/off, -/obj/machinery/computer/security/telescreen{ +/obj/machinery/computer/security/telescreen/minisat{ dir = 1; - name = "MiniSat Monitor"; - network = list("MiniSat","tcomm"); pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -26362,10 +26342,8 @@ /obj/machinery/computer/station_alert{ dir = 1 }, -/obj/machinery/computer/security/telescreen{ +/obj/machinery/computer/security/telescreen/minisat{ dir = 1; - name = "MiniSat Monitor"; - network = list("MiniSat","tcomm"); pixel_y = -30 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -28856,10 +28834,8 @@ /area/medical/medbay) "bHC" = ( /obj/machinery/light, -/obj/machinery/computer/security/telescreen{ +/obj/machinery/computer/security/telescreen/minisat{ dir = 1; - name = "MiniSat Monitor"; - network = list("MiniSat","tcomm"); pixel_y = -30 }, /mob/living/simple_animal/pet/dog/fox/Renault, @@ -37343,9 +37319,7 @@ dir = 1 }, /obj/structure/table/wood, -/obj/machinery/computer/security/telescreen{ - name = "vault monitor"; - network = list("vault"); +/obj/machinery/computer/security/telescreen/vault{ pixel_y = 30 }, /obj/item/paper_bin{ @@ -38071,10 +38045,7 @@ pixel_y = 34; req_access_txt = "30" }, -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching the RD's goons from the safety of his office."; - name = "Research Monitor"; - network = list("Research","MiniSat","RD"); +/obj/machinery/computer/security/telescreen/rd{ pixel_x = 31; pixel_y = 30 }, @@ -40455,11 +40426,8 @@ pixel_x = 8; pixel_y = -36 }, -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching the turbine vent."; +/obj/machinery/computer/security/telescreen/turbine{ dir = 8; - name = "turbine vent monitor"; - network = list("Turbine"); pixel_x = 32 }, /obj/machinery/computer/turbine_computer{ @@ -59524,10 +59492,7 @@ }, /area/crew_quarters/courtroom) "ghX" = ( -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching Prison Wing holding areas."; - name = "Prison Monitor"; - network = list("Prison"); +/obj/machinery/computer/security/telescreen/prison{ pixel_y = -30 }, /turf/simulated/floor/plasteel{ @@ -62301,10 +62266,8 @@ dir = 4 }, /obj/structure/table/glass, -/obj/machinery/computer/security/telescreen{ +/obj/machinery/computer/security/telescreen/minisat{ dir = 4; - name = "MiniSat Monitor"; - network = list("MiniSat","tcomm"); pixel_y = -30 }, /obj/item/folder/blue, @@ -82080,10 +82043,7 @@ /obj/effect/landmark/lightsout, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching Prison Wing holding areas."; - name = "Prison Monitor"; - network = list("Prison"); +/obj/machinery/computer/security/telescreen/prison{ pixel_y = -30 }, /obj/structure/cable/yellow{ @@ -92752,10 +92712,7 @@ dir = 8 }, /obj/structure/table, -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching the horrors within the test chamber."; - name = "Research Monitor"; - network = list("TestChamber"); +/obj/machinery/computer/security/telescreen/research{ pixel_y = 30 }, /obj/item/radio/intercom{ diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 7f215d8bcc5..7daf7f1ef77 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -46661,10 +46661,7 @@ }, /area/medical/cmostore) "clj" = ( -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching the RD's goons from the safety of his office."; - name = "Research Monitor"; - network = list("Research","Research Outpost","RD"); +/obj/machinery/computer/security/telescreen/rd{ pixel_y = 2 }, /obj/structure/table/glass, @@ -47008,14 +47005,11 @@ /obj/structure/chair/office/dark{ dir = 4 }, -/obj/machinery/computer/security/telescreen{ - desc = "A telescreen that connects to the engine's camera network."; +/obj/machinery/computer/security/telescreen/engine{ dir = 8; layer = 4; - name = "Engine Monitor"; - network = list("engine"); pixel_y = 30 - }, + }, /turf/simulated/floor/plasteel, /area/engine/controlroom) "cmk" = ( @@ -55281,10 +55275,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching the horrors within the test chamber."; - name = "Research Monitor"; - network = list("TestChamber"); +/obj/machinery/computer/security/telescreen/research{ pixel_y = -32 }, /turf/simulated/floor/plasteel{ @@ -61454,14 +61445,11 @@ /obj/machinery/camera{ c_tag = "Engineering East" }, -/obj/machinery/computer/security/telescreen{ - desc = "A telescreen that connects to the engine's camera network."; +/obj/machinery/computer/security/telescreen/engine{ dir = 8; layer = 4; - name = "Engine Monitor"; - network = list("engine"); pixel_y = 30 - }, + }, /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel, /area/engine/hardsuitstorage) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 0928d100024..38f92f013cb 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -59,6 +59,42 @@ board_name = "Entertainment Monitor" build_path = /obj/machinery/computer/security/telescreen/entertainment +/obj/item/circuitboard/camera/engine + board_name = "Engine Camera Monitor" + build_path = /obj/machinery/computer/security/telescreen/engine + +/obj/item/circuitboard/camera/research + board_name = "Research Monitor" + build_path = /obj/machinery/computer/security/telescreen/research + +/obj/item/circuitboard/camera/rd + board_name = "Research Director Monitor" + build_path = /obj/machinery/computer/security/telescreen/rd + +/obj/item/circuitboard/camera/prison + board_name = "Prison Monitor" + build_path = /obj/machinery/computer/security/telescreen/prison + +/obj/item/circuitboard/camera/interrogation + board_name = "Interrogation Monitor" + build_path = /obj/machinery/computer/security/telescreen/interrogation + +/obj/item/circuitboard/camera/minisat + board_name = "MiniSat Monitor" + build_path = /obj/machinery/computer/security/telescreen/minisat + +/obj/item/circuitboard/camera/upload + board_name = "AI Upload Monitor" + build_path = /obj/machinery/computer/security/telescreen/upload + +/obj/item/circuitboard/camera/vault + board_name = "Vault Monitor" + build_path = /obj/machinery/computer/security/telescreen/vault + +/obj/item/circuitboard/camera/turbine + board_name = "Turbine Vent Monitor" + build_path = /obj/machinery/computer/security/telescreen/turbine + /obj/item/circuitboard/camera/wooden_tv board_name = "Wooden TV" build_path = /obj/machinery/computer/security/wooden_tv diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index b5671317ebb..bd9c9e137fb 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -261,3 +261,57 @@ light_color = "#FAC54B" network = list("Power Alarms","Atmosphere Alarms","Fire Alarms") circuit = /obj/item/circuitboard/camera/engineering + +/obj/machinery/computer/security/telescreen/engine + name = "engine monitor" + desc = "A telescreen that connects to the engine's camera network."; + network = list("engine") + circuit = /obj/item/circuitboard/camera/engine + +/obj/machinery/computer/security/telescreen/research + name = "research monitor" + desc = "Used for watching the horrors within the test chamber."; + network = list("TestChamber") + circuit = /obj/item/circuitboard/camera/research + +/obj/machinery/computer/security/telescreen/rd + name = "research director monitor" + desc = "Used for watching the RD's goons from the safety of his office."; + network = list("Research","Research Outpost","RD","MiniSat") + circuit = /obj/item/circuitboard/camera/rd + +/obj/machinery/computer/security/telescreen/prison + name = "prison monitor" + desc = "Used for watching Prison Wing holding areas."; + network = list("Prison") + circuit = /obj/item/circuitboard/camera/prison + +/obj/machinery/computer/security/telescreen/interrogation + name = "interrogation monitor" + desc = "Used for watching interrogations."; + network = list("Interrogation") + circuit = /obj/item/circuitboard/camera/interrogation + +/obj/machinery/computer/security/telescreen/minisat + name = "minisat monitor" + desc = "Used for watching areas on the MiniSat."; + network = list("MiniSat","tcomm") + circuit = /obj/item/circuitboard/camera/minisat + +/obj/machinery/computer/security/telescreen/upload + name = "ai upload monitor" + desc = "Used for watching the AI Upload."; + network = list("AIUpload") + circuit = /obj/item/circuitboard/camera/upload + +/obj/machinery/computer/security/telescreen/vault + name = "vault monitor" + desc = "Used for watching the vault."; + network = list("vault") + circuit = /obj/item/circuitboard/camera/vault + +/obj/machinery/computer/security/telescreen/turbine + name = "turbine vent monitor" + desc = "Used for watching the turbine vent."; + network = list("Turbine") + circuit = /obj/item/circuitboard/camera/turbine