Skip to content

Commit

Permalink
Bugfix: Telescreen abuse (#3829)
Browse files Browse the repository at this point in the history
  • Loading branch information
SAADf603 authored Nov 14, 2023
1 parent fe938ce commit f462da5
Show file tree
Hide file tree
Showing 5 changed files with 1,136 additions and 1,176 deletions.
42 changes: 11 additions & 31 deletions _maps/map_files/Delta/delta.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -11785,10 +11785,7 @@
/area/civilian/vacantoffice)
"bxn" = (
/obj/structure/table/reinforced,
/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/research{
pixel_y = 2
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -27994,10 +27991,8 @@
/area/maintenance/fpmaint)
"cQv" = (
/obj/structure/table/reinforced,
/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/test_chamber{
pixel_y = 2
},
/turf/simulated/floor/plasteel{
dir = 8;
Expand Down Expand Up @@ -40733,12 +40728,8 @@
},
/obj/item/twohanded/required/kirbyplants,
/obj/effect/decal/warning_stripes/west,
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the singularity chamber.";
/obj/machinery/computer/security/telescreen/singularity{
dir = 8;
layer = 4;
name = "Singularity Engine Telescreen";
network = list("Singularity");
pixel_x = -32
},
/turf/simulated/floor/plasteel,
Expand Down Expand Up @@ -86137,16 +86128,12 @@
},
/area/security/warden)
"oar" = (
/obj/machinery/computer/security/telescreen{
desc = "Used to monitor interrogations.";
dir = 4;
layer = 4;
name = "Interrogation Monitor";
network = list("Interrogation");
req_access = list(63)
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/table/reinforced,
/obj/machinery/computer/security/telescreen/prison{
pixel_y = 2;
network = list("Interrogation")
},
/turf/simulated/floor/plasteel{
dir = 4;
icon_state = "red"
Expand Down Expand Up @@ -104271,10 +104258,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/table/reinforced,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/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/research{
pixel_y = 2
},
/turf/simulated/floor/plasteel{
Expand Down Expand Up @@ -118818,12 +118802,8 @@
"vsE" = (
/obj/effect/decal/warning_stripes/west,
/obj/structure/table/reinforced,
/obj/machinery/computer/security/telescreen{
desc = "Used for watching the test chamber.";
dir = 4;
layer = 4;
name = "Test Chamber Telescreen";
network = list("Toxins")
/obj/machinery/computer/security/telescreen/toxin_chamber{
pixel_y = 2
},
/turf/simulated/floor/plasteel,
/area/toxins/launch)
Expand Down
Loading

0 comments on commit f462da5

Please sign in to comment.