From 2163998e2f0aaa17f204637a8bdbf9e2023b044e Mon Sep 17 00:00:00 2001 From: Yoshax Date: Fri, 12 Aug 2016 03:07:16 +0100 Subject: [PATCH] Fixes #2303 --- code/__defines/machinery.dm | 1 + code/game/machinery/camera/presets.dm | 6 +++++- maps/polaris-1.dmm | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/code/__defines/machinery.dm b/code/__defines/machinery.dm index cc77b8c3c59..8c999f6d96f 100644 --- a/code/__defines/machinery.dm +++ b/code/__defines/machinery.dm @@ -48,6 +48,7 @@ var/global/defer_powernet_rebuild = 0 // True if net rebuild will be called #define NETWORK_ROBOTS "Robots" #define NETWORK_PRISON "Prison" #define NETWORK_SECURITY "Security" +#define NETWORK_INTERROGATION "Interrogation" #define NETWORK_TELECOM "Tcomsat" #define NETWORK_THUNDER "Thunderdome" #define NETWORK_COMMUNICATORS "Communicators" diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm index 136bafa90ed..bf4839e7c75 100644 --- a/code/game/machinery/camera/presets.dm +++ b/code/game/machinery/camera/presets.dm @@ -17,7 +17,8 @@ var/global/list/station_networks = list( NETWORK_RESEARCH_OUTPOST, NETWORK_ROBOTS, NETWORK_PRISON, - NETWORK_SECURITY + NETWORK_SECURITY, + NETWORK_INTERROGATION ) var/global/list/engineering_networks = list( NETWORK_ENGINE, @@ -66,6 +67,9 @@ var/global/list/engineering_networks = list( /obj/machinery/camera/network/exodus network = list(NETWORK_EXODUS) +/obj/machinery/camera/network/interrogation + network = list(NETWORK_INTERROGATION) + /obj/machinery/camera/network/mining network = list(NETWORK_MINE) diff --git a/maps/polaris-1.dmm b/maps/polaris-1.dmm index f2a55305810..f1afed62b35 100644 --- a/maps/polaris-1.dmm +++ b/maps/polaris-1.dmm @@ -1168,7 +1168,7 @@ "awx" = (/obj/machinery/conveyor{dir = 4; id = "garbage"},/obj/machinery/light/small{dir = 1},/obj/structure/plasticflaps/mining,/turf/simulated/floor,/area/maintenance/disposal) "awy" = (/obj/machinery/conveyor{dir = 2; id = "garbage"},/obj/machinery/alarm{dir = 8; pixel_x = 25; pixel_y = 0},/turf/simulated/floor,/area/maintenance/disposal) "awz" = (/obj/effect/floor_decal/industrial/loading,/obj/machinery/door/firedoor/border_only,/obj/structure/plasticflaps{opacity = 1},/obj/machinery/navbeacon{codes_txt = "delivery;dir=2"; freq = 1400; location = "Command"},/turf/simulated/floor/tiled,/area/bridge_hallway) -"awA" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/camera/network/security{c_tag = "SEC - Interrogation"},/turf/simulated/floor/tiled/dark,/area/security/interrogation) +"awA" = (/obj/machinery/atmospherics/unary/vent_pump/on,/obj/machinery/camera/network/interrogation{c_tag = "INT - Interrogation"},/turf/simulated/floor/tiled/dark,/area/security/interrogation) "awB" = (/obj/structure/bed/chair,/turf/simulated/floor/tiled/dark,/area/security/interrogation) "awC" = (/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/turf/simulated/floor/tiled/dark,/area/security/interrogation) "awD" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/corner/red{dir = 1},/turf/simulated/floor/tiled,/area/security/brig)