diff --git a/html/changelogs/bridge_tweaks.yml b/html/changelogs/bridge_tweaks.yml
new file mode 100644
index 00000000000..b0c867f6711
--- /dev/null
+++ b/html/changelogs/bridge_tweaks.yml
@@ -0,0 +1,6 @@
+author: SleepyGemmy
+
+delete-after: True
+
+changes:
+ - maptweak: "Makes the bridge radiation shielded and adds safety shutters to the windows."
\ No newline at end of file
diff --git a/maps/_common/areas/station/command.dm b/maps/_common/areas/station/command.dm
index 434ca2419c3..58d4ce33c11 100644
--- a/maps/_common/areas/station/command.dm
+++ b/maps/_common/areas/station/command.dm
@@ -46,6 +46,10 @@
name = "Command - Station Authentication Terminal Safe"
icon_state = "bridge"
+/area/bridge/controlroom // Horizon.
+ name = "Command - Control Room"
+ flags = RAD_SHIELDED
+
/area/crew_quarters/captain
name = "Command - Captain's Office"
icon_state = "captain"
diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
index b7a418f0a68..f49f57133ce 100644
--- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
+++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
@@ -116,7 +116,7 @@
dir = 10
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"am" = (
/obj/structure/table/reinforced,
/obj/machinery/photocopier/faxmachine{
@@ -128,7 +128,7 @@
dir = 5
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"an" = (
/obj/effect/floor_decal/corner/blue{
dir = 5
@@ -140,7 +140,7 @@
/obj/item/stack/medical/ointment,
/obj/item/storage/firstaid,
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"ao" = (
/obj/effect/floor_decal/spline/fancy/wood,
/obj/effect/floor_decal/spline/fancy/wood{
@@ -328,7 +328,7 @@
dir = 1
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"aH" = (
/obj/machinery/door/firedoor,
/obj/effect/map_effect/door_helper/unres,
@@ -386,7 +386,7 @@
dir = 8
},
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"aM" = (
/obj/effect/floor_decal/corner_wide/paleblue/full,
/obj/machinery/photocopier,
@@ -553,7 +553,7 @@
pixel_y = 4
},
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"bb" = (
/obj/machinery/door/airlock/external{
frequency = 1337;
@@ -997,7 +997,7 @@
/obj/effect/floor_decal/corner/blue/full,
/obj/item/device/taperecorder,
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"bP" = (
/obj/structure/table/rack,
/obj/effect/floor_decal/corner/blue/diagonal,
@@ -1048,7 +1048,7 @@
},
/obj/machinery/papershredder,
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"bU" = (
/obj/effect/floor_decal/industrial/warning/corner{
dir = 1
@@ -1680,7 +1680,7 @@
dir = 8
},
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"dj" = (
/obj/effect/floor_decal/corner/green/diagonal{
dir = 8
@@ -2494,7 +2494,7 @@
dir = 4
},
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"ex" = (
/obj/effect/floor_decal/corner/green/full,
/obj/machinery/alarm{
@@ -2634,7 +2634,7 @@
icon_state = "1-8"
},
/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
-/area/bridge)
+/area/bridge/controlroom)
"eM" = (
/obj/effect/floor_decal/spline/fancy/wood{
dir = 4
@@ -3168,7 +3168,7 @@
dir = 1
},
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"fX" = (
/obj/machinery/telecomms/bus/preset_two,
/turf/simulated/floor/bluegrid,
@@ -3221,7 +3221,7 @@
pixel_x = -25
},
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"gc" = (
/obj/effect/floor_decal/corner/green{
dir = 10
@@ -3481,7 +3481,7 @@
/obj/structure/table/reinforced,
/obj/effect/floor_decal/corner/blue/full,
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"gB" = (
/obj/effect/floor_decal/corner/blue{
dir = 9
@@ -3571,7 +3571,7 @@
},
/obj/machinery/disposal/small/east,
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"gM" = (
/obj/structure/closet/secure_closet/personal,
/obj/effect/floor_decal/corner/green/diagonal,
@@ -3693,7 +3693,7 @@
dir = 4
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"gW" = (
/obj/structure/window/shuttle/scc_space_ship,
/obj/structure/grille,
@@ -3921,7 +3921,7 @@
icon_state = "1-4"
},
/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
-/area/bridge)
+/area/bridge/controlroom)
"hv" = (
/obj/machinery/door/airlock/engineering{
name = "Deck 3 Civilian Substation";
@@ -4044,7 +4044,7 @@
},
/obj/effect/floor_decal/corner/blue/full,
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"hF" = (
/obj/effect/floor_decal/corner/green{
dir = 4
@@ -4589,7 +4589,7 @@
dir = 1
},
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"iB" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -4618,7 +4618,7 @@
pixel_y = 4
},
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"iD" = (
/obj/effect/floor_decal/spline/plain{
dir = 10
@@ -4688,7 +4688,7 @@
dir = 4
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"iJ" = (
/obj/effect/floor_decal/corner/paleblue{
dir = 10
@@ -4807,6 +4807,14 @@
dir = 9
},
/obj/structure/disposalpipe/segment,
+/obj/machinery/power/apc{
+ dir = 8;
+ name = "north bump";
+ pixel_x = -24
+ },
+/obj/structure/cable/green{
+ icon_state = "0-4"
+ },
/turf/simulated/floor/tiled,
/area/bridge)
"iT" = (
@@ -4854,7 +4862,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"iW" = (
/obj/effect/floor_decal/spline/fancy/wood/full,
/obj/structure/flora/ausbushes/ppflowers,
@@ -4941,7 +4949,7 @@
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"jg" = (
/obj/effect/floor_decal/corner/green/full{
dir = 4
@@ -5212,7 +5220,7 @@
dir = 4
},
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"jE" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -6141,7 +6149,7 @@
},
/obj/item/paper_scanner,
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"lq" = (
/obj/machinery/papershredder,
/obj/effect/floor_decal/corner/blue/full{
@@ -6482,7 +6490,7 @@
id = "bridge blast";
name = "Bridge Lockdown";
pixel_x = -5;
- pixel_y = -24;
+ pixel_y = -23;
req_access = list(19)
},
/obj/machinery/button/remote/blast_door{
@@ -6492,8 +6500,14 @@
pixel_y = -33;
req_access = list(60)
},
+/obj/machinery/button/remote/blast_door{
+ id = "shutters_deck3_bridgesafety";
+ name = "Bridge Safety Shutters";
+ pixel_y = -23;
+ pixel_x = 6
+ },
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"lX" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -6717,7 +6731,7 @@
},
/obj/machinery/photocopier,
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"mw" = (
/obj/machinery/door/window/eastright{
name = "Shower"
@@ -7233,9 +7247,6 @@
/obj/effect/floor_decal/corner/yellow{
dir = 10
},
-/obj/structure/cable/green{
- icon_state = "1-4"
- },
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
},
@@ -7246,6 +7257,12 @@
dir = 1;
icon_state = "pipe-c"
},
+/obj/structure/cable/green{
+ icon_state = "1-8"
+ },
+/obj/structure/cable/green{
+ icon_state = "1-4"
+ },
/turf/simulated/floor/tiled,
/area/bridge)
"nt" = (
@@ -7601,7 +7618,7 @@
dir = 1
},
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"oe" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -7682,7 +7699,7 @@
pixel_y = -18
},
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"ol" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -7696,7 +7713,7 @@
req_one_access = list(19, 38)
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"om" = (
/obj/effect/floor_decal/corner/blue{
dir = 5
@@ -7970,7 +7987,7 @@
/turf/simulated/floor/tiled/ramp/bottom{
dir = 1
},
-/area/bridge)
+/area/bridge/controlroom)
"oM" = (
/obj/structure/closet/secure_closet/guncabinet{
name = "Weaponry (Rifle)"
@@ -7997,7 +8014,7 @@
dir = 9
},
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"oP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/black{
dir = 4
@@ -8552,7 +8569,7 @@
/obj/machinery/light,
/obj/machinery/firealarm/south,
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"pT" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -8618,7 +8635,7 @@
dir = 8
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"pY" = (
/obj/machinery/bodyscanner{
dir = 8
@@ -8637,8 +8654,13 @@
/area/horizon/hallway/deck_three/primary/starboard/docks)
"qa" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/machinery/door/blast/shutters/open{
+ dir = 2;
+ name = "Safety Shutter";
+ id = "shutters_deck3_bridgesafety"
+ },
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"qb" = (
/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
/area/engineering/break_room)
@@ -8938,7 +8960,7 @@
dir = 10
},
/turf/simulated/floor/reinforced,
-/area/bridge)
+/area/bridge/controlroom)
"qH" = (
/obj/effect/floor_decal/spline/plain{
dir = 6
@@ -9390,7 +9412,7 @@
/turf/simulated/floor/tiled/ramp/bottom{
dir = 4
},
-/area/bridge)
+/area/bridge/controlroom)
"rD" = (
/obj/effect/floor_decal/corner/paleblue{
dir = 5
@@ -9526,7 +9548,7 @@
dir = 1
},
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"rO" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
@@ -10519,7 +10541,7 @@
dir = 4
},
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"tC" = (
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1337;
@@ -10553,7 +10575,7 @@
req_one_access = list(19, 38)
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"tF" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -10589,7 +10611,7 @@
icon_state = "0-4"
},
/turf/simulated/floor,
-/area/bridge)
+/area/bridge/controlroom)
"tJ" = (
/obj/effect/floor_decal/corner/paleblue{
dir = 6
@@ -10677,13 +10699,13 @@
dir = 1
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"tQ" = (
/obj/structure/cable/green{
icon_state = "2-4"
},
/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
-/area/bridge)
+/area/bridge/controlroom)
"tR" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
@@ -10726,7 +10748,7 @@
},
/obj/machinery/light/small,
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"tV" = (
/obj/item/reagent_containers/toothpaste{
pixel_x = -3
@@ -10926,7 +10948,7 @@
pixel_x = -28
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"un" = (
/obj/effect/floor_decal/corner/green{
dir = 6
@@ -10958,7 +10980,7 @@
network = list("Command","Capt_Office")
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"ur" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 5
@@ -11313,7 +11335,7 @@
opacity = 0
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"uZ" = (
/obj/machinery/photocopier,
/obj/machinery/power/apc{
@@ -11337,7 +11359,7 @@
pixel_y = 32
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"vb" = (
/obj/effect/floor_decal/corner/blue/full{
dir = 1
@@ -11385,7 +11407,7 @@
dir = 4
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"vh" = (
/obj/machinery/door/firedoor,
/obj/effect/map_effect/wingrille_spawn/reinforced/polarized{
@@ -11538,7 +11560,7 @@
dir = 1
},
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"vx" = (
/turf/simulated/wall/r_wall,
/area/crew_quarters/heads/hop/xo)
@@ -11892,7 +11914,7 @@
dir = 10
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"wf" = (
/obj/effect/floor_decal/corner/blue/diagonal,
/obj/machinery/atmospherics/pipe/manifold/hidden/cyan,
@@ -11925,7 +11947,7 @@
/obj/item/device/flashlight,
/obj/item/device/flashlight,
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"wj" = (
/obj/machinery/light{
dir = 1
@@ -11964,7 +11986,7 @@
dir = 6
},
/turf/simulated/floor/reinforced,
-/area/bridge)
+/area/bridge/controlroom)
"wn" = (
/obj/machinery/light,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -12350,7 +12372,7 @@
/turf/simulated/floor/tiled/ramp/bottom{
dir = 4
},
-/area/bridge)
+/area/bridge/controlroom)
"wZ" = (
/obj/effect/floor_decal/corner/grey/diagonal{
dir = 8
@@ -12576,7 +12598,7 @@
dir = 4
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"xv" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -13038,7 +13060,7 @@
dir = 5
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"yn" = (
/obj/effect/floor_decal/corner/blue{
dir = 6
@@ -13057,7 +13079,7 @@
icon_state = "2-8"
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"yo" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -13181,7 +13203,7 @@
dir = 1
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"yB" = (
/obj/machinery/button/remote/airlock{
dir = 4;
@@ -13294,7 +13316,7 @@
dir = 10
},
/turf/simulated/floor/reinforced,
-/area/bridge)
+/area/bridge/controlroom)
"yM" = (
/obj/structure/lattice/catwalk,
/turf/simulated/open/airless,
@@ -13505,7 +13527,7 @@
dir = 1
},
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"zi" = (
/obj/effect/floor_decal/corner/red/diagonal,
/obj/structure/cable/green{
@@ -13689,7 +13711,7 @@
pixel_x = 8
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"zy" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing/mapped,
@@ -13954,7 +13976,7 @@
dir = 4
},
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"zY" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/glass_command{
@@ -14159,7 +14181,7 @@
"As" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/ramp/bottom,
-/area/bridge)
+/area/bridge/controlroom)
"At" = (
/obj/structure/table/reinforced/wood,
/obj/item/storage/slide_projector,
@@ -14325,7 +14347,7 @@
dir = 4
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"AK" = (
/obj/effect/map_effect/wingrille_spawn/reinforced/polarized{
id = "Interro"
@@ -14382,7 +14404,7 @@
"AQ" = (
/obj/structure/bed/stool/chair/office/bridge,
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"AR" = (
/obj/effect/floor_decal/corner/paleblue/full{
dir = 1
@@ -14621,7 +14643,7 @@
dir = 5
},
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"Bo" = (
/obj/effect/floor_decal/corner_wide/blue{
dir = 5
@@ -14923,7 +14945,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"BU" = (
/obj/effect/floor_decal/spline/fancy/wood{
dir = 1
@@ -15166,7 +15188,7 @@
dir = 1
},
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"Ct" = (
/obj/machinery/atmospherics/binary/pump/on{
dir = 8;
@@ -15197,7 +15219,7 @@
/turf/simulated/floor/tiled/ramp/bottom{
dir = 8
},
-/area/bridge)
+/area/bridge/controlroom)
"Cx" = (
/obj/effect/floor_decal/corner/paleblue{
dir = 5
@@ -15335,7 +15357,7 @@
/area/crew_armory)
"CK" = (
/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
-/area/bridge)
+/area/bridge/controlroom)
"CL" = (
/obj/structure/cable/green{
icon_state = "1-2"
@@ -15782,7 +15804,7 @@
dir = 1
},
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"DF" = (
/obj/effect/floor_decal/corner/blue{
dir = 4
@@ -15792,7 +15814,7 @@
dir = 5
},
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"DG" = (
/obj/structure/bed/stool/chair/office/bridge,
/obj/effect/floor_decal/corner/blue{
@@ -16697,7 +16719,7 @@
dir = 10
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"Fo" = (
/turf/simulated/wall,
/area/security/investigations)
@@ -16981,7 +17003,7 @@
dir = 4
},
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"FR" = (
/obj/structure/cable/green{
icon_state = "1-8"
@@ -17120,7 +17142,7 @@
dir = 6
},
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"Gg" = (
/obj/effect/floor_decal/industrial/outline/grey,
/obj/structure/closet{
@@ -17242,7 +17264,7 @@
},
/obj/item/device/multitool,
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"Gr" = (
/turf/simulated/wall,
/area/hallway/secondary/entry/emergency)
@@ -17529,7 +17551,7 @@
dir = 1
},
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"GS" = (
/obj/effect/floor_decal/corner_wide/blue{
dir = 6
@@ -17590,7 +17612,7 @@
dir = 1
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"GX" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -17648,7 +17670,7 @@
dir = 1
},
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"Hc" = (
/obj/effect/floor_decal/corner/green/full{
dir = 4
@@ -17700,7 +17722,7 @@
/turf/simulated/floor/tiled/ramp/bottom{
dir = 1
},
-/area/bridge)
+/area/bridge/controlroom)
"Hh" = (
/obj/machinery/door/firedoor,
/obj/structure/cable/green{
@@ -17799,7 +17821,7 @@
req_one_access = list(19, 38)
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"Hq" = (
/obj/structure/table/wood,
/obj/effect/floor_decal/corner/paleblue{
@@ -17952,7 +17974,7 @@
dir = 1
},
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"HD" = (
/obj/structure/disposalpipe/segment,
/obj/effect/map_effect/wingrille_spawn/reinforced/firedoor,
@@ -17986,7 +18008,7 @@
dir = 1
},
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"HH" = (
/obj/structure/railing/mapped,
/obj/structure/railing/mapped{
@@ -18172,7 +18194,7 @@
},
/obj/structure/flora/pottedplant/random,
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"HX" = (
/obj/machinery/firealarm/north,
/obj/machinery/camera/network/medbay{
@@ -18246,7 +18268,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"Ie" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -19401,7 +19423,7 @@
/obj/effect/floor_decal/corner/paleblue,
/obj/machinery/hologram/holopad,
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"Kg" = (
/obj/structure/reagent_dispensers/watertank,
/obj/effect/decal/cleanable/dirt,
@@ -19511,7 +19533,7 @@
dir = 4
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"Kr" = (
/obj/effect/map_effect/wingrille_spawn/reinforced/polarized{
id = "cap"
@@ -20067,7 +20089,7 @@
dir = 9
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"Lv" = (
/obj/structure/trash_pile,
/turf/simulated/floor,
@@ -20284,7 +20306,7 @@
/obj/item/paper_bin,
/obj/item/pen,
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"LO" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -20571,7 +20593,7 @@
/obj/structure/closet/emcloset,
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"Mr" = (
/obj/effect/floor_decal/corner_wide/green{
dir = 10
@@ -20649,14 +20671,14 @@
dir = 8
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"Mw" = (
/obj/machinery/shipsensors{
pixel_y = 7
},
/obj/effect/floor_decal/industrial/warning/full,
/turf/simulated/floor/reinforced,
-/area/bridge)
+/area/bridge/controlroom)
"Mx" = (
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
@@ -20808,7 +20830,7 @@
dir = 1
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"MK" = (
/obj/structure/closet/secure_closet/guncabinet{
name = "Weaponry (Rifle)"
@@ -20831,7 +20853,7 @@
dir = 6
},
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"MM" = (
/obj/effect/floor_decal/spline/fancy/wood{
dir = 9
@@ -20921,7 +20943,7 @@
dir = 1
},
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"MW" = (
/obj/machinery/newscaster{
pixel_x = 32
@@ -20952,7 +20974,7 @@
dir = 4
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"MY" = (
/obj/effect/map_effect/wingrille_spawn/reinforced/firedoor,
/obj/machinery/door/blast/shutters/open{
@@ -21034,7 +21056,7 @@
dir = 4
},
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"Nh" = (
/obj/effect/floor_decal/corner/green{
dir = 9
@@ -21156,7 +21178,7 @@
},
/obj/machinery/disposal/small/west,
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"Nv" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -21386,7 +21408,7 @@
req_one_access = list(19, 38)
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"NP" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -21410,7 +21432,7 @@
dir = 1
},
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"NR" = (
/obj/effect/floor_decal/corner/green/full{
dir = 8
@@ -21529,7 +21551,7 @@
opacity = 0
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"Oa" = (
/obj/effect/floor_decal/corner/green{
dir = 10
@@ -21688,7 +21710,7 @@
icon_state = "pipe-c"
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"Op" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -21814,7 +21836,7 @@
dir = 1
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"OB" = (
/obj/effect/floor_decal/corner/green{
dir = 9
@@ -21868,7 +21890,7 @@
icon_state = "2-8"
},
/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
-/area/bridge)
+/area/bridge/controlroom)
"OH" = (
/obj/machinery/power/apc/low{
dir = 8;
@@ -21905,7 +21927,7 @@
pixel_x = -23
},
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"OK" = (
/obj/structure/disposalpipe/segment{
dir = 2;
@@ -22027,6 +22049,9 @@
/obj/effect/floor_decal/corner/yellow/full{
dir = 4
},
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled,
/area/bridge)
"OV" = (
@@ -22122,7 +22147,7 @@
dir = 9
},
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"Pe" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/tiled,
@@ -22138,7 +22163,7 @@
dir = 6
},
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"Pg" = (
/obj/structure/window/shuttle/scc_space_ship,
/obj/structure/grille,
@@ -22187,7 +22212,7 @@
pixel_y = 1
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"Pk" = (
/obj/machinery/alarm{
dir = 8;
@@ -22271,7 +22296,7 @@
dir = 1
},
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"Pr" = (
/obj/effect/floor_decal/spline/fancy/wood{
dir = 5
@@ -22441,7 +22466,7 @@
pixel_x = 24
},
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"PH" = (
/obj/machinery/door/window/brigdoor/westleft{
name = "Inner Office Access";
@@ -22558,8 +22583,13 @@
/obj/structure/cable/green{
icon_state = "0-4"
},
+/obj/machinery/door/blast/shutters/open{
+ dir = 2;
+ name = "Safety Shutter";
+ id = "shutters_deck3_bridgesafety"
+ },
/turf/simulated/floor/plating,
-/area/bridge)
+/area/bridge/controlroom)
"PR" = (
/obj/machinery/door/firedoor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -22611,7 +22641,7 @@
pixel_y = 2
},
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"PV" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
@@ -22863,7 +22893,7 @@
opacity = 0
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"Qp" = (
/obj/effect/floor_decal/corner/paleblue{
dir = 10
@@ -22925,15 +22955,8 @@
/turf/simulated/floor/tiled/dark,
/area/horizon/crew_quarters/fitness/gym)
"Qu" = (
-/obj/effect/map_effect/wingrille_spawn/reinforced/polarized{
- id = "cap"
- },
-/obj/machinery/door/firedoor,
-/obj/structure/cable/green{
- icon_state = "0-8"
- },
-/turf/simulated/floor,
-/area/bridge)
+/turf/simulated/wall/r_wall,
+/area/bridge/controlroom)
"Qv" = (
/obj/effect/floor_decal/corner/paleblue/diagonal,
/obj/machinery/light{
@@ -23367,7 +23390,7 @@
},
/obj/machinery/hologram/holopad/long_range,
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"Rn" = (
/obj/structure/bed/stool/chair/padded/brown{
dir = 4
@@ -23486,7 +23509,7 @@
},
/obj/structure/flora/pottedplant/random,
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"Ry" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -23797,7 +23820,7 @@
icon_state = "1-2"
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"Sd" = (
/obj/effect/floor_decal/corner/blue{
dir = 5
@@ -23807,7 +23830,7 @@
pixel_y = 32
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"Sf" = (
/obj/structure/bed/stool/chair/office/dark{
dir = 8
@@ -23960,7 +23983,7 @@
dir = 4
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"Su" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
@@ -24102,14 +24125,14 @@
},
/obj/structure/table/glass,
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"SI" = (
/obj/effect/floor_decal/corner/blue{
dir = 5
},
/obj/structure/flora/pottedplant/random,
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"SJ" = (
/obj/structure/disposalpipe/segment,
/obj/effect/floor_decal/corner/green/diagonal,
@@ -24145,7 +24168,7 @@
},
/obj/machinery/recharger,
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"SQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/reinforced,
@@ -24236,7 +24259,7 @@
dir = 4
},
/turf/simulated/floor/wood,
-/area/bridge)
+/area/crew_quarters/captain)
"Tb" = (
/turf/simulated/floor/tiled/freezer,
/area/medical/washroom)
@@ -24826,7 +24849,7 @@
/obj/item/device/hand_labeler,
/obj/item/stack/packageWrap,
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"Ui" = (
/obj/effect/floor_decal/corner_wide/blue,
/obj/effect/floor_decal/spline/plain/corner,
@@ -24847,7 +24870,7 @@
},
/obj/structure/bed/stool/chair/office/bridge,
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"Ul" = (
/obj/machinery/cryopod,
/obj/structure/railing/mapped,
@@ -25159,7 +25182,7 @@
/obj/machinery/recharger,
/obj/item/aicard,
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"UM" = (
/obj/machinery/access_button{
command = "cycle_interior";
@@ -25250,7 +25273,7 @@
},
/obj/structure/cable/green,
/turf/simulated/floor,
-/area/bridge)
+/area/bridge/controlroom)
"UV" = (
/turf/simulated/open,
/area/horizon/hallway/deck_three/primary/starboard)
@@ -25261,7 +25284,7 @@
/turf/simulated/floor/tiled/ramp/bottom{
dir = 8
},
-/area/bridge)
+/area/bridge/controlroom)
"UX" = (
/obj/effect/floor_decal/spline/fancy{
dir = 1
@@ -25270,7 +25293,7 @@
dir = 1
},
/turf/simulated/floor/carpet/rubber,
-/area/bridge)
+/area/bridge/controlroom)
"UY" = (
/obj/structure/lattice/catwalk,
/obj/structure/railing/mapped{
@@ -25360,8 +25383,13 @@
/obj/structure/cable/green{
icon_state = "0-4"
},
+/obj/machinery/door/blast/shutters/open{
+ dir = 2;
+ name = "Safety Shutter";
+ id = "shutters_deck3_bridgesafety"
+ },
/turf/simulated/floor/plating,
-/area/bridge)
+/area/bridge/controlroom)
"Vh" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/vending/snack,
@@ -25541,7 +25569,7 @@
},
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled/dark,
-/area/bridge)
+/area/bridge/controlroom)
"Vy" = (
/obj/structure/cryofeed{
dir = 4
@@ -25632,7 +25660,7 @@
dir = 4
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"VF" = (
/obj/machinery/telecomms/relay/preset/telecomms,
/turf/simulated/floor/bluegrid,
@@ -25762,7 +25790,7 @@
dir = 6
},
/turf/simulated/floor/reinforced,
-/area/bridge)
+/area/bridge/controlroom)
"VT" = (
/obj/effect/floor_decal/spline/plain{
dir = 4
@@ -25771,7 +25799,7 @@
dir = 9
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"VU" = (
/obj/machinery/door/airlock/maintenance{
req_one_access = list(12)
@@ -26133,7 +26161,7 @@
icon_state = "0-8"
},
/turf/simulated/floor,
-/area/bridge)
+/area/bridge/controlroom)
"WI" = (
/turf/simulated/wall/r_wall,
/area/security/forensics_office)
@@ -26191,7 +26219,7 @@
pixel_x = 32
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"WP" = (
/obj/machinery/computer/cryopod{
pixel_y = 32
@@ -26284,7 +26312,7 @@
req_one_access = list(19, 38)
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"WY" = (
/obj/effect/floor_decal/corner/green/diagonal,
/obj/machinery/atmospherics/unary/vent_scrubber/on,
@@ -26371,7 +26399,7 @@
},
/obj/structure/bed/stool/chair,
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"Xf" = (
/obj/structure/window/shuttle/scc_space_ship,
/obj/structure/grille,
@@ -26478,7 +26506,7 @@
/obj/structure/closet/firecloset/full,
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"Xp" = (
/obj/machinery/alarm{
dir = 4;
@@ -28006,7 +28034,7 @@
opacity = 0
},
/turf/simulated/floor/tiled,
-/area/bridge)
+/area/bridge/controlroom)
"ZT" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/structure/sign/flag/zenghu{
@@ -46975,11 +47003,11 @@ JE
XJ
JQ
Vz
-US
-Qu
+JQ
+Yk
Ta
-Qu
-US
+Yk
+JQ
uq
Lu
VT
@@ -47177,13 +47205,13 @@ rd
XJ
Mv
hE
-US
+Qu
zx
Oo
gL
um
tP
-US
+Qu
HW
od
wY
@@ -47985,7 +48013,7 @@ EA
US
Xo
tU
-US
+Qu
Sd
iI
jf
@@ -48191,7 +48219,7 @@ WX
ym
vg
pS
-US
+Qu
Kf
HC
fW
@@ -48389,7 +48417,7 @@ Jo
US
SH
Fn
-US
+Qu
Xe
vg
Hb
@@ -48591,7 +48619,7 @@ qt
US
xu
MX
-US
+Qu
mv
St
UX
@@ -48791,10 +48819,10 @@ Aw
te
ce
US
-US
+Qu
NO
-US
-US
+Qu
+Qu
gV
Uk
MV
@@ -49195,15 +49223,15 @@ ha
Gv
px
gs
-US
+Qu
ZS
-US
+Qu
va
iV
pX
pX
VE
-US
+Qu
Rx
iA
Cw
@@ -49605,12 +49633,12 @@ fx
AT
fx
fx
-US
-US
+Qu
+Qu
Qo
-US
-US
-US
+Qu
+Qu
+Qu
CK
CK
at