diff --git a/html/changelogs/nauticall-bridgetweaks-2-3.yml b/html/changelogs/nauticall-bridgetweaks-2-3.yml
new file mode 100644
index 00000000000..56e813e5dc3
--- /dev/null
+++ b/html/changelogs/nauticall-bridgetweaks-2-3.yml
@@ -0,0 +1,44 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# wip (For works in progress)
+# tweak
+# soundadd
+# sounddel
+# rscadd (general adding of nice things)
+# rscdel (general deleting of nice things)
+# imageadd
+# imagedel
+# maptweak
+# spellcheck (typo fixes)
+# experiment
+# balance
+# admin
+# backend
+# security
+# refactor
+#################################
+
+# Your name.
+author: nauticall
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - maptweak: "Moderately modified and fixed some things in the Captain's office, including a broken button, some lighting tweaks, furniture reshuffling, and more equipment."
+ - maptweak: "Added a light switch to the bridge, among some other furniture reshuffling to prevent wall object overlap."
+ - maptweak: "Changed the sec briefing room chairs. They now actually make sense."
+
diff --git a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
index a3068c1f879..6b44c19d466 100644
--- a/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
+++ b/maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
@@ -141,6 +141,9 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
+/obj/structure/cable/green{
+ icon_state = "2-8"
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"adQ" = (
@@ -845,14 +848,11 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 4
},
-/obj/machinery/recharger{
- pixel_x = 8;
- pixel_y = 6
+/obj/machinery/papershredder{
+ pixel_x = 7
},
-/obj/structure/table/standard,
-/obj/item/device/taperecorder{
- pixel_x = -4;
- pixel_y = 3
+/obj/structure/filingcabinet{
+ pixel_x = -9
},
/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop/xo)
@@ -1028,6 +1028,7 @@
"aLB" = (
/obj/effect/floor_decal/corner/dark_blue/full,
/obj/machinery/photocopier,
+/obj/machinery/light,
/turf/simulated/floor/tiled,
/area/bridge/upperdeck)
"aLK" = (
@@ -1046,7 +1047,9 @@
},
/obj/effect/floor_decal/corner/dark_blue/diagonal,
/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/machinery/door/firedoor,
+/obj/machinery/door/firedoor{
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/bridge)
"aLV" = (
@@ -1129,6 +1132,10 @@
},
/turf/simulated/floor/wood,
/area/lawoffice/representative_two)
+"aPR" = (
+/obj/effect/shuttle_landmark/lift/operations_third_deck,
+/turf/simulated/open,
+/area/operations/office_aux)
"aQk" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/glass_security{
@@ -1258,7 +1265,6 @@
/obj/effect/floor_decal/industrial/warning{
dir = 6
},
-/obj/machinery/light/spot,
/obj/structure/railing/mapped{
dir = 4
},
@@ -1267,6 +1273,7 @@
},
/obj/structure/cable/green,
/obj/structure/grille,
+/obj/machinery/light,
/turf/simulated/floor/tiled/dark/full/airless,
/area/bridge/controlroom)
"aVh" = (
@@ -1350,6 +1357,7 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 7
},
+/obj/random/pottedplant,
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"aXG" = (
@@ -1470,7 +1478,7 @@
id = "sat_blast";
name = "Scuttling Device Blast Doors Control";
pixel_x = 10;
- pixel_y = -23;
+ pixel_y = -20;
req_access = list(20)
},
/obj/effect/floor_decal/spline/fancy/wood,
@@ -1480,10 +1488,14 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/camera/network/command{
- c_tag = "Bridge - Captain's Office Fore";
- dir = 1;
- network = list("Command","Capt_Office")
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
@@ -1559,20 +1571,12 @@
/turf/simulated/floor/tiled/dark,
/area/bridge/aibunker)
"bbm" = (
-/obj/structure/disposalpipe/segment{
+/obj/effect/floor_decal/industrial/warning/cee{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/structure/cable{
- d1 = 4;
- d2 = 8;
- icon_state = "4-8"
+/obj/machinery/light/small/emergency{
+ dir = 8;
+ pixel_x = 16
},
/turf/simulated/floor,
/area/maintenance/engineering_ladder)
@@ -1777,6 +1781,17 @@
/obj/effect/floor_decal/industrial/outline/firefighting_closet,
/turf/simulated/floor/tiled,
/area/horizon/hallway/deck_three/primary/starboard)
+"biz" = (
+/obj/effect/floor_decal/spline/plain{
+ dir = 1
+ },
+/obj/effect/floor_decal/spline/plain,
+/obj/machinery/power/apc/super/north,
+/obj/structure/cable/green{
+ icon_state = "0-4"
+ },
+/turf/simulated/floor/carpet/rubber,
+/area/tcommsat/chamber)
"biY" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 10
@@ -2162,8 +2177,8 @@
dir = 7
},
/obj/structure/bed/stool/chair/padded/beige,
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 4
+/obj/structure/cable/green{
+ icon_state = "4-8"
},
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
@@ -2466,7 +2481,7 @@
/turf/simulated/floor/carpet/rubber,
/area/tcommsat/chamber)
"bSO" = (
-/obj/structure/table/wood,
+/obj/structure/table/reinforced/wood,
/obj/item/folder/blue,
/obj/item/pen,
/turf/simulated/floor/tiled/dark,
@@ -2623,23 +2638,6 @@
},
/turf/simulated/floor/carpet/rubber,
/area/tcommsat/entrance)
-"bZn" = (
-/obj/effect/floor_decal/spline/plain{
- dir = 10
- },
-/obj/effect/floor_decal/spline/plain/corner{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/black{
- dir = 5
- },
-/obj/machinery/camera/motion{
- network = list("Command","Security","Tcomsat");
- c_tag = "Telecommunications - Central Compartment Starboard";
- dir = 4
- },
-/turf/simulated/floor/carpet/rubber,
-/area/tcommsat/chamber)
"bZx" = (
/obj/effect/floor_decal/corner/dark_blue/full{
dir = 8
@@ -2722,9 +2720,6 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/item/device/radio/intercom/east{
- pixel_y = 1
- },
/obj/machinery/light{
dir = 4
},
@@ -2784,7 +2779,7 @@
/area/maintenance/security_starboard)
"ceD" = (
/obj/effect/floor_decal/spline/fancy/wood{
- dir = 8
+ dir = 9
},
/obj/structure/disposalpipe/junction{
dir = 8;
@@ -3072,6 +3067,16 @@
},
/turf/simulated/floor/tiled,
/area/crew_quarters/lounge/secondary)
+"ctf" = (
+/obj/effect/floor_decal/spline/plain,
+/obj/effect/floor_decal/spline/plain{
+ dir = 1
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/carpet/rubber,
+/area/tcommsat/chamber)
"cth" = (
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
@@ -3200,15 +3205,6 @@
/turf/simulated/floor,
/area/maintenance/engineering_ladder)
"cAF" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/turf/simulated/floor/carpet,
/area/crew_quarters/captain)
"cAG" = (
@@ -3574,9 +3570,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 6
},
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"cOZ" = (
@@ -3621,16 +3615,21 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 1
},
-/obj/machinery/disposal/small/south{
- pixel_y = -19;
- dir = 1
- },
-/obj/structure/disposalpipe/trunk{
- dir = 1
- },
/obj/structure/cable/green{
icon_state = "4-8"
},
+/obj/structure/disposalpipe/junction{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/obj/machinery/camera/network/command{
+ c_tag = "Bridge - Captain's Office Fore";
+ dir = 1;
+ network = list("Command","Capt_Office")
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"cPM" = (
@@ -3947,7 +3946,7 @@
/turf/simulated/open,
/area/maintenance/engineering_ladder)
"ddZ" = (
-/obj/structure/table/wood,
+/obj/structure/table/reinforced/wood,
/obj/item/pen,
/obj/item/paper_bin{
pixel_x = -3;
@@ -4152,15 +4151,6 @@
},
/turf/simulated/floor/tiled,
/area/horizon/security/investigations_hallway)
-"dmp" = (
-/obj/structure/platform_stairs/full{
- dir = 4
- },
-/obj/structure/platform{
- dir = 1
- },
-/turf/simulated/floor/tiled/full,
-/area/bridge/upperdeck)
"dmv" = (
/obj/machinery/disposal/small/north,
/obj/structure/disposalpipe/trunk{
@@ -4409,6 +4399,9 @@
/area/horizon/cafeteria)
"dwW" = (
/obj/structure/disposalpipe/junction,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"dxD" = (
@@ -4453,6 +4446,12 @@
dir = 10
},
/obj/machinery/light,
+/obj/structure/bed/stool/chair{
+ dir = 1
+ },
+/obj/effect/landmark/start{
+ name = "Security Officer"
+ },
/turf/simulated/floor/tiled/dark,
/area/horizon/security/meeting_room)
"dBS" = (
@@ -4559,11 +4558,6 @@
/obj/machinery/light{
dir = 8
},
-/obj/machinery/alarm/north{
- pixel_y = 0;
- dir = 8;
- pixel_x = -10
- },
/turf/simulated/floor/tiled,
/area/bridge/supply)
"dFS" = (
@@ -4628,12 +4622,20 @@
/turf/simulated/wall,
/area/maintenance/substation/civilian_east)
"dHD" = (
-/obj/effect/floor_decal/spline/plain/corner{
- dir = 8
- },
/obj/effect/floor_decal/spline/plain{
+ dir = 10
+ },
+/obj/effect/floor_decal/spline/plain/corner{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/black{
dir = 5
},
+/obj/machinery/camera/motion{
+ network = list("Command","Security","Tcomsat");
+ c_tag = "Telecommunications - Central Compartment Starboard";
+ dir = 4
+ },
/turf/simulated/floor/carpet/rubber,
/area/tcommsat/chamber)
"dHJ" = (
@@ -4688,24 +4690,29 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 10
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
-/obj/structure/cable/green{
- icon_state = "0-8"
- },
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/power/apc/south{
- is_critical = 1
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/machinery/light_switch{
+ pixel_y = -19;
+ pixel_x = -6
+ },
+/obj/item/device/radio/intercom/south{
+ pixel_x = 14
},
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
@@ -4738,17 +4745,12 @@
/turf/simulated/floor/tiled/dark,
/area/horizon/security/evidence_storage)
"dMh" = (
-/obj/structure/disposalpipe/junction{
- dir = 8;
- icon_state = "pipe-j2"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
- },
/obj/machinery/hologram/holopad,
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 1
+ },
/turf/simulated/floor/carpet,
/area/crew_quarters/captain)
"dMl" = (
@@ -4761,10 +4763,6 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 7
},
-/obj/machinery/keycard_auth{
- pixel_x = 1;
- pixel_y = -26
- },
/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop/xo)
"dNi" = (
@@ -4789,12 +4787,6 @@
},
/turf/simulated/floor/tiled,
/area/bridge/supply)
-"dNO" = (
-/obj/effect/floor_decal/industrial/warning,
-/obj/effect/decal/cleanable/dirt,
-/obj/random/junk,
-/turf/simulated/floor,
-/area/maintenance/engineering_ladder)
"dNV" = (
/obj/effect/floor_decal/spline/plain{
dir = 10
@@ -5337,6 +5329,14 @@
pixel_y = 4
},
/obj/item/pen,
+/obj/item/stamp/xo{
+ pixel_x = 6;
+ pixel_y = 14
+ },
+/obj/item/stamp/denied{
+ pixel_y = 14;
+ pixel_x = -2
+ },
/turf/simulated/floor/carpet,
/area/crew_quarters/heads/hop/xo)
"ehu" = (
@@ -5550,6 +5550,12 @@
/obj/machinery/alarm/north,
/turf/simulated/floor/tiled,
/area/horizon/hallway/deck_three/primary/central)
+"eny" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/full,
+/area/operations/office_aux)
"enA" = (
/obj/effect/floor_decal/corner/brown/diagonal,
/obj/structure/table/wood,
@@ -5708,13 +5714,7 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 4
},
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"esb" = (
@@ -5760,6 +5760,9 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 1
},
+/obj/structure/cable/green{
+ icon_state = "1-4"
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"evn" = (
@@ -6270,7 +6273,9 @@
/obj/structure/platform{
dir = 1
},
-/obj/machinery/door/firedoor,
+/obj/machinery/door/firedoor{
+ dir = 4
+ },
/turf/simulated/floor/tiled/full,
/area/bridge/upperdeck)
"eJa" = (
@@ -6785,7 +6790,9 @@
},
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/structure/platform,
-/obj/machinery/door/firedoor,
+/obj/machinery/door/firedoor{
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/bridge/upperdeck)
"fer" = (
@@ -6814,11 +6821,6 @@
"ffj" = (
/turf/simulated/open,
/area/turbolift/primary/deck_3)
-"ffm" = (
-/obj/effect/floor_decal/industrial/warning,
-/obj/effect/decal/cleanable/dirt,
-/turf/simulated/floor,
-/area/maintenance/engineering_ladder)
"ffA" = (
/obj/structure/cable/green{
icon_state = "4-8"
@@ -6916,6 +6918,17 @@
},
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
+"fhB" = (
+/obj/effect/floor_decal/spline/plain,
+/obj/effect/floor_decal/spline/plain{
+ dir = 1
+ },
+/obj/machinery/camera/motion{
+ network = list("Command","Security","Tcomsat");
+ c_tag = "Telecommunications - Central Compartment Port"
+ },
+/turf/simulated/floor/carpet/rubber,
+/area/tcommsat/chamber)
"fid" = (
/obj/structure/disposalpipe/down,
/obj/structure/lattice/catwalk,
@@ -6978,13 +6991,6 @@
/turf/simulated/floor/wood,
/area/crew_quarters/lounge/secondary)
"fiZ" = (
-/obj/structure/railing/mapped{
- dir = 4
- },
-/obj/structure/railing/mapped{
- dir = 1;
- pixel_y = 9
- },
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
@@ -7003,11 +7009,6 @@
/obj/structure/cable/green{
icon_state = "0-2"
},
-/obj/machinery/door/blast/shutters/open{
- dir = 8;
- id = "captainshutters";
- name = "Safety Shutter"
- },
/obj/machinery/door/blast/regular{
density = 0;
icon_state = "pdoor0";
@@ -7015,6 +7016,11 @@
name = "Bridge Blast Doors";
opacity = 0
},
+/obj/machinery/door/blast/shutters/open{
+ dir = 8;
+ id = "shutters_deck3_captain";
+ name = "Safety Shutter"
+ },
/turf/simulated/floor/plating,
/area/crew_quarters/captain)
"fjt" = (
@@ -7336,13 +7342,12 @@
"ftN" = (
/obj/structure/table/reinforced/wood,
/obj/machinery/photocopier/faxmachine{
- department = "Captain's Office"
+ department = "Captain's Office";
+ pixel_y = 6
},
/obj/effect/floor_decal/spline/fancy/wood{
dir = 5
},
-/obj/item/card/id/captains_spare,
-/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"ftO" = (
@@ -7428,35 +7433,15 @@
/turf/simulated/floor/tiled/dark,
/area/horizon/holodeck_control/beta)
"fxj" = (
-/obj/structure/disposalpipe/segment{
- dir = 1;
- icon_state = "pipe-c"
- },
+/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 1
},
-/obj/machinery/button/remote/blast_door{
- desc = "A remote control-switch for shutters.";
- dir = 1;
- id = "cap_office_desk";
- name = "Desk Privacy Shutter";
- pixel_x = 26;
- pixel_y = 8
- },
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
- },
/obj/item/storage/secure/safe{
pixel_y = 33;
pixel_x = 31
},
-/obj/machinery/button/remote/airlock{
- dir = 1;
- pixel_x = 26;
- name = "Command Foyer Doors";
- id = "command_foyer";
- pixel_y = -3
- },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/carpet,
/area/crew_quarters/captain)
"fxk" = (
@@ -7478,6 +7463,12 @@
/obj/effect/floor_decal/corner/dark_blue{
dir = 10
},
+/obj/structure/bed/stool/chair{
+ dir = 1
+ },
+/obj/effect/landmark/start{
+ name = "Security Officer"
+ },
/turf/simulated/floor/tiled/dark,
/area/horizon/security/meeting_room)
"fyw" = (
@@ -7516,6 +7507,7 @@
dir = 1
},
/obj/structure/closet/secure_closet/bridge_crew,
+/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled,
/area/bridge/bridge_crew)
"fyZ" = (
@@ -7731,11 +7723,23 @@
/turf/simulated/floor/bluegrid,
/area/tcommsat/chamber)
"fHm" = (
-/obj/structure/table/rack,
-/obj/random/loot,
-/obj/effect/floor_decal/industrial/warning,
-/turf/simulated/floor,
-/area/maintenance/engineering_ladder)
+/obj/effect/floor_decal/spline/plain{
+ dir = 8
+ },
+/obj/effect/floor_decal/spline/plain{
+ dir = 4
+ },
+/obj/machinery/atmospherics/unary/vent_pump{
+ external_pressure_bound = 140;
+ external_pressure_bound_default = 140;
+ icon_state = "map_vent_out";
+ pressure_checks = 0;
+ pressure_checks_default = 0;
+ use_power = 1
+ },
+/obj/machinery/firealarm/west,
+/turf/simulated/floor/carpet/rubber,
+/area/tcommsat/chamber)
"fHn" = (
/obj/structure/lattice/catwalk/indoor/grate,
/obj/structure/cable{
@@ -7834,13 +7838,15 @@
/turf/simulated/floor/tiled,
/area/bridge/supply)
"fIr" = (
-/obj/effect/floor_decal/spline/fancy/wood,
/obj/structure/cable/green{
icon_state = "4-8"
},
/obj/structure/cable/green{
icon_state = "1-8"
},
+/obj/effect/floor_decal/spline/fancy/wood/corner{
+ dir = 8
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"fJy" = (
@@ -7904,17 +7910,6 @@
},
/turf/simulated/open,
/area/horizon/hallway/deck_three/primary/central)
-"fMc" = (
-/obj/effect/floor_decal/spline/plain,
-/obj/effect/floor_decal/spline/plain{
- dir = 1
- },
-/obj/machinery/camera/motion{
- network = list("Command","Security","Tcomsat");
- c_tag = "Telecommunications - Central Compartment Port"
- },
-/turf/simulated/floor/carpet/rubber,
-/area/tcommsat/chamber)
"fMl" = (
/obj/machinery/vending/cigarette,
/obj/effect/floor_decal/spline/fancy/wood{
@@ -7922,12 +7917,6 @@
},
/turf/simulated/floor/wood,
/area/crew_quarters/lounge/secondary)
-"fMm" = (
-/obj/effect/floor_decal/spline/plain{
- dir = 4
- },
-/turf/simulated/floor/reinforced/airless,
-/area/horizon/exterior)
"fMB" = (
/obj/machinery/atmospherics/pipe/manifold/hidden{
dir = 8
@@ -8620,6 +8609,9 @@
/obj/item/folder/yellow{
pixel_x = 3
},
+/obj/item/device/radio/off{
+ pixel_y = 9
+ },
/turf/simulated/floor/carpet,
/area/crew_quarters/heads/hop/xo)
"gjn" = (
@@ -8648,11 +8640,6 @@
},
/obj/structure/grille,
/obj/structure/window/shuttle/scc_space_ship/cardinal,
-/obj/machinery/door/blast/shutters/open{
- dir = 8;
- id = "captainshutters";
- name = "Safety Shutter"
- },
/obj/machinery/door/blast/regular{
density = 0;
icon_state = "pdoor0";
@@ -8660,10 +8647,14 @@
name = "Bridge Blast Doors";
opacity = 0
},
+/obj/machinery/door/blast/shutters/open{
+ dir = 8;
+ id = "shutters_deck3_captain";
+ name = "Safety Shutter"
+ },
/turf/simulated/floor/plating,
/area/crew_quarters/captain)
"gjT" = (
-/obj/machinery/light,
/obj/effect/floor_decal/spline/plain,
/turf/simulated/floor/marble/dark,
/area/bridge/minibar)
@@ -9042,6 +9033,9 @@
/obj/structure/disposalpipe/segment{
dir = 4
},
+/obj/effect/floor_decal/spline/fancy/wood/corner{
+ dir = 4
+ },
/turf/simulated/floor/wood,
/area/bridge/minibar)
"gyt" = (
@@ -9134,12 +9128,12 @@
dir = 4
},
/obj/machinery/alarm/west,
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 1;
+ level = 2
+ },
/turf/simulated/floor/tiled,
/area/horizon/stairwell/bridge)
-"gBA" = (
-/obj/effect/shuttle_landmark/lift/operations_third_deck,
-/turf/simulated/open,
-/area/operations/office_aux)
"gBM" = (
/obj/effect/floor_decal/industrial/hatch/red,
/turf/simulated/floor/reinforced/airless,
@@ -9158,7 +9152,7 @@
id = "bridge_foyer";
name = "Bridge Bolt Control";
pixel_x = 27;
- pixel_y = -7;
+ pixel_y = -8;
req_access = list(19)
},
/turf/simulated/floor/tiled/dark,
@@ -10131,6 +10125,15 @@
/obj/effect/floor_decal/industrial/outline/medical,
/turf/simulated/floor/tiled/dark/full,
/area/bridge/aibunker)
+"hjI" = (
+/obj/structure/table/rack,
+/obj/random/loot,
+/obj/effect/floor_decal/industrial/warning,
+/obj/machinery/light/small/emergency{
+ dir = 1
+ },
+/turf/simulated/floor,
+/area/maintenance/engineering_ladder)
"hjM" = (
/obj/effect/floor_decal/industrial/warning/cee{
dir = 8
@@ -10249,13 +10252,11 @@
/turf/simulated/floor/tiled,
/area/horizon/hallway/deck_three/primary/central)
"hmu" = (
-/obj/structure/railing/mapped,
/obj/effect/floor_decal/corner/dark_blue{
dir = 10
},
-/obj/machinery/computer/security{
- dir = 1
- },
+/obj/item/modular_computer/console/preset/security,
+/obj/structure/railing/mapped,
/turf/simulated/floor/tiled/dark,
/area/bridge/controlroom)
"hmC" = (
@@ -10790,19 +10791,12 @@
/turf/simulated/floor/tiled,
/area/horizon/crew_quarters/fitness/changing)
"hCi" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/structure/disposalpipe/segment,
-/obj/structure/cable/green{
- icon_state = "1-2"
+/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
+/obj/machinery/door/blast/shutters{
+ dir = 2;
+ id = "cargo_desk"
},
-/obj/machinery/door/firedoor,
-/obj/machinery/door/airlock/mining{
- dir = 1;
- req_one_access = list(26,29,31,48,67,70);
- name = "Operations Bay"
- },
-/turf/simulated/floor/tiled/full,
+/turf/simulated/floor/tiled/dark/full,
/area/operations/office_aux)
"hCm" = (
/obj/structure/cable{
@@ -10833,15 +10827,10 @@
/turf/simulated/floor/tiled,
/area/bridge/supply)
"hCP" = (
-/obj/effect/floor_decal/spline/plain,
-/obj/effect/floor_decal/spline/plain{
- dir = 1
- },
-/obj/machinery/light{
- dir = 1
- },
-/turf/simulated/floor/carpet/rubber,
-/area/tcommsat/chamber)
+/obj/effect/floor_decal/industrial/warning,
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor,
+/area/maintenance/engineering_ladder)
"hCT" = (
/obj/effect/floor_decal/corner/dark_green/diagonal,
/obj/structure/cable/green{
@@ -10904,7 +10893,7 @@
"hFC" = (
/obj/structure/table/reinforced/wood,
/obj/item/modular_computer/laptop/preset/command/captain{
- pixel_y = 2
+ pixel_y = 9
},
/obj/machinery/door/firedoor,
/obj/machinery/door/blast/shutters{
@@ -10915,7 +10904,7 @@
name = "Captain Desk Shutters";
opacity = 0
},
-/turf/simulated/floor/tiled/full,
+/turf/simulated/floor/tiled/dark/full,
/area/crew_quarters/captain)
"hGl" = (
/obj/effect/floor_decal/spline/fancy/wood{
@@ -11185,9 +11174,6 @@
/obj/effect/floor_decal/industrial/warning{
dir = 5
},
-/obj/machinery/light/spot{
- dir = 1
- },
/obj/structure/railing/mapped{
dir = 4
},
@@ -11199,6 +11185,9 @@
icon_state = "0-2"
},
/obj/structure/grille,
+/obj/machinery/light{
+ dir = 1
+ },
/turf/simulated/floor/tiled/dark/full/airless,
/area/bridge/controlroom)
"hQX" = (
@@ -11303,6 +11292,13 @@
},
/turf/simulated/floor/tiled/dark,
/area/engineering/break_room)
+"hUT" = (
+/obj/effect/floor_decal/industrial/warning{
+ dir = 6
+ },
+/obj/effect/decal/cleanable/dirt,
+/turf/simulated/floor/plating,
+/area/maintenance/engineering_ladder)
"hWx" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -11327,6 +11323,21 @@
},
/obj/item/device/radio/intercom/north,
/obj/structure/table/reinforced/steel,
+/obj/item/folder/blue{
+ pixel_y = 7;
+ pixel_x = 5
+ },
+/obj/item/clipboard{
+ pixel_x = -4;
+ pixel_y = 2
+ },
+/obj/item/pen/blue{
+ pixel_x = 5
+ },
+/obj/item/pen/red{
+ pixel_x = 7;
+ pixel_y = 3
+ },
/turf/simulated/floor/tiled/dark,
/area/bridge/controlroom)
"hYG" = (
@@ -11420,13 +11431,17 @@
/obj/structure/table/reinforced/wood,
/obj/machinery/chemical_dispenser/bar_soft{
dir = 1;
- pixel_y = -2
+ pixel_y = 1
},
/obj/effect/floor_decal/spline/fancy/wood{
dir = 7
},
/obj/item/reagent_containers/food/drinks/drinkingglass{
- pixel_y = 13
+ pixel_y = 16;
+ pixel_x = 7
+ },
+/obj/item/reagent_containers/food/drinks/drinkingglass{
+ pixel_y = 16
},
/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop/xo)
@@ -11789,17 +11804,6 @@
},
/turf/simulated/floor/tiled,
/area/horizon/crew_quarters/fitness/changing)
-"isZ" = (
-/obj/effect/floor_decal/spline/plain,
-/obj/effect/floor_decal/spline/plain{
- dir = 1
- },
-/obj/effect/floor_decal/industrial/outline/firefighting_closet,
-/obj/structure/closet/walllocker/firecloset{
- pixel_y = 32
- },
-/turf/simulated/floor/carpet/rubber,
-/area/tcommsat/chamber)
"itc" = (
/obj/effect/shuttle_landmark/horizon/dock/deck_3/starboard_1{
dir = 4
@@ -11866,6 +11870,8 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 4
},
+/obj/item/device/taperecorder,
+/obj/item/device/radio/off,
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"ivg" = (
@@ -11889,15 +11895,15 @@
/turf/simulated/floor,
/area/maintenance/engineering_ladder)
"ivK" = (
+/obj/machinery/suit_cycler/captain,
+/obj/item/clothing/suit/space/void/captain,
+/obj/item/tank/jetpack/oxygen,
/obj/effect/floor_decal/spline/fancy/wood{
- dir = 1
- },
-/obj/structure/cable/green{
- icon_state = "1-2"
- },
-/obj/structure/cable/green{
- icon_state = "2-8"
+ dir = 4
},
+/obj/machinery/light,
+/obj/item/clothing/head/helmet/space/void/captain,
+/obj/item/clothing/mask/gas/half,
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"ivO" = (
@@ -12644,6 +12650,20 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/supply,
/turf/simulated/floor/tiled,
/area/horizon/hallway/deck_three/primary/port/docks)
+"iRW" = (
+/obj/effect/floor_decal/spline/plain{
+ dir = 8
+ },
+/obj/effect/floor_decal/spline/plain{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/black,
+/obj/machinery/light{
+ dir = 8;
+ icon_state = "tube_empty"
+ },
+/turf/simulated/floor/carpet/rubber,
+/area/tcommsat/chamber)
"iSb" = (
/obj/structure/table/wood,
/turf/simulated/floor/carpet/art,
@@ -12687,8 +12707,10 @@
icon_state = "4-8"
},
/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/machinery/door/firedoor,
/obj/structure/platform,
+/obj/machinery/door/firedoor{
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/bridge/upperdeck)
"iTU" = (
@@ -12944,33 +12966,27 @@
/turf/simulated/floor/tiled,
/area/horizon/hallway/deck_three/primary/central)
"jdH" = (
+/obj/machinery/power/apc/west,
+/obj/structure/cable/green{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/obj/structure/table/reinforced/wood,
/obj/effect/floor_decal/spline/fancy/wood{
dir = 8
},
-/obj/structure/disposalpipe/segment{
- dir = 4;
- icon_state = "pipe-c"
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 6
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 6
- },
-/obj/structure/table/reinforced/wood,
-/obj/item/leviathan_case{
- pixel_x = -8;
- pixel_y = 3
- },
/obj/machinery/case_button/shuttle{
pixel_x = 4;
- pixel_y = 6
+ pixel_y = 15
},
-/obj/machinery/light_switch{
- dir = 8;
- pixel_x = -21;
- pixel_y = 4
+/obj/item/leviathan_case{
+ pixel_x = -8;
+ pixel_y = 17
},
+/obj/item/flame/lighter/zippo{
+ pixel_x = -8
+ },
+/obj/item/card/id/captains_spare,
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"jdI" = (
@@ -13157,12 +13173,6 @@
},
/turf/simulated/floor/tiled/dark,
/area/horizon/crew_armoury)
-"jnj" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/turf/simulated/floor/tiled/full,
-/area/operations/office_aux)
"jns" = (
/obj/structure/bed/stool/chair,
/obj/effect/floor_decal/corner/dark_green/diagonal,
@@ -13175,17 +13185,16 @@
"jok" = (
/obj/structure/table/reinforced/wood,
/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup{
- pixel_x = -8;
- pixel_y = 10
- },
-/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup{
- pixel_x = -8;
+ pixel_x = 11;
pixel_y = 4
},
-/obj/item/storage/box/fancy/donut,
/obj/machinery/chemical_dispenser/coffee/full{
- pixel_y = 10;
- pixel_x = 3
+ pixel_y = 8;
+ pixel_x = -3
+ },
+/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/one{
+ pixel_y = -1;
+ pixel_x = 11
},
/turf/simulated/floor/carpet,
/area/crew_quarters/captain)
@@ -13659,16 +13668,11 @@
/turf/simulated/floor/plating,
/area/maintenance/engineering_ladder)
"jFu" = (
-/obj/effect/floor_decal/spline/plain{
- dir = 1
- },
-/obj/effect/floor_decal/spline/plain,
-/obj/machinery/power/apc/super/north,
-/obj/structure/cable/green{
- icon_state = "0-4"
- },
-/turf/simulated/floor/carpet/rubber,
-/area/tcommsat/chamber)
+/obj/effect/floor_decal/industrial/warning,
+/obj/effect/decal/cleanable/dirt,
+/obj/random/junk,
+/turf/simulated/floor,
+/area/maintenance/engineering_ladder)
"jFO" = (
/obj/effect/landmark/start{
name = "Chief Medical Officer"
@@ -14148,21 +14152,6 @@
/obj/item/paper_bin{
pixel_x = -6
},
-/obj/item/pen/green{
- pixel_y = -3;
- pixel_x = 3
- },
-/obj/item/folder/blue{
- pixel_y = 7;
- pixel_x = 9
- },
-/obj/item/pen/blue{
- pixel_x = 8;
- pixel_y = 3
- },
-/obj/item/pen/red{
- pixel_x = 5
- },
/obj/item/stamp/denied{
pixel_x = 1;
pixel_y = 15
@@ -14174,7 +14163,24 @@
},
/obj/machinery/recharger/wallcharger{
pixel_x = 5;
- pixel_y = 28
+ pixel_y = 20
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/obj/item/pen/fountain/captain{
+ pixel_x = -5
+ },
+/obj/item/folder/sec{
+ pixel_y = 5;
+ pixel_x = 9
+ },
+/obj/item/folder/red{
+ pixel_x = 9
+ },
+/obj/item/paper/monitorkey{
+ pixel_y = -6;
+ pixel_x = 9
},
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
@@ -14377,7 +14383,6 @@
/obj/item/book/manual/psych,
/obj/item/book/manual/wiki/security_space_law,
/obj/item/book/manual/wiki/station_procedure,
-/obj/item/book/manual/gravitygenerator,
/obj/machinery/camera/network/command{
c_tag = "Bridge - Captain's Office Aft"
},
@@ -14819,6 +14824,7 @@
},
/obj/item/device/radio/intercom/north,
/obj/structure/table/reinforced/steel,
+/obj/item/device/taperecorder,
/turf/simulated/floor/tiled/dark,
/area/bridge/controlroom)
"kwf" = (
@@ -15120,7 +15126,6 @@
/turf/simulated/floor/tiled/dark/full,
/area/horizon/longbow)
"kHi" = (
-/obj/machinery/alarm/south,
/obj/effect/floor_decal/spline/fancy/wood/cee{
dir = 8
},
@@ -15675,11 +15680,6 @@
/obj/structure/grille,
/obj/structure/window/shuttle/scc_space_ship/cardinal,
/obj/structure/cable/green,
-/obj/machinery/door/blast/shutters/open{
- dir = 8;
- id = "captainshutters";
- name = "Safety Shutter"
- },
/obj/machinery/door/blast/regular{
density = 0;
icon_state = "pdoor0";
@@ -15687,6 +15687,11 @@
name = "Bridge Blast Doors";
opacity = 0
},
+/obj/machinery/door/blast/shutters/open{
+ dir = 8;
+ id = "shutters_deck3_captain";
+ name = "Safety Shutter"
+ },
/turf/simulated/floor/plating,
/area/crew_quarters/captain)
"lbi" = (
@@ -15802,17 +15807,9 @@
/obj/structure/railing/mapped{
dir = 4
},
-/obj/item/device/taperecorder{
- pixel_x = -9;
- pixel_y = -5
- },
/obj/effect/floor_decal/corner/dark_blue{
dir = 6
},
-/obj/item/clipboard{
- pixel_x = 5;
- pixel_y = -4
- },
/obj/item/folder/blue{
pixel_y = 7;
pixel_x = 5
@@ -15821,14 +15818,16 @@
pixel_y = 7;
pixel_x = 5
},
-/obj/item/pen/red{
- pixel_x = 7;
- pixel_y = 3
- },
-/obj/item/pen/blue{
- pixel_x = 5
- },
/obj/structure/table/reinforced/steel,
+/obj/item/folder/red{
+ pixel_y = 4;
+ pixel_x = 5
+ },
+/obj/machinery/light_switch{
+ dir = 6;
+ pixel_x = 5;
+ pixel_y = -7
+ },
/turf/simulated/floor/tiled/dark,
/area/bridge/controlroom)
"ldS" = (
@@ -16004,6 +16003,7 @@
/obj/structure/table/standard,
/obj/item/storage/box/lights/mixed,
/obj/item/storage/box/lights/tubes,
+/obj/item/device/lightreplacer,
/turf/simulated/floor/tiled,
/area/bridge/bridge_crew)
"lkQ" = (
@@ -16147,7 +16147,6 @@
/obj/effect/floor_decal/industrial/warning{
dir = 10
},
-/obj/machinery/light/spot,
/obj/structure/railing/mapped{
dir = 8
},
@@ -16163,6 +16162,19 @@
/obj/structure/grille,
/turf/simulated/floor/tiled/dark/full/airless,
/area/bridge/controlroom)
+"lpo" = (
+/obj/effect/floor_decal/spline/plain/corner{
+ dir = 8
+ },
+/obj/effect/floor_decal/spline/plain/corner,
+/obj/effect/floor_decal/spline/plain{
+ dir = 1
+ },
+/obj/machinery/light{
+ dir = 1
+ },
+/turf/simulated/floor/carpet/rubber,
+/area/tcommsat/chamber)
"lqb" = (
/obj/effect/floor_decal/corner/dark_blue{
dir = 10
@@ -16289,7 +16301,6 @@
dir = 1
},
/obj/machinery/firealarm/north,
-/obj/machinery/light/small/emergency,
/turf/simulated/floor/reinforced,
/area/bridge/selfdestruct)
"ltG" = (
@@ -16333,17 +16344,27 @@
/turf/simulated/floor/reinforced,
/area/bridge/controlroom)
"lve" = (
-/obj/machinery/door/airlock/highsecurity{
- name = "Emergency Exit";
+/obj/effect/floor_decal/spline/fancy/wood{
+ dir = 10
+ },
+/obj/machinery/button/remote/airlock{
+ name = "Emergency Escape Bolts";
+ specialfunctions = 4;
+ id = "cap_escape";
+ pixel_x = -21;
+ dir = 8;
+ pixel_y = -5
+ },
+/obj/machinery/button/remote/blast_door{
+ desc = "A remote control-switch for engine core.";
+ id = "cap_escape_blast";
+ name = "Emergency Exit Blast Door";
+ pixel_x = -21;
req_access = list(20);
- locked = 1;
- id_tag = "cap_escape"
+ dir = 8;
+ pixel_y = 8
},
-/obj/machinery/door/blast/regular{
- dir = 4;
- id = "cap_escape_blast"
- },
-/turf/simulated/floor/tiled,
+/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"lvm" = (
/obj/structure/table/reinforced/wood,
@@ -16360,9 +16381,6 @@
/obj/effect/floor_decal/industrial/warning{
dir = 9
},
-/obj/machinery/light/spot{
- dir = 1
- },
/obj/structure/railing/mapped{
dir = 8
},
@@ -16382,12 +16400,6 @@
/obj/effect/floor_decal/corner/red/diagonal,
/turf/simulated/floor/tiled/dark,
/area/horizon/crew_armoury)
-"lvS" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 5
- },
-/turf/simulated/floor/plating,
-/area/maintenance/engineering_ladder)
"lvV" = (
/obj/effect/floor_decal/spline/fancy/wood{
dir = 7
@@ -16612,10 +16624,6 @@
/obj/machinery/light{
dir = 8
},
-/obj/machinery/camera/network/command{
- c_tag = "Bridge - Conference Room";
- dir = 4
- },
/turf/simulated/floor/tiled/dark,
/area/bridge/meeting_room)
"lEq" = (
@@ -16885,15 +16893,6 @@
/turf/simulated/floor/tiled/dark,
/area/bridge/controlroom)
"lQE" = (
-/obj/structure/disposalpipe/segment{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 4
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 4
- },
/obj/machinery/hologram/holopad/long_range,
/turf/simulated/floor/carpet,
/area/crew_quarters/captain)
@@ -17073,12 +17072,13 @@
dir = 7
},
/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"mae" = (
@@ -17236,7 +17236,12 @@
/obj/effect/floor_decal/corner/dark_blue{
dir = 5
},
-/obj/machinery/photocopier,
+/obj/structure/table/reinforced/steel,
+/obj/machinery/photocopier/faxmachine{
+ anchored = 0;
+ department = "SCCV Horizon Bridge";
+ pixel_y = 4
+ },
/turf/simulated/floor/tiled,
/area/bridge/controlroom)
"mcf" = (
@@ -17311,13 +17316,17 @@
/obj/structure/disposalpipe/trunk{
dir = 1
},
+/obj/machinery/keycard_auth{
+ pixel_x = 1;
+ pixel_y = -26
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop/xo)
"meU" = (
/turf/simulated/wall/r_wall,
/area/bridge/upperdeck)
"mfh" = (
-/obj/structure/table/wood,
+/obj/structure/table/reinforced/wood,
/obj/item/clipboard,
/turf/simulated/floor/tiled/dark,
/area/bridge/meeting_room)
@@ -17470,10 +17479,7 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 8
},
-/obj/structure/disposalpipe/segment{
- dir = 8;
- icon_state = "pipe-c"
- },
+/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"mhE" = (
@@ -17525,6 +17531,16 @@
},
/turf/simulated/floor,
/area/crew_quarters/captain)
+"miH" = (
+/obj/structure/disposalpipe/segment,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/machinery/light/small/emergency{
+ dir = 4
+ },
+/turf/simulated/floor,
+/area/maintenance/engineering_ladder)
"miK" = (
/obj/effect/floor_decal/spline/fancy/wood{
dir = 5
@@ -17616,7 +17632,7 @@
icon_state = "1-8"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 9
+ dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -17889,10 +17905,6 @@
/obj/item/melee/baton/loaded,
/obj/item/melee/baton/loaded,
/obj/effect/floor_decal/industrial/outline/red,
-/obj/machinery/camera/network/command{
- c_tag = "Bridge - Supplies Room";
- dir = 8
- },
/turf/simulated/floor/tiled,
/area/bridge/supply)
"mvx" = (
@@ -18106,10 +18118,7 @@
/turf/simulated/floor/carpet,
/area/horizon/security/investigators_office)
"mHZ" = (
-/obj/machinery/alarm/north{
- dir = 2;
- pixel_y = -9
- },
+/obj/machinery/alarm/south,
/obj/effect/floor_decal/spline/fancy/wood{
dir = 1
},
@@ -18119,6 +18128,15 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"mIc" = (
@@ -18187,11 +18205,15 @@
name = "Captain Desk Shutters";
opacity = 0
},
-/obj/item/storage/secure/briefcase{
- pixel_x = -5
- },
/obj/structure/disposalpipe/segment,
-/turf/simulated/floor/tiled/full,
+/obj/item/storage/secure/briefcase,
+/obj/machinery/button/switch/windowtint{
+ dir = 4;
+ id = "cap";
+ pixel_x = 19;
+ pixel_y = 1
+ },
+/turf/simulated/floor/tiled/dark/full,
/area/crew_quarters/captain)
"mKb" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
@@ -18253,6 +18275,9 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 4
},
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"mNj" = (
@@ -18454,9 +18479,6 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
-/obj/machinery/camera/network/command{
- c_tag = "Bridge - Executive Officer's Office"
- },
/turf/simulated/floor/carpet,
/area/crew_quarters/heads/hop/xo)
"mTK" = (
@@ -18796,12 +18818,6 @@
/turf/simulated/floor/tiled/white,
/area/hallway/medical/upper)
"ncr" = (
-/obj/effect/landmark/start{
- name = "Security Officer"
- },
-/obj/structure/bed/stool/chair{
- dir = 1
- },
/obj/effect/floor_decal/corner/dark_blue/full{
dir = 4
},
@@ -18960,7 +18976,7 @@
name = "Captain Desk Shutters";
opacity = 0
},
-/turf/simulated/floor/tiled/full,
+/turf/simulated/floor/tiled/dark/full,
/area/crew_quarters/captain)
"nji" = (
/obj/effect/floor_decal/corner/dark_green{
@@ -19514,6 +19530,9 @@
/obj/effect/floor_decal/corner/dark_blue{
dir = 6
},
+/obj/machinery/recharge_station,
+/obj/effect/floor_decal/industrial/hatch/yellow,
+/obj/machinery/firealarm/north,
/turf/simulated/floor/tiled,
/area/horizon/stairwell/bridge)
"nDO" = (
@@ -19887,13 +19906,12 @@
id = "conferencesafetyshutters";
name = "Conference Room Shutters";
pixel_x = -26;
- pixel_y = 4;
+ pixel_y = 8;
req_access = list(19)
},
/obj/machinery/light_switch{
dir = 5;
- pixel_x = -26;
- pixel_y = -3
+ pixel_x = -26
},
/turf/simulated/floor/carpet,
/area/bridge/meeting_room)
@@ -19949,16 +19967,18 @@
/turf/simulated/floor/tiled/dark/full,
/area/tcommsat/chamber)
"nRe" = (
-/obj/machinery/suit_cycler/captain,
-/obj/item/clothing/suit/space/void/captain,
-/obj/item/tank/jetpack/oxygen,
-/obj/item/clothing/head/helmet/space/void/captain,
-/obj/effect/floor_decal/spline/fancy/wood{
- dir = 6
- },
/obj/structure/cable/green{
icon_state = "4-8"
},
+/obj/effect/floor_decal/spline/fancy/wood{
+ dir = 4
+ },
+/obj/structure/filingcabinet{
+ pixel_x = -9
+ },
+/obj/machinery/papershredder{
+ pixel_x = 7
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"nRH" = (
@@ -20078,6 +20098,15 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 6
},
+/obj/structure/table/standard,
+/obj/item/device/taperecorder{
+ pixel_x = -4;
+ pixel_y = 3
+ },
+/obj/machinery/recharger{
+ pixel_x = 8;
+ pixel_y = 6
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop/xo)
"nVK" = (
@@ -20259,10 +20288,10 @@
dir = 1
},
/obj/structure/cable/green{
- icon_state = "4-8"
+ icon_state = "1-2"
},
/obj/structure/cable/green{
- icon_state = "1-4"
+ icon_state = "2-8"
},
/turf/simulated/floor/carpet,
/area/crew_quarters/captain)
@@ -20334,11 +20363,11 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 6
},
-/obj/structure/filingcabinet{
- pixel_x = -8
- },
-/obj/structure/filingcabinet/chestdrawer{
- pixel_x = 8
+/obj/structure/displaycase/adhomai_map,
+/obj/machinery/button/remote/blast_door{
+ id = "shutters_deck3_captain";
+ name = "External Shutters";
+ pixel_y = -18
},
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
@@ -20412,7 +20441,9 @@
dir = 4
},
/obj/structure/table/reinforced/wood,
-/obj/item/reagent_containers/glass/beaker/teapot,
+/obj/item/reagent_containers/glass/beaker/teapot{
+ pixel_y = 4
+ },
/turf/simulated/floor/wood,
/area/bridge/minibar)
"ogm" = (
@@ -20693,16 +20724,6 @@
/obj/item/stock_parts/subspace/crystal,
/turf/simulated/floor/carpet/rubber,
/area/tcommsat/entrance)
-"ook" = (
-/obj/structure/disposalpipe/segment,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
-/obj/structure/lattice/catwalk/indoor/grate,
-/obj/machinery/light/small/emergency{
- dir = 4
- },
-/turf/simulated/floor,
-/area/maintenance/engineering_ladder)
"ooy" = (
/obj/structure/grille,
/obj/machinery/door/firedoor,
@@ -21354,9 +21375,6 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
/obj/effect/floor_decal/spline/fancy/wood/corner{
dir = 1
},
@@ -21604,20 +21622,13 @@
/turf/simulated/floor/tiled,
/area/horizon/hallway/deck_three/primary/central)
"oTB" = (
-/obj/machinery/requests_console/north{
- announcementConsole = 1;
- department = "Bridge";
- departmentType = 5;
- name = "Bridge Requests Console";
- pixel_y = 35;
- pixel_x = -2
- },
/obj/effect/floor_decal/corner/dark_blue/full{
dir = 8
},
/obj/machinery/light{
dir = 8
},
+/obj/machinery/photocopier,
/turf/simulated/floor/tiled,
/area/bridge/controlroom)
"oTL" = (
@@ -21884,15 +21895,6 @@
/obj/structure/bed/stool/padded/blue,
/turf/simulated/floor/tiled/dark,
/area/horizon/security/evidence_storage)
-"pfd" = (
-/obj/effect/floor_decal/spline/fancy/wood{
- dir = 8
- },
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
-/turf/simulated/floor/wood,
-/area/crew_quarters/captain)
"pfL" = (
/obj/machinery/door/window{
dir = 1
@@ -21998,7 +22000,6 @@
/turf/simulated/wall/shuttle/scc_space_ship/cardinal,
/area/crew_quarters/captain)
"plp" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/floor_decal/corner/dark_blue/full,
/obj/machinery/camera/network/command{
c_tag = "Bridge - Kitchen Stairwell";
@@ -22217,6 +22218,21 @@
},
/turf/simulated/floor/tiled/full,
/area/bridge)
+"pwt" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/structure/disposalpipe/segment,
+/obj/structure/cable/green{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/firedoor,
+/obj/machinery/door/airlock/mining{
+ dir = 1;
+ req_one_access = list(26,29,31,48,67,70);
+ name = "Operations Bay"
+ },
+/turf/simulated/floor/tiled/full,
+/area/operations/office_aux)
"pwL" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/door/airlock/external,
@@ -22458,11 +22474,16 @@
/turf/simulated/floor/tiled,
/area/horizon/hallway/deck_three/primary/central)
"pKI" = (
-/obj/effect/floor_decal/corner/dark_blue/full{
- dir = 8
+/obj/machinery/door/airlock/highsecurity{
+ name = "Emergency Exit";
+ req_access = list(20);
+ locked = 1;
+ id_tag = "cap_escape"
+ },
+/obj/machinery/door/blast/regular{
+ dir = 4;
+ id = "cap_escape_blast"
},
-/obj/machinery/firealarm/west,
-/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/tiled,
/area/horizon/stairwell/bridge)
"pMi" = (
@@ -22553,6 +22574,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
+/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled,
/area/bridge/bridge_crew)
"pOs" = (
@@ -22642,8 +22664,10 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/item/device/radio/intercom/east{
- pixel_y = 1
+/obj/machinery/alarm/north{
+ dir = 4;
+ pixel_y = 0;
+ pixel_x = 10
},
/turf/simulated/floor/tiled,
/area/bridge/controlroom)
@@ -22661,7 +22685,7 @@
/obj/effect/floor_decal/spline/fancy/wood/cee{
dir = 8
},
-/obj/structure/displaycase/adhomai_map,
+/obj/random/pottedplant,
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"pSD" = (
@@ -22861,7 +22885,6 @@
/obj/effect/floor_decal/corner/dark_blue{
dir = 9
},
-/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/power/apc/low/west,
/obj/structure/cable/green{
icon_state = "0-2"
@@ -22915,10 +22938,11 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 10
},
-/obj/machinery/light{
- dir = 8
- },
/obj/structure/disposalpipe/segment,
+/obj/machinery/light_switch{
+ dir = 8;
+ pixel_x = -19
+ },
/turf/simulated/floor/wood,
/area/bridge/minibar)
"qcE" = (
@@ -22949,12 +22973,6 @@
/obj/effect/floor_decal/corner/dark_blue{
dir = 9
},
-/obj/structure/bed/stool/chair{
- dir = 4
- },
-/obj/effect/landmark/start{
- name = "Investigator"
- },
/turf/simulated/floor/tiled/dark,
/area/horizon/security/meeting_room)
"qeu" = (
@@ -23085,11 +23103,8 @@
/area/tcommsat/chamber)
"qkE" = (
/obj/machinery/alarm/north,
-/obj/effect/floor_decal/spline/fancy/wood{
- dir = 1
- },
/obj/machinery/chem_heater,
-/turf/simulated/floor/wood,
+/turf/simulated/floor/tiled/full,
/area/bridge/minibar)
"qkW" = (
/obj/structure/cable/green{
@@ -23303,11 +23318,6 @@
"qrL" = (
/obj/structure/grille,
/obj/machinery/door/firedoor,
-/obj/machinery/door/blast/shutters/open{
- dir = 8;
- id = "captainshutters";
- name = "Safety Shutter"
- },
/obj/structure/cable/green{
d2 = 2;
icon_state = "0-2"
@@ -23320,13 +23330,20 @@
name = "Bridge Blast Doors";
opacity = 0
},
+/obj/machinery/door/blast/shutters/open{
+ dir = 8;
+ id = "shutters_deck3_captain";
+ name = "Safety Shutter"
+ },
/turf/simulated/floor/plating,
/area/crew_quarters/captain)
"qrQ" = (
-/obj/structure/bed/stool/bar/padded/blue,
/obj/effect/floor_decal/spline/fancy/wood{
dir = 8
},
+/obj/structure/bed/stool/bar/padded/blue{
+ dir = 8
+ },
/turf/simulated/floor/wood,
/area/bridge/minibar)
"qsd" = (
@@ -23449,13 +23466,17 @@
/obj/effect/floor_decal/corner/dark_blue{
dir = 5
},
-/obj/item/paper_bin,
-/obj/item/pen,
-/obj/item/clipboard,
+/obj/item/clipboard{
+ pixel_y = 2;
+ pixel_x = -22
+ },
/obj/item/stack/packageWrap,
/obj/item/device/hand_labeler,
/obj/item/stack/wrapping_paper,
/obj/structure/table/reinforced/steel,
+/obj/item/folder/sec{
+ pixel_y = 3
+ },
/turf/simulated/floor/tiled,
/area/bridge/controlroom)
"qxO" = (
@@ -23622,6 +23643,17 @@
},
/turf/simulated/floor/reinforced/airless,
/area/horizon/exterior)
+"qCO" = (
+/obj/effect/floor_decal/spline/plain,
+/obj/effect/floor_decal/spline/plain{
+ dir = 1
+ },
+/obj/effect/floor_decal/industrial/outline/firefighting_closet,
+/obj/structure/closet/walllocker/firecloset{
+ pixel_y = 32
+ },
+/turf/simulated/floor/carpet/rubber,
+/area/tcommsat/chamber)
"qDc" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -23630,6 +23662,7 @@
dir = 6
},
/obj/structure/closet/secure_closet/bridge_crew,
+/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled,
/area/bridge/bridge_crew)
"qDx" = (
@@ -23672,14 +23705,6 @@
/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled/full,
/area/horizon/hallway/deck_three/primary/central)
-"qGg" = (
-/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
-/obj/machinery/door/blast/shutters{
- dir = 2;
- id = "cargo_desk"
- },
-/turf/simulated/floor/tiled/dark/full,
-/area/operations/office_aux)
"qGP" = (
/obj/effect/floor_decal/corner/dark_blue/diagonal,
/obj/random/pottedplant,
@@ -23744,8 +23769,10 @@
dir = 1
},
/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/machinery/door/firedoor,
/obj/structure/window/reinforced,
+/obj/machinery/door/firedoor{
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/bridge/upperdeck)
"qIl" = (
@@ -23773,6 +23800,9 @@
dir = 1
},
/obj/machinery/disposal/small/west,
+/obj/item/device/radio/intercom/east{
+ pixel_y = 1
+ },
/turf/simulated/floor/tiled,
/area/bridge/controlroom)
"qIy" = (
@@ -23906,12 +23936,13 @@
/turf/simulated/floor/tiled/dark,
/area/bridge/controlroom)
"qMd" = (
-/obj/structure/fireaxecabinet/north{
- pixel_y = 30
- },
/obj/effect/floor_decal/corner/dark_blue{
dir = 5
},
+/obj/machinery/light_switch{
+ dir = 1;
+ pixel_y = 28
+ },
/turf/simulated/floor/tiled,
/area/bridge/controlroom)
"qMs" = (
@@ -24001,24 +24032,32 @@
/turf/simulated/floor/tiled,
/area/horizon/hallway/deck_three/primary/central)
"qRg" = (
-/obj/structure/table/reinforced/wood,
/obj/effect/floor_decal/spline/fancy/wood{
dir = 9
},
-/obj/structure/disposalpipe/segment{
- dir = 2;
- icon_state = "pipe-c"
- },
-/obj/machinery/atmospherics/unary/vent_pump/on{
- dir = 8
+/obj/structure/table/reinforced/wood,
+/obj/item/pinpointer{
+ pixel_x = 7;
+ pixel_y = -2
},
/obj/item/disk/nuclear{
pixel_x = 10;
pixel_y = 6
},
-/obj/item/pinpointer{
- pixel_x = 7;
- pixel_y = -7
+/obj/machinery/button/remote/blast_door{
+ desc = "A remote control-switch for shutters.";
+ dir = 1;
+ id = "cap_office_desk";
+ name = "Desk Privacy Shutter";
+ pixel_x = -6;
+ pixel_y = 8
+ },
+/obj/machinery/button/remote/airlock{
+ dir = 1;
+ pixel_x = -6;
+ name = "Command Foyer Doors";
+ id = "command_foyer";
+ pixel_y = -3
},
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
@@ -24059,9 +24098,8 @@
/area/hallway/medical/upper)
"qSY" = (
/obj/effect/floor_decal/industrial/warning{
- dir = 6
+ dir = 5
},
-/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
/area/maintenance/engineering_ladder)
"qTN" = (
@@ -24326,15 +24364,17 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 7
},
-/obj/machinery/firealarm/west{
- dir = 2;
- pixel_x = 0;
- pixel_y = -22
- },
+/obj/machinery/firealarm/south,
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/light,
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"rfY" = (
@@ -24499,8 +24539,6 @@
eftpos_name = "HoP EFTPOS scanner"
},
/obj/item/book/manual/wiki/security_space_law,
-/obj/item/stamp/denied,
-/obj/item/stamp/xo,
/turf/simulated/floor/wood,
/area/crew_quarters/heads/hop/xo)
"rmh" = (
@@ -24679,7 +24717,7 @@
"rqM" = (
/obj/item/folder/blue,
/obj/item/pen,
-/obj/structure/table/wood,
+/obj/structure/table/reinforced/wood,
/turf/simulated/floor/tiled/dark,
/area/bridge/meeting_room)
"rqN" = (
@@ -24804,12 +24842,8 @@
/obj/effect/floor_decal/spline/plain/corner{
dir = 8
},
-/obj/effect/floor_decal/spline/plain/corner,
/obj/effect/floor_decal/spline/plain{
- dir = 1
- },
-/obj/machinery/light{
- dir = 1
+ dir = 5
},
/turf/simulated/floor/carpet/rubber,
/area/tcommsat/chamber)
@@ -24988,11 +25022,14 @@
/turf/simulated/floor,
/area/maintenance/engineering_ladder)
"rzX" = (
-/obj/structure/window/shuttle/scc_space_ship,
-/obj/structure/grille,
-/obj/machinery/door/firedoor,
-/turf/simulated/floor/plating,
-/area/maintenance/security_starboard)
+/obj/structure/bed/stool/bar/padded/blue{
+ dir = 8
+ },
+/obj/effect/floor_decal/spline/fancy/wood{
+ dir = 8
+ },
+/turf/simulated/floor/wood,
+/area/bridge/minibar)
"rAd" = (
/obj/effect/map_effect/map_helper/ruler_tiles_3,
/turf/simulated/floor/reinforced/airless,
@@ -25128,13 +25165,9 @@
/turf/simulated/floor/tiled/full,
/area/horizon/hallway/deck_three/primary/starboard)
"rGK" = (
-/obj/effect/floor_decal/industrial/warning/cee{
- dir = 4
- },
-/obj/machinery/light/small/emergency{
- dir = 8;
- pixel_x = 16
- },
+/obj/structure/table/rack,
+/obj/random/loot,
+/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor,
/area/maintenance/engineering_ladder)
"rHb" = (
@@ -25422,12 +25455,26 @@
/obj/effect/floor_decal/corner/dark_blue{
dir = 10
},
-/obj/machinery/light/floor,
/obj/machinery/camera/network/command{
c_tag = "Bridge - XO Line";
dir = 1;
network = list("Command","XO_Office")
},
+/obj/structure/table/standard,
+/obj/machinery/recharger{
+ pixel_x = -8;
+ pixel_y = 8
+ },
+/obj/item/device/toner,
+/obj/item/device/toner,
+/obj/item/paper_bin{
+ pixel_x = 5;
+ pixel_y = 9
+ },
+/obj/item/pen{
+ pixel_y = 9;
+ pixel_x = 4
+ },
/turf/simulated/floor/tiled,
/area/bridge/upperdeck)
"rQI" = (
@@ -26436,9 +26483,6 @@
name = "Commemorative SCC Plaque"
},
/obj/effect/floor_decal/spline/fancy/wood/full,
-/obj/structure/cable/green{
- icon_state = "4-8"
- },
/mob/living/simple_animal/corgi/fox/Chauncey,
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
@@ -26627,6 +26671,9 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 7
},
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"sFf" = (
@@ -26771,21 +26818,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
-/obj/machinery/camera/network/third_deck{
- c_tag = "Third Deck - Port Hallway Approach";
- dir = 1
- },
/turf/simulated/floor/tiled,
/area/horizon/hallway/deck_three/primary/central)
"sIz" = (
-/obj/effect/floor_decal/corner/dark_blue/full{
- dir = 1
- },
-/obj/machinery/recharge_station,
-/obj/machinery/light{
- dir = 4
- },
-/turf/simulated/floor/tiled,
+/turf/simulated/wall/r_wall,
/area/horizon/stairwell/bridge)
"sIL" = (
/obj/structure/table/wood,
@@ -26850,6 +26886,7 @@
dir = 6
},
/obj/effect/floor_decal/industrial/outline/red,
+/obj/machinery/alarm/east,
/turf/simulated/floor/tiled,
/area/bridge/supply)
"sKT" = (
@@ -26911,12 +26948,6 @@
pixel_x = -23;
pixel_y = 4
},
-/obj/structure/bed/stool/chair{
- dir = 4
- },
-/obj/effect/landmark/start{
- name = "Investigator"
- },
/turf/simulated/floor/tiled/dark,
/area/horizon/security/meeting_room)
"sNZ" = (
@@ -27065,6 +27096,9 @@
/area/horizon/security/evidence_storage)
"sSv" = (
/obj/structure/table/reinforced/wood,
+/obj/item/paper_scanner{
+ pixel_x = -1
+ },
/turf/simulated/floor/carpet,
/area/crew_quarters/heads/hop/xo)
"sSC" = (
@@ -27476,15 +27510,6 @@
},
/turf/simulated/floor/wood,
/area/bridge/minibar)
-"tnY" = (
-/obj/structure/table/rack,
-/obj/random/loot,
-/obj/effect/floor_decal/industrial/warning,
-/obj/machinery/light/small/emergency{
- dir = 1
- },
-/turf/simulated/floor,
-/area/maintenance/engineering_ladder)
"tor" = (
/obj/effect/floor_decal/spline/fancy/wood/cee,
/obj/structure/flora/ausbushes/ywflowers,
@@ -27998,7 +28023,9 @@
},
/obj/effect/floor_decal/corner/dark_blue/diagonal,
/obj/effect/floor_decal/industrial/hatch/yellow,
-/obj/machinery/door/firedoor,
+/obj/machinery/door/firedoor{
+ dir = 4
+ },
/turf/simulated/floor/tiled,
/area/bridge)
"tFz" = (
@@ -28198,11 +28225,6 @@
/obj/structure/cable/green{
icon_state = "1-2"
},
-/obj/machinery/door/blast/shutters/open{
- dir = 8;
- id = "captainshutters";
- name = "Safety Shutter"
- },
/obj/machinery/door/blast/regular{
density = 0;
icon_state = "pdoor0";
@@ -28210,6 +28232,11 @@
name = "Bridge Blast Doors";
opacity = 0
},
+/obj/machinery/door/blast/shutters/open{
+ dir = 8;
+ id = "shutters_deck3_captain";
+ name = "Safety Shutter"
+ },
/turf/simulated/floor/plating,
/area/crew_quarters/captain)
"tKU" = (
@@ -28226,20 +28253,19 @@
/area/bridge/controlroom)
"tLh" = (
/obj/effect/floor_decal/spline/fancy/wood,
-/obj/structure/table/wood,
+/obj/structure/table/reinforced/wood,
/obj/machinery/button/remote/airlock{
dir = 9;
id = "conference_room";
name = "Conference Room Bolts";
- pixel_x = -4;
- pixel_y = 4;
+ pixel_x = -3;
+ pixel_y = 8;
specialfunctions = 4
},
/obj/machinery/button/switch/windowtint{
dir = 5;
id = "bridgeconf";
- pixel_x = -4;
- pixel_y = -3
+ pixel_x = -3
},
/turf/simulated/floor/carpet,
/area/bridge/meeting_room)
@@ -28275,10 +28301,10 @@
/turf/simulated/floor/wood,
/area/crew_quarters/lounge/secondary)
"tNE" = (
-/obj/item/hullbeacon/red,
/obj/effect/floor_decal/spline/plain/corner{
dir = 1
},
+/obj/structure/grille,
/turf/simulated/floor/reinforced/airless,
/area/horizon/exterior)
"tNF" = (
@@ -28840,6 +28866,9 @@
/obj/machinery/light{
dir = 4
},
+/obj/item/clothing/mask/gas/alt,
+/obj/item/clothing/mask/gas/alt,
+/obj/item/clothing/mask/gas/alt,
/turf/simulated/floor/tiled,
/area/bridge/supply)
"uhy" = (
@@ -29073,13 +29102,6 @@
/obj/effect/floor_decal/corner/dark_blue{
dir = 9
},
-/obj/structure/table/standard,
-/obj/item/device/toner,
-/obj/item/device/toner,
-/obj/machinery/recharger{
- pixel_x = -6;
- pixel_y = 8
- },
/turf/simulated/floor/tiled,
/area/bridge/upperdeck)
"utH" = (
@@ -29361,11 +29383,6 @@
/obj/structure/cable/green{
icon_state = "1-4"
},
-/obj/machinery/door/blast/shutters/open{
- dir = 8;
- id = "captainshutters";
- name = "Safety Shutter"
- },
/obj/machinery/door/blast/regular{
density = 0;
icon_state = "pdoor0";
@@ -29373,6 +29390,11 @@
name = "Bridge Blast Doors";
opacity = 0
},
+/obj/machinery/door/blast/shutters/open{
+ dir = 8;
+ id = "shutters_deck3_captain";
+ name = "Safety Shutter"
+ },
/turf/simulated/floor/plating,
/area/crew_quarters/captain)
"uCk" = (
@@ -29712,7 +29734,7 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 1
},
-/obj/structure/table/wood,
+/obj/structure/table/reinforced/wood,
/obj/item/book/manual/wiki/security_space_law,
/obj/item/paper_bin{
pixel_x = -3;
@@ -30116,7 +30138,6 @@
/obj/effect/floor_decal/corner/dark_blue/full{
dir = 1
},
-/obj/effect/floor_decal/industrial/outline/red,
/obj/machinery/firealarm/west{
dir = 4;
pixel_x = 22
@@ -30505,25 +30526,16 @@
/area/template_noop)
"vtr" = (
/obj/effect/floor_decal/spline/fancy/wood,
-/obj/machinery/button/remote/blast_door{
- desc = "A remote control-switch for engine core.";
- id = "cap_escape_blast";
- name = "Emergency Exit Blast Door";
- pixel_x = -7;
- pixel_y = -23;
- req_access = list(20)
- },
/obj/structure/cable/green{
icon_state = "4-8"
},
-/obj/machinery/button/remote/airlock{
- name = "Emergency Escape Bolts";
- specialfunctions = 4;
- id = "cap_escape";
- pixel_y = -23;
- pixel_x = 6
+/obj/machinery/disposal/small/north,
+/obj/structure/disposalpipe/trunk{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
},
-/obj/machinery/light,
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"vtG" = (
@@ -30851,12 +30863,12 @@
c_tag = "Bridge - Aft";
dir = 8
},
-/obj/machinery/alarm/north{
- dir = 4;
- pixel_y = 0;
- pixel_x = 10
+/obj/machinery/papershredder{
+ pixel_x = 7
+ },
+/obj/structure/filingcabinet{
+ pixel_x = -9
},
-/obj/machinery/papershredder,
/turf/simulated/floor/tiled,
/area/bridge/controlroom)
"vDv" = (
@@ -31029,6 +31041,9 @@
/obj/effect/floor_decal/spline/fancy/wood/corner{
dir = 4
},
+/obj/structure/cable/green{
+ icon_state = "4-8"
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"vJc" = (
@@ -31298,9 +31313,6 @@
/obj/machinery/light{
dir = 4
},
-/obj/machinery/camera/network/command{
- c_tag = "Bridge - Human Resources Lounge"
- },
/turf/simulated/floor/tiled,
/area/bridge/cciaroom/lounge)
"vSg" = (
@@ -31567,32 +31579,30 @@
/turf/simulated/wall/r_wall,
/area/horizon/hallway/deck_three/primary/central)
"wdJ" = (
-/obj/machinery/photocopier/faxmachine{
- anchored = 0;
- department = "SCCV Horizon Bridge";
- pixel_y = 4
- },
/obj/effect/floor_decal/corner/dark_blue{
dir = 5
},
/obj/structure/table/reinforced/steel,
+/obj/machinery/requests_console/north{
+ announcementConsole = 1;
+ department = "Bridge";
+ departmentType = 5;
+ name = "Bridge Requests Console";
+ pixel_y = 32
+ },
+/obj/item/paper_bin{
+ pixel_y = 3;
+ pixel_x = -5
+ },
+/obj/item/pen{
+ pixel_x = -5
+ },
/turf/simulated/floor/tiled,
/area/bridge/controlroom)
"weA" = (
/obj/structure/bed/stool/chair/office/bridge{
dir = 1
},
-/obj/machinery/button/switch/windowtint{
- dir = 10;
- id = "cap";
- pixel_x = 41;
- pixel_y = 33
- },
-/obj/machinery/computer/security/telescreen{
- name = "Access Monitor";
- network = list("Capt_Office");
- pixel_y = 32
- },
/obj/machinery/button/remote/blast_door{
dir = 10;
id = "bridge blast";
@@ -31684,6 +31694,9 @@
/obj/effect/floor_decal/corner/dark_blue/full{
dir = 1
},
+/obj/structure/fireaxecabinet/north{
+ pixel_y = 30
+ },
/turf/simulated/floor/tiled,
/area/bridge/controlroom)
"wik" = (
@@ -31737,11 +31750,6 @@
/obj/structure/cable/green{
icon_state = "1-8"
},
-/obj/machinery/door/blast/shutters/open{
- dir = 8;
- id = "captainshutters";
- name = "Safety Shutter"
- },
/obj/machinery/door/blast/regular{
density = 0;
icon_state = "pdoor0";
@@ -31749,6 +31757,11 @@
name = "Bridge Blast Doors";
opacity = 0
},
+/obj/machinery/door/blast/shutters/open{
+ dir = 8;
+ id = "shutters_deck3_captain";
+ name = "Safety Shutter"
+ },
/turf/simulated/floor/plating,
/area/crew_quarters/captain)
"wld" = (
@@ -32323,35 +32336,37 @@
/turf/simulated/floor/reinforced/airless,
/area/template_noop)
"wGR" = (
-/obj/item/stack/medical/ointment,
-/obj/item/stack/medical/ointment,
-/obj/item/stack/medical/bruise_pack,
-/obj/item/stack/medical/bruise_pack,
-/obj/item/reagent_containers/hypospray/autoinjector/dylovene,
-/obj/item/reagent_containers/hypospray/autoinjector/dylovene,
-/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline,
-/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline,
-/obj/structure/closet/walllocker/medical/secure{
- pixel_y = 30
- },
/obj/effect/floor_decal/corner/dark_blue/diagonal,
/obj/effect/floor_decal/industrial/outline/medical,
+/obj/item/storage/firstaid/large,
+/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline,
+/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline,
+/obj/item/reagent_containers/hypospray/autoinjector/dylovene,
+/obj/item/reagent_containers/hypospray/autoinjector/dylovene,
+/obj/item/storage/firstaid/o2,
+/obj/structure/closet/walllocker/medical{
+ pixel_y = 30
+ },
/turf/simulated/floor/tiled,
/area/bridge)
"wHl" = (
-/obj/effect/floor_decal/spline/plain{
- dir = 8
- },
-/obj/effect/floor_decal/spline/plain{
+/obj/structure/disposalpipe/segment{
dir = 4
},
-/obj/machinery/atmospherics/pipe/simple/hidden/black,
-/obj/machinery/light{
- dir = 8;
- icon_state = "tube_empty"
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
},
-/turf/simulated/floor/carpet/rubber,
-/area/tcommsat/chamber)
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/lattice/catwalk/indoor/grate,
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor,
+/area/maintenance/engineering_ladder)
"wIr" = (
/obj/machinery/door/firedoor,
/obj/machinery/door/blast/shutters{
@@ -32420,6 +32435,9 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
+/obj/effect/floor_decal/spline/fancy/wood{
+ dir = 1
+ },
/turf/simulated/floor/wood,
/area/bridge/minibar)
"wJY" = (
@@ -32440,6 +32458,7 @@
dir = 8
},
/obj/machinery/alarm/north,
+/obj/random/pottedplant,
/turf/simulated/floor/wood,
/area/bridge/meeting_room)
"wLb" = (
@@ -32538,13 +32557,13 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 5
},
-/obj/machinery/button/remote/airlock{
- dir = 1;
- pixel_y = 28;
- name = "Exterior Shutters";
- id = "captainshutters"
- },
/obj/structure/displaycase/captain_revolver,
+/obj/machinery/button/remote/blast_door{
+ dir = 1;
+ id = "shutters_deck3_captain";
+ name = "External Shutters";
+ pixel_y = 26
+ },
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"wQI" = (
@@ -32746,28 +32765,13 @@
/area/horizon/hallway/deck_three/primary/central)
"wUu" = (
/obj/machinery/vending/dinnerware,
-/obj/effect/floor_decal/spline/fancy/wood{
- dir = 9
- },
-/turf/simulated/floor/wood,
-/area/bridge/minibar)
-"wUx" = (
-/obj/effect/floor_decal/spline/plain{
+/obj/machinery/light{
dir = 8
},
-/obj/effect/floor_decal/spline/plain{
- dir = 4
- },
-/obj/machinery/atmospherics/unary/vent_pump{
- external_pressure_bound = 140;
- external_pressure_bound_default = 140;
- icon_state = "map_vent_out";
- pressure_checks = 0;
- pressure_checks_default = 0;
- use_power = 1
- },
-/obj/machinery/firealarm/west,
-/turf/simulated/floor/carpet/rubber,
+/turf/simulated/floor/tiled/full,
+/area/bridge/minibar)
+"wUx" = (
+/turf/simulated/floor/reinforced/airless,
/area/tcommsat/chamber)
"wUC" = (
/obj/structure/cable{
@@ -33950,6 +33954,9 @@
dir = 4;
pixel_y = 6
},
+/obj/machinery/light{
+ dir = 8
+ },
/turf/simulated/floor/marble/dark,
/area/bridge/minibar)
"xPq" = (
@@ -34030,10 +34037,7 @@
dir = 1
},
/obj/effect/landmark/start{
- name = "Warden"
- },
-/obj/effect/floor_decal/corner/dark_blue{
- dir = 6
+ name = "Security Officer"
},
/turf/simulated/floor/tiled/dark,
/area/horizon/security/meeting_room)
@@ -34181,7 +34185,7 @@
/turf/simulated/floor/wood,
/area/lawoffice/representative_two)
"ycA" = (
-/obj/structure/table/wood,
+/obj/structure/table/reinforced/wood,
/turf/simulated/floor/carpet,
/area/bridge/meeting_room)
"ydF" = (
@@ -34284,7 +34288,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/floor_decal/spline/fancy/wood{
- dir = 1
+ dir = 9
},
/turf/simulated/floor/wood,
/area/bridge/minibar)
@@ -47191,7 +47195,7 @@ bWc
hzU
gzJ
oWf
-gBA
+aPR
svx
fxk
gvG
@@ -47397,7 +47401,7 @@ svx
svx
snv
oRM
-hCi
+pwt
xAc
xon
mqJ
@@ -47598,8 +47602,8 @@ oWf
hdq
acp
oIL
-jnj
-qGg
+eny
+hCi
iya
uOA
iHj
@@ -49580,12 +49584,12 @@ wGH
wGH
wGH
wGH
-wGH
-wGH
-wGH
-wGH
-oXs
-oXs
+wUx
+wUx
+wUx
+wUx
+abZ
+abZ
oXs
oXs
ail
@@ -49986,9 +49990,9 @@ wGH
wGH
abZ
bSA
-wUx
-wHl
-bZn
+fHm
+iRW
+dHD
qUt
sCe
hIp
@@ -50187,7 +50191,7 @@ wGH
wGH
wGH
abZ
-jFu
+biz
wug
xSg
fer
@@ -51399,7 +51403,7 @@ wGH
wGH
abZ
abZ
-hCP
+ctf
wlV
qmy
sed
@@ -51456,20 +51460,20 @@ gQw
ivg
wGH
wGH
+iUA
+wGH
+wGH
+wGH
+iUA
+wGH
+wGH
+wGH
+iUA
wGH
wGH
wGH
wGH
-wGH
-wGH
-wGH
-wGH
-wGH
-wGH
-wGH
-wGH
-wGH
-wGH
+iUA
wGH
vBY
opC
@@ -52408,16 +52412,16 @@ wGH
wGH
wGH
wGH
-abZ
-rvn
+rRe
+lpo
pdq
izr
aVJ
qUt
wIu
jFn
-lvS
qSY
+hUT
wxR
pAw
pAw
@@ -52610,8 +52614,8 @@ wGH
wGH
wGH
wGH
-abZ
-fMc
+rRe
+fhB
fmB
fHi
qkD
@@ -52619,7 +52623,7 @@ mYf
vtf
kIk
aZl
-ook
+miH
xBf
bpD
tGl
@@ -52812,14 +52816,14 @@ wGH
wGH
wGH
wGH
-abZ
-isZ
+rRe
+qCO
vvm
sdc
tav
pcj
-dNO
-bbm
+jFu
+wHl
qLy
qLy
qLy
@@ -53014,14 +53018,14 @@ fJy
fJy
fJy
kCw
-abZ
+rRe
tav
eBt
iLf
dgI
mzs
-ffm
-bbm
+hCP
+wHl
qLy
pWR
pWR
@@ -53216,14 +53220,14 @@ feY
feY
feY
hBq
-abZ
-dHD
+rRe
+rvn
ekB
jzx
qdg
qUt
-tnY
-bbm
+hjI
+wHl
qLy
aiX
xbM
@@ -53424,8 +53428,8 @@ qUt
qUt
qUt
qUt
-fHm
-bbm
+rGK
+wHl
qLy
kTG
kTG
@@ -53627,7 +53631,7 @@ eoQ
eoQ
eoQ
vtf
-bbm
+wHl
qLy
isK
hCT
@@ -53695,7 +53699,7 @@ hmu
ltT
ltH
mrU
-wGH
+iUA
vkb
dSF
dSF
@@ -53829,7 +53833,7 @@ tNk
raP
eoQ
nZp
-bbm
+wHl
qLy
mCX
bpD
@@ -53877,7 +53881,7 @@ kQK
tDF
vup
ans
-dmp
+mhs
fiZ
aVm
qKG
@@ -54032,7 +54036,7 @@ ceV
ltG
fHn
kUj
-rGK
+bbm
rgZ
bpD
bpD
@@ -55311,8 +55315,8 @@ eAw
xEZ
auq
mrU
-bEW
-kMe
+iUA
+vkb
dSF
dSF
dSF
@@ -55513,8 +55517,8 @@ hhA
rqU
omA
mrU
-vkb
-slH
+bEW
+kMe
dSF
dSF
dSF
@@ -55703,7 +55707,7 @@ jKp
mvo
sKC
ugJ
-htX
+asO
whG
qEj
pSe
@@ -56502,7 +56506,7 @@ xyc
saT
pba
vJh
-pfd
+vJh
vID
nja
pvv
@@ -56722,7 +56726,7 @@ hKm
ftB
qrQ
qrQ
-qrQ
+rzX
pNE
sHE
vkb
@@ -57051,7 +57055,7 @@ cPq
cPq
cPq
cPq
-cPq
+hLZ
pZS
kUM
sfK
@@ -57310,7 +57314,7 @@ iIp
soE
kiq
pXY
-ivK
+tPV
adF
wFT
tPV
@@ -57518,7 +57522,7 @@ soE
wPX
iuR
nRe
-soE
+ivK
sIz
nDn
ygv
@@ -58465,7 +58469,7 @@ cPq
mKC
cPq
cPq
-cPq
+hLZ
pZS
kUM
yfs
@@ -59285,8 +59289,8 @@ waj
oAR
ydF
vrL
-rzX
-rzX
+fll
+fll
fll
fll
gaw
@@ -59474,10 +59478,10 @@ cPq
cPq
cPq
cPq
+cPq
+cPq
ohD
-cPq
-cPq
-cPq
+hLZ
vrL
ydF
ltv
@@ -59487,7 +59491,7 @@ waj
sWr
ydF
vrL
-cPq
+hLZ
cPq
cPq
cPq
@@ -59679,7 +59683,7 @@ cPq
cPq
cPq
cPq
-cPq
+hLZ
vrL
ydF
dda
@@ -59689,7 +59693,7 @@ waj
ecP
ydF
vrL
-cPq
+hLZ
cPq
cPq
ohD
@@ -59881,7 +59885,7 @@ cPq
cPq
cPq
cPq
-cPq
+hLZ
vrL
ydF
azF
@@ -59891,7 +59895,7 @@ tqS
sWr
ydF
vrL
-cPq
+hLZ
cPq
cPq
cPq
@@ -59936,8 +59940,8 @@ cPq
cPq
cPq
cPq
-wbr
cPq
+wbr
cPq
mKC
slH
@@ -60083,7 +60087,7 @@ cPq
cPq
cPq
cPq
-cPq
+hLZ
vrL
ydF
eUd
@@ -60093,7 +60097,7 @@ fEh
eUd
ydF
vrL
-cPq
+hLZ
cPq
cPq
cPq
@@ -60283,9 +60287,9 @@ cPq
cPq
cPq
cPq
+cPq
+cPq
hLZ
-nxf
-cPq
vrL
ydF
ydF
@@ -60295,7 +60299,7 @@ ydF
ydF
ydF
vrL
-cPq
+hLZ
cPq
cPq
cPq
@@ -60485,9 +60489,9 @@ cPq
cPq
cPq
cPq
+cPq
+cPq
hLZ
-jRX
-cPq
vrL
vrL
vrL
@@ -60497,11 +60501,11 @@ vrL
vrL
vrL
vrL
+hLZ
cPq
cPq
cPq
-cPq
-cPq
+ohD
qAq
xMj
gza
@@ -60687,23 +60691,23 @@ cPq
cPq
cPq
cPq
-hLZ
-ozD
+cPq
+cPq
tNE
+hLZ
+hLZ
+hLZ
+hLZ
+hLZ
+hLZ
+hLZ
+hLZ
+hLZ
+hLZ
cPq
cPq
cPq
cPq
-cPq
-cPq
-cPq
-cPq
-cPq
-ohD
-cPq
-cPq
-cPq
-ohD
fzf
bif
hco
@@ -60889,23 +60893,23 @@ cPq
cPq
cPq
cPq
-hLZ
-hLZ
-ozD
-fMm
-fMm
-fMm
-nxf
+cPq
+ohD
cPq
cPq
cPq
cPq
cPq
+ohD
cPq
cPq
cPq
cPq
cPq
+ohD
+cPq
+cPq
+cPq
fzf
lWN
qBM
@@ -61092,12 +61096,12 @@ cPq
cPq
cPq
cPq
-hLZ
-hLZ
-hLZ
-hLZ
-hLZ
-hLZ
+cPq
+cPq
+cPq
+cPq
+cPq
+cPq
cPq
cPq
cPq
@@ -61527,7 +61531,7 @@ lnI
jzb
sLg
tZE
-kxs
+xSX
kxs
dAI
tni
@@ -61729,7 +61733,7 @@ lnI
bqY
iVD
fyZ
-gTO
+xSX
kxs
fxm
tni
@@ -61931,8 +61935,8 @@ lnI
vTI
pms
fyZ
-kxs
-kxs
+xSX
+gTO
xJq
tGG
tGG
@@ -62117,7 +62121,7 @@ cPq
cPq
cPq
cPq
-cPq
+ohD
gTG
jzy
jzy
@@ -62537,7 +62541,7 @@ lnI
msr
udU
rdm
-xSX
+nYQ
nYQ
ncr
oIR