From 7a37db59205ec51d833f5aaf04e2797580988219 Mon Sep 17 00:00:00 2001 From: kirieee <140837937+kirieee@users.noreply.github.com> Date: Sun, 22 Oct 2023 17:15:08 -0400 Subject: [PATCH 01/11] Synth storage closet (#21) Co-authored-by: Morrow --- maps/map_files/golden_arrow/golden_arrow.dmm | 4787 +++++++++--------- 1 file changed, 2511 insertions(+), 2276 deletions(-) diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm index 08b869e59d..22b9cd91cd 100644 --- a/maps/map_files/golden_arrow/golden_arrow.dmm +++ b/maps/map_files/golden_arrow/golden_arrow.dmm @@ -21,6 +21,24 @@ icon_state = "test_floor4" }, /area/almayer/living/briefing) +"ah" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/tool/warning_cone{ + pixel_x = -7; + pixel_y = 6 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/engineering) "al" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -30,11 +48,22 @@ }, /area/almayer/hallways/hangar) "an" = ( -/obj/structure/machinery/power/terminal{ - dir = 8 +/obj/structure/closet/emcloset, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "test_floor5" + }, +/area/almayer/engineering) +"aq" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 }, /obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, /area/almayer/engineering) "ar" = ( /obj/structure/machinery/landinglight/ds1/delayone{ @@ -44,6 +73,13 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"aw" = ( +/obj/structure/sign/safety/storage{ + pixel_x = 9; + pixel_y = 29 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/starboard_hallway) "ax" = ( /obj/structure/cargo_container/arious/mid, /turf/open/floor/almayer{ @@ -63,14 +99,15 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"az" = ( -/obj/structure/machinery/power/monitor{ - name = "Core Power Monitoring" - }, -/turf/open/floor/almayer{ - icon_state = "plate" +"aA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/platform/stair_cut, +/obj/structure/stairs/perspective{ + dir = 8; + icon_state = "p_stair_full" }, -/area/almayer/engineering) +/turf/open/floor/almayer, +/area/almayer/hallways/starboard_hallway) "aB" = ( /obj/structure/machinery/landinglight/ds1/delaythree{ dir = 4 @@ -79,6 +116,12 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"aG" = ( +/obj/structure/largecrate/supply/supplies/tables_racks, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/engineering) "aI" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -108,14 +151,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha/squad_one) -"aK" = ( -/obj/structure/closet/secure_closet/engineering_electrical{ - req_one_access = list() - }, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/almayer/engineering) "aN" = ( /turf/open/floor/almayer{ icon_state = "cargo_arrow" @@ -150,6 +185,23 @@ }, /turf/open/floor/almayer, /area/almayer/living/platoon_commander_rooms) +"aX" = ( +/obj/structure/platform_decoration{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 1; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/starboard_hallway) +"ba" = ( +/obj/item/tool/warning_cone{ + pixel_x = 4; + pixel_y = 16 + }, +/obj/item/stool, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/synthcloset) "bb" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -165,17 +217,20 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"bg" = ( +/obj/structure/largecrate/supply/supplies/sandbags, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/engineering) "bh" = ( /obj/effect/landmark/start/marine/leader/alpha, /obj/effect/landmark/late_join/alpha, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/cryo_cells) -"bl" = ( -/obj/structure/machinery/portable_atmospherics/powered/scrubber, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/engineering) "bo" = ( /obj/structure/window/framed/almayer, /turf/open/floor/almayer{ @@ -199,6 +254,16 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"bu" = ( +/obj/structure/machinery/camera/autoname/almayer, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/hangar) "bw" = ( /obj/structure/curtain/red, /turf/open/floor/almayer{ @@ -213,6 +278,28 @@ icon_state = "cargo" }, /area/almayer/hallways/hangar) +"bB" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/engineering) +"bD" = ( +/obj/structure/machinery/door/airlock/almayer/command/reinforced{ + dir = 1; + name = "\improper Platoon Commander's Office" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/living/platoon_commander_rooms) "bG" = ( /obj/structure/window/reinforced{ dir = 4; @@ -257,32 +344,11 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"bI" = ( -/obj/structure/machinery/conveyor{ - dir = 8 - }, -/obj/structure/barricade/handrail{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) -"bP" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" +"bO" = ( +/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage{ + req_one_access = list() }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/engineering) "bQ" = ( /obj/structure/machinery/landinglight/ds1{ @@ -315,9 +381,28 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"bZ" = ( +/obj/structure/window/framed/almayer, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/starboard_hallway) "ca" = ( /turf/closed/wall/almayer/outer, /area/almayer/hallways/hangar) +"cj" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering) "cl" = ( /obj/structure/machinery/landinglight/ds1/delayone{ dir = 4 @@ -369,14 +454,11 @@ }, /area/almayer/hallways/hangar) "cw" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" +/obj/structure/machinery/computer/atmos_alert{ + dir = 4 }, -/obj/effect/decal/cleanable/blood/oil, +/obj/structure/surface/table/almayer, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -428,6 +510,18 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha/squad_one) +"cG" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/powercell, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/engineering) "cH" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/med_data/laptop, @@ -435,6 +529,12 @@ icon_state = "sterile_green" }, /area/almayer/medical) +"cI" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/hangar) "cJ" = ( /obj/structure/bed/chair/office/light{ dir = 1 @@ -487,15 +587,6 @@ icon_state = "sterile_green" }, /area/almayer/medical) -"dc" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/status_display{ - pixel_x = -32 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering) "dd" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -504,6 +595,20 @@ icon_state = "sterile_green" }, /area/almayer/medical) +"de" = ( +/obj/structure/machinery/light{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/starboard_hallway) +"dg" = ( +/obj/structure/machinery/portable_atmospherics/powered/scrubber, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/engineering) "di" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -511,9 +616,12 @@ }, /area/almayer/living/cryo_cells) "dj" = ( +/obj/structure/closet/fireaxecabinet{ + pixel_y = 30 + }, /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 + icon_state = "E"; + pixel_x = 1 }, /turf/open/floor/almayer{ dir = 5; @@ -555,6 +663,18 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/squads/alpha/platoon_sergeant) +"ds" = ( +/obj/structure/machinery/power/terminal{ + dir = 4 + }, +/obj/item/tool/wirecutters{ + pixel_y = -6 + }, +/obj/item/device/multitool{ + pixel_x = -10 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering) "dt" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -632,93 +752,66 @@ icon_state = "cargo" }, /area/almayer/hallways/hangar) -"dU" = ( -/obj/structure/largecrate, -/obj/structure/largecrate{ - pixel_y = 16 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/almayer/hallways/starboard_hallway) "dX" = ( /obj/structure/machinery/light{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/squads/alpha/squad_two) -"dZ" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/engineering) "ea" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ icon_state = "sterile_green" }, /area/almayer/medical) -"ee" = ( -/obj/structure/largecrate/supply/supplies/tables_racks, +"eo" = ( /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "cargo_arrow" }, -/area/almayer/engineering) -"ei" = ( -/obj/structure/machinery/autolathe, -/obj/structure/machinery/light{ - dir = 8 +/area/almayer/hallways/port_hallway) +"eu" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 1 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/engineering) -"em" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/area/almayer/hallways/hangar) +"ey" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering) -"en" = ( -/obj/structure/machinery/light{ - dir = 1 +/obj/structure/machinery/door/airlock/almayer/maint/reinforced{ + access_modified = 1; + dir = 8; + req_one_access = list(36); + name = "\improper Synthetic Preperations" }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/machinery/door/poddoor/almayer/closed{ + dir = 4; + indestructible = 1 }, -/area/almayer/engineering) -"eo" = ( /turf/open/floor/almayer{ - icon_state = "cargo_arrow" + icon_state = "test_floor4" }, -/area/almayer/hallways/port_hallway) -"eu" = ( +/area/almayer/living/synthcloset) +"eB" = ( +/obj/structure/prop/almayer/computers/sensor_computer1, /obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; + icon_state = "W"; pixel_x = -1; pixel_y = 1 }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 1 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/hangar) +/area/almayer/hallways/starboard_hallway) "eH" = ( /obj/structure/window/framed/almayer/hull, /turf/open/floor/almayer{ @@ -738,13 +831,6 @@ icon_state = "cargo" }, /area/almayer/living/cryo_cells) -"eN" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/firecloset/full, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/almayer/hallways/starboard_hallway) "eR" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -755,37 +841,37 @@ icon_state = "dark_sterile" }, /area/almayer/living/cryo_cells) +"eT" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 2 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/almayer, +/area/almayer/living/synthcloset) "eU" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ icon_state = "test_floor4" }, /area/almayer/hallways/hangar) -"eV" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer, -/area/almayer/engineering) "eY" = ( /turf/open/floor/almayer{ icon_state = "test_floor5" }, /area/almayer/hallways/hangar) -"eZ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering) -"fb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/suit_storage_unit/carbon_unit, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/almayer/engineering) "fe" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -825,16 +911,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha/platoon_sergeant) -"fi" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/pipes/vents/scrubber, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/hangar) "fl" = ( /obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 4 @@ -843,6 +919,10 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"fm" = ( +/obj/structure/foamed_metal, +/turf/open/floor/plating, +/area/almayer/engineering) "fo" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -857,16 +937,37 @@ icon_state = "dark_sterile" }, /area/almayer/living/cryo_cells) +"fp" = ( +/obj/structure/closet/secure_closet/engineering_welding{ + req_one_access = list() + }, +/turf/open/floor/almayer{ + icon_state = "test_floor5" + }, +/area/almayer/engineering) +"fq" = ( +/obj/structure/machinery/conveyor{ + dir = 10 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/starboard_hallway) "fv" = ( -/obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ - icon_state = "S" + icon_state = "W" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/engineering) "fx" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -893,6 +994,16 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"fF" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/engineering) "fJ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/prop/invuln/overhead_pipe{ @@ -929,16 +1040,6 @@ icon_state = "test_floor4" }, /area/almayer/medical) -"fP" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1; - name = "\improper Supply Bay" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/starboard_hallway) "fX" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -956,20 +1057,17 @@ icon_state = "sterile_green" }, /area/almayer/medical) -"ga" = ( -/obj/structure/machinery/door/airlock/almayer/engineering/reinforced{ - req_one_access = list(); - name = "\improper Engineering Airlock" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/engineering) "gd" = ( /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/squads/alpha/squad_two) +"gf" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering) "gg" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ @@ -992,6 +1090,16 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"gn" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/secure_closet/surgical{ + pixel_x = -30 + }, +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/synthcloset) "gp" = ( /obj/structure/surface/rack, /obj/effect/decal/warning_stripes{ @@ -1009,6 +1117,24 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) +"gt" = ( +/obj/structure/machinery/power/monitor{ + name = "Core Power Monitoring" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering) +"gx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/cm_vending/sorted/tech/tool_storage{ + req_one_access = list() + }, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering) "gz" = ( /obj/structure/ship_ammo/rocket/widowmaker, /turf/open/floor/almayer{ @@ -1028,16 +1154,6 @@ /obj/structure/machinery/telecomms/relay/preset/tower, /turf/open/floor/almayer, /area/almayer/engineering) -"gC" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor/autoname{ - dir = 1; - req_one_access = list(); - autoname = 0 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/engineering) "gD" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 @@ -1047,12 +1163,8 @@ }, /area/almayer/hallways/hangar) "gE" = ( -/obj/structure/surface/rack, -/obj/effect/spawner/random/technology_scanner, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering) +/turf/closed/wall/almayer, +/area/almayer/hallways/starboard_hallway) "gG" = ( /obj/structure/machinery/light{ dir = 1 @@ -1074,19 +1186,6 @@ icon_state = "plate" }, /area/almayer/living/cryo_cells) -"gI" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/engineering) "gL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light{ @@ -1103,26 +1202,30 @@ icon_state = "plate" }, /area/almayer/squads/alpha/platoon_sergeant) -"gQ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/supply_drop/echo, +"gS" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/platform{ +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + dir = 8; + icon_state = "cargo_arrow" + }, +/area/almayer/hallways/port_hallway) +"gT" = ( +/obj/structure/machinery/conveyor{ dir = 8 }, /turf/open/floor/almayer{ - icon_state = "test_floor5" + dir = 5; + icon_state = "plating" }, /area/almayer/hallways/starboard_hallway) "gW" = ( -/obj/structure/ladder{ - height = 2; - id = "req1" - }, /turf/open/floor/almayer{ - icon_state = "test_floor5" + icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/engineering) "ha" = ( /obj/structure/machinery/light{ dir = 8 @@ -1156,30 +1259,25 @@ icon_state = "test_floor4" }, /area/almayer/medical) -"hu" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, +"hq" = ( /obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; + icon_state = "W"; pixel_x = -1; - pixel_y = 2 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) -"hv" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 + pixel_y = 1 }, +/obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 + icon_state = "E"; + pixel_x = 1 }, +/turf/open/floor/almayer, +/area/almayer/living/synthcloset) +"hy" = ( /obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 }, +/turf/open/floor/almayer, /area/almayer/engineering) "hA" = ( /obj/structure/pipes/standard/simple/hidden/supply{ @@ -1218,15 +1316,25 @@ icon_state = "test_floor4" }, /area/almayer/medical) -"hJ" = ( -/obj/structure/platform_decoration{ - dir = 4 +"hL" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 1 }, +/obj/structure/sign/safety/electronics{ + pixel_x = 31; + pixel_y = 6 + }, +/obj/structure/sign/safety/high_voltage{ + pixel_x = 31; + pixel_y = -6 + }, +/obj/structure/machinery/portable_atmospherics/canister/air, /turf/open/floor/almayer{ - dir = 1; - icon_state = "cargo_arrow" + icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/engineering) "hN" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/secure_data{ @@ -1256,6 +1364,24 @@ "hS" = ( /turf/closed/wall/almayer, /area/almayer/living/platoon_commander_rooms) +"hU" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/obj/item/device/flashlight{ + pixel_x = -4; + pixel_y = 7 + }, +/obj/item/tool/warning_cone, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/engineering) "hW" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/recharger, @@ -1264,6 +1390,12 @@ icon_state = "sterile_green" }, /area/almayer/medical) +"if" = ( +/obj/structure/reagent_dispensers/fueltank/custom, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/engineering) "ik" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -1280,17 +1412,14 @@ /area/almayer/living/cafeteria_port) "il" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 + icon_state = "N"; + pixel_y = 2 }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/engineering) "ip" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -1307,17 +1436,6 @@ icon_state = "test_floor4" }, /area/almayer/living/cryo_cells) -"iv" = ( -/obj/structure/closet/secure_closet/engineering_welding{ - req_one_access = list() - }, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering) "iy" = ( /obj/structure/pipes/vents/pump{ dir = 8 @@ -1365,6 +1483,12 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha/squad_one) +"iF" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/starboard_hallway) "iG" = ( /obj/structure/machinery/door/poddoor/almayer/open, /obj/structure/pipes/standard/simple/hidden/supply, @@ -1395,18 +1519,34 @@ icon_state = "plate" }, /area/almayer/hallways/port_hallway) -"iO" = ( +"iQ" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 +/obj/structure/machinery/light{ + dir = 8 }, -/turf/open/floor/almayer, -/area/almayer/engineering) +/obj/structure/machinery/photocopier, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/starboard_hallway) "iR" = ( /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/living/platoon_commander_rooms) +"iX" = ( +/obj/structure/sign/safety/rewire{ + pixel_x = 14; + pixel_y = 29 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/hangar) "jb" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -1477,12 +1617,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"jp" = ( -/obj/structure/closet/secure_closet/engineering_electrical{ - req_one_access = list() - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering) "js" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -1496,6 +1630,24 @@ icon_state = "plate" }, /area/almayer/squads/alpha/squad_two) +"jy" = ( +/obj/effect/decal/cleanable/blood/oil, +/obj/structure/machinery/computer/station_alert{ + dir = 8; + pixel_x = 15; + pixel_y = 2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/synthcloset) +"jD" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/turf/open/floor/almayer, +/area/almayer/engineering) "jG" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ @@ -1515,6 +1667,14 @@ icon_state = "dark_sterile" }, /area/almayer/medical) +"jN" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/cell_charger, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering) "jO" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -1527,6 +1687,18 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"jQ" = ( +/obj/structure/machinery/pipedispenser, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/engineering) +"jS" = ( +/obj/structure/machinery/power/terminal{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering) "jU" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -1565,26 +1737,39 @@ icon_state = "test_floor4" }, /area/almayer/living/briefing) -"km" = ( -/obj/effect/decal/cleanable/dirt, +"kh" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/belt/utility/full, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/hallways/hangar) -"kn" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/alarm/almayer{ - dir = 1 +/area/almayer/engineering) +"kk" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 }, -/obj/item/storage/toolbox/electrical, /obj/effect/decal/warning_stripes{ icon_state = "E"; pixel_x = 1 }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/engineering) +"km" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/hangar) "kq" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -1604,21 +1789,45 @@ icon_state = "cargo" }, /area/almayer/living/cryo_cells) -"kt" = ( -/obj/structure/machinery/light{ - dir = 4 +"kw" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/starboard_hallway) +"kB" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer, +/area/almayer/engineering) +"kF" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/reagentgrinder/industrial{ + pixel_y = 9 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) -"kA" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 4 +/area/almayer/engineering) +"kH" = ( +/obj/structure/machinery/computer/cryopod{ + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "test_floor5" }, /area/almayer/engineering) "kI" = ( @@ -1630,12 +1839,16 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha/platoon_sergeant) -"kS" = ( -/obj/structure/window/framed/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" +"kO" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, -/area/almayer/engineering) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/starboard_hallway) +"kS" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/hallways/starboard_hallway) "kU" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -1717,17 +1930,15 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) -"lt" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering) "ly" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/manifold/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) +"lA" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/starboard_hallway) "lB" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -1740,12 +1951,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"lC" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/almayer/engineering) "lE" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/supply{ @@ -1762,38 +1967,12 @@ }, /area/almayer/living/cafeteria_port) "lK" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/almayer/hallways/starboard_hallway) -"lL" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/engineering) -"lM" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/item/tool/wet_sign, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/atmos_alert{ + dir = 4 }, -/area/almayer/engineering) -"lO" = ( -/obj/structure/surface/rack, -/obj/item/storage/briefcase/inflatable, -/obj/item/storage/briefcase/inflatable, /turf/open/floor/almayer{ - icon_state = "test_floor5" + icon_state = "plate" }, /area/almayer/engineering) "lQ" = ( @@ -1814,16 +1993,23 @@ icon_state = "plate" }, /area/almayer/squads/alpha/platoon_sergeant) -"lW" = ( +"lV" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ - req_one_access = list(); - req_one_access_txt = "8;12;40" +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep{ + req_access = list(); + req_one_access_txt = "8;12;39" }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/squads/alpha/squad_two) +/area/almayer/squads/alpha/squad_one) +"mb" = ( +/obj/structure/machinery/door/poddoor/almayer/locked{ + dir = 4; + name = "\improper Hangar Lockdown Blast Door" + }, +/turf/closed/wall/almayer/outer, +/area/almayer/hallways/starboard_hallway) "mc" = ( /obj/structure/bed{ can_buckle = 0 @@ -1875,17 +2061,11 @@ /turf/open/floor/almayer, /area/almayer/hallways/hangar) "mo" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/surface/rack, +/obj/item/storage/briefcase/inflatable, +/obj/item/storage/briefcase/inflatable, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + icon_state = "test_floor5" }, /area/almayer/engineering) "ms" = ( @@ -1895,13 +2075,6 @@ icon_state = "cargo_arrow" }, /area/almayer/hallways/port_hallway) -"mw" = ( -/obj/structure/machinery/power/terminal{ - dir = 8 - }, -/obj/effect/decal/cleanable/blood/oil, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering) "mB" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -1925,22 +2098,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/alpha/squad_one) -"mI" = ( -/obj/structure/pipes/vents/pump{ - dir = 4 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/engineering) "mR" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, @@ -1966,31 +2123,12 @@ }, /area/almayer/living/cryo_cells) "mZ" = ( -/obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, -/obj/item/folder/yellow, -/obj/item/book/manual/engineering_construction, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/engineering) -"na" = ( -/obj/structure/machinery/computer/cryopod{ - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, +/obj/structure/closet/firecloset/full, /turf/open/floor/almayer{ icon_state = "test_floor5" }, -/area/almayer/engineering) +/area/almayer/hallways/starboard_hallway) "nb" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ name = "\improper Squad Two Armoury"; @@ -2013,12 +2151,17 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"nf" = ( -/obj/structure/reagent_dispensers/fueltank/custom, +"ng" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/machinery/light, +/obj/structure/largecrate, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "plate" }, -/area/almayer/engineering) +/area/almayer/hallways/starboard_hallway) "ni" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed/chair/comfy/alpha{ @@ -2083,25 +2226,53 @@ /area/almayer/hallways/starboard_hallway) "ny" = ( /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/starboard_hallway) +"nD" = ( +/obj/structure/machinery/conveyor{ + dir = 8 + }, +/obj/structure/barricade/handrail{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 }, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hallways/starboard_hallway) +"nF" = ( +/obj/structure/pipes/vents/pump{ + dir = 8 + }, +/obj/structure/machinery/power/apc/almayer{ + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, +/area/almayer/living/synthcloset) "nG" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/squads/alpha/squad_one) -"nH" = ( -/obj/structure/machinery/light, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/hangar) "nK" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/power/apc/almayer{ @@ -2203,6 +2374,21 @@ icon_state = "logo_c" }, /area/almayer/living/briefing) +"oo" = ( +/obj/structure/closet/secure_closet/engineering_electrical{ + req_one_access = list() + }, +/turf/open/floor/almayer{ + icon_state = "test_floor5" + }, +/area/almayer/engineering) +"or" = ( +/obj/structure/machinery/conveyor, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/starboard_hallway) "ot" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/rifle/m41aMK1{ @@ -2240,14 +2426,30 @@ /obj/structure/window/reinforced/tinted/frosted, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/platoon_commander_rooms) -"oD" = ( +"oB" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 + icon_state = "E"; + pixel_x = 1 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering) +/obj/structure/machinery/computer/supply_drop_console/limited{ + icon = 'icons/obj/structures/props/almayer_props.dmi'; + icon_state = "sensor_comp2"; + layer = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/starboard_hallway) +"oC" = ( +/obj/structure/plasticflaps, +/obj/structure/machinery/conveyor{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/starboard_hallway) "oH" = ( /obj/structure/machinery/light{ dir = 4 @@ -2297,6 +2499,13 @@ icon_state = "plate" }, /area/almayer/living/cafeteria_port) +"oO" = ( +/obj/structure/machinery/power/terminal{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering) "oQ" = ( /obj/item/prop/helmetgarb/gunoil{ pixel_x = 7; @@ -2316,27 +2525,24 @@ icon_state = "plate" }, /area/almayer/squads/alpha/squad_one) -"oS" = ( -/obj/item/reagent_container/spray/cleaner{ - pixel_x = 5; - pixel_y = 10 +"oW" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 1 }, -/obj/structure/janitorialcart, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering) -"oX" = ( -/obj/structure/machinery/conveyor, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, -/area/almayer/hallways/starboard_hallway) -"pe" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/belt/utility/full, /turf/open/floor/almayer{ icon_state = "plate" }, +/area/almayer/hallways/hangar) +"oX" = ( +/obj/structure/largecrate/supply/generator, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, /area/almayer/engineering) "pf" = ( /obj/effect/decal/cleanable/dirt, @@ -2415,28 +2621,14 @@ }, /area/almayer/hallways/hangar) "pR" = ( -/obj/structure/closet/crate, -/obj/effect/decal/cleanable/dirt, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/gloves/yellow, -/obj/item/clothing/gloves/yellow, -/obj/item/clothing/gloves/yellow, -/obj/item/clothing/gloves/yellow, -/obj/item/clothing/gloves/yellow, -/obj/item/tool/shovel/snow, -/obj/item/tool/shovel/snow, -/obj/item/tool/shovel/snow, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/engineering) +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer, +/area/almayer/hallways/hangar) "pS" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/machinery/power/smes/buildable, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/suit_storage_unit/carbon_unit, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "test_floor5" }, /area/almayer/engineering) "pW" = ( @@ -2458,6 +2650,13 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha/squad_one) +"qc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 4 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/hallways/starboard_hallway) "qf" = ( /obj/structure/machinery/cryopod/right{ pixel_y = 6 @@ -2494,24 +2693,6 @@ icon_state = "test_floor4" }, /area/almayer/living/cryo_cells) -"qr" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/tool/warning_cone{ - pixel_x = -7; - pixel_y = 6 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/engineering) "qu" = ( /obj/structure/machinery/door/airlock/multi_tile/almayer/generic{ dir = 1; @@ -2533,6 +2714,25 @@ icon_state = "cargo" }, /area/almayer/hallways/hangar) +"qz" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/structure/filingcabinet{ + density = 0; + pixel_x = 8; + pixel_y = 16 + }, +/obj/structure/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 18 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/starboard_hallway) "qA" = ( /turf/closed/wall/almayer, /area/almayer/squads/alpha/platoon_sergeant) @@ -2554,13 +2754,6 @@ icon_state = "plate" }, /area/almayer/squads/alpha/squad_two) -"qE" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer, -/area/almayer/engineering) "qI" = ( /obj/structure/machinery/landinglight/ds1/delayone{ dir = 8 @@ -2581,12 +2774,6 @@ icon_state = "dark_sterile" }, /area/almayer/living/cafeteria_port) -"qS" = ( -/obj/structure/largecrate/supply/floodlights, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/engineering) "qT" = ( /turf/open/floor/almayer/uscm/directional{ dir = 9 @@ -2598,12 +2785,14 @@ }, /turf/open/floor/almayer, /area/almayer/living/platoon_commander_rooms) -"qX" = ( -/obj/effect/decal/cleanable/greenglow, -/obj/structure/reagent_dispensers/fueltank/custom, -/obj/structure/sign/safety/storage{ - pixel_x = 7; - pixel_y = -28 +"qW" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/toolbox/mechanical/green{ + pixel_y = 10 + }, +/obj/item/storage/toolbox/mechanical/green{ + pixel_x = -7; + pixel_y = -1 }, /turf/open/floor/almayer{ icon_state = "plate" @@ -2632,13 +2821,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"rg" = ( -/obj/structure/sign/safety/storage{ - pixel_x = 9; - pixel_y = 29 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "rh" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -2659,11 +2841,33 @@ dir = 1 }, /area/almayer/living/briefing) +"ro" = ( +/obj/structure/largecrate/supply/supplies/water, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/engineering) +"rq" = ( +/obj/structure/largecrate/supply/floodlights, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/engineering) "rr" = ( /turf/open/floor/almayer/uscm/directional{ dir = 5 }, /area/almayer/living/briefing) +"rt" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/item/tool/wet_sign, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/engineering) "rx" = ( /obj/structure/surface/table/almayer, /obj/structure/pipes/standard/simple/hidden/supply, @@ -2681,21 +2885,6 @@ }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"rz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/engineering) "rA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/janitorialcart, @@ -2762,14 +2951,6 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"rY" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer{ - icon_state = "bluefull" - }, -/area/almayer/living/platoon_commander_rooms) "rZ" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -2830,17 +3011,6 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) -"sp" = ( -/obj/structure/machinery/power/monitor{ - name = "Core Power Monitoring" - }, -/obj/structure/sign/safety/terminal{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/almayer/engineering) "sv" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -2851,15 +3021,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"sw" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/reagentgrinder/industrial{ - pixel_y = 9 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering) "sy" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -2876,8 +3037,11 @@ "sC" = ( /turf/closed/wall/almayer/outer, /area/almayer/squads/alpha/platoon_sergeant) -"sD" = ( -/turf/closed/wall/almayer, +"sE" = ( +/obj/structure/machinery/power/smes/buildable, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, /area/almayer/engineering) "sI" = ( /turf/closed/wall/almayer/outer, @@ -2889,24 +3053,6 @@ icon_state = "cargo_arrow" }, /area/almayer/hallways/starboard_hallway) -"sL" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/obj/item/device/flashlight{ - pixel_x = -4; - pixel_y = 7 - }, -/obj/item/tool/warning_cone, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/engineering) "sN" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out"; @@ -2925,15 +3071,6 @@ icon_state = "dark_sterile" }, /area/almayer/living/cafeteria_port) -"sP" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/structure/machinery/status_display{ - pixel_y = -30 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/almayer/engineering) "sR" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, @@ -2963,6 +3100,24 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha/squad_two) +"sX" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/paper_bin/uscm{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/clipboard{ + pixel_x = 8; + pixel_y = 3 + }, +/obj/item/tool/pen{ + pixel_x = 12 + }, +/obj/structure/surface/table/almayer, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/starboard_hallway) "sY" = ( /obj/structure/closet/secure_closet/personal/cabinet{ req_access = null @@ -3013,10 +3168,32 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha/squad_two) +"tA" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/starboard_hallway) +"tB" = ( +/obj/structure/closet/firecloset/full, +/turf/open/floor/almayer{ + icon_state = "test_floor5" + }, +/area/almayer/engineering) "tG" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/almayer/hallways/hangar) +"tS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep{ + req_access = list(); + req_one_access_txt = "8;12;40" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha/squad_two) "tT" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, @@ -3072,6 +3249,16 @@ /obj/structure/machinery/faxmachine/uscm/command/capt, /turf/open/floor/almayer, /area/almayer/living/platoon_commander_rooms) +"uo" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/starboard_hallway) "up" = ( /obj/structure/bed/chair/comfy{ dir = 1 @@ -3086,6 +3273,13 @@ icon_state = "dark_sterile" }, /area/almayer/living/cafeteria_port) +"us" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, +/area/almayer/engineering) "uu" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -3109,30 +3303,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"uB" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/surface/table/almayer, -/obj/item/tool/hand_labeler{ - pixel_x = 4; - pixel_y = 11 - }, -/obj/item/reagent_container/food/drinks/coffeecup/uscm{ - pixel_x = -6; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) -"uE" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering) "uF" = ( /obj/structure/surface/table/reinforced/prison, /obj/structure/machinery/computer/crew/alt, @@ -3180,22 +3350,30 @@ /turf/open/floor/almayer, /area/almayer/squads/alpha/platoon_sergeant) "uQ" = ( -/obj/structure/machinery/power/smes/buildable, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 5; + icon_state = "plating" }, /area/almayer/engineering) -"uY" = ( -/obj/structure/machinery/power/terminal{ - dir = 4 - }, -/obj/item/tool/wirecutters{ - pixel_y = -6 +"uS" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 }, -/obj/item/device/multitool{ - pixel_x = -10 +/turf/open/floor/almayer, +/area/almayer/hallways/starboard_hallway) +"uX" = ( +/obj/structure/closet/secure_closet/engineering_chief, +/turf/open/floor/almayer{ + icon_state = "test_floor5" }, -/turf/open/floor/plating/plating_catwalk, /area/almayer/engineering) "vb" = ( /obj/structure/surface/table/reinforced/almayer_B{ @@ -3205,19 +3383,24 @@ /turf/closed/wall/almayer, /area/almayer/living/platoon_commander_rooms) "vc" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/machinery/computer/supply_drop_console/limited{ - icon = 'icons/obj/structures/props/almayer_props.dmi'; - icon_state = "sensor_comp2"; - layer = 4 +/obj/structure/closet/radiation, +/obj/structure/machinery/light{ + dir = 1 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor5" + }, +/area/almayer/engineering) +"vg" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) "vk" = ( /obj/structure/machinery/light, @@ -3227,6 +3410,15 @@ icon_state = "cargo_arrow" }, /area/almayer/living/briefing) +"vo" = ( +/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ + pixel_y = 25 + }, +/obj/structure/machinery/cm_vending/sorted/tech/comp_storage, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering) "vp" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -3239,9 +3431,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/port_hallway) -"vr" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/engineering) "vt" = ( /obj/structure/machinery/power/apc/almayer{ dir = 1 @@ -3267,15 +3456,55 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha/squad_two) -"vH" = ( +"vG" = ( +/obj/structure/machinery/power/terminal{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/pouch/electronics{ + pixel_x = 6; + pixel_y = -1 + }, +/obj/item/storage/toolbox/mechanical{ + pixel_x = -7; + pixel_y = -8 + }, +/obj/item/stack/cable_coil, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering) +"vJ" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" }, -/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/hangar) +/area/almayer/engineering) +"vK" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/starboard_hallway) "vL" = ( /obj/structure/sign/safety/bulkhead_door{ pixel_x = -19 @@ -3284,15 +3513,6 @@ icon_state = "plate" }, /area/almayer/hallways/port_hallway) -"vM" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) "vN" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -3309,6 +3529,15 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"vP" = ( +/obj/structure/machinery/light, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/hangar) "vS" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -3327,37 +3556,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) -"vW" = ( -/obj/structure/closet/toolcloset, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering) -"vY" = ( -/obj/structure/sign/safety/rewire{ - pixel_x = 14; - pixel_y = 29 - }, +"wa" = ( /obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "S" }, -/area/almayer/hallways/hangar) -"wa" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/platform/stair_cut, -/obj/structure/stairs/perspective{ - dir = 8; - icon_state = "p_stair_full" +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/engineering) "wc" = ( /obj/structure/machinery/door/airlock/almayer/command/reinforced{ name = "\improper Platoon Commander's Quarters" @@ -3380,15 +3588,15 @@ }, /area/almayer/hallways/port_hallway) "wi" = ( -/obj/structure/machinery/power/smes/buildable, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, +/obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, -/area/almayer/engineering) +/area/almayer/hallways/hangar) "wl" = ( /turf/open/floor/almayer, /area/almayer/living/grunt_rnr) @@ -3402,10 +3610,6 @@ icon_state = "plate" }, /area/almayer/hallways/port_hallway) -"wr" = ( -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/hallways/hangar) "wx" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -3422,29 +3626,30 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"wC" = ( +"wH" = ( /obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 + icon_state = "N"; + pixel_y = 2 }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" +/obj/item/clothing/ears/earmuffs{ + pixel_x = -8; + pixel_y = 8 }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering) -"wI" = ( -/obj/structure/machinery/light{ - dir = 1 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" }, +/area/almayer/engineering) +"wI" = ( +/obj/structure/surface/rack, +/obj/effect/spawner/random/technology_scanner, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/hangar) +/area/almayer/engineering) "wJ" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/light{ @@ -3468,34 +3673,29 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"wP" = ( -/obj/structure/ladder{ - height = 1; - id = "req1" +"wN" = ( +/obj/structure/closet/fireaxecabinet{ + pixel_x = -32 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes{ - icon_state = "S" +/obj/item/book/manual/robotics_cyborgs{ + pixel_y = 8 + }, +/obj/item/tool/wirecutters, +/obj/item/tool/weldingtool/hugetank, +/obj/structure/surface/rack, +/obj/structure/machinery/light/small{ + dir = 1 }, /turf/open/floor/almayer{ - icon_state = "test_floor5" + icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/living/synthcloset) "wS" = ( /obj/structure/machinery/light{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/living/briefing) -"wU" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/engineering) "wV" = ( /obj/structure/machinery/door/airlock/almayer/generic{ dir = 1; @@ -3507,22 +3707,6 @@ icon_state = "test_floor4" }, /area/almayer/squads/alpha/platoon_sergeant) -"wW" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) -"wY" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer, -/area/almayer/engineering) "xf" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, @@ -3545,17 +3729,6 @@ /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer, /area/almayer/squads/alpha/squad_one) -"xy" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/engineering) "xz" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/warning_stripes{ @@ -3584,13 +3757,18 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/squads/alpha/squad_two) -"xF" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/squads/alpha/squad_two) +"xJ" = ( +/obj/structure/closet/secure_closet/engineering_welding{ + req_one_access = list() + }, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering) "xK" = ( /obj/structure/machinery/light{ dir = 8 @@ -3630,16 +3808,33 @@ icon_state = "cargo_arrow" }, /area/almayer/living/grunt_rnr) -"xZ" = ( +"yc" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/engineering) +"ye" = ( +/turf/closed/wall/almayer, +/area/almayer/engineering) +"yg" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep{ - req_access = list(); - req_one_access_txt = "8;12;40" +/obj/structure/supply_drop/echo, +/obj/effect/decal/cleanable/dirt, +/obj/structure/platform{ + dir = 8 }, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor5" }, -/area/almayer/squads/alpha/squad_two) +/area/almayer/hallways/starboard_hallway) "yj" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 1; @@ -3649,16 +3844,13 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"yp" = ( -/obj/structure/machinery/door/airlock/almayer/engineering/reinforced{ - req_one_access = list(); - name = "\improper Engineering Airlock" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 +"yo" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/structure/machinery/status_display{ + pixel_y = -30 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "test_floor5" }, /area/almayer/engineering) "ys" = ( @@ -3697,6 +3889,12 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) +"yy" = ( +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "test_floor5" + }, +/area/almayer/engineering) "yA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet/squad_sergeant{ @@ -3707,16 +3905,6 @@ icon_state = "plate" }, /area/almayer/squads/alpha/squad_one) -"yE" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/engineering) "yF" = ( /obj/effect/decal/warning_stripes{ icon_state = "W"; @@ -3728,14 +3916,19 @@ }, /area/almayer/living/cryo_cells) "yJ" = ( -/obj/structure/machinery/conveyor{ - dir = 10 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 }, -/area/almayer/hallways/starboard_hallway) +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer, +/area/almayer/living/synthcloset) "yL" = ( /obj/structure/closet/coffin/woodencrate, /obj/item/storage/box/m94, @@ -3773,6 +3966,11 @@ icon_state = "cargo_arrow" }, /area/almayer/hallways/port_hallway) +"yU" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, +/area/almayer/hallways/starboard_hallway) "yY" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -3798,6 +3996,25 @@ icon_state = "dark_sterile" }, /area/almayer/living/cryo_cells) +"zk" = ( +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ + req_one_access = list(); + req_one_access_txt = "8;12;39" + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/squads/alpha/squad_one) +"zl" = ( +/obj/structure/machinery/power/smes/buildable, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/engineering) "zn" = ( /obj/structure/machinery/light{ dir = 4 @@ -3813,10 +4030,6 @@ icon_state = "dark_sterile" }, /area/almayer/living/cryo_cells) -"zp" = ( -/obj/structure/closet/emcloset, -/turf/closed/wall/almayer/outer, -/area/almayer/engineering) "zt" = ( /obj/structure/machinery/light{ dir = 8 @@ -3829,18 +4042,11 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"zB" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/general_air_control/large_tank_control{ - dir = 4; - name = "Lower Deck Waste Tank Control" - }, -/obj/structure/sign/safety/terminal{ - pixel_x = -17 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +"zA" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/engineering) "zD" = ( /turf/open/floor/almayer{ @@ -3848,6 +4054,29 @@ icon_state = "cargo_arrow" }, /area/almayer/hallways/hangar) +"zG" = ( +/obj/structure/machinery/camera/autoname/almayer{ + dir = 8; + name = "ship-grade camera" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer, +/area/almayer/engineering) +"zI" = ( +/obj/structure/pipes/vents/pump, +/obj/item/tool/mop{ + pixel_x = -9; + pixel_y = 20 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer, +/area/almayer/engineering) "zJ" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -3864,6 +4093,21 @@ icon_state = "plate" }, /area/almayer/hallways/port_hallway) +"zL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/engineering) "zM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/supply, @@ -3880,9 +4124,10 @@ }, /area/almayer/squads/alpha/platoon_sergeant) "zY" = ( -/turf/open/floor/almayer{ - icon_state = "test_floor4" +/obj/structure/closet/secure_closet/engineering_electrical{ + req_one_access = list() }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/engineering) "zZ" = ( /obj/effect/decal/cleanable/dirt, @@ -3900,22 +4145,6 @@ icon_state = "test_floor4" }, /area/almayer/hallways/port_hallway) -"Af" = ( -/obj/structure/window/framed/almayer, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/starboard_hallway) -"Ao" = ( -/obj/structure/reagent_dispensers/fueltank, -/obj/structure/machinery/camera/autoname/almayer{ - dir = 4; - name = "ship-grade camera" - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/engineering) "Ap" = ( /obj/structure/surface/table/almayer, /obj/item/trash/ceramic_plate, @@ -3927,12 +4156,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"Av" = ( -/obj/structure/machinery/power/terminal{ - dir = 4 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering) "Aw" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -3962,6 +4185,19 @@ icon_state = "dark_sterile" }, /area/almayer/living/cryo_cells) +"AC" = ( +/obj/structure/machinery/power/terminal{ + dir = 8 + }, +/obj/item/stack/catwalk{ + pixel_x = 12; + pixel_y = -9 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/engineering) "AG" = ( /obj/structure/machinery/landinglight/ds1/delaythree{ dir = 1 @@ -3972,39 +4208,8 @@ }, /area/almayer/hallways/hangar) "AH" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) -"AJ" = ( -/obj/structure/surface/table/almayer, -/obj/item/tool/stamp/denied{ - pixel_x = 2; - pixel_y = 10 - }, -/obj/item/device/eftpos{ - eftpos_name = "Cargo Bay EFTPOS scanner"; - pixel_x = -10 - }, -/obj/item/tool/stamp/ro{ - pixel_x = -8; - pixel_y = 10 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/obj/item/storage/fancy/cigar{ - pixel_x = 6 - }, -/obj/item/ashtray/glass{ - pixel_x = 11; - pixel_y = 9 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/engineering) "AK" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -4014,6 +4219,21 @@ icon_state = "test_floor4" }, /area/almayer/hallways/hangar) +"AL" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/hangar) +"AO" = ( +/obj/structure/machinery/autolathe, +/obj/structure/machinery/light{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering) "AP" = ( /obj/structure/prop/invuln/lifeboat_hatch_placeholder/terminal{ layer = 2.1 @@ -4042,16 +4262,14 @@ }, /area/almayer/hallways/port_hallway) "Bd" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/power/apc/almayer{ - dir = 1 +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 9 }, -/obj/structure/machinery/light{ - dir = 4 +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "plate" }, -/obj/structure/largecrate, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/engineering) "Bf" = ( /obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer{ @@ -4105,23 +4323,15 @@ /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/living/cryo_cells) -"Bt" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/firstaid/rad{ - pixel_x = -7; - pixel_y = 2 - }, -/obj/item/storage/firstaid/toxin{ - pixel_x = 8; - pixel_y = 2 - }, -/obj/structure/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, +/area/almayer/living/cryo_cells) +"Bt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "plating" }, /area/almayer/engineering) "Bu" = ( @@ -4130,6 +4340,19 @@ icon_state = "plate" }, /area/almayer/squads/alpha/squad_one) +"Bv" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{ + name = "Damage Control Locker"; + req_one_access = list() + }, +/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{ + name = "\improper Damage Control Locker"; + req_one_access = list() + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/engineering) "Bw" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/safety/rewire{ @@ -4160,30 +4383,6 @@ icon_state = "plate" }, /area/almayer/squads/alpha/squad_two) -"BB" = ( -/obj/structure/machinery/conveyor{ - dir = 9 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/hallways/starboard_hallway) -"BF" = ( -/obj/item/stack/sheet/metal{ - amount = 50 - }, -/obj/item/stack/sheet/plasteel{ - amount = 40; - pixel_x = 7; - pixel_y = 6 - }, -/obj/structure/closet/crate/construction, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/almayer/engineering) "BM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light{ @@ -4195,13 +4394,8 @@ }, /area/almayer/living/cryo_cells) "BN" = ( -/obj/structure/closet/radiation, -/obj/structure/machinery/status_display{ - pixel_y = 30 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, +/obj/structure/closet/emcloset, +/turf/closed/wall/almayer/outer, /area/almayer/engineering) "BO" = ( /obj/structure/bed/chair{ @@ -4216,20 +4410,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"BV" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/engineering) "BW" = ( /obj/structure/sign/safety/hazard{ pixel_x = -19; @@ -4284,30 +4464,20 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"Cd" = ( -/obj/structure/machinery/cm_vending/sorted/medical/wall_med{ - pixel_y = 25 - }, -/obj/structure/machinery/cm_vending/sorted/tech/comp_storage, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering) "Ce" = ( -/obj/structure/prop/almayer/computers/sensor_computer1, -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1; - pixel_y = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light{ +/obj/structure/surface/table/almayer, +/obj/structure/machinery/alarm/almayer{ dir = 1 }, +/obj/item/storage/toolbox/electrical, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/engineering) "Cf" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -4333,20 +4503,11 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/engineering) -"Cq" = ( -/obj/structure/machinery/camera/autoname/almayer, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" +/obj/structure/bed/chair{ + dir = 8 }, -/area/almayer/hallways/hangar) +/turf/open/floor/almayer, +/area/almayer/hallways/starboard_hallway) "Cr" = ( /turf/open/space/basic, /area/space) @@ -4386,6 +4547,21 @@ icon_state = "test_floor4" }, /area/almayer/medical) +"Cy" = ( +/obj/structure/machinery/conveyor{ + dir = 8 + }, +/obj/structure/barricade/handrail{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/starboard_hallway) "CC" = ( /obj/structure/surface/rack, /obj/item/ammo_magazine/flamer_tank, @@ -4415,19 +4591,6 @@ icon_state = "dark_sterile" }, /area/almayer/living/cafeteria_port) -"CJ" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/engineering) "CK" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -4449,17 +4612,18 @@ "CP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/light{ - dir = 8 + dir = 4 }, -/obj/structure/machinery/photocopier, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) -"CY" = ( -/obj/structure/largecrate/supply/supplies/water, +/area/almayer/engineering) +"CX" = ( +/obj/structure/machinery/light{ + dir = 1 + }, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "plate" }, /area/almayer/engineering) "CZ" = ( @@ -4504,18 +4668,6 @@ icon_state = "plate" }, /area/almayer/squads/alpha/platoon_sergeant) -"Dj" = ( -/obj/structure/machinery/power/apc/almayer{ - dir = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/hangar) "Dl" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin{ @@ -4596,17 +4748,6 @@ icon_state = "plate" }, /area/almayer/living/cafeteria_port) -"DH" = ( -/obj/structure/machinery/camera/autoname/almayer{ - dir = 8; - name = "ship-grade camera" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer, -/area/almayer/engineering) "DM" = ( /obj/structure/machinery/power/apc/almayer, /obj/effect/decal/cleanable/dirt, @@ -4618,34 +4759,6 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha/squad_two) -"DU" = ( -/obj/structure/largecrate/supply/supplies/sandbags, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/engineering) -"DV" = ( -/obj/structure/machinery/door/airlock/almayer/command/reinforced{ - dir = 1; - name = "\improper Platoon Commander's Office" - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/living/platoon_commander_rooms) -"DW" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/atmos_alert{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering) "DX" = ( /obj/structure/toilet{ pixel_y = 16 @@ -4685,6 +4798,25 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"Ep" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer, +/area/almayer/living/synthcloset) +"Er" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/starboard_hallway) "Eu" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -4700,28 +4832,23 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) -"Ez" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 +"EA" = ( +/obj/structure/machinery/power/monitor{ + name = "Core Power Monitoring" + }, +/obj/structure/sign/safety/terminal{ + pixel_x = -17 }, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + icon_state = "test_floor5" }, /area/almayer/engineering) "EB" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/machinery/light, -/obj/structure/largecrate, +/obj/structure/window/framed/almayer, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor4" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/engineering) "ED" = ( /turf/open/floor/almayer{ dir = 1; @@ -4748,6 +4875,17 @@ icon_state = "plate" }, /area/almayer/living/cryo_cells) +"EJ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/engineering) "EK" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/camera/autoname/almayer{ @@ -4796,28 +4934,9 @@ }, /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/living/grunt_rnr) -"ES" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/powercell, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/engineering) -"EU" = ( -/obj/structure/closet/firecloset/full, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "test_floor5" + icon_state = "plate" }, -/area/almayer/engineering) +/area/almayer/living/grunt_rnr) "EX" = ( /obj/effect/decal/warning_stripes{ icon_state = "W" @@ -4863,6 +4982,13 @@ icon_state = "plate" }, /area/almayer/squads/alpha/squad_one) +"Ff" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer, +/area/almayer/engineering) "Fg" = ( /turf/open/floor/almayer, /area/almayer/squads/alpha/squad_two) @@ -4894,31 +5020,12 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) -"Fn" = ( -/obj/effect/decal/cleanable/dirt, +"Fu" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) -"Fu" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) -"Fv" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering) +/area/almayer/hallways/port_hallway) "Fw" = ( /obj/effect/decal/warning_stripes{ icon_state = "NE-out"; @@ -4938,69 +5045,21 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha/squad_two) "Fz" = ( -/obj/structure/filingcabinet{ - density = 0; - pixel_x = 8; - pixel_y = 16 - }, -/obj/structure/filingcabinet{ - density = 0; - pixel_x = -8; - pixel_y = 18 - }, -/obj/structure/filingcabinet{ - density = 0; - pixel_x = 8; - pixel_y = 16 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) +/obj/structure/closet/crate/trashcart, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering) "FE" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) -"FF" = ( -/obj/structure/pipes/vents/pump{ - dir = 8 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering) "FI" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/living/grunt_rnr) -"FJ" = ( -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/engineering) -"FL" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/hangar) "FN" = ( /obj/structure/machinery/medical_pod/sleeper{ dir = 8; @@ -5072,12 +5131,6 @@ icon_state = "plate" }, /area/almayer/living/cryo_cells) -"Gb" = ( -/obj/structure/closet/firecloset/full, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/almayer/engineering) "Gf" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/cameras/wooden_tv/prop{ @@ -5144,42 +5197,46 @@ icon_state = "dark_sterile" }, /area/almayer/living/cafeteria_port) -"Gl" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor/autoname{ - dir = 1; - req_one_access = list(); - autoname = 0 - }, +"Gq" = ( /obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 5 }, -/area/almayer/engineering) -"Gn" = ( /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/engineering) +/area/almayer/hallways/starboard_hallway) "Gs" = ( /obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"Gv" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +"Gu" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, /obj/effect/decal/warning_stripes{ icon_state = "W" }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering) +"Gv" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering) "Gx" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hallways/starboard_hallway) +"Gy" = ( +/obj/structure/machinery/recharge_station, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering) "Gz" = ( /obj/structure/bed/chair/comfy{ dir = 8 @@ -5189,6 +5246,15 @@ icon_state = "plate" }, /area/almayer/living/cafeteria_port) +"GA" = ( +/obj/structure/machinery/power/apc/almayer{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/engineering) "GG" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -5239,16 +5305,15 @@ icon_state = "test_floor4" }, /area/almayer/hallways/hangar) -"GP" = ( +"GO" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep{ - req_access = list(); - req_one_access_txt = "8;12;39" +/obj/structure/sign/safety/synth_storage{ + pixel_x = -20 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/squads/alpha/squad_one) +/area/almayer/hallways/port_hallway) "GQ" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -5258,23 +5323,21 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) "GU" = ( -/obj/effect/decal/cleanable/dirt, -/obj/item/paper_bin/uscm{ - pixel_x = -8; - pixel_y = 5 - }, -/obj/item/clipboard{ - pixel_x = 8; - pixel_y = 3 - }, -/obj/item/tool/pen{ - pixel_x = 12 - }, /obj/structure/surface/table/almayer, +/obj/item/device/radio, +/obj/item/device/lightreplacer, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/engineering) +"GV" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 + }, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/living/platoon_commander_rooms) "GY" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -5282,6 +5345,27 @@ icon_state = "cargo_arrow" }, /area/almayer/living/briefing) +"Hc" = ( +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/general_air_control/large_tank_control{ + dir = 4; + name = "Lower Deck Waste Tank Control" + }, +/obj/structure/sign/safety/terminal{ + pixel_x = -17 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering) +"Hh" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/engineering) "Hj" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/prop/almayer/CICmap{ @@ -5292,32 +5376,20 @@ icon_state = "plate" }, /area/almayer/squads/alpha/platoon_sergeant) +"Hk" = ( +/obj/structure/closet/coffin/woodencrate, +/obj/item/clothing/accessory/storage/droppouch, +/obj/item/clothing/accessory/storage/droppouch, +/turf/open/floor/almayer{ + icon_state = "test_floor5" + }, +/area/almayer/hallways/starboard_hallway) "Hm" = ( /obj/structure/bed/chair{ dir = 4 }, /turf/open/floor/almayer, /area/almayer/squads/alpha/platoon_sergeant) -"Hq" = ( -/obj/structure/largecrate/supply/generator, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/engineering) -"Hr" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 5 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/hangar) -"Hu" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer, -/area/almayer/engineering) "Hv" = ( /obj/item/frame/camera{ desc = "The Staff Officer insisted he needed to monitor everyone at all times."; @@ -5348,12 +5420,13 @@ icon_state = "test_floor4" }, /area/almayer/squads/alpha/squad_two) -"HC" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 +"Hx" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "test_floor5" }, -/turf/open/floor/almayer, -/area/almayer/hallways/hangar) +/area/almayer/engineering) "HG" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -5379,33 +5452,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"HI" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 1 - }, -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/hangar) -"HJ" = ( -/obj/structure/pipes/vents/pump, -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light{ - dir = 1 - }, -/obj/structure/surface/table/almayer, -/obj/structure/machinery/prop/almayer/computer/PC{ - dir = 4 - }, -/obj/structure/sign/safety/terminal{ - pixel_x = -20 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) "HK" = ( /turf/closed/wall/almayer, /area/almayer/living/cryo_cells) @@ -5416,6 +5462,12 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"HR" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "bluefull" + }, +/area/almayer/hallways/hangar) "HS" = ( /obj/structure/machinery/landinglight/ds1/delaythree{ dir = 4 @@ -5425,6 +5477,13 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"HT" = ( +/obj/structure/machinery/power/terminal{ + dir = 8 + }, +/obj/effect/decal/cleanable/blood/oil, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering) "HV" = ( /obj/structure/machinery/landinglight/ds1/delayone{ dir = 4 @@ -5448,22 +5507,35 @@ icon_state = "dark_sterile" }, /area/almayer/living/cryo_cells) -"Ig" = ( -/obj/structure/pipes/vents/pump{ - dir = 1 +"Ii" = ( +/obj/structure/machinery/cryopod, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/living/cryo_cells) +"It" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor/autoname{ + dir = 1; + req_one_access = list(); + autoname = 0 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 }, -/turf/open/floor/almayer, -/area/almayer/living/platoon_commander_rooms) -"Ii" = ( -/obj/structure/machinery/cryopod, /turf/open/floor/almayer{ - icon_state = "cargo" + icon_state = "test_floor4" }, -/area/almayer/living/cryo_cells) +/area/almayer/engineering) "Iw" = ( /obj/structure/surface/table/almayer, /turf/open/floor/almayer, /area/almayer/squads/alpha/platoon_sergeant) +"Iy" = ( +/obj/structure/computer3frame, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering) "IC" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -5492,32 +5564,44 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha/squad_two) "IN" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/structure/filingcabinet{ - density = 0; - pixel_x = 8; - pixel_y = 16 - }, -/obj/structure/filingcabinet{ - density = 0; - pixel_x = -8; - pixel_y = 18 +/obj/structure/closet/toolcloset, +/obj/structure/machinery/light{ + dir = 1 }, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/engineering) "IP" = ( -/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering) +"IR" = ( /obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 2 }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/obj/effect/decal/warning_stripes{ + icon_state = "NW-out"; + pixel_x = -1; + pixel_y = 2 + }, +/obj/structure/pipes/standard/manifold/hidden/supply, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/engineering) +"IS" = ( +/obj/structure/reagent_dispensers/fueltank, +/obj/structure/machinery/camera/autoname/almayer{ + dir = 4; + name = "ship-grade camera" + }, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/engineering) "IT" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -5555,6 +5639,15 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"IZ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/hangar) "Jb" = ( /obj/structure/machinery/cm_vending/clothing/medic/alpha, /turf/open/floor/almayer{ @@ -5599,6 +5692,15 @@ }, /turf/open/floor/almayer, /area/almayer/squads/alpha/platoon_sergeant) +"Jp" = ( +/obj/structure/machinery/conveyor{ + dir = 9 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/hallways/starboard_hallway) "Jq" = ( /obj/structure/machinery/landinglight/ds1/delaytwo{ dir = 8 @@ -5615,13 +5717,6 @@ icon_state = "plate" }, /area/almayer/living/cafeteria_port) -"JC" = ( -/obj/structure/closet/emcloset, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/almayer/engineering) "JD" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -5673,18 +5768,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"Kc" = ( -/obj/structure/pipes/vents/pump, -/obj/item/tool/mop{ - pixel_x = -9; - pixel_y = 20 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/turf/open/floor/almayer, -/area/almayer/engineering) "Kd" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, @@ -5730,26 +5813,6 @@ icon_state = "plate" }, /area/almayer/squads/alpha/platoon_sergeant) -"Ko" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 2 - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering) "Kp" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/rifle/m41aMK1{ @@ -5763,12 +5826,16 @@ icon_state = "plate" }, /area/almayer/squads/alpha/squad_one) -"Ks" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +"Ku" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ + req_one_access = list(); + req_one_access_txt = "8;12;40" + }, /turf/open/floor/almayer{ - icon_state = "bluefull" + icon_state = "plate" }, -/area/almayer/hallways/hangar) +/area/almayer/squads/alpha/squad_two) "Kv" = ( /turf/open/floor/almayer, /area/almayer/squads/alpha/platoon_sergeant) @@ -5782,16 +5849,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"KB" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/engineering) "KD" = ( /obj/effect/decal/warning_stripes{ icon_state = "SW-out"; @@ -5806,14 +5863,6 @@ /obj/vehicle/powerloader, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"KJ" = ( -/obj/structure/closet/secure_closet/engineering_welding{ - req_one_access = list() - }, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/almayer/engineering) "KK" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -5844,12 +5893,6 @@ icon_state = "plate" }, /area/almayer/squads/alpha/platoon_sergeant) -"KR" = ( -/obj/structure/closet/secure_closet/engineering_chief, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/almayer/engineering) "KU" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -5865,6 +5908,12 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"La" = ( +/obj/structure/pipes/standard/manifold/hidden/supply{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/engineering) "Ld" = ( /obj/structure/window/reinforced{ dir = 4; @@ -5915,15 +5964,6 @@ /obj/effect/landmark/observer_start, /turf/open/floor/plating, /area/almayer/hallways/hangar) -"Lh" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "Ll" = ( /obj/structure/ship_ammo/minirocket/incendiary, /turf/open/floor/almayer{ @@ -5943,23 +5983,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/almayer/hallways/hangar) -"Lq" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 2 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "NW-out"; - pixel_x = -1; - pixel_y = 2 - }, -/obj/structure/pipes/standard/manifold/hidden/supply, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/engineering) "Ls" = ( /obj/structure/machinery/cm_vending/sorted/uniform_supply/squad_prep/alpha{ density = 0 @@ -5971,12 +5994,6 @@ icon_state = "plate" }, /area/almayer/squads/alpha/platoon_sergeant) -"Lt" = ( -/obj/structure/closet/emcloset, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/almayer/engineering) "Lx" = ( /obj/structure/machinery/landinglight/ds1{ dir = 8 @@ -5985,6 +6002,13 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) +"LC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/emcloset, +/turf/open/floor/almayer{ + icon_state = "test_floor5" + }, +/area/almayer/hallways/starboard_hallway) "LE" = ( /obj/structure/machinery/camera/autoname/almayer{ dir = 8; @@ -6028,18 +6052,6 @@ /obj/effect/landmark/start/marine/alpha, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/cryo_cells) -"LP" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "W"; - pixel_x = -1; - pixel_y = 1 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/engineering) "LQ" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -6064,19 +6076,52 @@ }, /area/almayer/living/cafeteria_port) "LT" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/warning_stripes{ - icon_state = "W" +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/status_display{ + pixel_x = -32 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering) "LZ" = ( /obj/structure/machinery/light, /turf/open/floor/almayer, /area/almayer/living/platoon_commander_rooms) +"Mc" = ( +/obj/structure/pipes/vents/pump{ + dir = 1 + }, +/turf/open/floor/almayer, +/area/almayer/living/platoon_commander_rooms) +"Md" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/starboard_hallway) "Me" = ( /turf/closed/wall/almayer, /area/almayer/squads/alpha/squad_two) +"Mf" = ( +/obj/effect/decal/cleanable/cobweb{ + dir = 8 + }, +/obj/item/notepad, +/obj/item/maintenance_jack, +/obj/structure/closet, +/obj/item/tool/pen{ + pixel_x = -5; + pixel_y = 4 + }, +/obj/item/device/camera, +/obj/item/device/camera_film, +/obj/item/storage/photo_album, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/living/synthcloset) "Mi" = ( /obj/structure/machinery/light{ dir = 4 @@ -6091,6 +6136,33 @@ icon_state = "sterile_green" }, /area/almayer/medical) +"Mk" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/hangar) +"Ml" = ( +/obj/structure/surface/table/almayer, +/obj/item/storage/firstaid/rad{ + pixel_x = -7; + pixel_y = 2 + }, +/obj/item/storage/firstaid/toxin{ + pixel_x = 8; + pixel_y = 2 + }, +/obj/structure/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering) "Mn" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -6098,6 +6170,15 @@ icon_state = "cargo_arrow" }, /area/almayer/living/cryo_cells) +"Mu" = ( +/obj/structure/machinery/door/airlock/almayer/engineering/reinforced{ + req_one_access = list(); + name = "\improper Engineering Airlock" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/engineering) "MB" = ( /obj/effect/decal/warning_stripes{ icon_state = "SE-out" @@ -6133,21 +6214,31 @@ "MK" = ( /turf/closed/wall/almayer/outer, /area/almayer/living/platoon_commander_rooms) +"ML" = ( +/obj/structure/largecrate, +/obj/structure/largecrate{ + pixel_y = 16 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor5" + }, +/area/almayer/hallways/starboard_hallway) "MN" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 }, /turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/hangar) -"MS" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 +"MW" = ( +/obj/structure/pipes/vents/pump{ + dir = 4 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering) -"MT" = ( /obj/effect/decal/warning_stripes{ - icon_state = "S" + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" }, /turf/open/floor/almayer{ dir = 5; @@ -6189,6 +6280,20 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/hangar) +"No" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "W"; + pixel_x = -1; + pixel_y = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light/small, +/turf/open/floor/almayer, +/area/almayer/living/synthcloset) "Np" = ( /turf/open/floor/almayer, /area/almayer/living/briefing) @@ -6196,6 +6301,33 @@ /obj/structure/surface/table/almayer, /turf/open/floor/almayer, /area/almayer/squads/alpha/squad_two) +"Nx" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/machinery/power/smes/buildable, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/engineering) +"Nz" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "NE-out"; + pixel_x = 1; + pixel_y = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/engineering) "NB" = ( /obj/structure/sign/safety/cryo{ pixel_x = 6; @@ -6238,31 +6370,15 @@ icon_state = "dark_sterile" }, /area/almayer/living/platoon_commander_rooms) -"NF" = ( -/obj/structure/closet/radiation, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/almayer/engineering) -"NH" = ( -/obj/structure/machinery/power/terminal{ - dir = 8 - }, -/obj/item/stack/catwalk{ - pixel_x = 12; - pixel_y = -9 +"NI" = ( +/obj/structure/machinery/cm_vending/clothing/synth/snowflake{ + pixel_x = -30; + density = 0 }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/engineering) -"NN" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" + icon_state = "test_floor5" }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) +/area/almayer/living/synthcloset) "NO" = ( /obj/structure/bed/chair/comfy, /turf/open/floor/almayer{ @@ -6281,6 +6397,16 @@ icon_state = "dark_sterile" }, /area/almayer/living/cafeteria_port) +"NU" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor/autoname{ + dir = 1; + req_one_access = list(); + autoname = 0 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/engineering) "NV" = ( /obj/structure/sign/safety/cryo{ pixel_x = 6; @@ -6290,6 +6416,12 @@ icon_state = "plate" }, /area/almayer/living/cryo_cells) +"NZ" = ( +/obj/structure/closet/radiation, +/turf/open/floor/almayer{ + icon_state = "test_floor5" + }, +/area/almayer/engineering) "Ob" = ( /obj/structure/platform{ dir = 4; @@ -6304,6 +6436,14 @@ icon_state = "plate" }, /area/almayer/living/briefing) +"Oc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering) "Od" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -6317,18 +6457,13 @@ icon_state = "plate" }, /area/almayer/hallways/port_hallway) -"Op" = ( -/obj/structure/closet/fireaxecabinet{ - pixel_y = 30 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" +"Ol" = ( +/obj/item/reagent_container/spray/cleaner{ + pixel_x = 5; + pixel_y = 10 }, +/obj/structure/janitorialcart, +/turf/open/floor/plating/plating_catwalk, /area/almayer/engineering) "Os" = ( /obj/structure/bed/chair/comfy, @@ -6336,6 +6471,12 @@ icon_state = "dark_sterile" }, /area/almayer/living/cafeteria_port) +"Oz" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 5 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/hangar) "OA" = ( /turf/open/floor/almayer{ icon_state = "dark_sterile" @@ -6348,19 +6489,6 @@ icon_state = "plate" }, /area/almayer/living/platoon_commander_rooms) -"OF" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E"; - pixel_x = 1 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "W" - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/engineering) "OG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/alarm/almayer{ @@ -6410,15 +6538,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"OQ" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/computer/cameras/engineering{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering) "OU" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -6430,6 +6549,26 @@ dir = 4 }, /area/almayer/living/briefing) +"OY" = ( +/obj/structure/ladder{ + height = 2; + id = "req1" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor5" + }, +/area/almayer/hallways/starboard_hallway) +"OZ" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 6 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, +/area/almayer/hallways/starboard_hallway) "Pc" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, @@ -6529,23 +6668,28 @@ icon_state = "dark_sterile" }, /area/almayer/medical) -"Pt" = ( -/obj/effect/decal/cleanable/blood/oil, +"Ps" = ( +/obj/item/stack/sheet/metal{ + amount = 50 + }, +/obj/item/stack/sheet/plasteel{ + amount = 40; + pixel_x = 7; + pixel_y = 6 + }, +/obj/structure/closet/crate/construction, /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "test_floor5" }, -/area/almayer/hallways/hangar) -"Pv" = ( +/area/almayer/engineering) +"Pt" = ( +/obj/effect/decal/cleanable/blood/oil, /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/cm_vending/sorted/tech/tool_storage{ - req_one_access = list() - }, -/obj/structure/machinery/light, /turf/open/floor/almayer{ icon_state = "plate" }, -/area/almayer/engineering) +/area/almayer/hallways/hangar) "Py" = ( /obj/structure/machinery/landinglight/ds1{ dir = 4 @@ -6570,15 +6714,6 @@ icon_state = "plate" }, /area/almayer/squads/alpha/squad_one) -"PC" = ( -/obj/structure/plasticflaps, -/obj/structure/machinery/conveyor{ - dir = 8 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" - }, -/area/almayer/hallways/starboard_hallway) "PF" = ( /obj/structure/machinery/light, /turf/open/floor/almayer{ @@ -6594,25 +6729,14 @@ icon_state = "plate" }, /area/almayer/squads/alpha/squad_two) -"PJ" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{ - name = "Damage Control Locker"; - req_one_access = list() - }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{ - name = "\improper Damage Control Locker"; - req_one_access = list() +"PL" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 10 }, /turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "plate" }, /area/almayer/engineering) -"PL" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "PQ" = ( /obj/structure/pipes/standard/manifold/hidden/supply{ dir = 8 @@ -6621,15 +6745,6 @@ icon_state = "cargo_arrow" }, /area/almayer/squads/alpha/platoon_sergeant) -"PR" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "S" - }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 9 - }, -/turf/open/floor/almayer, -/area/almayer/engineering) "PW" = ( /obj/structure/machinery/door/airlock/almayer/command/reinforced{ name = "\improper Private Briefing Room"; @@ -6721,6 +6836,33 @@ icon_state = "plate" }, /area/almayer/hallways/port_hallway) +"Qq" = ( +/obj/structure/machinery/door/airlock/almayer/engineering/reinforced{ + req_one_access = list(); + name = "\improper Engineering Airlock" + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/engineering) +"Qt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/surface/table/almayer, +/obj/item/tool/hand_labeler{ + pixel_x = 4; + pixel_y = 11 + }, +/obj/item/reagent_container/food/drinks/coffeecup/uscm{ + pixel_x = -6; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/starboard_hallway) "Qu" = ( /obj/structure/machinery/firealarm{ pixel_y = 28 @@ -6748,8 +6890,17 @@ /obj/structure/mirror{ pixel_x = 28 }, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/living/cryo_cells) +/turf/open/floor/plating/plating_catwalk, +/area/almayer/living/cryo_cells) +"Qz" = ( +/obj/structure/closet/radiation, +/obj/structure/machinery/status_display{ + pixel_y = 30 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor5" + }, +/area/almayer/engineering) "QD" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -6766,13 +6917,6 @@ icon_state = "sterile_green" }, /area/almayer/medical) -"QF" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/almayer/engineering) "QI" = ( /obj/structure/surface/table/almayer, /obj/effect/decal/cleanable/dirt, @@ -6789,6 +6933,20 @@ icon_state = "test_floor4" }, /area/almayer/squads/alpha/squad_one) +"QL" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/structure/pipes/standard/simple/hidden/supply, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/engineering) "QM" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -6810,6 +6968,13 @@ /obj/structure/bed/chair/office/dark, /turf/open/floor/almayer, /area/almayer/living/platoon_commander_rooms) +"QP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/largecrate, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/starboard_hallway) "QQ" = ( /obj/structure/toilet{ dir = 8 @@ -6836,11 +7001,6 @@ icon_state = "cargo" }, /area/almayer/living/cryo_cells) -"QV" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) "QW" = ( /obj/structure/cargo_container/wy/left, /obj/structure/sign/poster{ @@ -6876,6 +7036,24 @@ icon_state = "dark_sterile" }, /area/almayer/living/cryo_cells) +"Rc" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/effect/decal/warning_stripes{ + icon_state = "SW-out"; + pixel_x = -1 + }, +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1; + name = "\improper Supply Office" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/starboard_hallway) +"Rd" = ( +/obj/structure/foamed_metal, +/turf/open/floor/plating, +/area/almayer/hallways/starboard_hallway) "Rg" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -6892,15 +7070,6 @@ icon_state = "plate" }, /area/almayer/squads/alpha/platoon_sergeant) -"Rj" = ( -/obj/structure/machinery/cm_vending/sorted/cargo_guns/squad{ - req_one_access = list(); - req_one_access_txt = "8;12;39" - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/squads/alpha/squad_one) "Rl" = ( /obj/structure/surface/table/almayer, /obj/item/tool/kitchen/tray{ @@ -6927,6 +7096,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) +"Rt" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/starboard_hallway) "Rv" = ( /turf/closed/wall/almayer/outer, /area/almayer/living/cafeteria_port) @@ -6967,9 +7145,45 @@ /obj/effect/landmark/start/marine/alpha, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/cryo_cells) +"RK" = ( +/obj/structure/machinery/light{ + dir = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/hangar) "RM" = ( -/obj/structure/foamed_metal, -/turf/open/floor/plating, +/obj/structure/closet/firecloset/full, +/obj/structure/machinery/light, +/turf/open/floor/almayer{ + icon_state = "test_floor5" + }, +/area/almayer/engineering) +"RN" = ( +/obj/structure/surface/rack, +/obj/item/clothing/mask/gas{ + pixel_x = -5; + pixel_y = 10 + }, +/obj/item/stack/sheet/glass{ + amount = 50 + }, +/obj/item/clothing/mask/gas{ + pixel_x = 5; + pixel_y = 10 + }, +/obj/item/stack/sheet/mineral/phoron/medium_stack{ + desc = "Phoron is an extremely rare mineral with exotic properties, often used in cutting-edge research. Just getting it into a stable, solid form is already hard enough. Handle with care."; + pixel_y = -9 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor5" + }, /area/almayer/engineering) "RO" = ( /obj/effect/decal/cleanable/dirt, @@ -6981,12 +7195,26 @@ icon_state = "plate" }, /area/almayer/squads/alpha/squad_two) +"RP" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer, +/area/almayer/engineering) "RT" = ( /obj/structure/machinery/landinglight/ds1/delayone, /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/hallways/hangar) +"RW" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer, +/area/almayer/hallways/starboard_hallway) "Sc" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ @@ -7038,12 +7266,19 @@ }, /area/almayer/living/cryo_cells) "Sj" = ( -/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "SE-out"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/obj/effect/decal/cleanable/blood/oil, /turf/open/floor/almayer{ - dir = 4; - icon_state = "cargo_arrow" + dir = 5; + icon_state = "plating" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/engineering) "Sl" = ( /obj/structure/surface/table/almayer, /obj/item/paper_bin{ @@ -7054,6 +7289,15 @@ icon_state = "dark_sterile" }, /area/almayer/living/cafeteria_port) +"Sn" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/engineering) "So" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -7121,10 +7365,6 @@ icon_state = "plate" }, /area/almayer/living/briefing) -"SD" = ( -/obj/structure/closet/crate/trashcart, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering) "SL" = ( /obj/structure/machinery/light{ dir = 8 @@ -7137,9 +7377,6 @@ /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) -"SQ" = ( -/turf/open/floor/almayer, -/area/almayer/engineering) "SR" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -7164,6 +7401,18 @@ icon_state = "plate" }, /area/almayer/squads/alpha/squad_two) +"SV" = ( +/obj/structure/surface/table/reinforced/almayer_B, +/obj/item/prop/magazine/book/theartofwar, +/obj/item/paper_bin/uscm{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/tool/pen{ + pixel_x = 12 + }, +/turf/open/floor/almayer, +/area/almayer/living/platoon_commander_rooms) "SY" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -7264,15 +7513,6 @@ icon_state = "plate" }, /area/almayer/living/grunt_rnr) -"Tl" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/hangar) "To" = ( /obj/effect/decal/warning_stripes{ icon_state = "S" @@ -7290,14 +7530,6 @@ icon_state = "dark_sterile" }, /area/almayer/living/cryo_cells) -"Tt" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 10 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering) "Tu" = ( /obj/structure/sign/safety/hazard{ pixel_x = -19; @@ -7319,21 +7551,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"Tv" = ( -/obj/structure/pipes/standard/manifold/hidden/supply{ - dir = 1 - }, -/turf/open/floor/almayer, -/area/almayer/engineering) -"Tw" = ( -/obj/structure/closet/radiation, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/almayer/engineering) "Tx" = ( /obj/structure/machinery/landinglight/ds1/delaythree{ dir = 8 @@ -7394,9 +7611,22 @@ icon_state = "plate" }, /area/almayer/squads/alpha/squad_one) +"TK" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "W" + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/engineering) "TN" = ( -/turf/closed/wall/almayer, -/area/almayer/hallways/starboard_hallway) +/turf/closed/wall/almayer/reinforced, +/area/almayer/engineering) "TO" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/supply, /turf/open/floor/almayer, @@ -7414,15 +7644,17 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"TQ" = ( -/obj/structure/pipes/standard/simple/hidden/supply, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "TT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/vents/scrubber, /turf/open/floor/almayer, /area/almayer/squads/alpha/squad_two) +"TW" = ( +/obj/structure/machinery/recharge_station, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/living/synthcloset) "TY" = ( /obj/structure/barricade/handrail{ dir = 1; @@ -7444,28 +7676,18 @@ icon_state = "plate" }, /area/almayer/living/cafeteria_port) -"Ud" = ( -/obj/structure/closet/coffin/woodencrate, -/obj/item/clothing/accessory/storage/droppouch, -/obj/item/clothing/accessory/storage/droppouch, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/almayer/hallways/starboard_hallway) -"Ue" = ( -/obj/structure/pipes/standard/simple/hidden/supply, +"Uf" = ( /obj/effect/decal/warning_stripes{ - icon_state = "SW-out"; - pixel_x = -1 - }, -/obj/structure/machinery/door/airlock/almayer/generic{ - dir = 1; - name = "\improper Supply Office" + icon_state = "W"; + pixel_x = -1; + pixel_y = 1 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - icon_state = "test_floor4" + dir = 5; + icon_state = "plating" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/engineering) "Uh" = ( /turf/open/floor/almayer{ icon_state = "test_floor5" @@ -7487,25 +7709,16 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha/squad_one) -"Ul" = ( -/obj/structure/surface/table/almayer, -/obj/structure/machinery/cell_charger, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering) -"Us" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 +"Um" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/cm_vending/clothing/synth{ + pixel_x = -30; + density = 0 }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 +/turf/open/floor/almayer{ + icon_state = "test_floor5" }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/hallways/starboard_hallway) +/area/almayer/living/synthcloset) "Uv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/pipes/standard/simple/hidden/supply, @@ -7516,18 +7729,9 @@ "UA" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - icon_state = "cargo_arrow" - }, -/area/almayer/hallways/hangar) -"UB" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light{ - dir = 4 - }, -/turf/open/floor/almayer{ - icon_state = "plate" + icon_state = "cargo_arrow" }, -/area/almayer/engineering) +/area/almayer/hallways/hangar) "UI" = ( /obj/structure/surface/table/almayer, /obj/item/device/cassette_tape/nam{ @@ -7545,17 +7749,6 @@ icon_state = "plate" }, /area/almayer/squads/alpha/platoon_sergeant) -"UM" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 6 - }, -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer, -/area/almayer/hallways/starboard_hallway) "UN" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/machinery/line_nexter{ @@ -7577,6 +7770,15 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) +"UR" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/engineering) "UT" = ( /obj/structure/machinery/disposal{ density = 0; @@ -7597,10 +7799,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"UZ" = ( -/obj/structure/foamed_metal, -/turf/open/floor/plating, -/area/almayer/hallways/starboard_hallway) "Va" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -7640,42 +7838,34 @@ }, /area/almayer/living/cryo_cells) "Vj" = ( -/obj/structure/surface/table/almayer, -/obj/item/storage/toolbox/mechanical/green{ - pixel_y = 10 - }, -/obj/item/storage/toolbox/mechanical/green{ - pixel_x = -7; - pixel_y = -1 - }, /turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering) -"Vm" = ( -/obj/structure/machinery/power/terminal{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/obj/item/storage/pouch/electronics{ - pixel_x = 6; - pixel_y = -1 - }, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -7; - pixel_y = -8 + dir = 5; + icon_state = "plating" }, -/obj/item/stack/cable_coil, -/turf/open/floor/plating/plating_catwalk, /area/almayer/engineering) "Vp" = ( /turf/closed/wall/almayer, /area/almayer/living/grunt_rnr) +"Vq" = ( +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering) "Vr" = ( /turf/open/floor/almayer{ icon_state = "plate" }, /area/almayer/living/briefing) +"Vu" = ( +/obj/structure/pipes/standard/simple/hidden/supply, +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 1; + name = "\improper Supply Bay" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor4" + }, +/area/almayer/hallways/starboard_hallway) "Vv" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -7689,19 +7879,18 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"VA" = ( -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering) -"VE" = ( -/obj/structure/machinery/recharge_station, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/engineering) -"VG" = ( +"VJ" = ( +/obj/structure/ladder{ + height = 1; + id = "req1" + }, +/obj/effect/decal/cleanable/dirt, /obj/effect/decal/warning_stripes{ - icon_state = "SE-out"; - pixel_x = 1 + icon_state = "S" + }, +/turf/open/floor/almayer{ + icon_state = "test_floor5" }, -/turf/open/floor/almayer, /area/almayer/hallways/starboard_hallway) "VK" = ( /obj/effect/decal/cleanable/dirt, @@ -7725,6 +7914,34 @@ icon_state = "plate" }, /area/almayer/squads/alpha/platoon_sergeant) +"VT" = ( +/obj/structure/surface/table/almayer, +/obj/item/tool/stamp/denied{ + pixel_x = 2; + pixel_y = 10 + }, +/obj/item/device/eftpos{ + eftpos_name = "Cargo Bay EFTPOS scanner"; + pixel_x = -10 + }, +/obj/item/tool/stamp/ro{ + pixel_x = -8; + pixel_y = 10 + }, +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 4 + }, +/obj/item/storage/fancy/cigar{ + pixel_x = 6 + }, +/obj/item/ashtray/glass{ + pixel_x = 11; + pixel_y = 9 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/starboard_hallway) "VX" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -7785,6 +8002,26 @@ }, /turf/open/floor/almayer, /area/almayer/hallways/port_hallway) +"Wo" = ( +/obj/structure/filingcabinet{ + density = 0; + pixel_x = 8; + pixel_y = 16 + }, +/obj/structure/filingcabinet{ + density = 0; + pixel_x = -8; + pixel_y = 18 + }, +/obj/structure/filingcabinet{ + density = 0; + pixel_x = 8; + pixel_y = 16 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/hallways/starboard_hallway) "Wp" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 9 @@ -7805,13 +8042,6 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"Wt" = ( -/obj/structure/largecrate/supply/generator, -/obj/structure/machinery/light, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/engineering) "Wu" = ( /obj/structure/largecrate/random/case/double, /turf/open/floor/almayer{ @@ -7827,37 +8057,24 @@ icon_state = "plate" }, /area/almayer/hallways/hangar) -"WB" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "NE-out"; - pixel_x = 1; - pixel_y = 1 - }, -/obj/structure/sign/safety/electronics{ - pixel_x = 31; - pixel_y = 6 +"WA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/power/apc/almayer{ + dir = 1 }, -/obj/structure/sign/safety/high_voltage{ - pixel_x = 31; - pixel_y = -6 +/obj/structure/machinery/light{ + dir = 4 }, -/obj/structure/machinery/portable_atmospherics/canister/air, +/obj/structure/largecrate, +/turf/open/floor/almayer, +/area/almayer/hallways/starboard_hallway) +"WG" = ( +/obj/effect/decal/cleanable/dirt, /turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering) -"WJ" = ( -/obj/structure/surface/table/reinforced/almayer_B, -/obj/item/prop/magazine/book/theartofwar, -/obj/item/paper_bin/uscm{ - pixel_x = -8; - pixel_y = 5 - }, -/obj/item/tool/pen{ - pixel_x = 12 + dir = 4; + icon_state = "cargo_arrow" }, -/turf/open/floor/almayer, -/area/almayer/living/platoon_commander_rooms) +/area/almayer/hallways/starboard_hallway) "WK" = ( /obj/structure/surface/rack, /obj/item/weapon/gun/flamer{ @@ -7879,24 +8096,6 @@ icon_state = "test_floor5" }, /area/almayer/living/briefing) -"WR" = ( -/obj/structure/machinery/computer/atmos_alert{ - dir = 4 - }, -/obj/structure/surface/table/almayer, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/engineering) -"WV" = ( -/obj/structure/machinery/door/poddoor/almayer/locked{ - dir = 4; - name = "\improper Hangar Lockdown Blast Door" - }, -/turf/closed/wall/almayer/outer, -/area/almayer/hallways/starboard_hallway) "WY" = ( /obj/effect/decal/warning_stripes{ icon_state = "NW-out"; @@ -7924,10 +8123,12 @@ /area/almayer/living/cryo_cells) "Xb" = ( /obj/structure/surface/table/almayer, -/obj/item/device/radio, -/obj/item/device/lightreplacer, +/obj/effect/decal/cleanable/dirt, +/obj/item/folder/yellow, +/obj/item/book/manual/engineering_construction, /turf/open/floor/almayer{ - icon_state = "plate" + dir = 5; + icon_state = "plating" }, /area/almayer/engineering) "Xc" = ( @@ -7941,29 +8142,23 @@ icon_state = "cargo" }, /area/almayer/hallways/hangar) -"Xl" = ( -/obj/structure/machinery/pipedispenser, -/turf/open/floor/almayer{ - icon_state = "cargo" - }, -/area/almayer/engineering) -"Xo" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "N"; - pixel_y = 2 +"Xj" = ( +/obj/structure/pipes/vents/pump, +/obj/effect/decal/cleanable/dirt, +/obj/structure/machinery/light{ + dir = 1 }, -/obj/item/clothing/ears/earmuffs{ - pixel_x = -8; - pixel_y = 8 +/obj/structure/surface/table/almayer, +/obj/structure/machinery/prop/almayer/computer/PC{ + dir = 4 }, -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 +/obj/structure/sign/safety/terminal{ + pixel_x = -20 }, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + icon_state = "plate" }, -/area/almayer/engineering) +/area/almayer/hallways/starboard_hallway) "Xs" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 10 @@ -7992,13 +8187,6 @@ icon_state = "dark_sterile" }, /area/almayer/living/cafeteria_port) -"Xx" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/largecrate, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/hallways/starboard_hallway) "Xy" = ( /obj/effect/decal/warning_stripes{ icon_state = "E"; @@ -8054,6 +8242,23 @@ icon_state = "dark_sterile" }, /area/almayer/living/cryo_cells) +"XN" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/turf/open/floor/almayer{ + icon_state = "test_floor5" + }, +/area/almayer/engineering) +"XP" = ( +/obj/effect/decal/cleanable/greenglow, +/obj/structure/reagent_dispensers/fueltank/custom, +/obj/structure/sign/safety/storage{ + pixel_x = 7; + pixel_y = -28 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, +/area/almayer/engineering) "XQ" = ( /obj/structure/pipes/standard/simple/hidden/supply{ dir = 4 @@ -8079,12 +8284,6 @@ icon_state = "plate" }, /area/almayer/living/cafeteria_port) -"XY" = ( -/obj/structure/computer3frame, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering) "Ya" = ( /obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ @@ -8114,9 +8313,23 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 5 }, -/obj/item/folder/black_random, -/turf/open/floor/plating/plating_catwalk, -/area/almayer/squads/alpha/platoon_sergeant) +/obj/item/folder/black_random, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/squads/alpha/platoon_sergeant) +"Ye" = ( +/obj/structure/pipes/standard/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/almayer{ + dir = 5; + icon_state = "plating" + }, +/area/almayer/engineering) "Yh" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -8127,6 +8340,15 @@ "Yj" = ( /turf/closed/wall/almayer, /area/almayer/hallways/hangar) +"Yl" = ( +/obj/structure/machinery/cm_vending/gear/synth{ + pixel_x = -30; + density = 0 + }, +/turf/open/floor/almayer{ + icon_state = "test_floor5" + }, +/area/almayer/living/synthcloset) "Ym" = ( /obj/structure/largecrate/random/secure, /turf/open/floor/almayer{ @@ -8158,6 +8380,16 @@ icon_state = "dark_sterile" }, /area/almayer/living/cafeteria_port) +"Yv" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 2 + }, +/obj/effect/decal/warning_stripes{ + icon_state = "S" + }, +/turf/open/floor/plating/plating_catwalk, +/area/almayer/engineering) "Yw" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ dir = 4; @@ -8195,6 +8427,9 @@ icon_state = "cargo_arrow" }, /area/almayer/living/briefing) +"YB" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/engineering) "YG" = ( /obj/effect/decal/warning_stripes{ icon_state = "N"; @@ -8223,18 +8458,35 @@ icon_state = "plate" }, /area/almayer/living/cafeteria_port) +"YO" = ( +/obj/structure/closet/crate, +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/glasses/meson, +/obj/item/clothing/gloves/yellow, +/obj/item/clothing/gloves/yellow, +/obj/item/clothing/gloves/yellow, +/obj/item/clothing/gloves/yellow, +/obj/item/clothing/gloves/yellow, +/obj/item/tool/shovel/snow, +/obj/item/tool/shovel/snow, +/obj/item/tool/shovel/snow, +/turf/open/floor/almayer{ + icon_state = "cargo" + }, +/area/almayer/engineering) "YP" = ( /turf/closed/wall/almayer/outer, /area/almayer/living/briefing) -"YV" = ( -/obj/structure/machinery/conveyor{ - dir = 8 +"YQ" = ( +/obj/effect/decal/warning_stripes{ + icon_state = "N"; + pixel_y = 1 }, +/obj/structure/pipes/standard/simple/hidden/supply, /turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" + icon_state = "plate" }, -/area/almayer/hallways/starboard_hallway) +/area/almayer/hallways/hangar) "YX" = ( /obj/effect/landmark/start/marine/medic/alpha, /obj/effect/landmark/late_join/alpha, @@ -8253,6 +8505,14 @@ icon_state = "plate" }, /area/almayer/squads/alpha/squad_two) +"Zd" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/warning_stripes{ + icon_state = "E"; + pixel_x = 1 + }, +/turf/open/floor/almayer, +/area/almayer/hallways/starboard_hallway) "Zf" = ( /turf/open/floor/almayer{ icon_state = "dark_sterile" @@ -8273,15 +8533,12 @@ icon_state = "plate" }, /area/almayer/squads/alpha/squad_two) -"Zm" = ( -/obj/structure/machinery/cm_vending/sorted/tech/electronics_storage{ - req_one_access = list() +"Zw" = ( +/obj/structure/largecrate/supply/generator, +/turf/open/floor/almayer{ + icon_state = "cargo" }, -/turf/open/floor/plating/plating_catwalk, /area/almayer/engineering) -"Zw" = ( -/turf/closed/wall/almayer/outer, -/area/almayer/hallways/starboard_hallway) "ZB" = ( /obj/structure/surface/table/almayer, /obj/structure/machinery/computer/med_data/laptop{ @@ -8294,32 +8551,14 @@ "ZC" = ( /turf/closed/wall/almayer, /area/almayer/squads/alpha/squad_one) -"ZF" = ( -/obj/structure/surface/rack, -/obj/item/clothing/mask/gas{ - pixel_x = -5; - pixel_y = 10 - }, -/obj/item/stack/sheet/glass{ - amount = 50 - }, -/obj/item/clothing/mask/gas{ - pixel_x = 5; - pixel_y = 10 - }, -/obj/item/stack/sheet/mineral/phoron/medium_stack{ - desc = "Phoron is an extremely rare mineral with exotic properties, often used in cutting-edge research. Just getting it into a stable, solid form is already hard enough. Handle with care."; - pixel_y = -9 - }, -/turf/open/floor/almayer{ - icon_state = "test_floor5" - }, -/area/almayer/engineering) "ZI" = ( /obj/effect/landmark/start/marine/smartgunner/alpha, /obj/effect/landmark/late_join/alpha, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/cryo_cells) +"ZJ" = ( +/turf/closed/wall/almayer/outer, +/area/almayer/living/synthcloset) "ZL" = ( /turf/open/floor/almayer{ icon_state = "plate" @@ -8338,20 +8577,10 @@ icon_state = "sterile_green" }, /area/almayer/medical) -"ZT" = ( -/obj/structure/machinery/conveyor{ - dir = 8 - }, -/obj/structure/barricade/handrail{ - dir = 8 - }, +"ZU" = ( +/obj/structure/pipes/standard/simple/hidden/supply, /obj/effect/decal/cleanable/dirt, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, +/turf/open/floor/plating/plating_catwalk, /area/almayer/hallways/starboard_hallway) "ZV" = ( /turf/open/floor/almayer{ @@ -8359,7 +8588,13 @@ }, /area/almayer/living/cryo_cells) "ZX" = ( -/turf/closed/wall/almayer/reinforced, +/obj/structure/surface/table/almayer, +/obj/structure/machinery/computer/cameras/engineering{ + dir = 1 + }, +/turf/open/floor/almayer{ + icon_state = "plate" + }, /area/almayer/engineering) (1,1,1) = {" @@ -15918,7 +16153,7 @@ Yp Fg Fg gd -xZ +tS Qw Cr Cr @@ -16070,7 +16305,7 @@ IE ty Fg Fg -lW +Ku Qw Cr Cr @@ -16199,13 +16434,13 @@ ca ca ca ca -ca -ca -ca -ca -ca -ca -ca +ZJ +ZJ +ZJ +ZJ +ZJ +ZJ +ZJ qA Ng fh @@ -16222,7 +16457,7 @@ hC mf Fy DR -xZ +tS Qw Cr Cr @@ -16351,13 +16586,13 @@ ca ZL CN rk -ca -Xz -Xz -Xz -Xz -Xz -ca +ZJ +wN +Yl +Um +NI +gn +ZJ hN Kv Kv @@ -16503,13 +16738,13 @@ ca ZL mm ax -ca -Xz -Xz -Xz -Xz -Xz -ca +ZJ +nF +eT +hq +Ep +No +ZJ Hj Kv Kv @@ -16655,13 +16890,13 @@ wz ZL AQ xh -ca -Xz -Xz -Xz -Xz -Xz -ca +ZJ +TW +yJ +ba +jy +Mf +ZJ ZB KQ UK @@ -16807,13 +17042,13 @@ pl pl yO wz -ca -ca -ca -ca -ca -ca -ca +ZJ +ZJ +ey +ZJ +ZJ +ZJ +ZJ qA qA qA @@ -16961,8 +17196,8 @@ Dc wz oK wp -wp -wp +gS +GO iN iN iN @@ -17113,8 +17348,8 @@ Qk lm iG SO +Fu SY -SO iK iK SO @@ -18046,7 +18281,7 @@ PZ Dx UI cT -GP +lV Ty Cr Cr @@ -18198,7 +18433,7 @@ cR Uk cD cT -Rj +zk Ty Cr Cr @@ -18350,7 +18585,7 @@ sf cT cT cs -GP +lV Ty Cr Cr @@ -19365,15 +19600,15 @@ ca ZL Qk zy -HI -FL -vH +YQ +AL +IZ zy pl pl pl zy -Hr +Oz aN KO KO @@ -19525,7 +19760,7 @@ JZ SR SR pO -Tl +Mk OH SR SR @@ -19826,7 +20061,7 @@ CZ aT Qc Bz -Ig +Mc bo eu Dc @@ -19976,12 +20211,12 @@ ZL hS um QO -WJ +SV Bz -rY -DV -Ks -wr +GV +bD +HR +pR Rg Nf uF @@ -20436,8 +20671,8 @@ hS hS hS hS -vY -HC +iX +cI Rg Nf ZR @@ -20588,9 +20823,9 @@ iR Bz qU hS -wI -HC -nH +RK +cI +vP Nf Nf Nf @@ -20741,22 +20976,22 @@ Bz OC hS pD -HC +cI Rg -TN -TN -TN -TN -TN -TN -TN -TN -TN -TN -TN -TN -TN -rg +gE +gE +gE +gE +gE +gE +gE +gE +gE +gE +gE +gE +gE +aw Yb nx YP @@ -20892,25 +21127,25 @@ iR Bz Jg hS -Cq +bu Dc Rg -TN -TN -HJ -uB -TN -Ud -UM -Fu -Fu -QV +gE +gE +Xj +Qt +gE +Hk +OZ +yU +yU +ZU Fl -TQ -fP -wW -Fn -ny +lA +Vu +kw +qc +Gq YP oa qv @@ -21047,22 +21282,22 @@ hS pD Dc Rg -TN -CP -Lh -AJ -TN -dU -Us +gE +iQ +Cn +VT +gE +ML +ny Rr nx -kt +de sa -Xx -Af -xF +QP +bZ +Er Rr -vM +Rt YP qh Vr @@ -21196,29 +21431,29 @@ hS MB hS hS -Dj +oW Dc Rg +gE +sX +tA +gE +gE +ML +ny +uS +ng TN -GU -PL -TN -TN -dU -Us -VG EB -ZX -kS -kS -sD -yp -ZX -yp -vr -vr -vr -vr +EB +ye +Qq +TN +Qq +YB +YB +YB +YB YP YP YP @@ -21351,26 +21586,26 @@ hS pD Dc Rg +gE +Wo +iF +Rc +Md +kO +vg +RW +LC TN Fz AH -Ue +AH Gv LT -hu -NN +Gv +Hc lK -ZX -SD -SQ -SQ -lt -dc -lt -zB -DW -sw -vr +kF +YB Cr Cr Cr @@ -21502,27 +21737,27 @@ gp hS pD Dc -nH +vP +gE +qz +Zd +gE +WA +DC +DC +RW +mZ TN IN IP -TN +gf Bd -DC -DC -NN -eN +CP +PL +hy +AH ZX -vW -VA -MS -uE -UB -Tt -iO -SQ -OQ -vr +YB Cr Cr Cr @@ -21652,29 +21887,29 @@ MK MK MK MK -fi +wi Td Rg -TN +gE co -gW +OY +gE +gE +Cy +sa +nD +gE TN TN -ZT -sa -bI +gW +It TN -ZX -ZX -zY -Gl -ZX -ZX -gE -lt -VA -Ul -vr +TN +wI +Gv +IP +jN +YB Cr Cr Cr @@ -21807,26 +22042,26 @@ ca Yw Yw Yw -Zw -Zw -Zw -Zw -Zw -PC -Zw -PC -Zw -ZX -oS -Kc -PR -Zm -ZX -Cd -lt -VA -XY -vr +kS +kS +kS +kS +kS +oC +kS +oC +kS +TN +Ol +zI +jD +bO +TN +vo +Gv +IP +Iy +YB Cr Cr Cr @@ -21959,26 +22194,26 @@ Cr Cr Cr Cr -Zw -UZ -UZ -UZ -Zw -YV -Zw -YV -Zw -ZX -iv -oD -eZ -Pv -ZX -en -Tv -eV -az -vr +kS +Rd +Rd +Rd +kS +gT +kS +gT +kS +TN +xJ +Oc +zA +gx +TN +CX +La +us +gt +YB Cr Cr Cr @@ -22111,26 +22346,26 @@ Cr Cr Cr Cr -Zw -UZ -UZ -UZ -Zw -YV -Zw -YV -Zw -ZX -jp -DH -qE -VE -ZX -na -wY -Hu -WB -vr +kS +Rd +Rd +Rd +kS +gT +kS +gT +kS +TN +zY +zG +Ff +Gy +TN +kH +kB +RP +hL +YB Cr Cr Cr @@ -22263,30 +22498,30 @@ Cr Cr Cr Cr -Zw -UZ -UZ -UZ -Zw -YV -Zw -YV -Zw -ZX -ZX -ZX -ZX -ZX -ZX -ZX -Cn -gC -vr -vr -vr -vr -vr -vr +kS +Rd +Rd +Rd +kS +gT +kS +gT +kS +TN +TN +TN +TN +TN +TN +TN +Hh +NU +YB +YB +YB +YB +YB +YB Cr Cr Cr @@ -22415,31 +22650,31 @@ Cr Cr Cr Cr -Zw -UZ -UZ -UZ -Zw -YV -Zw -YV -Zw -ZX -RM -RM -RM -RM +kS +Rd +Rd +Rd +kS +gT +kS +gT +kS +TN +fm +fm +fm +fm +fm +TN +UR +Sn +Vq +YB +RN +tB RM -ZX -wU -MT -Gn -vr -ZF -Gb -EU -vr -vr +YB +YB Cr Cr Cr @@ -22567,31 +22802,31 @@ Cr Cr Cr Cr -Zw -Zw -Zw -Zw -Zw -YV -Zw -YV -Zw -ZX -ZX -ZX -ZX -ZX -ZX -ZX -dZ -lM -qX -vr -bP -xy -rz -aK -vr +kS +kS +kS +kS +kS +gT +kS +gT +kS +TN +TN +TN +TN +TN +TN +TN +Nz +rt +XP +YB +bB +EJ +zL +oo +YB Cr Cr Cr @@ -22719,31 +22954,31 @@ Cr Cr Cr Cr -Zw -Zw -wP +kS +kS +VJ co -Zw -YV -Zw -YV -Zw -ZX -pe +kS +gT +kS +gT +kS +TN +kh +qW +GU +Ml +AO +EA +yc +aq +Uf +Bv Vj Xb Bt -ei -sp -gI -Ez -LP -PJ -FJ -mZ -yE -KJ -vr +fp +YB Cr Cr Cr @@ -22871,31 +23106,31 @@ Cr Cr Cr Cr -Zw +kS +eB +uo +WG +kS +gT +kS +gT +kS +TN Ce fv Sj -Zw -YV -Zw -YV -Zw -ZX -kn -BV +TK +MW +QL +IR +cG +fF +gW +Vj cw -OF -mI -mo -Lq -ES -lL -zY -FJ -WR -yE -BF -vr +Bt +Ps +YB Cr Cr Cr @@ -23023,31 +23258,31 @@ Cr Cr Cr Cr -Zw +kS +oB +vK +aA +kS +gT +kS +gT +kS +TN vc il wa -Zw -YV -Zw -YV -Zw -ZX -Tw +sE +Nx +sE +Ye +Sn +uX +YB dj -KB +fF uQ pS -uQ -hv -MT -KR -vr -Op -lL -CJ -fb -vr +YB Cr Cr Cr @@ -23175,31 +23410,31 @@ Cr Cr Cr Cr -Zw -Zw -gQ -hJ -Zw -YV -Zw -YV -Zw -ZX +kS +kS +yg +aX +kS +gT +kS +gT +kS +TN +Qz +il +wa +oO +AC +HT +ah +wa +yo BN -dj -KB +yy +mo an -NH -mw -qr -KB -sP -zp -Lt -lO -JC -vr -vr +YB +YB Cr Cr Cr @@ -23327,30 +23562,30 @@ Cr Cr Cr Cr -Zw -Zw -WV -Zw -Zw -YV -Zw -YV -Zw -ZX -NF -dj -MT -Av -Vm -uY -sL -KB -QF -vr -vr -vr -vr -vr +kS +kS +mb +kS +kS +gT +kS +gT +kS +TN +NZ +il +Sn +jS +vG +ds +hU +wa +Hx +YB +YB +YB +YB +YB Cr Cr Cr @@ -23479,26 +23714,26 @@ Cr Cr Cr Cr -Zw -UZ -UZ -UZ -Zw -YV -Zw -YV -Zw -ZX -NF -dj -MT -uQ -wi -uQ -Xo -MT -lC -vr +kS +Rd +Rd +Rd +kS +gT +kS +gT +kS +TN +NZ +il +Sn +sE +zl +sE +wH +Sn +XN +YB Cr Cr Cr @@ -23631,26 +23866,26 @@ Cr Cr Cr Cr -Zw -UZ -UZ -UZ -Zw -YV -Zw -YV -Zw -ZX -ZX -ZX -ga -ZX -ZX -ZX -yp -ZX -vr -vr +kS +Rd +Rd +Rd +kS +gT +kS +gT +kS +TN +TN +TN +Mu +TN +TN +TN +Qq +TN +YB +YB Cr Cr Cr @@ -23783,25 +24018,25 @@ Cr Cr Cr Cr -Zw -UZ -Zw -Zw -Zw -YV -Zw -YV -Zw -Zw -vr -Gn -em -nf -Ao -pR -Fv -Gn -vr +kS +Rd +kS +kS +kS +gT +kS +gT +kS +kS +YB +Vq +Yv +if +IS +YO +cj +Vq +YB Cr Cr Cr @@ -23935,25 +24170,25 @@ Cr Cr Cr Cr -Zw -UZ -Zw -oX -oX -yJ -Zw -BB -oX +kS +Rd +kS +or +or +fq +kS +Jp +or +or +YB +bg +kk +Gu +Gu +Gu +vJ oX -vr -DU -FF -wC -wC -wC -Ko -Wt -vr +YB Cr Cr Cr @@ -24087,25 +24322,25 @@ Cr Cr Cr Cr +kS +kS +kS +kS +kS +kS +kS +kS +kS +kS +YB +ro +rq +jQ +GA +dg +aG Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -Zw -vr -CY -qS -Xl -kA -bl -ee -Hq -vr +YB Cr Cr Cr @@ -24249,15 +24484,15 @@ Cr Cr Cr Cr -vr -vr -vr -vr -vr -vr -vr -vr -vr +YB +YB +YB +YB +YB +YB +YB +YB +YB Cr Cr Cr From 29c6e3b927ed98722efbccda4c7dd7d6a2aa85b8 Mon Sep 17 00:00:00 2001 From: morrowwolf Date: Sun, 22 Oct 2023 19:36:07 -0400 Subject: [PATCH 02/11] Comms clarity (#24) --- code/modules/admin/game_master/game_master.dm | 13 +++++++- code/modules/mob/hear_say.dm | 3 ++ tgui/packages/tgui/interfaces/GameMaster.js | 30 +++++++++++++++++-- 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/code/modules/admin/game_master/game_master.dm b/code/modules/admin/game_master/game_master.dm index d61a7b6921..45f3750ff3 100644 --- a/code/modules/admin/game_master/game_master.dm +++ b/code/modules/admin/game_master/game_master.dm @@ -2,6 +2,9 @@ /// Assoc list that holds our custom game master objectives, formatted as atom = objective_string GLOBAL_LIST_EMPTY(game_master_objectives) +/// Percentage of characters end up clear when sent via radio message +GLOBAL_VAR_INIT(radio_communication_clarity, 100) + /proc/open_game_master_panel(client/using_client) set name = "Game Master Panel" set category = "Game Master" @@ -72,7 +75,6 @@ GLOBAL_LIST_EMPTY(game_master_objectives) /// End Objective Stuff - /// Holds what type of click intercept we are using var/current_click_intercept_action @@ -105,6 +107,8 @@ GLOBAL_LIST_EMPTY(game_master_objectives) // Objective stuff data["objective_click_intercept"] = objective_click_intercept + // Communication stuff + data["communication_clarity"] = GLOB.radio_communication_clarity return data @@ -161,6 +165,13 @@ GLOBAL_LIST_EMPTY(game_master_objectives) current_click_intercept_action = OBJECTIVE_CLICK_INTERCEPT_ACTION return + //Communication Section + if("set_communication_clarity") + var/new_clarity = text2num(params["clarity"]) + if(!isnum(new_clarity)) + return + + GLOB.radio_communication_clarity = clamp(new_clarity, 0, 100) /datum/game_master/ui_close(mob/user) . = ..() diff --git a/code/modules/mob/hear_say.dm b/code/modules/mob/hear_say.dm index 19f461be75..8a13617fa7 100644 --- a/code/modules/mob/hear_say.dm +++ b/code/modules/mob/hear_say.dm @@ -90,6 +90,9 @@ else message = stars(message) + if(GLOB.radio_communication_clarity < 100) + message = stars(message, GLOB.radio_communication_clarity) + if(language) style = language.color diff --git a/tgui/packages/tgui/interfaces/GameMaster.js b/tgui/packages/tgui/interfaces/GameMaster.js index 8e641b1884..815e37dd05 100644 --- a/tgui/packages/tgui/interfaces/GameMaster.js +++ b/tgui/packages/tgui/interfaces/GameMaster.js @@ -1,5 +1,5 @@ import { useBackend } from '../backend'; -import { Flex, Dropdown, Button, Section } from '../components'; +import { Flex, Dropdown, Button, Section, Slider } from '../components'; import { Window } from '../layouts'; export const GameMaster = (props, context) => { @@ -25,7 +25,7 @@ export const GameMaster = (props, context) => { }} /> - + { + +
+ + +
+ From 87ca9f6f804024b4daa4405ce0e850dcecbf80e9 Mon Sep 17 00:00:00 2001 From: Morrow Date: Sun, 22 Oct 2023 19:40:07 -0400 Subject: [PATCH 03/11] headset tweaks --- code/game/objects/items/devices/radio/headset.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 4e37424a59..1f7c20a648 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -493,6 +493,7 @@ initial_keys = list(/obj/item/device/encryptionkey/mcom) volume = RADIO_VOLUME_CRITICAL multibroadcast_cooldown = LOW_MULTIBROADCAST_COOLDOWN + frequency = ALPHA_FREQ /obj/item/device/radio/headset/almayer/mcom/alt initial_keys = list(/obj/item/device/encryptionkey/mcom/alt) @@ -569,7 +570,6 @@ name = "marine radio headset" desc = "A standard marine radio headset. When worn, grants access to Squad Leader tracker. Click tracker with empty hand to open Squad Info window." frequency = ALPHA_FREQ - initial_keys = list(/obj/item/device/encryptionkey/public) //############################## ALPHA ############################### /obj/item/device/radio/headset/almayer/marine/alpha From 7e527db42df026b0ee20313994e287d614302edd Mon Sep 17 00:00:00 2001 From: Morrow Date: Sun, 22 Oct 2023 19:42:11 -0400 Subject: [PATCH 04/11] higher pref points --- code/__DEFINES/client_prefs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__DEFINES/client_prefs.dm b/code/__DEFINES/client_prefs.dm index 5337f64d9e..3e922d98e6 100644 --- a/code/__DEFINES/client_prefs.dm +++ b/code/__DEFINES/client_prefs.dm @@ -32,7 +32,7 @@ #define AGE_MIN 19 //youngest a character can be #define AGE_MAX 90 //oldest a character can be //no. you are not allowed to be 160. -#define MAX_GEAR_COST 7 //Used in chargen for loadout limit. +#define MAX_GEAR_COST 10 //Used in chargen for loadout limit. ///dual_wield_pref from /datum/preferences ///Fire both weapons when dual wielding From 2f19845312cb030db1e10f34834c9a8105416a58 Mon Sep 17 00:00:00 2001 From: Morrow Date: Sun, 22 Oct 2023 19:44:57 -0400 Subject: [PATCH 05/11] two jackets for pltco --- maps/map_files/golden_arrow/golden_arrow.dmm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm index 22b9cd91cd..f77a46b7d7 100644 --- a/maps/map_files/golden_arrow/golden_arrow.dmm +++ b/maps/map_files/golden_arrow/golden_arrow.dmm @@ -3122,6 +3122,8 @@ /obj/structure/closet/secure_closet/personal/cabinet{ req_access = null }, +/obj/item/clothing/suit/storage/jacket/marine/service/tanker, +/obj/item/clothing/suit/storage/jacket/marine/service, /turf/open/floor/almayer{ icon_state = "plate" }, From 323c883e8763c75e40faf5d42814d4725a0c0455 Mon Sep 17 00:00:00 2001 From: Morrow Date: Sun, 22 Oct 2023 20:08:11 -0400 Subject: [PATCH 06/11] Fixes some idle drone issues --- .../carbon/xenomorph/ai/movement/drone.dm | 86 ++++++++++--------- 1 file changed, 44 insertions(+), 42 deletions(-) diff --git a/code/modules/mob/living/carbon/xenomorph/ai/movement/drone.dm b/code/modules/mob/living/carbon/xenomorph/ai/movement/drone.dm index c612fdbe79..ef91bd32bc 100644 --- a/code/modules/mob/living/carbon/xenomorph/ai/movement/drone.dm +++ b/code/modules/mob/living/carbon/xenomorph/ai/movement/drone.dm @@ -15,9 +15,6 @@ if(idle_xeno.throwing) return - if(idle_xeno.resting) - return - if(home_turf) if(get_dist(home_turf, idle_xeno) > max_distance_from_home) home_turf = null @@ -38,52 +35,16 @@ if(next_home_search > world.time) return - var/turf/current_turf = get_turf(idle_xeno.loc) + var/turf/current_turf = get_turf(idle_xeno) next_home_search = world.time + home_search_delay - if(!current_turf.weeds && current_turf.is_weedable() >= FULLY_WEEDABLE) + if(!current_turf.weeds && check_turf(current_turf)) home_turf = current_turf else var/shortest_distance for(var/turf/potential_home as anything in RANGE_TURFS(home_locate_range, current_turf)) - - var/area/found_area = get_area(potential_home) - if(found_area.flags_area & AREA_NOTUNNEL) - continue - - if(found_area.flags_area & AREA_UNWEEDABLE) - continue - - if(!found_area.can_build_special) - continue - - if(potential_home in blacklisted_turfs) - continue - - if(potential_home.weeds) - continue - - if(potential_home.is_weedable() < FULLY_WEEDABLE) - continue - - if(locate(/obj/effect/alien/weeds/node) in range(3, potential_home)) - continue - - if(potential_home.density) + if(!check_turf(potential_home)) continue - var/blocked = FALSE - for(var/atom/potential_blocker as anything in potential_home) - if(potential_blocker.can_block_movement) - blocked = TRUE - break - - if(blocked) - continue - - for(var/obj/structure/struct in potential_home) - if(struct.density && !(struct.flags_atom & ON_BORDER)) - continue - if(shortest_distance && get_dist(idle_xeno, potential_home) > shortest_distance) continue @@ -103,3 +64,44 @@ /datum/xeno_ai_movement/drone/proc/unblacklist_turf(turf/unblacklisting_turf) blacklisted_turfs -= unblacklisting_turf + +/datum/xeno_ai_movement/drone/proc/check_turf(turf/checked_turf) + var/area/found_area = get_area(checked_turf) + if(found_area.flags_area & AREA_NOTUNNEL) + return FALSE + + if(found_area.flags_area & AREA_UNWEEDABLE) + return FALSE + + if(!found_area.can_build_special) + return FALSE + + if(checked_turf in blacklisted_turfs) + return FALSE + + if(checked_turf.weeds) + return FALSE + + if(checked_turf.is_weedable() < FULLY_WEEDABLE) + return FALSE + + if(locate(/obj/effect/alien/weeds/node) in range(3, checked_turf)) + return FALSE + + if(checked_turf.density) + return FALSE + + var/blocked = FALSE + for(var/atom/potential_blocker as anything in checked_turf) + if(potential_blocker.can_block_movement) + blocked = TRUE + break + + if(blocked) + return FALSE + + for(var/obj/structure/struct in checked_turf) + if(struct.density && !(struct.flags_atom & ON_BORDER)) + return FALSE + + return TRUE From 8972de9753be8e70fd0b0cf62c1d733beda6ac84 Mon Sep 17 00:00:00 2001 From: kirieee <140837937+kirieee@users.noreply.github.com> Date: Sun, 22 Oct 2023 22:55:32 -0400 Subject: [PATCH 07/11] door fix + flavor (#25) --- maps/map_files/golden_arrow/golden_arrow.dmm | 51 ++++++++------------ 1 file changed, 19 insertions(+), 32 deletions(-) diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm index f77a46b7d7..71575c902c 100644 --- a/maps/map_files/golden_arrow/golden_arrow.dmm +++ b/maps/map_files/golden_arrow/golden_arrow.dmm @@ -218,10 +218,14 @@ }, /area/almayer/hallways/hangar) "bg" = ( -/obj/structure/largecrate/supply/supplies/sandbags, /obj/structure/machinery/light{ dir = 1 }, +/obj/structure/closet/crate/construction, +/obj/item/stack/sandbags_empty/half, +/obj/item/stack/sandbags_empty/half, +/obj/item/stack/sandbags_empty/half, +/obj/item/stack/sandbags_empty/half, /turf/open/floor/almayer{ icon_state = "cargo" }, @@ -3122,8 +3126,6 @@ /obj/structure/closet/secure_closet/personal/cabinet{ req_access = null }, -/obj/item/clothing/suit/storage/jacket/marine/service/tanker, -/obj/item/clothing/suit/storage/jacket/marine/service, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -3385,10 +3387,10 @@ /turf/closed/wall/almayer, /area/almayer/living/platoon_commander_rooms) "vc" = ( -/obj/structure/closet/radiation, /obj/structure/machinery/light{ dir = 1 }, +/obj/structure/closet/emcloset, /turf/open/floor/almayer{ icon_state = "test_floor5" }, @@ -3640,6 +3642,10 @@ /obj/structure/pipes/standard/simple/hidden/supply{ dir = 8 }, +/obj/item/device/walkman{ + pixel_y = -6; + pixel_x = 4 + }, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" @@ -4347,10 +4353,6 @@ name = "Damage Control Locker"; req_one_access = list() }, -/obj/structure/machinery/door/airlock/multi_tile/almayer/engidoor{ - name = "\improper Damage Control Locker"; - req_one_access = list() - }, /turf/open/floor/almayer{ icon_state = "test_floor4" }, @@ -5425,6 +5427,7 @@ "Hx" = ( /obj/structure/closet/secure_closet/engineering_personal, /obj/structure/machinery/light, +/obj/item/device/cassette_tape/aesthetic, /turf/open/floor/almayer{ icon_state = "test_floor5" }, @@ -5565,15 +5568,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/squads/alpha/squad_two) -"IN" = ( -/obj/structure/closet/toolcloset, -/obj/structure/machinery/light{ - dir = 1 - }, -/turf/open/floor/almayer{ - icon_state = "plate" - }, -/area/almayer/engineering) "IP" = ( /turf/open/floor/plating/plating_catwalk, /area/almayer/engineering) @@ -6419,7 +6413,7 @@ }, /area/almayer/living/cryo_cells) "NZ" = ( -/obj/structure/closet/radiation, +/obj/structure/closet/secure_closet/engineering_electrical, /turf/open/floor/almayer{ icon_state = "test_floor5" }, @@ -6487,6 +6481,9 @@ "OC" = ( /obj/structure/surface/table/reinforced/almayer_B, /obj/structure/machinery/light, +/obj/item/device/cassette_tape/pop3{ + pixel_y = 3 + }, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -6895,10 +6892,10 @@ /turf/open/floor/plating/plating_catwalk, /area/almayer/living/cryo_cells) "Qz" = ( -/obj/structure/closet/radiation, /obj/structure/machinery/status_display{ pixel_y = 30 }, +/obj/structure/closet/firecloset/full, /turf/open/floor/almayer{ icon_state = "test_floor5" }, @@ -7772,15 +7769,6 @@ }, /turf/open/floor/plating/plating_catwalk, /area/almayer/living/grunt_rnr) -"UR" = ( -/obj/structure/pipes/standard/simple/hidden/supply{ - dir = 8 - }, -/turf/open/floor/almayer{ - dir = 5; - icon_state = "plating" - }, -/area/almayer/engineering) "UT" = ( /obj/structure/machinery/disposal{ density = 0; @@ -8251,12 +8239,11 @@ }, /area/almayer/engineering) "XP" = ( -/obj/effect/decal/cleanable/greenglow, -/obj/structure/reagent_dispensers/fueltank/custom, /obj/structure/sign/safety/storage{ pixel_x = 7; pixel_y = -28 }, +/obj/structure/reagent_dispensers/ammoniatank, /turf/open/floor/almayer{ icon_state = "plate" }, @@ -21750,7 +21737,7 @@ DC RW mZ TN -IN +CX IP gf Bd @@ -22668,7 +22655,7 @@ fm fm fm TN -UR +yc Sn Vq YB From 013781c6f6f99c51f06d80a577b2cb59217fefa7 Mon Sep 17 00:00:00 2001 From: Warfan1815 <69102610+Warfan1815@users.noreply.github.com> Date: Wed, 25 Oct 2023 05:00:46 +0100 Subject: [PATCH 08/11] EPIc Epi changes (#22) Co-authored-by: Morrow --- code/__DEFINES/chemistry.dm | 1 + .../vending/vendor_types/crew/synthetic.dm | 3 --- .../machinery/vending/vendor_types/medical.dm | 1 - .../vendor_types/squad_prep/squad_medic.dm | 3 ++- .../items/reagent_containers/autoinjectors.dm | 9 +++++++++ code/game/objects/items/storage/belt.dm | 1 - .../chemistry_properties/prop_special.dm | 17 +++++++++++++++++ .../reagents/chemistry_reactions/medical.dm | 7 +++++++ .../reagents/chemistry_reagents/medical.dm | 15 ++++++++++++++- .../vehicles/interior/interactable/vendors.dm | 1 - icons/obj/items/syringe.dmi | Bin 7035 -> 7079 bytes 11 files changed, 50 insertions(+), 8 deletions(-) diff --git a/code/__DEFINES/chemistry.dm b/code/__DEFINES/chemistry.dm index 078ccbdc2d..b99013f8a0 100644 --- a/code/__DEFINES/chemistry.dm +++ b/code/__DEFINES/chemistry.dm @@ -221,6 +221,7 @@ #define PROPERTY_ANTICARCINOGENIC "anti-carcinogenic" #define PROPERTY_UNKNOWN "unknown" //just has an OD effect #define PROPERTY_HEMOSITIC "hemositic" +#define PROPERTY_REVITALIZING "revitalizing" //Property rarity diff --git a/code/game/machinery/vending/vendor_types/crew/synthetic.dm b/code/game/machinery/vending/vendor_types/crew/synthetic.dm index 8e556318c7..bf96246e92 100644 --- a/code/game/machinery/vending/vendor_types/crew/synthetic.dm +++ b/code/game/machinery/vending/vendor_types/crew/synthetic.dm @@ -49,7 +49,6 @@ list("Injector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), list("Injector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), - list("Injector (Epinephrine)", 2, /obj/item/reagent_container/hypospray/autoinjector/adrenaline, null, VENDOR_ITEM_REGULAR), list("Injector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), list("Injector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), list("Injector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), @@ -60,7 +59,6 @@ list("Autoinjector (C-M) (EMPTY)", 2, /obj/item/reagent_container/hypospray/autoinjector/empty/medium, null, VENDOR_ITEM_REGULAR), list("Autoinjector (C-L) (EMPTY)", 4, /obj/item/reagent_container/hypospray/autoinjector/empty/large, null, VENDOR_ITEM_REGULAR), - list("Emergency Defibrillator", 4, /obj/item/device/defibrillator, null, VENDOR_ITEM_MANDATORY), list("Health Analyzer", 4, /obj/item/device/healthanalyzer, null, VENDOR_ITEM_REGULAR), list("Surgical Line", 4, /obj/item/tool/surgery/surgical_line, null, VENDOR_ITEM_REGULAR), list("Synth-Graft", 4, /obj/item/tool/surgery/synthgraft, null, VENDOR_ITEM_REGULAR), @@ -348,7 +346,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_synth_snowflake, list( list("Autocompressor", 15, /obj/item/clothing/suit/auto_cpr, null, VENDOR_ITEM_REGULAR), list("Backpack Firefighting Watertank", 15, /obj/item/reagent_container/glass/watertank/atmos, null, VENDOR_ITEM_REGULAR), list("Breaching Hammer", 15, /obj/item/weapon/twohanded/breacher/synth, null, VENDOR_ITEM_REGULAR), - list("Compact Defibrillator", 15, /obj/item/device/defibrillator/compact, null, VENDOR_ITEM_REGULAR), list("Compact Nailgun kit", 15, /obj/effect/essentials_set/cnailgun, null, VENDOR_ITEM_REGULAR), list("Crew Monitor", 15, /obj/item/tool/crew_monitor, null, VENDOR_ITEM_REGULAR), list("Experimental Meson Goggles", 15, /obj/item/clothing/glasses/night/experimental_mesons, null, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/medical.dm b/code/game/machinery/vending/vendor_types/medical.dm index 9844101cb1..6e721ec4fe 100644 --- a/code/game/machinery/vending/vendor_types/medical.dm +++ b/code/game/machinery/vending/vendor_types/medical.dm @@ -141,7 +141,6 @@ list("AUTOINJECTORS", -1, null, null), list("Autoinjector (Bicaridine)", round(scale * 5), /obj/item/reagent_container/hypospray/autoinjector/bicaridine, VENDOR_ITEM_REGULAR), list("Autoinjector (Dexalin+)", round(scale * 5), /obj/item/reagent_container/hypospray/autoinjector/dexalinp, VENDOR_ITEM_REGULAR), - list("Autoinjector (Epinephrine)", round(scale * 5), /obj/item/reagent_container/hypospray/autoinjector/adrenaline, VENDOR_ITEM_REGULAR), list("Autoinjector (Inaprovaline)", round(scale * 5), /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, VENDOR_ITEM_REGULAR), list("Autoinjector (Kelotane)", round(scale * 5), /obj/item/reagent_container/hypospray/autoinjector/kelotane, VENDOR_ITEM_REGULAR), list("Autoinjector (Oxycodone)", round(scale * 5), /obj/item/reagent_container/hypospray/autoinjector/oxycodone, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm index c965b7c90e..833692b8b9 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm @@ -23,7 +23,6 @@ GLOBAL_LIST_INIT(cm_vending_gear_medic, list( list("AUTOINJECTORS", 0, null, null, null), list("Autoinjector (Bicaridine)", 1, /obj/item/reagent_container/hypospray/autoinjector/bicaridine, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Dexalin+)", 1, /obj/item/reagent_container/hypospray/autoinjector/dexalinp, null, VENDOR_ITEM_REGULAR), - list("Autoinjector (Epinephrine)", 2, /obj/item/reagent_container/hypospray/autoinjector/adrenaline, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Inaprovaline)", 1, /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Kelotane)", 1, /obj/item/reagent_container/hypospray/autoinjector/kelotane, null, VENDOR_ITEM_REGULAR), list("Autoinjector (Oxycodone)", 2, /obj/item/reagent_container/hypospray/autoinjector/oxycodone, null, VENDOR_ITEM_REGULAR), @@ -214,4 +213,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_medic, list( /obj/item/storage/surgical_case/regular, /obj/item/reagent_container/blood/OMinus, /obj/item/reagent_container/blood/OMinus, + /obj/item/reagent_container/hypospray/autoinjector/adrenaline_concentrated, + /obj/item/reagent_container/hypospray/autoinjector/adrenaline_concentrated, ) diff --git a/code/game/objects/items/reagent_containers/autoinjectors.dm b/code/game/objects/items/reagent_containers/autoinjectors.dm index 46463e628c..248bdd7392 100644 --- a/code/game/objects/items/reagent_containers/autoinjectors.dm +++ b/code/game/objects/items/reagent_containers/autoinjectors.dm @@ -99,6 +99,15 @@ display_maptext = TRUE maptext_label = "Ep" +/obj/item/reagent_container/hypospray/autoinjector/adrenaline_concentrated + name = "epinephrine (concentrated) autoinjector" + chemname = "adrenaline_concentrated" + desc = "An autoinjector loaded with 3 uses of Epinephrine, better known as Adrenaline, a nerve stimulant useful in restarting the heart. In this concentrated form, it will prevent unconciousness but will cause minor suffocation." + amount_per_transfer_from_this = LOWM_REAGENTS_OVERDOSE * INJECTOR_PERCENTAGE_OF_OD + volume = (LOWM_REAGENTS_OVERDOSE * INJECTOR_PERCENTAGE_OF_OD) * INJECTOR_USES + display_maptext = TRUE + maptext_label = "Ep" + /obj/item/reagent_container/hypospray/autoinjector/dexalinp name = "dexalin plus autoinjector" chemname = "dexalinp" diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 71edc21e29..d2451ff29a 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -245,7 +245,6 @@ new /obj/item/stack/medical/advanced/bruise_pack(src) new /obj/item/stack/medical/advanced/ointment(src) new /obj/item/stack/medical/advanced/ointment(src) - new /obj/item/reagent_container/hypospray/autoinjector/adrenaline(src) new /obj/item/reagent_container/hypospray/autoinjector/dexalinp(src) new /obj/item/reagent_container/hypospray/autoinjector/oxycodone(src) new /obj/item/storage/pill_bottle/bicaridine(src) diff --git a/code/modules/reagents/chemistry_properties/prop_special.dm b/code/modules/reagents/chemistry_properties/prop_special.dm index 640e184263..7baa66fc58 100644 --- a/code/modules/reagents/chemistry_properties/prop_special.dm +++ b/code/modules/reagents/chemistry_properties/prop_special.dm @@ -369,3 +369,20 @@ /datum/chem_property/special/firepenetrating/update_reagent() holder.fire_penetrating = TRUE ..() + +/datum/chem_property/special/revitalizing + name = PROPERTY_REVITALIZING + code = "REV" + description = "For a period of time, revitalizes the main systems of the body and prevents unconciousness." + rarity = PROPERTY_ADMIN + category = PROPERTY_TYPE_STIMULANT + value = 666 + +/datum/chem_property/special/revitalizing/reagent_added(mob/living/M) + if(!ishuman(M)) + return + M.status_flags &= ~CANKNOCKOUT + M.knocked_out = 0 + +/datum/chem_property/special/revitalizing/on_delete(mob/living/M) + M.status_flags |= CANKNOCKOUT diff --git a/code/modules/reagents/chemistry_reactions/medical.dm b/code/modules/reagents/chemistry_reactions/medical.dm index 2e38117134..72a491d779 100644 --- a/code/modules/reagents/chemistry_reactions/medical.dm +++ b/code/modules/reagents/chemistry_reactions/medical.dm @@ -14,6 +14,13 @@ required_reagents = list("carbon" = 1, "nitrogen" = 1, "oxygen" = 1) result_amount = 2 +/datum/chemical_reaction/adrenaline_concentrated + name = "Epinephrine (concentrated)" + id = "adrenaline_concentrated" + result = "adrenaline_concentrated" + required_reagents = list("carbon" = 1, "nitrogen" = 1, "oxygen" = 1, "phoron" = 3) + result_amount = 1 + /datum/chemical_reaction/alkysine name = "Alkysine" id = "alkysine" diff --git a/code/modules/reagents/chemistry_reagents/medical.dm b/code/modules/reagents/chemistry_reagents/medical.dm index f69d1b952c..01269a0d85 100644 --- a/code/modules/reagents/chemistry_reagents/medical.dm +++ b/code/modules/reagents/chemistry_reagents/medical.dm @@ -275,7 +275,7 @@ id = "adrenaline" description = "A natural muscle and heart stimulant. Useful for restarting the heart. Overdosing may stress the heart and cause tissue damage." reagent_state = LIQUID - color = "FFE703" // Yellow-ish + color = "#FFE703" // Yellow-ish overdose = LOWM_REAGENTS_OVERDOSE overdose_critical = LOWM_REAGENTS_OVERDOSE_CRITICAL custom_metabolism = AMOUNT_PER_TIME(1, 5 SECONDS) @@ -283,6 +283,19 @@ properties = list(PROPERTY_PAINKILLING = 1.5, PROPERTY_ELECTROGENETIC = 4, PROPERTY_INTRAVENOUS = 1) flags = REAGENT_TYPE_MEDICAL | REAGENT_SCANNABLE +/datum/reagent/medical/adrenaline_concentrated + name = "Epinephrine (concentrated)" + id = "adrenaline_concentrated" + description = "A natural muscle and heart stimulant that is in a high concerntration. Useful for restarting the heart and preventing unconciousness but in this concentrated form it will cause minor suffocation. Overdosing may stress the heart and cause tissue damage." + reagent_state = LIQUID + color = "#FFE702" // Yellow-ish + overdose = LOWM_REAGENTS_OVERDOSE + overdose_critical = LOWM_REAGENTS_OVERDOSE_CRITICAL + custom_metabolism = AMOUNT_PER_TIME(1, 10 SECONDS) + chemclass = CHEM_CLASS_COMMON + properties = list(PROPERTY_PAINKILLING = 1.5, PROPERTY_ELECTROGENETIC = 4, PROPERTY_REVITALIZING = 1, PROPERTY_HYPOXEMIC = 5, PROPERTY_INTRAVENOUS = 1) + flags = REAGENT_TYPE_MEDICAL | REAGENT_SCANNABLE + /datum/reagent/medical/ultrazine name = "Ultrazine" id = "ultrazine" diff --git a/code/modules/vehicles/interior/interactable/vendors.dm b/code/modules/vehicles/interior/interactable/vendors.dm index 6d98bc85e4..f5aef4f430 100644 --- a/code/modules/vehicles/interior/interactable/vendors.dm +++ b/code/modules/vehicles/interior/interactable/vendors.dm @@ -77,7 +77,6 @@ list("AUTOINJECTORS", -1, null, null), list("Autoinjector (Bicaridine)", round(scale * 3), /obj/item/reagent_container/hypospray/autoinjector/bicaridine, VENDOR_ITEM_REGULAR), list("Autoinjector (Dexalin+)", round(scale * 3), /obj/item/reagent_container/hypospray/autoinjector/dexalinp, VENDOR_ITEM_REGULAR), - list("Autoinjector (Epinephrine)", round(scale * 3), /obj/item/reagent_container/hypospray/autoinjector/adrenaline, VENDOR_ITEM_REGULAR), list("Autoinjector (Inaprovaline)", round(scale * 3), /obj/item/reagent_container/hypospray/autoinjector/inaprovaline, VENDOR_ITEM_REGULAR), list("Autoinjector (Kelotane)", round(scale * 3), /obj/item/reagent_container/hypospray/autoinjector/kelotane, VENDOR_ITEM_REGULAR), list("Autoinjector (Oxycodone)", round(scale * 3), /obj/item/reagent_container/hypospray/autoinjector/oxycodone, VENDOR_ITEM_REGULAR), diff --git a/icons/obj/items/syringe.dmi b/icons/obj/items/syringe.dmi index d08b2a8c2d9f99de5a954543eb3722fcbee6c115..d54123a898efa86dcafbf7acc3661027f4371d9c 100644 GIT binary patch literal 7079 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 MDQhd0-M4)5Kbk30dH?_b literal 7035 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 Date: Wed, 25 Oct 2023 00:04:49 -0400 Subject: [PATCH 09/11] sentry ammo --- maps/map_files/golden_arrow/golden_arrow.dmm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maps/map_files/golden_arrow/golden_arrow.dmm b/maps/map_files/golden_arrow/golden_arrow.dmm index 71575c902c..babbc40c63 100644 --- a/maps/map_files/golden_arrow/golden_arrow.dmm +++ b/maps/map_files/golden_arrow/golden_arrow.dmm @@ -4343,6 +4343,7 @@ }, /area/almayer/engineering) "Bu" = ( +/obj/item/ammo_magazine/sentry, /obj/item/defenses/handheld/sentry, /turf/open/floor/almayer{ icon_state = "plate" @@ -6343,6 +6344,7 @@ pixel_x = 14; pixel_y = 29 }, +/obj/item/ammo_magazine/sentry, /obj/item/defenses/handheld/sentry, /turf/open/floor/almayer{ icon_state = "plate" From ed17044d9e1d33c99b27b2a45c03fc7be82b1c40 Mon Sep 17 00:00:00 2001 From: morrowwolf Date: Wed, 25 Oct 2023 15:38:45 -0400 Subject: [PATCH 10/11] Update README.md discord (#28) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fced9e02c9..e02929ee4f 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![Build Status](https://github.com/PvE-CMSS13/PvE-CMSS13/workflows/CI%20Suite/badge.svg)](https://github.com/PvE-CMSS13/PvE-CMSS13/actions?query=workflow%3A%22CI+Suite%22) * **Code:** https://github.com/PvE-CMSS13/PvE-CMSS13 -* **Discord:** https://discord.gg/v6P6wns5dN +* **Discord:** https://discord.gg/pve-cmss13 This is the codebase for the PvE CM-SS13 fork of CM-SS13 flavoured fork of SpaceStation 13 From 03505927e2025374a6c5128ac3fe0a668cf57a62 Mon Sep 17 00:00:00 2001 From: Doubleumc Date: Wed, 25 Oct 2023 16:00:03 -0400 Subject: [PATCH 11/11] APC capacity increase (#27) --- code/modules/vehicles/apc/apc_command.dm | 2 +- code/modules/vehicles/apc/apc_medical.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/vehicles/apc/apc_command.dm b/code/modules/vehicles/apc/apc_command.dm index c5bd559283..67051cd1a6 100644 --- a/code/modules/vehicles/apc/apc_command.dm +++ b/code/modules/vehicles/apc/apc_command.dm @@ -7,7 +7,7 @@ interior_map = /datum/map_template/interior/apc_command - passengers_slots = 8 + passengers_slots = 15 var/sensor_radius = 45 //45 tiles radius diff --git a/code/modules/vehicles/apc/apc_medical.dm b/code/modules/vehicles/apc/apc_medical.dm index f8809bedaa..92813c988f 100644 --- a/code/modules/vehicles/apc/apc_medical.dm +++ b/code/modules/vehicles/apc/apc_medical.dm @@ -8,7 +8,7 @@ interior_map = /datum/map_template/interior/apc_med - passengers_slots = 8 + passengers_slots = 15 //MED APC can store additional 6 dead revivable bodies for the triage //but interior won't allow more revivable dead if passengers_taken_slots >= passengers_slots + revivable_dead_slots //to prevent infinitely growing the marine force inside of the vehicle