Skip to content

Commit

Permalink
Brig Detainment Cameras now have their own Console (#6762)
Browse files Browse the repository at this point in the history
# About the pull request

All cameras in the "detainment" area of the Brig now get their own
console
Also adds cameras to each of the Perma Brig cells, one each
respectively.

# Explain why it's good for the game

Generally a good QOL Update so that MPs dont have to type in or scroll
*every single time* they want to check in on inmates, now they have a
dedicated console for it.


# Testing Photographs and Procedure
<details>
<summary>Screenshots & Videos</summary>


![image](https://github.com/user-attachments/assets/3ca5b68a-10d3-4c67-ba54-9212231fcc17)

![image](https://github.com/user-attachments/assets/13a1eaa6-4a8e-4464-bcaa-f2d0a50817cb)


</details>


# Changelog

:cl:
add: All Brig Detainment Cameras are now linked to a new Brig Camera
Console Computer, available in the Brig Lobby, Warden's Office, CIC, and
CMP Office.
maptweak: Removed one of the Security Records Consoles in the Brig Lobby
in place for a Brig Camera Console.
mapadd: Both Brig Perma Cells now have brig cameras in them.
/:cl:
  • Loading branch information
efzapa committed Jul 29, 2024
1 parent 66375e9 commit ab65c71
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 19 deletions.
1 change: 1 addition & 0 deletions code/__DEFINES/camera.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#define CAMERA_NET_CONTAINMENT "Containment"
#define CAMERA_NET_CONTAINMENT_HIDDEN "Containment Hidden"
#define CAMERA_NET_RESEARCH "Research"
#define CAMERA_NET_BRIG "Brig"
#define CAMERA_NET_ALAMO "Alamo"
#define CAMERA_NET_NORMANDY "Normandy"
#define CAMERA_NET_COLONY "Colony"
Expand Down
4 changes: 4 additions & 0 deletions code/game/machinery/camera/presets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@
name = "ares core camera"
network = list(CAMERA_NET_ARES)

/obj/structure/machinery/camera/autoname/almayer/brig
name = "brig camera"
network = list(CAMERA_NET_BRIG)

//used by the landing camera dropship equipment. Do not place them right under where the dropship lands.
//Should place them near each corner of your LZs.
/obj/structure/machinery/camera/autoname/lz_camera
Expand Down
4 changes: 4 additions & 0 deletions code/game/machinery/computer/camera_console.dm
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,10 @@
/obj/structure/machinery/computer/cameras/almayer_network/vehicle
network = list(CAMERA_NET_ALMAYER, CAMERA_NET_VEHICLE)

/obj/structure/machinery/computer/cameras/almayer_brig
name = "Brig Cameras Console"
network = list(CAMERA_NET_BRIG)

/obj/structure/machinery/computer/cameras/mortar
name = "Mortar Camera Interface"
alpha = 0
Expand Down
63 changes: 44 additions & 19 deletions maps/map_files/USS_Almayer/USS_Almayer.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3320,6 +3320,14 @@
/obj/structure/surface/table/reinforced/almayer_B,
/obj/structure/machinery/faxmachine/uscm/command,
/obj/item/device/megaphone,
/obj/structure/machinery/computer/cameras/almayer_brig{
dir = 8;
desc = "Used to access the various cameras in the security brig.";
name = "brig cameras console";
pixel_y = 12;
pixel_x = 17;
layer = 2.99
},
/turf/open/floor/almayer/plate,
/area/almayer/command/cic)
"awQ" = (
Expand Down Expand Up @@ -19918,7 +19926,14 @@
"ekZ" = (
/obj/structure/surface/table/almayer,
/obj/structure/machinery/computer/secure_data{
dir = 4
dir = 4;
pixel_y = 10
},
/obj/structure/machinery/computer/cameras/almayer_brig{
dir = 4;
desc = "Used to access the various cameras in the security brig.";
name = "brig cameras console";
pixel_y = -11
},
/turf/open/floor/almayer/red/west,
/area/almayer/shipboard/brig/warden_office)
Expand Down Expand Up @@ -31590,7 +31605,16 @@
"jhI" = (
/obj/structure/surface/table/almayer,
/obj/structure/machinery/computer/secure_data{
dir = 4
dir = 4;
pixel_y = 19;
layer = 2.99
},
/obj/structure/machinery/computer/cameras/almayer_brig{
dir = 4;
desc = "Used to access the various cameras in the security brig.";
name = "brig cameras console";
pixel_y = 5;
layer = 2.99
},
/turf/open/floor/almayer,
/area/almayer/shipboard/brig/chief_mp_office)
Expand Down Expand Up @@ -33768,7 +33792,7 @@
/obj/structure/pipes/standard/simple/hidden/supply{
dir = 4
},
/obj/structure/machinery/camera/autoname/almayer,
/obj/structure/machinery/camera/autoname/almayer/brig,
/turf/open/floor/almayer,
/area/almayer/shipboard/brig/cells)
"kcg" = (
Expand Down Expand Up @@ -34442,6 +34466,7 @@
id = "Perma 1";
pixel_y = 24
},
/obj/structure/machinery/camera/autoname/almayer/brig,
/turf/open/floor/almayer/plate,
/area/almayer/shipboard/brig/perma)
"krA" = (
Expand Down Expand Up @@ -34630,7 +34655,8 @@
"kvL" = (
/obj/structure/surface/table/almayer,
/obj/structure/machinery/computer/cameras/almayer_network{
dir = 4
dir = 4;
pixel_y = 0
},
/turf/open/floor/almayer/red/west,
/area/almayer/shipboard/brig/warden_office)
Expand Down Expand Up @@ -61350,9 +61376,8 @@
/turf/open/floor/plating/plating_catwalk,
/area/almayer/maint/hull/lower/stern)
"vsz" = (
/obj/structure/machinery/camera/autoname/almayer{
dir = 8;
name = "ship-grade camera"
/obj/structure/machinery/camera/autoname/almayer/brig{
dir = 8
},
/turf/open/floor/almayer,
/area/almayer/shipboard/brig/cells)
Expand Down Expand Up @@ -61882,10 +61907,8 @@
/turf/open/floor/almayer/silver,
/area/almayer/shipboard/brig/cic_hallway)
"vCy" = (
/obj/structure/machinery/camera/autoname/almayer{
dir = 4;
name = "ship-grade camera";
pixel_y = 6
/obj/structure/machinery/camera/autoname/almayer/brig{
dir = 4
},
/turf/open/floor/almayer/green/west,
/area/almayer/shipboard/brig/cells)
Expand Down Expand Up @@ -63920,6 +63943,7 @@
id = "Perma 2";
pixel_y = 24
},
/obj/structure/machinery/camera/autoname/almayer/brig,
/turf/open/floor/almayer/plate,
/area/almayer/shipboard/brig/perma)
"wnL" = (
Expand Down Expand Up @@ -64322,7 +64346,8 @@
"wvE" = (
/obj/structure/surface/table/almayer,
/obj/structure/machinery/computer/cameras/almayer_network{
dir = 4
dir = 4;
pixel_y = 1
},
/obj/structure/machinery/light{
dir = 1
Expand Down Expand Up @@ -66191,9 +66216,6 @@
dir = 1
},
/obj/structure/surface/table/almayer,
/obj/structure/machinery/computer/secure_data{
dir = 4
},
/obj/structure/sign/safety/terminal{
pixel_x = 3;
pixel_y = 27
Expand All @@ -66202,6 +66224,11 @@
pixel_x = 15;
pixel_y = 27
},
/obj/structure/machinery/computer/cameras/almayer_brig{
dir = 4;
desc = "Used to access the various cameras in the security brig.";
name = "brig cameras console"
},
/turf/open/floor/almayer/red/west,
/area/almayer/shipboard/brig/processing)
"xjK" = (
Expand Down Expand Up @@ -68586,10 +68613,8 @@
/turf/open/floor/almayer/cargo,
/area/almayer/engineering/lower/engine_core)
"yhg" = (
/obj/structure/machinery/camera/autoname/almayer{
dir = 4;
name = "ship-grade camera";
pixel_y = 6
/obj/structure/machinery/camera/autoname/almayer/brig{
dir = 4
},
/turf/open/floor/plating/plating_catwalk,
/area/almayer/shipboard/brig/cells)
Expand Down

0 comments on commit ab65c71

Please sign in to comment.