Skip to content

Commit

Permalink
Give shipside medical an overwatch console (#17011)
Browse files Browse the repository at this point in the history
Co-authored-by: Elsa <[email protected]>
  • Loading branch information
novaepee and Elsa authored Feb 3, 2025
1 parent 4a4f793 commit 6fda8fe
Show file tree
Hide file tree
Showing 6 changed files with 63 additions and 10 deletions.
5 changes: 4 additions & 1 deletion _maps/map_files/Arachne/TGS_Arachne.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2533,6 +2533,9 @@
dir = 4
},
/obj/structure/cable,
/obj/structure/bed/chair/office/dark{
dir = 4
},
/turf/open/floor/mainship/sterile/side{
dir = 8
},
Expand Down Expand Up @@ -4969,10 +4972,10 @@
/turf/open/floor/wood,
/area/mainship/living/pilotbunks)
"enc" = (
/obj/structure/bed/chair/office/dark,
/obj/machinery/camera/autoname/mainship{
dir = 8
},
/obj/machinery/computer/camera_advanced/overwatch/medical,
/turf/open/floor/mainship/sterile/side{
dir = 8
},
Expand Down
13 changes: 8 additions & 5 deletions _maps/map_files/Pillar_of_Spring/TGS_Pillar_of_Spring.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -9930,7 +9930,7 @@
/turf/open/floor/mainship/stripesquare,
/area/mainship/living/grunt_rnr)
"mpw" = (
/obj/effect/spawner/random/misc/structure/flavorvending/snackweighted,
/obj/machinery/computer/crew,
/turf/open/floor/mainship/sterile/side,
/area/mainship/medical/lower_medical)
"mqD" = (
Expand All @@ -9953,7 +9953,7 @@
/turf/open/floor/engine,
/area/mainship/engineering/port_atmos)
"mqY" = (
/obj/machinery/computer/crew,
/obj/machinery/computer/camera_advanced/overwatch/medical,
/turf/open/floor/mainship/sterile/side,
/area/mainship/medical/lower_medical)
"mrK" = (
Expand Down Expand Up @@ -14201,8 +14201,7 @@
/turf/open/floor/mainship/mono,
/area/mainship/hallways/hangar)
"rDn" = (
/obj/structure/table/mainship/nometal,
/obj/machinery/recharger,
/obj/effect/spawner/random/misc/structure/flavorvending/snackweighted,
/turf/open/floor/mainship/sterile/side,
/area/mainship/medical/lower_medical)
"rEw" = (
Expand Down Expand Up @@ -17094,6 +17093,10 @@
"vjE" = (
/turf/open/floor/mainship/mono,
/area/mainship/living/commandbunks)
"vkm" = (
/obj/structure/bed/chair/office/dark,
/turf/open/floor/mainship/sterile/dark,
/area/mainship/medical/lower_medical)
"vkB" = (
/obj/structure/prop/mainship/mapping_computer,
/turf/open/floor/mainship/emerald{
Expand Down Expand Up @@ -47792,7 +47795,7 @@ sDn
uvB
euF
gqB
lAT
vkm
mqY
wcT
nkC
Expand Down
1 change: 1 addition & 0 deletions _maps/map_files/Sulaco/TGS_Sulaco.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -20202,6 +20202,7 @@
/area/sulaco/telecomms)
"oIc" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on,
/obj/machinery/computer/camera_advanced/overwatch/medical,
/turf/open/floor/prison/whitegreen/corner{
dir = 8
},
Expand Down
14 changes: 10 additions & 4 deletions _maps/map_files/Theseus/TGS_Theseus.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2530,8 +2530,8 @@
/area/mainship/squads/alpha)
"aZQ" = (
/obj/machinery/atmospherics/components/unary/vent_pump/layer1{
on = 1;
dir = 8
dir = 8;
on = 1
},
/turf/open/floor/mainship/mono,
/area/mainship/living/numbertwobunks)
Expand Down Expand Up @@ -10177,6 +10177,12 @@
dir = 1
},
/area/mainship/command/corporateliaison)
"gNF" = (
/obj/machinery/cic_maptable,
/turf/open/floor/mainship/sterile/side{
dir = 9
},
/area/mainship/medical/lower_medical)
"gNV" = (
/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden,
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer1{
Expand Down Expand Up @@ -19256,7 +19262,7 @@
},
/area/mainship/engineering/lower_engineering)
"vrv" = (
/obj/machinery/cic_maptable,
/obj/machinery/computer/camera_advanced/overwatch/medical,
/turf/open/floor/mainship/sterile/side{
dir = 1
},
Expand Down Expand Up @@ -51882,7 +51888,7 @@ bGZ
lMe
bJC
hVU
wsC
gNF
bJG
qvE
doe
Expand Down
40 changes: 40 additions & 0 deletions code/game/objects/machinery/overwatch.dm
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,13 @@ GLOBAL_LIST_EMPTY(active_cas_targets)
desc = "Big Brother Requisition demands to see money flowing into the void that is greed."
circuit = /obj/item/circuitboard/computer/supplyoverwatch

/obj/machinery/computer/camera_advanced/overwatch/medical
screen_overlay = "overwatch_med_screen"
name = "Medical Overwatch Console"
desc = "Overwatching patients are one of the responsibilities of shipside medical personnel. Just make sure you don't get bored."
req_access = list(ACCESS_MARINE_MEDBAY)
circuit = /obj/item/circuitboard/computer/supplyoverwatch

/obj/machinery/computer/camera_advanced/overwatch/som
faction = FACTION_SOM
icon_state = "som_console"
Expand Down Expand Up @@ -579,6 +586,39 @@ GLOBAL_LIST_EMPTY(active_cas_targets)
popup.open()


/obj/machinery/computer/camera_advanced/overwatch/medical/interact(mob/living/user)
. = ..()
if(.)
return

var/dat
if(!operator)
dat += "<B>Main Operator:</b> <A href='?src=[text_ref(src)];operation=change_main_operator'>----------</A><BR>"
else
dat += "<B>Main Operator:</b> <A href='?src=[text_ref(src)];operation=change_main_operator'>[operator.name]</A><BR>"
dat += " <A href='?src=[text_ref(src)];operation=logout_main'>{Stop Overwatch}</A><BR>"
dat += "----------------------<br>"
switch(state)
if(OW_MAIN)
for(var/datum/squad/S AS in watchable_squads)
dat += "<b>[S.name] Squad</b> <a href='?src=[text_ref(src)];operation=message;current_squad=[text_ref(S)]'>\[Message Squad\]</a><br>"
if(S.squad_leader)
dat += "<b>Leader:</b> <a href='?src=[text_ref(src)];operation=use_cam;cam_target=\ref[S.squad_leader]'>[S.squad_leader.name]</a> "
dat += "<a href='?src=[text_ref(src)];operation=sl_message;current_squad=[text_ref(S)]'>\[MSG\]</a><br>"
else
dat += "<b>Leader:</b> <font color=red>NONE</font><br>"
if(S.overwatch_officer)
dat += "<b>Squad Overwatch:</b> [S.overwatch_officer.name]<br>"
else
dat += "<b>Squad Overwatch:</b> <font color=red>NONE</font><br>"
dat += "<A href='?src=[text_ref(src)];operation=monitor;squad_id=[S.id]'>[S.name] Squad Monitor</a><br>"
if(OW_MONITOR)//Info screen.
dat += get_squad_info()

var/datum/browser/popup = new(user, "overwatch", "<div align='center'>Medical Overwatch Console</div>", 550, 550)
popup.set_content(dat)
popup.open()

/obj/machinery/computer/camera_advanced/overwatch/req/interact(mob/living/user)
. = ..()
if(.)
Expand Down
Binary file modified icons/obj/machines/computer.dmi
Binary file not shown.

0 comments on commit 6fda8fe

Please sign in to comment.