From 96813cac8ec86721377fe32cd3534ec70f8102b5 Mon Sep 17 00:00:00 2001 From: Cael_Aislinn Date: Thu, 25 Oct 2012 21:30:26 +1000 Subject: [PATCH] another partial fix Signed-off-by: Cael_Aislinn --- .../WorkInProgress/Cael_Aislinn/Rust/areas.dm | 14 +++ code/game/area/Space Station 13 areas.dm | 4 + maps/Antiqua.dmm | 106 +++++++++--------- 3 files changed, 71 insertions(+), 53 deletions(-) create mode 100644 code/WorkInProgress/Cael_Aislinn/Rust/areas.dm diff --git a/code/WorkInProgress/Cael_Aislinn/Rust/areas.dm b/code/WorkInProgress/Cael_Aislinn/Rust/areas.dm new file mode 100644 index 00000000000..d59882ee9ab --- /dev/null +++ b/code/WorkInProgress/Cael_Aislinn/Rust/areas.dm @@ -0,0 +1,14 @@ + +/area/engine/cooling + +/area/engine/port_gyro_bay + +/area/engine/starboard_gyro_bay + +/area/engine/generators + +/area/engine/turbine_control + +/area/engine/reactor_core + +/area/engine/aux_control diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index 0b888273e95..e3e081d772c 100755 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -696,6 +696,10 @@ proc/process_ghost_teleport_locs() name = "\improper Research Director's Office" icon_state = "head_quarters" +/area/crew_quarters/hos + name = "\improper Head of Security's Office" + icon_state = "head_quarters" + /area/crew_quarters/chief name = "\improper Chief Engineer's Office" icon_state = "head_quarters" diff --git a/maps/Antiqua.dmm b/maps/Antiqua.dmm index 95016013009..f58949a590d 100644 --- a/maps/Antiqua.dmm +++ b/maps/Antiqua.dmm @@ -800,7 +800,7 @@ "apt" = (/obj/structure/closet{name = "Evidence Closet"},/obj/machinery/power/apc{dir = 8; directwired = 1; name = "\improper Detective APC"; pixel_x = 0; pixel_y = 0; pixel_z = 0},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) "apu" = (/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) "apv" = (/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) -"apw" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; layer = 4; pixel_x = 24},/obj/machinery/light_switch{dir = 1; pixel_y = 24},/obj/item/weapon/storage/briefcase{pixel_y = -4},/obj/machinery/coatrack,/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) +"apw" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; layer = 4; pixel_x = 24},/obj/machinery/light_switch{dir = 1; pixel_y = 24},/obj/item/weapon/storage/briefcase{pixel_y = -4},/turf/simulated/floor{icon_state = "grimy"},/area/security/detectives_office) "apx" = (/obj/machinery/camera{c_tag = "Front Hallway - EVA"; dir = 4; network = "SS13"},/turf/simulated/floor{icon_state = "red"; dir = 8},/area/hallway/primary/fore) "apy" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/turf/simulated/floor{icon_state = "whitehall"; dir = 4},/area/hallway/primary/fore) "apz" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id = "xeno"; name = "Containment Shutter"; opacity = 0},/obj/machinery/door/airlock/glass_medical{name = "Xenobiology"; req_access_txt = "55"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) @@ -885,7 +885,7 @@ "ara" = (/obj/machinery/power/apc{dir = 2; name = "Xenobiology APC"; pixel_y = -25},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) "arb" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/airlock/glass_medical{name = "Monkey Pen"; req_access_txt = "55"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) "arc" = (/mob/living/carbon/monkey,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) -"ard" = (/obj/machinery/disease2/monkeycloner,/obj/machinery/camera{c_tag = "Xenobiology Monkey Pen"; dir = 8; network = "Research"; pixel_x = 0},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) +"ard" = (/obj/machinery/camera{c_tag = "Xenobiology Monkey Pen"; dir = 8; network = "Research"; pixel_x = 0},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/toxins/xenobiology) "are" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/maintenance/port) "arf" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/security/main) "arg" = (/obj/machinery/vending/cigarette,/obj/machinery/camera{c_tag = "Security Officer Area"; dir = 4; network = "Security"},/turf/simulated/floor,/area/security/main) @@ -2508,7 +2508,7 @@ "aWl" = (/obj/item/weapon/crowbar,/obj/machinery/light/spot{tag = "icon-bulb1 (NORTH)"; icon_state = "bulb1"; dir = 1},/turf/simulated/floor/plating,/area/teleporter) "aWm" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; pixel_x = 24},/turf/simulated/floor/plating,/area/teleporter) "aWn" = (/obj/machinery/door/airlock/maintenance_hatch{req_access_txt = "19"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/crew_quarters/heads) -"aWo" = (/turf/simulated/wall/r_wall,/area/crew_quarters/heads/chief) +"aWo" = (/turf/simulated/wall/r_wall,/area/crew_quarters/chief) "aWp" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "shutter0"; network = "Breakroom Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/engineering_break_room) "aWq" = (/obj/machinery/door/firedoor/border_only,/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "shutter0"; network = "Breakroom Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/engineering_break_room) "aWr" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/machinery/door/poddoor/shutters{density = 0; dir = 2; icon_state = "shutter0"; network = "Breakroom Shutters"; opacity = 0},/turf/simulated/floor/plating,/area/engine/engineering_break_room) @@ -2540,15 +2540,15 @@ "aWR" = (/obj/structure/stool{pixel_y = 8},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter) "aWS" = (/turf/simulated/floor/plating,/area/teleporter) "aWT" = (/obj/machinery/light/small{dir = 8},/turf/simulated/floor/plating,/area/maintenance/aft) -"aWU" = (/turf/simulated/wall/r_wall,/area/crew_quarters/heads/hor) +"aWU" = (/turf/simulated/wall/r_wall,/area/crew_quarters/hor) "aWV" = (/obj/structure/table/reinforced,/obj/item/weapon/packageWrap,/obj/item/device/destTagger{pixel_x = 4; pixel_y = 3},/obj/machinery/power/apc{desc = "Hehehe, it says Head Quarters."; dir = 1; name = "Head Quarters APC"; pixel_y = 25},/turf/simulated/floor,/area/crew_quarters/heads) "aWW" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/crew_quarters/heads) -"aWX" = (/turf/simulated/wall,/area/crew_quarters/heads/chief) -"aWY" = (/obj/structure/table,/obj/item/wardrobe/chief_engineer,/turf/simulated/floor,/area/crew_quarters/heads/chief) -"aWZ" = (/obj/effect/landmark{name = "plant"},/obj/machinery/power/apc{dir = 1; name = "CE Quarters APC"; pixel_y = 25},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor,/area/crew_quarters/heads/chief) -"aXa" = (/obj/structure/bookcase/manuals/engineering,/turf/simulated/floor,/area/crew_quarters/heads/chief) -"aXb" = (/obj/machinery/computer/security/engineering,/turf/simulated/floor,/area/crew_quarters/heads/chief) -"aXc" = (/obj/structure/table,/turf/simulated/floor,/area/crew_quarters/heads/chief) +"aWX" = (/turf/simulated/wall,/area/crew_quarters/chief) +"aWY" = (/obj/structure/table,/obj/item/wardrobe/chief_engineer,/turf/simulated/floor,/area/crew_quarters/chief) +"aWZ" = (/obj/effect/landmark{name = "plant"},/obj/machinery/power/apc{dir = 1; name = "CE Quarters APC"; pixel_y = 25},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor,/area/crew_quarters/chief) +"aXa" = (/obj/structure/bookcase/manuals/engineering,/turf/simulated/floor,/area/crew_quarters/chief) +"aXb" = (/obj/machinery/computer/security/engineering,/turf/simulated/floor,/area/crew_quarters/chief) +"aXc" = (/obj/structure/table,/turf/simulated/floor,/area/crew_quarters/chief) "aXd" = (/turf/simulated/wall/r_wall,/area/atmos) "aXe" = (/obj/effect/landmark{name = "plant"},/turf/simulated/floor,/area/atmos) "aXf" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor,/area/engine/locker) @@ -2583,16 +2583,16 @@ "aXI" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/highsecurity{name = "Teleport Access"; req_access_txt = "17"},/turf/simulated/floor,/area/teleporter) "aXJ" = (/obj/item/device/radio/beacon,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter) "aXK" = (/obj/machinery/requests_console{department = "Teleporter"; pixel_x = 30},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter) -"aXL" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/stamp/rd,/turf/simulated/floor,/area/crew_quarters/heads/hor) -"aXM" = (/obj/structure/table,/obj/item/weapon/clipboard,/obj/item/weapon/pen,/turf/simulated/floor,/area/crew_quarters/heads/hor) -"aXN" = (/obj/structure/table,/obj/machinery/power/apc{dir = 1; name = "RD Quarters APC"; pixel_y = 25},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor,/area/crew_quarters/heads/hor) -"aXO" = (/obj/structure/bookcase/manuals/research_and_development,/turf/simulated/floor,/area/crew_quarters/heads/hor) -"aXP" = (/turf/simulated/wall,/area/crew_quarters/heads/hor) +"aXL" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/stamp/rd,/turf/simulated/floor,/area/crew_quarters/hor) +"aXM" = (/obj/structure/table,/obj/item/weapon/clipboard,/obj/item/weapon/pen,/turf/simulated/floor,/area/crew_quarters/hor) +"aXN" = (/obj/structure/table,/obj/machinery/power/apc{dir = 1; name = "RD Quarters APC"; pixel_y = 25},/obj/structure/cable{icon_state = "0-2"; pixel_y = 1; d2 = 2},/turf/simulated/floor,/area/crew_quarters/hor) +"aXO" = (/obj/structure/bookcase/manuals/research_and_development,/turf/simulated/floor,/area/crew_quarters/hor) +"aXP" = (/turf/simulated/wall,/area/crew_quarters/hor) "aXQ" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk,/turf/simulated/floor,/area/crew_quarters/heads) -"aXR" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/ce,/turf/simulated/floor,/area/crew_quarters/heads/chief) -"aXS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/crew_quarters/heads/chief) -"aXT" = (/turf/simulated/floor,/area/crew_quarters/heads/chief) -"aXU" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/crew_quarters/heads/chief) +"aXR" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/ce,/turf/simulated/floor,/area/crew_quarters/chief) +"aXS" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/crew_quarters/chief) +"aXT" = (/turf/simulated/floor,/area/crew_quarters/chief) +"aXU" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/crew_quarters/chief) "aXV" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/atmos) "aXW" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor,/area/atmos) "aXX" = (/obj/structure/closet/wardrobe/engineering_yellow,/turf/simulated/floor,/area/engine/locker) @@ -2624,15 +2624,15 @@ "aYx" = (/obj/structure/table{pixel_y = 0},/obj/item/clothing/glasses/hud/health,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/surgery) "aYy" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{tag = "icon-whitehall (WEST)"; icon_state = "whitehall"; dir = 8},/area/hallway/primary/port) "aYz" = (/obj/machinery/light/spot{tag = "icon-bulb1 (WEST)"; icon_state = "bulb1"; dir = 8},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter) -"aYA" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor,/area/crew_quarters/heads/hor) -"aYB" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor,/area/crew_quarters/heads/hor) -"aYC" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/crew_quarters/heads/hor) -"aYD" = (/turf/simulated/floor,/area/crew_quarters/heads/hor) +"aYA" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/turf/simulated/floor,/area/crew_quarters/hor) +"aYB" = (/obj/structure/stool/bed/chair{dir = 1},/turf/simulated/floor,/area/crew_quarters/hor) +"aYC" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/crew_quarters/hor) +"aYD" = (/turf/simulated/floor,/area/crew_quarters/hor) "aYE" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/crew_quarters/heads) "aYF" = (/obj/machinery/light{dir = 4},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/crew_quarters/heads) -"aYG" = (/obj/machinery/camera{c_tag = "Chief Engineer's Quarters"; dir = 4; network = "Command"},/turf/simulated/floor,/area/crew_quarters/heads/chief) -"aYH" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/item/weapon/stamp/ce,/turf/simulated/floor,/area/crew_quarters/heads/chief) -"aYI" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/heads/chief) +"aYG" = (/obj/machinery/camera{c_tag = "Chief Engineer's Quarters"; dir = 4; network = "Command"},/turf/simulated/floor,/area/crew_quarters/chief) +"aYH" = (/obj/structure/table,/obj/item/weapon/paper_bin{pixel_x = -3; pixel_y = 7},/obj/item/weapon/pen,/obj/item/weapon/stamp/ce,/turf/simulated/floor,/area/crew_quarters/chief) +"aYI" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/crew_quarters/chief) "aYJ" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/atmos) "aYK" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/turf/simulated/floor,/area/atmos) "aYL" = (/turf/simulated/wall/r_wall,/area/atmos) @@ -2672,17 +2672,17 @@ "aZt" = (/obj/effect/decal/warning_stripes{tag = "icon-NE-in"; icon_state = "NE-in"},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter) "aZu" = (/obj/effect/decal/warning_stripes{tag = "icon-S"; icon_state = "S"},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter) "aZv" = (/obj/machinery/power/apc{dir = 4; name = "Teleporter APC"; pixel_x = 25; pixel_y = 0},/obj/effect/decal/warning_stripes{tag = "icon-NW-in"; icon_state = "NW-in"},/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter) -"aZw" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area/crew_quarters/heads/hor) -"aZx" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor,/area/crew_quarters/heads/hor) -"aZy" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor,/area/crew_quarters/heads/hor) -"aZz" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/command{req_access_txt = "30"},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor,/area/crew_quarters/heads/hor) +"aZw" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor,/area/crew_quarters/hor) +"aZx" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor,/area/crew_quarters/hor) +"aZy" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor,/area/crew_quarters/hor) +"aZz" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/command{req_access_txt = "30"},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor,/area/crew_quarters/hor) "aZA" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor,/area/crew_quarters/heads) "aZB" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = "90Curve"},/turf/simulated/floor,/area/crew_quarters/heads) -"aZC" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/command{name = "Chief Engineer"; req_access_txt = "56"},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor,/area/crew_quarters/heads/chief) -"aZD" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor,/area/crew_quarters/heads/chief) -"aZE" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor,/area/crew_quarters/heads/chief) -"aZF" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor,/area/crew_quarters/heads/chief) -"aZG" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/crew_quarters/heads/chief) +"aZC" = (/obj/machinery/door/firedoor/border_only,/obj/machinery/door/airlock/command{name = "Chief Engineer"; req_access_txt = "56"},/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor,/area/crew_quarters/chief) +"aZD" = (/obj/structure/cable{tag = "Streight"; icon_state = "4-8"; pixel_x = 1; d1 = 4; d2 = 8},/turf/simulated/floor,/area/crew_quarters/chief) +"aZE" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = "90Curve"},/turf/simulated/floor,/area/crew_quarters/chief) +"aZF" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor,/area/crew_quarters/chief) +"aZG" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/crew_quarters/chief) "aZH" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/atmos) "aZI" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/machinery/portable_atmospherics/pump,/turf/simulated/floor,/area/atmos) "aZJ" = (/obj/machinery/alarm{dir = 8; icon_state = "alarm0"; layer = 4; pixel_x = 24},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/atmos) @@ -2714,13 +2714,13 @@ "baj" = (/obj/machinery/teleport/station,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter) "bak" = (/obj/machinery/teleport/hub,/turf/simulated/floor{dir = 4; icon_state = "vault"; name = "Mainframe floor"; nitrogen = 100; oxygen = 0; tag = "icon-vault (EAST)"; temperature = 80},/area/teleporter) "bal" = (/obj/structure/rack,/obj/item/weapon/tank/oxygen,/obj/item/clothing/mask/gas,/turf/simulated/floor{tag = "icon-vault (NORTHEAST)"; icon_state = "vault"; dir = 5},/area/teleporter) -"bam" = (/obj/effect/landmark{name = "plant"},/turf/simulated/floor,/area/crew_quarters/heads/hor) -"ban" = (/obj/machinery/camera{c_tag = "Research Director's Quarters"; dir = 8; network = "Command"},/obj/machinery/firealarm{dir = 4; layer = 4; pixel_x = 24},/turf/simulated/floor,/area/crew_quarters/heads/hor) +"bam" = (/obj/effect/landmark{name = "plant"},/turf/simulated/floor,/area/crew_quarters/hor) +"ban" = (/obj/machinery/camera{c_tag = "Research Director's Quarters"; dir = 8; network = "Command"},/obj/machinery/firealarm{dir = 4; layer = 4; pixel_x = 24},/turf/simulated/floor,/area/crew_quarters/hor) "bao" = (/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/crew_quarters/heads) -"bap" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/rig/elite,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig/elite,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor,/area/crew_quarters/heads/chief) -"baq" = (/obj/structure/closet/secure_closet/engineering_chief,/turf/simulated/floor,/area/crew_quarters/heads/chief) -"bar" = (/obj/machinery/power/monitor{name = "Engineering Power Monitor"},/turf/simulated/floor,/area/crew_quarters/heads/chief) -"bas" = (/obj/machinery/computer/lockdown{department = "Engineering"; name = "Engineering Lockdown Control"},/turf/simulated/floor,/area/crew_quarters/heads/chief) +"bap" = (/obj/structure/rack{dir = 8; layer = 2.9},/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/rig/elite,/obj/item/clothing/mask/breath,/obj/item/clothing/head/helmet/space/rig/elite,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor,/area/crew_quarters/chief) +"baq" = (/obj/structure/closet/secure_closet/engineering_chief,/turf/simulated/floor,/area/crew_quarters/chief) +"bar" = (/obj/machinery/power/monitor{name = "Engineering Power Monitor"},/turf/simulated/floor,/area/crew_quarters/chief) +"bas" = (/obj/machinery/computer/lockdown{department = "Engineering"; name = "Engineering Lockdown Control"},/turf/simulated/floor,/area/crew_quarters/chief) "bat" = (/obj/effect/sign/fire{desc = "A warning sign which reads 'INFLAMMABLE'"; name = "INFLAMMABLE"},/turf/simulated/wall/r_wall,/area/atmos) "bau" = (/obj/machinery/atmospherics/portables_connector{dir = 4},/obj/machinery/portable_atmospherics/pump,/obj/machinery/light/small{dir = 8},/turf/simulated/floor,/area/atmos) "bav" = (/obj/machinery/camera{c_tag = "Refilling Station"; dir = 8; network = "Atmospherics"},/obj/machinery/firealarm{dir = 4; layer = 4; pixel_x = 24},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/atmos) @@ -2749,10 +2749,10 @@ "baS" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay) "baT" = (/obj/machinery/door/firedoor/border_only{dir = 4},/obj/structure/window/basic{dir = 5},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/medbay) "baU" = (/obj/machinery/camera{c_tag = "Port Hallway - Med-Lobby (Front)"; dir = 8; network = "SS13"},/obj/structure/disposalpipe/segment{dir = 1},/turf/simulated/floor{icon_state = "blue"; dir = 4},/area/hallway/primary/port) -"baV" = (/obj/structure/table,/turf/simulated/floor,/area/crew_quarters/heads/hor) -"baW" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/rd,/turf/simulated/floor,/area/crew_quarters/heads/hor) -"baX" = (/obj/structure/closet/secure_closet/RD,/turf/simulated/floor,/area/crew_quarters/heads/hor) -"baY" = (/obj/structure/closet/secure_closet/RD,/turf/simulated/floor,/area/crew_quarters/heads/hor) +"baV" = (/obj/structure/table,/turf/simulated/floor,/area/crew_quarters/hor) +"baW" = (/obj/structure/stool/bed,/obj/item/weapon/bedsheet/rd,/turf/simulated/floor,/area/crew_quarters/hor) +"baX" = (/obj/structure/closet/secure_closet/RD,/turf/simulated/floor,/area/crew_quarters/hor) +"baY" = (/obj/structure/closet/secure_closet/RD,/turf/simulated/floor,/area/crew_quarters/hor) "baZ" = (/obj/machinery/alarm{dir = 4; icon_state = "alarm0"; pixel_x = -22},/obj/structure/disposalpipe/segment,/turf/simulated/floor,/area/crew_quarters/heads) "bba" = (/obj/machinery/firealarm{dir = 4; layer = 4; pixel_x = 24},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor,/area/crew_quarters/heads) "bbb" = (/turf/simulated/wall,/area/crew_quarters/heads/hop) @@ -3475,7 +3475,7 @@ "boQ" = (/obj/effect/landmark{name = "plant"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "neutral"; dir = 6},/area/crew_quarters) "boR" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/crew_quarters) "boS" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/turf/simulated/floor/plating,/area/maintenance/aft) -"boT" = (/obj/machinery/disease2/monkeycloner,/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/genetics) +"boT" = (/obj/machinery/light{icon_state = "tube1"; dir = 8},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/genetics) "boU" = (/obj/structure/crematorium{id = "crematorium"},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) "boV" = (/obj/structure/stool,/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) "boW" = (/obj/structure/table,/obj/item/weapon/hand_labeler{pixel_x = -4; pixel_y = 4},/obj/item/weapon/paper_bin,/obj/item/weapon/pen,/obj/effect/decal/cleanable/cobweb2,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "dark"},/area/medical/morgue) @@ -3690,7 +3690,7 @@ "bsX" = (/obj/machinery/door/firedoor/border_only{dir = 8},/obj/machinery/door/airlock/glass_medical{name = "Monkey Pen"; req_access_txt = "39"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) "bsY" = (/obj/structure/stool,/obj/effect/landmark/start{name = "Virologist"},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) "bsZ" = (/obj/structure/table,/obj/item/weapon/virusdish/random,/obj/item/weapon/virusdish/random{pixel_y = 8},/obj/item/weapon/virusdish/random{pixel_x = -6; pixel_y = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) -"bta" = (/obj/machinery/disease2/monkeycloner,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) +"bta" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) "btb" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/mob/living/carbon/monkey,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) "btc" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/door/firedoor/border_only{dir = 8},/obj/structure/window/reinforced{dir = 5; health = 1e+007},/turf/simulated/floor/plating,/area/medical/virology) "btd" = (/obj/machinery/light,/obj/machinery/firealarm{dir = 2; layer = 4; pixel_x = 0; pixel_y = 25},/obj/structure/closet/l3closet/virology,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) @@ -3699,9 +3699,9 @@ "btg" = (/obj/structure/table,/obj/item/weapon/cleaner,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) "bth" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) "bti" = (/obj/machinery/camera{c_tag = "Virology"; dir = 1; network = "Medbay"},/obj/machinery/light,/obj/machinery/alarm{dir = 1; layer = 4; pixel_y = -22},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 8},/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) -"btj" = (/obj/machinery/disease2/diseaseanalyser,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) -"btk" = (/obj/machinery/disease2/isolator,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) -"btl" = (/obj/machinery/disease2/incubator,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) +"btj" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) +"btk" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) +"btl" = (/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) "btm" = (/obj/machinery/light,/obj/machinery/firealarm{dir = 4; layer = 4; pixel_x = 24},/obj/structure/table,/turf/simulated/floor{icon_state = "white"; dir = 8},/area/medical/virology) "btn" = (/obj/machinery/door/poddoor/four_tile_hor,/turf/space,/area) "bto" = (/turf/space,/area/start) @@ -3798,7 +3798,7 @@ "bvb" = (/obj/structure/grille,/obj/machinery/door/firedoor/border_only{dir = 1},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area) "bvc" = (/obj/structure/closet/crate,/obj/item/weapon/storage/trashbag,/obj/item/weapon/extinguisher,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area) "bvd" = (/obj/structure/table/reinforced,/obj/item/weapon/cell/infinite,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area) -"bve" = (/obj/structure/closet,/obj/item/weapon/storage/bible/tajaran,/obj/item/weapon/storage/bible/booze,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area) +"bve" = (/obj/structure/closet,/obj/item/weapon/storage/bible,/obj/item/weapon/storage/bible/booze,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area) "bvf" = (/obj/structure/table/reinforced,/obj/item/device/taperecorder,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area) "bvg" = (/obj/structure/table/reinforced,/obj/structure/bedsheetbin,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area) "bvh" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/pill_bottle/tramadol,/turf/unsimulated/floor{icon = 'shuttle.dmi'; icon_state = "floor3"},/area) @@ -3839,9 +3839,9 @@ "bvQ" = (/obj/structure/lattice,/turf/unsimulated/floor{tag = "icon-panelscorched"; icon_state = "panelscorched"},/area) "bvR" = (/obj/item/weapon/storage/box,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area) "bvS" = (/obj/structure/table/reinforced,/obj/item/weapon/stock_parts/subspace/transmitter,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area) -"bvT" = (/obj/structure/table/reinforced,/obj/item/weapon/candlepack,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area) +"bvT" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/fancy/candle_box,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area) "bvU" = (/obj/structure/closet,/obj/item/weapon/storage/box,/obj/item/weapon/storage/box,/obj/item/weapon/paperscrap,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area) -"bvV" = (/obj/structure/table/reinforced,/obj/item/ashtray/glass,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area) +"bvV" = (/obj/structure/table/reinforced,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area) "bvW" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/briefcase,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area) "bvX" = (/obj/item/stack/tile/plasteel,/turf/unsimulated/floor,/area) "bvY" = (/obj/structure/device/piano,/turf/unsimulated/floor{icon_state = "whiteshiny"},/area)