From 4d98bdfba12c4449b91fb5ac41618745dd9a2e6f Mon Sep 17 00:00:00 2001 From: GySgtMurphy Date: Mon, 16 Dec 2024 23:51:37 -0500 Subject: [PATCH 1/9] initial pass at cargo --- maps/endeavour/levels/deck3.dmm | 756 +++++++++++++------------------- 1 file changed, 317 insertions(+), 439 deletions(-) diff --git a/maps/endeavour/levels/deck3.dmm b/maps/endeavour/levels/deck3.dmm index 647c0eb28ed3..4757f8a3a762 100644 --- a/maps/endeavour/levels/deck3.dmm +++ b/maps/endeavour/levels/deck3.dmm @@ -827,12 +827,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_equiptment_storage) -"aFt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/reinforced, -/area/quartermaster/miningdock) "aFF" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -1820,8 +1814,7 @@ "biZ" = ( /obj/machinery/mineral/processing_unit_console{ density = 0; - pixel_y = -33; - pixel_x = 0 + pixel_y = -33 }, /obj/effect/floor_decal/industrial/warning/dust{ dir = 1 @@ -1981,10 +1974,8 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "boI" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/brown/border, /obj/machinery/air_alarm/south_mount, -/turf/simulated/floor/tiled/monodark, +/turf/simulated/wall/r_wall/prepainted/cargo, /area/quartermaster/foyer) "boM" = ( /obj/structure/cable/green{ @@ -2113,9 +2104,6 @@ /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, /area/endeavour/hallway/d3fwdhall) -"bta" = ( -/turf/simulated/floor/reinforced, -/area/maintenance/bar/catwalk) "btf" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/effect/floor_decal/borderfloorblack{ @@ -2385,10 +2373,6 @@ /turf/space, /area/space) "bBM" = ( -/obj/machinery/mech_recharger, -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, /obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/belterdock) @@ -2626,6 +2610,8 @@ /obj/structure/disposalpipe/junction/flipped{ dir = 4 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/brown/border, /turf/simulated/floor/tiled/monodark, /area/quartermaster/foyer) "bLl" = ( @@ -3219,6 +3205,12 @@ }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/structure/disposalpipe/junction, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/brown/bordercorner{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "cmw" = ( @@ -3233,9 +3225,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, +/obj/structure/disposalpipe/junction/yjunction, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "cmR" = ( @@ -3521,8 +3511,7 @@ /area/quartermaster/warehouse) "cyG" = ( /obj/machinery/status_display/supply_display{ - pixel_x = -32; - pixel_y = 0 + pixel_x = -32 }, /turf/simulated/floor/wood, /area/quartermaster/qm) @@ -3961,11 +3950,7 @@ /turf/simulated/floor/tiled/dark, /area/security/armoury) "cNA" = ( -/obj/structure/flora/pottedplant/thinbush{ - pixel_x = 0; - pixel_y = 3 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/quartermaster/belterdock) "cPE" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -4016,17 +4001,19 @@ /turf/simulated/floor/tiled, /area/hydroponics) "cQm" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/techmaint, /area/quartermaster/belterdock) "cQn" = ( /obj/machinery/air_alarm{ @@ -4311,12 +4298,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) "cZm" = ( @@ -4366,6 +4355,14 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/brown/border, +/obj/effect/floor_decal/corner/brown/bordercorner2{ + dir = 9 + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "daO" = ( @@ -4710,12 +4707,6 @@ /obj/effect/floor_decal/corner_oldtile/white/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) -"dip" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/brown/border, -/obj/structure/flora/pottedplant/large, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/foyer) "diG" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4855,7 +4846,6 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "dns" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 @@ -5090,6 +5080,12 @@ dir = 1; icon_state = "pipe-c" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "dyV" = ( @@ -5353,12 +5349,20 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "dIt" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 10 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/brown/border, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "dIB" = ( @@ -6946,19 +6950,21 @@ /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "eBy" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/hyperpad/centre{ + map_pad_id = "lavaland_station"; + map_pad_link_id = "lavaland_away"; + newcolor = "#fcba03" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/techmaint, /area/quartermaster/belterdock) "eBO" = ( /turf/simulated/floor/tiled/dark, @@ -7137,12 +7143,6 @@ }, /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) -"eEO" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/tiled/techmaint, -/area/quartermaster/belterdock) "eFf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7431,7 +7431,6 @@ /obj/effect/floor_decal/corner/brown/diagonal, /obj/landmark/spawnpoint/job/shaft_miner, /obj/item/stool/padded{ - pixel_x = 0; pixel_y = 13 }, /turf/simulated/floor/tiled/white, @@ -8600,10 +8599,14 @@ /turf/simulated/floor/tiled/monotile, /area/security/brig) "fGh" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 +/obj/item/storage/firstaid/regular{ + pixel_y = 8 }, -/turf/simulated/floor/tiled/techmaint, +/obj/item/storage/firstaid/fire{ + pixel_y = 3 + }, +/obj/structure/table/reinforced, +/turf/simulated/floor/tiled, /area/quartermaster/belterdock) "fGL" = ( /turf/simulated/floor/tiled, @@ -8638,11 +8641,9 @@ "fJl" = ( /obj/structure/table/steel_reinforced, /obj/item/storage/firstaid/o2{ - pixel_x = 0; pixel_y = 7 }, /obj/item/storage/firstaid/toxin{ - pixel_x = 0; pixel_y = 3 }, /turf/simulated/floor/tiled/techmaint, @@ -8798,9 +8799,6 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, @@ -8808,6 +8806,9 @@ dir = 2; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) "fMA" = ( @@ -8868,9 +8869,8 @@ /turf/simulated/floor/crystal, /area/endeavour/hallway/d3fwdhall) "fNj" = ( -/obj/machinery/light{ - dir = 8; - light_range = 12 +/obj/structure/flora/pottedplant/thinbush{ + pixel_y = 3 }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) @@ -9124,17 +9124,19 @@ /turf/simulated/floor/tiled, /area/security/brig) "fRJ" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/tiled/techmaint, /area/quartermaster/belterdock) "fRP" = ( /obj/effect/floor_decal/corner/brown/diagonal, @@ -9205,6 +9207,7 @@ "fTy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "fTB" = ( @@ -10691,12 +10694,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/bedrooms) "gXm" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -10709,6 +10706,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 10 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 10 + }, +/obj/structure/flora/pottedplant/large, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "gXN" = ( @@ -11091,8 +11095,6 @@ /turf/simulated/floor/tiled, /area/security/lobby) "hmk" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/brown/border, /obj/machinery/light, /turf/simulated/floor/tiled/monodark, /area/quartermaster/foyer) @@ -11481,11 +11483,7 @@ /turf/simulated/floor/tiled/old_cargo/red, /area/security/security_processing) "hzu" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/brown/border, -/obj/effect/floor_decal/borderfloorblack/corner2, -/obj/effect/floor_decal/corner/brown/bordercorner2, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/plating, /area/quartermaster/foyer) "hBC" = ( /obj/structure/disposalpipe/segment{ @@ -12477,10 +12475,11 @@ /turf/simulated/floor/plating, /area/security/hallway) "imI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ - dir = 8 + dir = 1; + icon_state = "pipe-c" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "imX" = ( @@ -13472,6 +13471,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "jdI" = ( @@ -14056,7 +14056,6 @@ "jwQ" = ( /obj/structure/table/rack/shelf, /obj/item/radio{ - pixel_x = 0; pixel_y = 7 }, /obj/item/radio{ @@ -14068,7 +14067,6 @@ pixel_y = 7 }, /obj/random/toolbox{ - pixel_x = 0; pixel_y = -5 }, /turf/simulated/floor/tiled, @@ -14250,14 +14248,6 @@ "jDP" = ( /turf/simulated/wall/prepainted, /area/security/nuke_storage) -"jEc" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/brown/border, -/obj/structure/bed/chair/comfy/black{ - dir = 1 - }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/foyer) "jEn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -14785,8 +14775,15 @@ /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/game_room) "kad" = ( -/obj/machinery/air_alarm/west_mount, -/turf/simulated/floor/tiled, +/obj/machinery/door/airlock/glass/mining{ + name = "Magmatic Rift Leap Pad"; + req_one_access = null + }, +/obj/map_helper/access_helper/airlock/station/mining_operations, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/plating, /area/quartermaster/belterdock) "kam" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, @@ -15062,14 +15059,6 @@ "kiu" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/breakroom) -"kiP" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/brown/border, -/obj/structure/bed/chair/comfy/brown{ - dir = 1 - }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/foyer) "kiR" = ( /obj/structure/table/standard, /obj/item/storage/box/cups, @@ -15731,7 +15720,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/wall/r_wall/prepainted/cargo, /area/quartermaster/foyer) "kKQ" = ( /obj/machinery/door/firedoor{ @@ -15795,9 +15784,6 @@ /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_7) "kMk" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /obj/structure/cable/green{ icon_state = "4-8" @@ -15811,12 +15797,8 @@ /turf/simulated/floor/tiled, /area/security/lobby) "kNT" = ( -/obj/vehicle/sealed/mecha/combat/fighter/cludge{ - dir = 4; - name = "\improper Titan Class Fighter" - }, -/turf/simulated/floor/reinforced, -/area/maintenance/bar/catwalk) +/turf/simulated/floor/tiled/steel_grid, +/area/quartermaster/belterdock) "kOc" = ( /obj/structure/cable/green{ icon_state = "1-8" @@ -15834,19 +15816,15 @@ dir = 4 }, /obj/item/hand_labeler{ - pixel_x = 0; pixel_y = 8 }, /obj/item/hand_labeler{ - pixel_x = 0; pixel_y = 5 }, /obj/item/hand_labeler{ - pixel_x = 0; pixel_y = 2 }, /obj/item/hand_labeler{ - pixel_x = 0; pixel_y = -1 }, /turf/simulated/floor/tiled/techmaint, @@ -15978,9 +15956,6 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "kSN" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, @@ -16329,7 +16304,6 @@ /area/security/forensics) "lfJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, @@ -16501,17 +16475,24 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3fwdmaint) "lmr" = ( -/obj/structure/table/reinforced, -/obj/item/storage/firstaid/regular{ - pixel_x = 0; - pixel_y = 8 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/item/storage/firstaid/fire{ - pixel_x = 0; - pixel_y = 3 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/quartermaster/belterdock) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/borderfloorblack/corner2, +/obj/effect/floor_decal/corner/brown/bordercorner2, +/obj/effect/floor_decal/corner/brown/border, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/foyer) "lmD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -16922,7 +16903,6 @@ /area/crew_quarters/fitness) "lAm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, @@ -17608,6 +17588,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/brown/border, /turf/simulated/floor/tiled/monodark, /area/quartermaster/foyer) "lYm" = ( @@ -17799,7 +17781,6 @@ "mhO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "mhY" = ( @@ -18302,20 +18283,16 @@ /area/endeavour/hallway/d3afthall) "mwk" = ( /obj/item/storage/box/nifsofts_mining{ - pixel_x = -3; - pixel_y = 0 + pixel_x = -3 }, /obj/item/suit_cooling_unit{ - pixel_x = -4; - pixel_y = 0 + pixel_x = -4 }, /obj/item/suit_cooling_unit{ - pixel_x = -4; - pixel_y = 0 + pixel_x = -4 }, /obj/item/duct_tape_roll{ - pixel_x = -4; - pixel_y = 0 + pixel_x = -4 }, /obj/structure/table/reinforced, /obj/effect/floor_decal/corner/brown/diagonal, @@ -18506,6 +18483,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "mGq" = ( @@ -19207,6 +19185,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/brown/border, /turf/simulated/floor/tiled/monodark, /area/quartermaster/foyer) "nfG" = ( @@ -19380,9 +19360,6 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Foyer" - }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "nmv" = ( @@ -19513,6 +19490,7 @@ /obj/machinery/light{ dir = 4 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) "nqm" = ( @@ -20216,9 +20194,6 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -20483,7 +20458,6 @@ "nWc" = ( /obj/effect/floor_decal/corner/brown/diagonal, /obj/item/stool/padded{ - pixel_x = 0; pixel_y = 13 }, /turf/simulated/floor/tiled/white, @@ -22059,6 +22033,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "oYK" = ( @@ -22227,11 +22202,9 @@ "pfu" = ( /obj/structure/table/steel_reinforced, /obj/item/storage/firstaid/regular{ - pixel_x = 0; pixel_y = 7 }, /obj/item/storage/firstaid/fire{ - pixel_x = 0; pixel_y = 3 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -22398,10 +22371,6 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) -"pjE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/foyer) "pjF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -22748,7 +22717,6 @@ dir = 4 }, /obj/structure/sign/department/cargo{ - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled/steel, @@ -24289,12 +24257,6 @@ }, /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) -"qup" = ( -/obj/machinery/door/airlock/maintenance, -/obj/item/barrier_tape_segment/engineering, -/obj/map_helper/access_helper/airlock/station/supply/maintenance, -/turf/simulated/floor/reinforced, -/area/maintenance/bar/catwalk) "quZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -24572,7 +24534,6 @@ "qDe" = ( /obj/structure/table/steel_reinforced, /obj/item/storage/toolbox/electrical{ - pixel_x = 0; pixel_y = 1 }, /turf/simulated/floor/tiled/techmaint, @@ -24945,13 +24906,6 @@ }, /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) -"qPD" = ( -/obj/machinery/button/remote/blast_door{ - id = "cludge_hanger"; - pixel_y = 32 - }, -/turf/simulated/floor/reinforced, -/area/maintenance/bar/catwalk) "qQb" = ( /obj/structure/closet/firecloset, /obj/effect/floor_decal/industrial/outline/red, @@ -25257,8 +25211,7 @@ /area/security/range) "rdb" = ( /obj/structure/filingcabinet{ - pixel_x = 11; - pixel_y = 0 + pixel_x = 11 }, /obj/machinery/keycard_auth{ pixel_y = -28 @@ -25584,12 +25537,6 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) -"rra" = ( -/obj/vehicle/sealed/mecha/combat/fighter/cludge{ - dir = 4 - }, -/turf/simulated/floor/reinforced, -/area/maintenance/bar/catwalk) "rrf" = ( /obj/machinery/power/apc/south_mount, /obj/structure/cable/green, @@ -26452,12 +26399,6 @@ }, /turf/simulated/floor/tiled/dark, /area/endeavour/station/stairs_three) -"rQL" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/reinforced, -/area/quartermaster/miningdock) "rQZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -26619,6 +26560,7 @@ dir = 1 }, /obj/structure/table/steel_reinforced, +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/monodark, /area/quartermaster/foyer) "rXe" = ( @@ -26966,9 +26908,7 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "sij" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/reinforced, /area/quartermaster/miningdock) "sil" = ( @@ -27650,7 +27590,10 @@ /area/endeavour/hallway/d3portamidhall) "sBr" = ( /obj/machinery/mech_recharger, -/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/machinery/air_alarm/west_mount, /turf/simulated/floor/tiled/steel_grid, /area/quartermaster/belterdock) "sCx" = ( @@ -27682,10 +27625,6 @@ /obj/structure/stairs/spawner/east, /turf/simulated/floor/plating, /area/maintenance/bar/lower) -"sDX" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled, -/area/quartermaster/belterdock) "sEi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -28327,7 +28266,6 @@ dir = 1 }, /obj/structure/sign/department/cargo{ - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/tiled, @@ -28420,7 +28358,6 @@ /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/brown/border, /obj/machinery/status_display/supply_display{ - pixel_x = 0; pixel_y = -32 }, /obj/structure/bed/chair/sofa/black{ @@ -28840,6 +28777,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/brown/border, /turf/simulated/floor/tiled/monodark, /area/quartermaster/foyer) "tqX" = ( @@ -28997,17 +28936,6 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) -"tyv" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/brown/border, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/brown/bordercorner2{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/foyer) "tzm" = ( /obj/structure/disposalpipe/junction{ dir = 8 @@ -29739,7 +29667,6 @@ /area/endeavour/hallway/d3portamidhall) "tZV" = ( /obj/item/radio/intercom{ - pixel_x = 0; req_access = list(); pixel_y = -26 }, @@ -29963,12 +29890,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) -"uhj" = ( -/obj/effect/decal/mecha_wreckage/cludge{ - dir = 1 - }, -/turf/simulated/floor/reinforced, -/area/maintenance/bar/catwalk) "uhv" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -30902,7 +30823,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 5 }, /turf/simulated/floor/reinforced, /area/quartermaster/miningdock) @@ -30991,6 +30912,10 @@ dir = 1; icon_state = "pipe-c" }, +/obj/structure/table/reinforced, +/obj/structure/flora/pottedplant/small{ + pixel_y = 11 + }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) "uMD" = ( @@ -31204,14 +31129,6 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/security/lobby) -"uUR" = ( -/obj/machinery/hyperpad/centre{ - map_pad_id = "lavaland_station"; - map_pad_link_id = "lavaland_away"; - newcolor = "#fcba03" - }, -/turf/simulated/floor/tiled/techmaint, -/area/quartermaster/belterdock) "uVc" = ( /obj/structure/fitness/punchingbag, /obj/structure/cable/green{ @@ -31489,7 +31406,6 @@ }, /obj/structure/table/woodentable, /obj/structure/flora/pottedplant/smallcactus{ - pixel_x = 0; pixel_y = 12 }, /turf/simulated/floor/wood, @@ -33478,7 +33394,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/obj/structure/disposalpipe/junction/yjunction, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "wku" = ( @@ -34028,7 +33943,6 @@ icon_state = "4-8" }, /obj/structure/sign/department/miner_dock{ - pixel_x = 0; pixel_y = 32 }, /turf/simulated/floor/reinforced, @@ -34452,7 +34366,6 @@ /obj/effect/floor_decal/corner/brown/border, /obj/structure/window/reinforced/survival_pod, /obj/machinery/light{ - pixel_x = 0; pixel_y = 7 }, /turf/simulated/floor/tiled/dark, @@ -34617,7 +34530,6 @@ }, /obj/machinery/status_display/supply_display{ mode = 99; - pixel_y = 0; pixel_x = -32 }, /obj/structure/disposalpipe/segment, @@ -34952,10 +34864,6 @@ /turf/simulated/floor/tiled, /area/security/lobby) "xlf" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, @@ -34994,14 +34902,7 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "xlv" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/brown/border, -/obj/structure/table/steel_reinforced, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 - }, /obj/machinery/status_display/supply_display{ - pixel_x = 0; pixel_y = -32 }, /turf/simulated/floor/tiled/dark, @@ -35489,7 +35390,6 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "xDs" = ( @@ -35604,14 +35504,6 @@ "xIP" = ( /turf/simulated/floor/crystal, /area/endeavour/hallway/d3fwdhall) -"xIS" = ( -/obj/structure/table/reinforced, -/obj/structure/flora/pottedplant/small{ - pixel_x = 0; - pixel_y = 11 - }, -/turf/simulated/floor/tiled, -/area/quartermaster/belterdock) "xJa" = ( /obj/structure/dogbed, /mob/living/simple_mob/animal/sif/fluffy, @@ -36151,14 +36043,6 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "xYM" = ( -/obj/machinery/door/firedoor{ - dir = 8 - }, -/obj/map_helper/access_helper/airlock/station/mining_operations, -/obj/machinery/door/airlock/glass/mining{ - name = "Magmatic Rift Leap Pad"; - req_one_access = null - }, /obj/structure/cable/green{ icon_state = "4-8" }, @@ -36174,7 +36058,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled, +/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, /area/quartermaster/belterdock) "xZp" = ( /obj/structure/bed/chair/wood{ @@ -36514,14 +36400,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/armoury) -"ykN" = ( -/obj/machinery/door/blast/regular{ - dir = 2; - id = "cludge_hanger" - }, -/obj/machinery/atmospheric_field_generator/perma, -/turf/simulated/floor/reinforced, -/area/maintenance/bar/catwalk) "yls" = ( /obj/structure/table/steel, /obj/item/tape_recorder, @@ -43818,13 +43696,13 @@ pRW jYr aKn rEk -bta -kNT -bta -rra -bta -bta -rEk +qLS +qLS +qLS +qLS +qLS +qLS +qLS eZz qLS qCs @@ -44012,13 +43890,13 @@ pRW jGe jYr rEk -bta -bta -bta -bta -bta -bta -rEk +qLS +qLS +qLS +qLS +qLS +qLS +qLS eZz eZz qCs @@ -44206,13 +44084,13 @@ pRW pRW pRW rEk -qPD -bta -bta -bta -bta -bta -qup +qLS +qLS +qLS +qLS +qLS +qLS +qLS qLS eZz esB @@ -44399,15 +44277,15 @@ pRW pRW pRW pRW -ykN -bta -bta -bta -bta -bta -bta rEk qLS +qLS +qLS +qLS +qLS +qLS +qLS +qLS eZz esB lif @@ -44593,15 +44471,15 @@ pRW pRW pRW pRW -ykN -bta -bta -bta -bta -bta -bta rEk qLS +qLS +qLS +qLS +qLS +qLS +qLS +qLS eZz esB lif @@ -44787,14 +44665,14 @@ pRW pRW pRW pRW -ykN -bta -bta -bta -bta -bta -uhj rEk +qLS +qLS +qLS +qLS +qLS +qLS +qLS wku eZz esB @@ -44981,15 +44859,15 @@ pRW pRW pRW pRW -ykN -bta -bta -bta -bta -bta -bta rEk qLS +qLS +qLS +qLS +qLS +qLS +qLS +qLS mVn jLH iIq @@ -45754,11 +45632,11 @@ uWE tdG iXY iXY -iXY -iXY -iXY -iXY -iXY +vSl +lYO +lYO +lYO +vSl iXY wuh blB @@ -45946,13 +45824,13 @@ ubg lwX gpG tdG -iXY -aFt -sij -iXY -iXY -iXY -iXY +rXr +xMm +vSl +oaN +ctb +wGx +vSl iXY wuh kRu @@ -46142,11 +46020,11 @@ jhZ tdG iXY wAS -iXY -iXY -iXY -iXY -iXY +vSl +tYv +dym +qmc +vSl mcn wuh bWp @@ -46334,13 +46212,13 @@ ceU tpp kxI tdG -iXY +sij uKF -rQL -iXY -iXY -iXY -iXY +vSl +aKj +qIH +qIH +vSl iXY wuh mEb @@ -46530,11 +46408,11 @@ jeT tdG iXY eFf -iXY -iXY -iXY -iXY -iXY +vSl +hRx +qIH +hpq +vSl ehr wuh qDS @@ -46724,11 +46602,11 @@ eIe tdG iXY eFf -iXY -iXY -iXY -iXY -iXY +xXl +fTI +qIH +iVL +vSl iXY wuh dPs @@ -46919,9 +46797,9 @@ tdG iXY eFf vSl -lYO -lYO -lYO +aKK +qIH +agW vSl oDU wuh @@ -47113,9 +46991,9 @@ tdG iXY eFf vSl -oaN -ctb -wGx +ufL +qIH +agW vSl iXY wuh @@ -47307,9 +47185,9 @@ tdG iXY eFf vSl -tYv -dym -qmc +vSl +vSl +vSl vSl iXY wuh @@ -47500,11 +47378,11 @@ cRB tdG iXY eFf -vSl -aKj -qIH -qIH -vSl +iXY +tqt +kLg +tqt +iXY iXY wuh sVr @@ -47694,11 +47572,11 @@ drT tdG rXr bxW -vSl -hRx -qIH -hpq -vSl +iXY +iXY +iXY +iXY +iXY iXY wuh uNM @@ -47888,11 +47766,11 @@ rAq iXY iXY eFf -xXl -fTI -qIH -iVL -vSl +iXY +iXY +iXY +iXY +iXY mcn wuh aGE @@ -48082,11 +47960,11 @@ nmv xMb rOn eFf -vSl -aKK -qIH -agW -vSl +iXY +iXY +iXY +iXY +iXY iXY wuh qek @@ -48276,11 +48154,11 @@ twR twR lAL eFf -vSl -ufL -qIH -agW -vSl +iXY +iXY +iXY +iXY +iXY mLl uWL rpH @@ -48470,11 +48348,11 @@ ePB twR feE rYq -vSl -vSl -vSl -vSl -vSl +iXY +iXY +iXY +iXY +iXY ufN wuh wHf @@ -48665,9 +48543,9 @@ twR ufN eFf iXY -tqt -kLg -tqt +iXY +iXY +iXY iXY ufN wuh @@ -48866,11 +48744,11 @@ iXY ufN wuh sBr -oNw +mLm cZe tBN fNj -kad +wzV cNA wzV lMH @@ -49060,13 +48938,13 @@ nmv avQ wuh bBM -mLm -cQm gDP -eEO +cQm vdN ipL wzV +cNA +wzV lMH vxy ukb @@ -49254,13 +49132,13 @@ iXY xTv wuh jwQ -oNw -eBy mJK -uUR +eBy bTA mmw wzV +cNA +wzV lMH iON ukb @@ -49447,13 +49325,13 @@ ufN iXY lag wuh -dVh -sDX -fRJ +kNT fTB -fGh +fRJ heO -oNw +fGh +wzV +cNA wzV lMH new @@ -49641,13 +49519,13 @@ fSr iXY nWj wuh -sBr +dVh npS fLU aBU uMs -lmr -xIS +wzV +oNw wzV lMH evB @@ -49838,10 +49716,10 @@ wuh wzV wzV mIP -mIP +kad xYM -mIP -mIP +wzV +cNA wzV lMH skT @@ -50034,8 +49912,8 @@ mSw ekJ xLm gXm -xLm -dIt +hdh +wnA hdh lMH nqP @@ -50228,8 +50106,8 @@ jon gNj wnA tqv -wnA -jEc +hdh +xlg hdh lMH cBD @@ -50422,7 +50300,7 @@ jon aHh atw nfA -pjE +hdh xlv hdh cJJ @@ -50616,8 +50494,8 @@ jon wjW wnA lXM -wnA -kiP +hdh +xlg hdh nCY che @@ -50809,9 +50687,9 @@ pHB mSw oGT xlg -daE -xlg -dip +dIt +hdh +wnA hdh pwn pwn @@ -51004,7 +50882,7 @@ mSw noW pzs bLd -wnA +hdh hmk hdh uRN @@ -51198,8 +51076,8 @@ jon waA xlg daE -xlg -tyv +hdh +wnA hrS til aIZ @@ -51585,8 +51463,8 @@ rER jon waA xlg -daE -xlg +lmr +hdh hzu hrS aIZ @@ -51780,7 +51658,7 @@ mSw vZG wnA lXM -wnA +hdh boI hdh eNB @@ -51975,7 +51853,7 @@ izO pZg cmi dyR -cDv +vKr tVX vKr vKr @@ -52367,11 +52245,11 @@ mhO xDr mhO lAm -pZg -pZg +hzi +hzi lfJ -pZg -pZg +hzi +hzi tEQ dns xlf @@ -53139,15 +53017,15 @@ iSP cmw bJS cmE -hzi +pZg jdF -hzi +pZg mFW -hzi -hzi +pZg +pZg oYC -hzi -hzi +pZg +pZg flt fTy imI From 09c68cadd5bd896f16463d960787f6dae2fb254f Mon Sep 17 00:00:00 2001 From: GySgtMurphy Date: Tue, 17 Dec 2024 23:11:27 -0500 Subject: [PATCH 2/9] finished adjusting cargo, started filling in the maints around it --- maps/endeavour/levels/deck3.dmm | 4912 +++++++++++++------------------ 1 file changed, 2120 insertions(+), 2792 deletions(-) diff --git a/maps/endeavour/levels/deck3.dmm b/maps/endeavour/levels/deck3.dmm index 4757f8a3a762..61f91403d467 100644 --- a/maps/endeavour/levels/deck3.dmm +++ b/maps/endeavour/levels/deck3.dmm @@ -31,11 +31,10 @@ /turf/simulated/floor/wood, /area/endeavour/surfacebase/bar_backroom) "aaY" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/delivery) +/obj/machinery/mineral/mint, +/obj/structure/window/reinforced, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/warehouse) "acd" = ( /obj/machinery/light_switch{ pixel_y = 26 @@ -70,22 +69,11 @@ /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) "acY" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/item/stack/flag/yellow{ - pixel_x = 42; - pixel_y = 1 - }, -/obj/item/stack/flag/yellow{ - pixel_x = 42; - pixel_y = 2 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/white, -/area/quartermaster/belterdock/gear) +/obj/structure/table/reinforced, +/obj/item/clothing/glasses/welding, +/obj/item/weldingtool/largetank, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "adf" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/hallwayaux) @@ -158,6 +146,10 @@ /obj/machinery/camera/network/cargo{ dir = 8 }, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "agU" = ( @@ -372,15 +364,18 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/security/evidence_storage) "aqN" = ( -/obj/machinery/power/apc/west_mount{ - cell_type = /obj/item/cell/super +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 }, -/obj/structure/cable/green{ - icon_state = "0-2" +/obj/effect/floor_decal/corner/brown/border{ + dir = 8 }, -/obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/carpet/turcarpet, -/area/crew_quarters/recreation_area) +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Warehouse" + }, +/obj/map_helper/access_helper/airlock/station/supply/department, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/warehouse) "aqY" = ( /obj/structure/table/woodentable, /obj/machinery/microwave, @@ -526,13 +521,13 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "avQ" = ( -/obj/machinery/light, -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/machinery/conveyor{ + dir = 8; + id = "mining_interior" }, -/obj/structure/ore_box, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/reinforced, +/obj/machinery/mineral/output, +/obj/machinery/light, +/turf/simulated/floor/tiled/monodark, /area/quartermaster/miningdock) "avW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -639,10 +634,8 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/security/evidence_storage) "ays" = ( -/obj/structure/table/standard, -/obj/item/hand_labeler, -/obj/item/hand_labeler, -/turf/simulated/floor/tiled/monodark, +/obj/structure/salvageable/autolathe, +/turf/simulated/floor/plating, /area/quartermaster/delivery) "ayC" = ( /obj/structure/toilet{ @@ -724,16 +717,15 @@ /turf/simulated/floor/tiled/dark, /area/janitor) "aBc" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/obj/effect/floor_decal/corner/brown/border{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 9 }, -/obj/structure/bed/chair/sofa/black/corner{ - dir = 1 +/obj/structure/table/wooden_reinforced, +/obj/machinery/recharger{ + pixel_x = -6; + pixel_y = 2 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "aBl" = ( /obj/structure/closet/wardrobe, @@ -789,9 +781,6 @@ /turf/space, /area/space) "aDs" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, @@ -801,20 +790,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) -"aDw" = ( -/obj/machinery/conveyor_switch/oneway{ - id = "mining_interior"; - name = "refining conveyor"; - pixel_y = 2; - pixel_x = -11 - }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 1 - }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/belterdock/refinery) "aDU" = ( /turf/simulated/wall/r_wall/prepainted/cargo, /area/quartermaster/belterdock/refinery) @@ -890,16 +870,10 @@ /turf/simulated/floor/tiled, /area/security/lobby) "aGE" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 1 - }, /obj/machinery/air_alarm{ pixel_y = 22 }, -/turf/simulated/floor/tiled, +/turf/simulated/wall/prepainted/cargo, /area/endeavour/surfacebase/mining_main/break_room) "aGV" = ( /obj/effect/floor_decal/borderfloor{ @@ -1018,7 +992,7 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "aIZ" = ( -/turf/simulated/floor/tiled/monodark, +/turf/simulated/floor/plating, /area/quartermaster/delivery) "aKg" = ( /obj/machinery/washing_machine, @@ -1754,6 +1728,7 @@ /area/security/evidence_storage) "bhw" = ( /obj/structure/table/hardwoodtable, +/obj/item/orion_ship, /turf/simulated/floor/carpet/bcarpet, /area/quartermaster/qm) "bhC" = ( @@ -1783,11 +1758,11 @@ /turf/simulated/floor, /area/security/brig) "bhP" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 - }, -/obj/structure/flora/grass/event/generic_bush1, -/turf/simulated/floor/grass, +/obj/structure/table/steel_reinforced, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/fiftyspawner/steel, +/obj/fiftyspawner/steel, +/turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) "bhQ" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -1812,15 +1787,10 @@ /turf/simulated/floor/plating, /area/maintenance/substation/cargo) "biZ" = ( -/obj/machinery/mineral/processing_unit_console{ - density = 0; - pixel_y = -33 - }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 1 - }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/belterdock/refinery) +/obj/structure/table/steel_reinforced, +/obj/item/storage/box/lights/mixed, +/turf/simulated/floor/reinforced, +/area/quartermaster/miningdock) "bje" = ( /obj/machinery/recharge_station, /obj/machinery/light/small{ @@ -1881,14 +1851,9 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "blB" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/structure/closet/secure_closet/miner, -/obj/item/binoculars, -/obj/machinery/light{ - dir = 1; - pixel_y = 20 - }, -/turf/simulated/floor/tiled/white, +/obj/structure/mopbucket, +/obj/item/mop, +/turf/simulated/floor/plating, /area/quartermaster/belterdock/gear) "blM" = ( /obj/effect/floor_decal/spline/fancy/wood, @@ -1950,13 +1915,8 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "bol" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/simulated/floor/wood, +/obj/machinery/vending/snack, +/turf/simulated/floor/tiled/dark, /area/endeavour/surfacebase/mining_main/break_room) "box" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -1974,8 +1934,12 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "boI" = ( -/obj/machinery/air_alarm/south_mount, -/turf/simulated/wall/r_wall/prepainted/cargo, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, /area/quartermaster/foyer) "boM" = ( /obj/structure/cable/green{ @@ -2011,17 +1975,8 @@ /turf/simulated/floor/tiled, /area/security/brig) "bpu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "bqn" = ( /obj/structure/sign/directions/cryo{ @@ -2046,17 +2001,18 @@ /turf/simulated/floor/tiled/monotile, /area/endeavour/hallway/d3afthall) "bqs" = ( +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/machinery/holopad, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" + dir = 10 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/white, /area/quartermaster/warehouse) "brs" = ( /obj/machinery/power/terminal, @@ -2224,7 +2180,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/maintenance/bar/lower) "bvs" = ( /obj/machinery/air_alarm{ @@ -2234,14 +2190,27 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/security/security_processing) "bvE" = ( -/obj/structure/window/reinforced{ - dir = 4 +/obj/structure/table/reinforced, +/obj/machinery/door/window{ + dir = 8; + req_one_access = list(31) }, -/obj/structure/window/reinforced{ +/obj/item/paper_bin{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/item/folder/white, +/obj/item/pen, +/obj/machinery/door/firedoor{ dir = 8 }, -/obj/structure/flora/grass/event/yellow_flowers1, -/turf/simulated/floor/grass, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/monodark, /area/quartermaster/foyer) "bvI" = ( /obj/machinery/light/small{ @@ -2529,14 +2498,16 @@ /turf/simulated/floor/plating, /area/endeavour/command/turrets) "bHV" = ( +/obj/machinery/light{ + dir = 1 + }, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/structure/bed/chair/sofa/black, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) "bIs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2700,9 +2671,16 @@ /turf/simulated/floor/wood, /area/quartermaster/qm) "bPg" = ( -/obj/landmark/spawnpoint/job/cargo_technician, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/warehouse) +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 + }, +/obj/structure/table/wooden_reinforced, +/turf/simulated/floor/wood, +/area/maintenance/cargo) "bPr" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/security_lockerroom) @@ -2711,12 +2689,9 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "bQe" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 1 - }, -/obj/effect/floor_decal/corner/brown/bordercorner{ - dir = 1 - }, +/obj/map_helper/access_helper/airlock/station/supply/mining, +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/multi_tile/metal/mait, /turf/simulated/floor/tiled/monotile, /area/quartermaster/belterdock/refinery) "bQp" = ( @@ -2925,9 +2900,10 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/prison/cell_block) "bWp" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/machinery/suit_cycler/mining, -/turf/simulated/floor/tiled/white, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, /area/quartermaster/belterdock/gear) "bWK" = ( /turf/simulated/wall/prepainted, @@ -3036,14 +3012,17 @@ /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "cdn" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "mining_interior" +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/machinery/mineral/output, -/obj/machinery/light, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/belterdock/refinery) +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/foyer) "cdy" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -3225,7 +3204,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/structure/disposalpipe/junction/yjunction, +/obj/structure/disposalpipe/junction/flipped{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "cmR" = ( @@ -3359,9 +3340,9 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_13) "crM" = ( -/obj/machinery/air_alarm/north_mount, -/turf/simulated/floor/carpet/blue, -/area/crew_quarters/sleep/Dorm_11) +/obj/structure/bed/chair/comfy/brown, +/turf/simulated/floor/wood, +/area/maintenance/cargo) "csb" = ( /turf/simulated/floor/airless/ceiling, /area/space) @@ -3644,25 +3625,20 @@ /turf/simulated/floor/tiled, /area/security/hanger) "cDv" = ( -/obj/effect/floor_decal/borderfloorblack/corner{ - dir = 8 +/obj/machinery/mineral/processing_unit_console{ + density = 0; + pixel_y = -33 }, -/obj/effect/floor_decal/corner/brown/bordercorner{ - dir = 8 +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 }, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/foyer) +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/miningdock) "cEd" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/brown/border{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, -/obj/structure/bed/chair/sofa/black{ - dir = 4 - }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "cEz" = ( /obj/structure/cable/green{ @@ -4302,10 +4278,6 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/light{ - dir = 8; - light_range = 12 - }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) "cZm" = ( @@ -4342,29 +4314,6 @@ }, /turf/simulated/floor/tiled/dark, /area/prison/cell_block) -"daE" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/brown/border, -/obj/effect/floor_decal/corner/brown/bordercorner2{ - dir = 9 - }, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/foyer) "daO" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_4) @@ -4423,23 +4372,15 @@ /turf/simulated/floor/tiled, /area/hydroponics) "dcu" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, /obj/structure/cable/green{ - icon_state = "1-8" + icon_state = "1-4" }, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/belterdock/refinery) +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/brown/border, +/obj/effect/floor_decal/borderfloorblack/corner2, +/obj/effect/floor_decal/corner/brown/bordercorner2, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/foyer) "dcx" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -4755,18 +4696,9 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/bedrooms) "dky" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals_central6, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "dkE" = ( /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) @@ -4775,14 +4707,16 @@ /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "dld" = ( -/obj/machinery/fire_alarm/south_mount{ - pixel_y = -24 +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/brown/border, +/obj/structure/bed/chair/sofa/black{ + dir = 1 }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 +/obj/machinery/status_display/supply_display{ + pixel_y = -32 }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) +/turf/simulated/floor/tiled/dark, +/area/quartermaster/foyer) "dlG" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4925,13 +4859,10 @@ /turf/simulated/open, /area/endeavour/hallway/d3aftmaint) "dqA" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/corner/brown/bordercorner{ - dir = 8 +/obj/structure/bed/chair/comfy{ + dir = 1 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "dqN" = ( /obj/machinery/recharger/wallcharger{ @@ -4973,14 +4904,15 @@ /turf/simulated/wall/r_wall/prepainted/cargo, /area/shuttle/mining_ship/general) "drV" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/belterdock/refinery) +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "dsm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -5076,16 +5008,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/effect/floor_decal/borderfloorblack{ dir = 8 }, /obj/effect/floor_decal/corner/brown/border{ dir = 8 }, +/obj/structure/disposalpipe/junction{ + dir = 2; + icon_state = "pipe-j2" + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "dyV" = ( @@ -5160,15 +5092,10 @@ /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_7) "dAP" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/flora/grass/event/sparse_grass2, -/turf/simulated/floor/grass/indoors, -/area/quartermaster/foyer) +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/structure/closet/secure_closet/miner, +/turf/simulated/floor/tiled/white, +/area/quartermaster/warehouse) "dAT" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -5332,13 +5259,6 @@ }, /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) -"dHW" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 9 - }, -/obj/structure/flora/grass/event/generic_bush1, -/turf/simulated/floor/grass, -/area/quartermaster/warehouse) "dHX" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -5453,6 +5373,12 @@ /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 }, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown/bordercorner{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "dMA" = ( @@ -5620,9 +5546,9 @@ /area/security/security_lockerroom) "dPi" = ( /obj/structure/table/woodentable, -/obj/item/instrument/glockenspiel, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) +/obj/machinery/microwave, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "dPj" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -5763,18 +5689,8 @@ /turf/simulated/floor/tiled/monotile, /area/crew_quarters/kitchen) "dTQ" = ( -/obj/map_helper/access_helper/airlock/station/supply/mining, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 8 - }, -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Refinery" - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/monotile, +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "dTT" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -5864,17 +5780,19 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "dVA" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 +/obj/machinery/light_switch{ + pixel_y = 24 }, -/obj/effect/floor_decal/corner/brown/border{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/structure/bed/chair/sofa/black, -/obj/machinery/light_switch{ - pixel_y = 24 +/obj/structure/table/wooden_reinforced, +/obj/machinery/chemical_dispenser/catering/bar_soft, +/obj/item/storage/box/glasses/square{ + pixel_x = -25; + pixel_y = 6 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "dVD" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, @@ -6018,11 +5936,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) "dZb" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "4-8" }, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/delivery) +/area/quartermaster/foyer) "dZs" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/structure/cable/green{ @@ -6049,13 +5967,6 @@ /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) -"ebz" = ( -/obj/machinery/power/apc/south_mount, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) "ebL" = ( /obj/structure/sink{ dir = 8; @@ -6226,11 +6137,17 @@ /turf/simulated/floor/wood, /area/maintenance/dormitory) "egp" = ( -/obj/structure/window/reinforced/survival_pod{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-4" }, -/turf/simulated/floor/tiled/techmaint, -/area/quartermaster/warehouse) +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/foyer) "egw" = ( /turf/simulated/floor/carpet/blue, /area/crew_quarters/sleep/Dorm_3) @@ -6343,10 +6260,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) -"ekD" = ( -/obj/structure/table/gamblingtable, -/turf/simulated/floor/tiled, -/area/endeavour/surfacebase/mining_main/break_room) "ekH" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_9) @@ -6386,19 +6299,16 @@ }, /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) -"elQ" = ( -/obj/structure/undies_wardrobe, -/turf/simulated/floor/carpet/blue, -/area/crew_quarters/sleep/Dorm_11) "emK" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/item/radio/intercom{ + pixel_y = -24 }, -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3portforhall) +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area_hallway) "emZ" = ( /obj/structure/table/rack/shelf/steel, /obj/item/clothing/mask/gas{ @@ -6591,7 +6501,7 @@ icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ - dir = 2; + dir = 4; icon_state = "pipe-c" }, /turf/simulated/floor/tiled, @@ -6655,8 +6565,12 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "etR" = ( -/obj/machinery/vending/cola, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/suit_storage_unit/mining, +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, +/turf/simulated/floor/tiled/white, /area/quartermaster/warehouse) "etU" = ( /obj/machinery/light/small{ @@ -6678,10 +6592,12 @@ /turf/simulated/floor/tiled, /area/hydroponics) "etZ" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 1 +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green{ + icon_state = "0-8" }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/white, /area/quartermaster/warehouse) "eum" = ( /obj/structure/cable{ @@ -6699,11 +6615,12 @@ /turf/simulated/floor/airless, /area/shuttle/mining_ship/general) "evc" = ( -/obj/machinery/light{ - dir = 1 +/obj/machinery/conveyor{ + dir = 5; + id = "mining_interior" }, -/turf/simulated/floor/tiled/techmaint, -/area/quartermaster/warehouse) +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/miningdock) "evi" = ( /obj/item/bedsheet/browndouble, /obj/structure/bed/double/padded, @@ -6826,19 +6743,18 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "eyn" = ( -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "cargo_line_shutter"; - name = "Cargo Line shutter"; - opacity = 0 +/obj/structure/railing{ + dir = 1 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/structure/disposalpipe/segment, -/obj/effect/paint/beastybrown, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/closet/crate, /turf/simulated/floor/plating, -/area/quartermaster/delivery) +/area/maintenance/cargo) "eyy" = ( /obj/machinery/camera/network/civilian{ dir = 1 @@ -6921,20 +6837,6 @@ /obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) -"eBl" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 8 - }, -/obj/map_helper/access_helper/airlock/station/supply/department, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Warehouse" - }, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/warehouse) "eBs" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 9 @@ -6947,7 +6849,7 @@ }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) "eBy" = ( /obj/machinery/hyperpad/centre{ @@ -7214,11 +7116,17 @@ /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/break_room) "eHQ" = ( -/obj/machinery/computer/ship/navigation/telescreen{ - pixel_x = -32 +/obj/machinery/sheet_silo_loader{ + dir = 1 }, -/turf/simulated/floor/carpet/turcarpet, -/area/crew_quarters/recreation_area) +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 8 + }, +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/miningdock) "eHT" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -7236,9 +7144,12 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/mining_ship/general) "eIB" = ( -/obj/machinery/recharge_station, -/turf/simulated/floor/tiled/techmaint, -/area/quartermaster/warehouse) +/obj/structure/catwalk, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/space) "eIC" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -7428,13 +7339,11 @@ /turf/simulated/floor/tiled/dark, /area/janitor) "ePx" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/landmark/spawnpoint/job/shaft_miner, -/obj/item/stool/padded{ - pixel_y = 13 +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/quartermaster/belterdock/gear) +/turf/simulated/floor/wood, +/area/endeavour/surfacebase/mining_main/break_room) "ePB" = ( /obj/machinery/computer/card{ dir = 4 @@ -7839,15 +7748,37 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "feq" = ( -/obj/machinery/mineral/mint, -/turf/simulated/floor/tiled/techmaint, -/area/quartermaster/warehouse) +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/obj/machinery/computer/supplycomp, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/foyer) "feE" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/window/reinforced{ + dir = 1 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/reinforced, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/machinery/door/window{ + req_one_access = list(31) + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/portable_atmospherics/canister/oxygen, +/turf/simulated/floor/tiled/monotechmaint, /area/quartermaster/miningdock) "feQ" = ( /obj/structure/cable{ @@ -7881,8 +7812,29 @@ /turf/simulated/floor/wood, /area/quartermaster/office) "ffW" = ( -/obj/structure/filingcabinet/chestdrawer, -/turf/simulated/floor/tiled/techmaint, +/obj/item/storage/box/nifsofts_mining{ + pixel_x = -3 + }, +/obj/item/suit_cooling_unit{ + pixel_x = -4 + }, +/obj/item/suit_cooling_unit{ + pixel_x = -4 + }, +/obj/item/duct_tape_roll{ + pixel_x = -4 + }, +/obj/structure/table/reinforced, +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/item/stack/flag/green{ + pixel_x = 7; + pixel_y = 1 + }, +/obj/item/stack/flag/green{ + pixel_x = 7; + pixel_y = 2 + }, +/turf/simulated/floor/tiled/white, /area/quartermaster/warehouse) "fgj" = ( /obj/machinery/camera/network/civilian{ @@ -7899,14 +7851,14 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "fgA" = ( -/obj/structure/window/reinforced/survival_pod{ - dir = 4 +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/white, /area/quartermaster/warehouse) "fgJ" = ( /obj/structure/cable/green{ @@ -8084,9 +8036,6 @@ /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) "fko" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -8164,6 +8113,9 @@ /obj/machinery/door/airlock/multi_tile/glass{ name = "Foyer" }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "flS" = ( @@ -8176,11 +8128,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/dark, /area/security/hallway) -"fmj" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, -/turf/simulated/floor/plating, -/area/endeavour/surfacebase/mining_main/break_room) "fmB" = ( /obj/machinery/air_alarm{ dir = 1; @@ -8336,16 +8283,9 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "fsN" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 10 - }, -/obj/structure/table/wooden_reinforced, -/obj/machinery/recharger{ - pixel_x = -6; - pixel_y = 2 - }, -/turf/simulated/floor/wood, -/area/endeavour/surfacebase/mining_main/break_room) +/obj/structure/salvageable/bliss, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) "fta" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/crystal, @@ -8366,14 +8306,8 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "fva" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/foyer) +/turf/simulated/wall/r_wall/prepainted/cargo, +/area/maintenance/cargo) "fvb" = ( /obj/structure/table/hardwoodtable, /obj/item/paper_bin{ @@ -8480,16 +8414,11 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "fBG" = ( -/obj/structure/bed/padded, -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/obj/machinery/light{ - dir = 1 +/obj/machinery/light/small{ + dir = 8 }, -/obj/random/bedsheet, -/turf/simulated/floor/carpet/blue, -/area/crew_quarters/sleep/Dorm_11) +/turf/simulated/floor/wood, +/area/maintenance/cargo) "fBZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -8599,15 +8528,11 @@ /turf/simulated/floor/tiled/monotile, /area/security/brig) "fGh" = ( -/obj/item/storage/firstaid/regular{ - pixel_y = 8 - }, -/obj/item/storage/firstaid/fire{ - pixel_y = 3 - }, /obj/structure/table/reinforced, -/turf/simulated/floor/tiled, -/area/quartermaster/belterdock) +/obj/item/storage/toolbox/syndicate, +/obj/item/pickaxe/drill, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "fGL" = ( /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) @@ -8639,14 +8564,9 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/starboardsolar) "fJl" = ( -/obj/structure/table/steel_reinforced, -/obj/item/storage/firstaid/o2{ - pixel_y = 7 - }, -/obj/item/storage/firstaid/toxin{ - pixel_y = 3 - }, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/white, /area/quartermaster/warehouse) "fJn" = ( /obj/machinery/light{ @@ -8869,9 +8789,17 @@ /turf/simulated/floor/crystal, /area/endeavour/hallway/d3fwdhall) "fNj" = ( -/obj/structure/flora/pottedplant/thinbush{ +/obj/structure/table/reinforced, +/obj/item/storage/firstaid/regular{ + pixel_y = 8 + }, +/obj/item/storage/firstaid/fire{ pixel_y = 3 }, +/obj/machinery/light{ + dir = 8; + light_range = 12 + }, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) "fND" = ( @@ -8966,8 +8894,9 @@ /turf/simulated/floor/plating, /area/security/armoury) "fOe" = ( -/turf/simulated/wall/prepainted, -/area/crew_quarters/sleep/Dorm_11) +/obj/structure/closet/wardrobe, +/turf/simulated/floor/wood, +/area/maintenance/cargo) "fOS" = ( /obj/structure/undies_wardrobe, /turf/simulated/floor/wood, @@ -9139,11 +9068,8 @@ /turf/simulated/floor/tiled/techmaint, /area/quartermaster/belterdock) "fRP" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/structure/table/reinforced, -/obj/machinery/recharger, -/obj/machinery/light, -/turf/simulated/floor/tiled/white, +/obj/structure/table/borosilicate, +/turf/simulated/floor/plating, /area/quartermaster/belterdock/gear) "fSo" = ( /obj/machinery/door/airlock{ @@ -9162,11 +9088,14 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_2) "fSr" = ( -/obj/machinery/power/apc/east_mount, -/obj/structure/cable/green{ - icon_state = "0-8" +/obj/machinery/mineral/unloading_machine, +/obj/structure/window/reinforced{ + dir = 1 }, -/turf/simulated/floor/reinforced, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 + }, +/turf/simulated/floor/tiled/monodark, /area/quartermaster/miningdock) "fSt" = ( /obj/machinery/light/small{ @@ -9208,6 +9137,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "fTB" = ( @@ -9236,9 +9168,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) -"fUB" = ( -/turf/simulated/floor/carpet/turcarpet, -/area/crew_quarters/recreation_area) "fUR" = ( /obj/machinery/camera/network/civilian{ dir = 8 @@ -9762,14 +9691,14 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "gnO" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/item/stool/padded, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 +/obj/machinery/status_display/supply_display{ + mode = 99; + pixel_y = 32 }, -/obj/landmark/spawnpoint/job/shaft_miner, -/turf/simulated/floor/tiled/white, -/area/quartermaster/belterdock/gear) +/obj/structure/table/wooden_reinforced, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/wood, +/area/quartermaster/office) "goa" = ( /obj/landmark/spawnpoint/latejoin/station/cyborg, /turf/simulated/floor/tiled/techfloor, @@ -9865,15 +9794,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/civilian) -"gqw" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/warehouse) "gqN" = ( /obj/machinery/space_heater, /turf/simulated/floor/plating, @@ -9971,10 +9891,13 @@ /turf/space, /area/space) "gtZ" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 1 +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/item/stool/padded, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/obj/landmark/spawnpoint/job/shaft_miner, +/turf/simulated/floor/tiled/white, /area/quartermaster/warehouse) "gug" = ( /obj/machinery/light/small{ @@ -10291,14 +10214,27 @@ /turf/simulated/floor/plating, /area/maintenance/substation/security) "gKi" = ( -/obj/item/radio/intercom{ - pixel_y = -24 +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/navblue/bordercorner2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1; + pixel_y = 20 + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "gKQ" = ( /obj/machinery/light/small{ dir = 8 @@ -10323,9 +10259,20 @@ /turf/simulated/floor/tiled, /area/security/range) "gLK" = ( -/obj/machinery/vending/coffee, -/turf/simulated/floor/tiled/techmaint, -/area/quartermaster/warehouse) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/foyer) "gLQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -10344,16 +10291,6 @@ "gLU" = ( /turf/simulated/floor/wood, /area/endeavour/surfacebase/bar_backroom) -"gLZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/delivery) "gMc" = ( /obj/spawner/window/reinforced/full/firelocks, /obj/structure/curtain/open/black, @@ -10477,11 +10414,12 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/brown/bordercorner, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, +/obj/structure/bed/chair/comfy{ + dir = 1 + }, +/turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "gRa" = ( /obj/machinery/disposal, @@ -10620,10 +10558,7 @@ /area/endeavour/hallway/d3starboardamidhall) "gUu" = ( /obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + icon_state = "1-8" }, /turf/simulated/floor/reinforced, /area/quartermaster/miningdock) @@ -10942,14 +10877,7 @@ /turf/simulated/floor/tiled/techmaint, /area/quartermaster/belterdock) "hgm" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/item/radio/intercom{ - pixel_y = -24 - }, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, +/obj/machinery/light/small, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area_hallway) "hhE" = ( @@ -11060,12 +10988,8 @@ /turf/simulated/wall/prepainted/civilian, /area/endeavour/hallway/d3aftmaint) "hlc" = ( -/obj/machinery/mineral/output, -/obj/effect/floor_decal/industrial/loading{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/corner/brown/diagonal, +/turf/simulated/floor/tiled/white, /area/quartermaster/warehouse) "hlx" = ( /obj/machinery/disposal, @@ -11095,9 +11019,13 @@ /turf/simulated/floor/tiled, /area/security/lobby) "hmk" = ( -/obj/machinery/light, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/foyer) +/obj/structure/disposalpipe/segment, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "hmF" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -11213,13 +11141,9 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 8 }, -/obj/map_helper/access_helper/airlock/station/supply/department, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Warehouse" - }, /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) @@ -11266,20 +11190,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) -"htn" = ( -/obj/machinery/door/firedoor, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/airlock{ - id_tag = "dorm13"; - name = "Dorm 13" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) "hup" = ( /obj/machinery/power/smes/buildable{ RCon_tag = "Deck 3 Aft Grid" @@ -11427,7 +11337,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/turf/simulated/floor/tiled, +/obj/structure/table/gamblingtable, +/turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "hxO" = ( /obj/machinery/door/airlock/glass_external{ @@ -11471,9 +11382,10 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "hzi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/tiled/monodark, /area/quartermaster/foyer) "hzs" = ( /obj/machinery/computer/secure_data, @@ -11546,23 +11458,35 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_9) "hDl" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/structure/table/steel_reinforced, +/obj/item/duct_tape_roll{ + pixel_x = -8; + pixel_y = -4 }, -/obj/structure/flora/grass/event/bright_flowers1, -/turf/simulated/floor/grass, +/obj/item/duct_tape_roll{ + pixel_x = -8; + pixel_y = 5 + }, +/obj/item/stamp/cargo{ + pixel_x = 7; + pixel_y = 8 + }, +/obj/item/stamp/denied{ + pixel_x = 7; + pixel_y = -1 + }, +/turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) "hDH" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance, -/obj/map_helper/access_helper/airlock/station/supply/mining, /obj/structure/cable/green{ icon_state = "1-2" }, /obj/structure/disposalpipe/segment{ dir = 1 }, -/turf/simulated/floor/tiled/monotile, +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor, +/turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "hEc" = ( /turf/simulated/floor/wood, @@ -11583,14 +11507,11 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3portamidhall) "hFO" = ( -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/machinery/computer/ship/navigation/telescreen{ + pixel_x = -32 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) +/turf/simulated/wall/r_wall/prepainted, +/area/crew_quarters/sleep/Dorm_13) "hGe" = ( /obj/machinery/door/airlock/glass{ desc = "A room dedicated for the repairs and recharging of adherent."; @@ -11761,18 +11682,11 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "hLw" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/brown/border{ +/obj/structure/bed/chair/comfy/brown{ dir = 4 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/warehouse) +/turf/simulated/floor/plating, +/area/maintenance/cargo) "hLN" = ( /obj/machinery/camera/network/civilian{ dir = 1 @@ -11858,14 +11772,19 @@ /turf/simulated/floor/tiled/dark, /area/security/riot_control) "hOq" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 2; + icon_state = "shutter0"; + id = "cargo_line_shutter"; + name = "Cargo Line shutter"; + opacity = 0 }, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/warehouse) +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/beastybrown, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) "hOu" = ( /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/red/bordercorner, @@ -12049,13 +11968,19 @@ /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) "hWB" = ( -/obj/effect/floor_decal/spline/fancy/wood, -/obj/structure/table/wooden_reinforced, -/obj/machinery/chemical_dispenser/catering/bar_coffee{ - dir = 1 +/obj/effect/floor_decal/borderfloorblack{ + dir = 10 }, -/turf/simulated/floor/wood, -/area/endeavour/surfacebase/mining_main/break_room) +/obj/effect/floor_decal/corner/brown/border{ + dir = 10 + }, +/obj/machinery/air_alarm/south_mount, +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/foyer) "hWG" = ( /obj/structure/table/marble, /obj/machinery/door/blast/shutters{ @@ -12080,11 +12005,36 @@ /turf/simulated/floor/plating, /area/maintenance/bar/lower) "hXO" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/brown/border, -/obj/structure/flora/pottedplant/minitree, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/foyer) +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/obj/item/clothing/accessory/permit/gun/planetside, +/obj/item/clothing/accessory/permit/gun/planetside, +/obj/item/clothing/accessory/permit/gun/planetside, +/obj/item/clothing/accessory/permit/gun/planetside, +/obj/structure/table/reinforced, +/obj/machinery/door/window/southright{ + req_one_access = list(48) + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/gun/energy/kinetic_accelerator, +/obj/effect/floor_decal/corner/brown/diagonal, +/turf/simulated/floor/tiled/white, +/area/quartermaster/warehouse) "hXW" = ( /obj/structure/table/steel, /obj/machinery/recharger, @@ -12242,12 +12192,13 @@ /turf/simulated/wall/r_wall/prepainted, /area/tether/surfacebase/entertainment) "ibL" = ( -/obj/structure/closet/wardrobe/mixed, -/obj/machinery/light/small{ +/obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/carpet/turcarpet, -/area/crew_quarters/recreation_area) +/obj/structure/window/reinforced, +/obj/structure/table/steel_reinforced, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/warehouse) "ibT" = ( /obj/structure/undies_wardrobe, /turf/simulated/floor/wood, @@ -12302,20 +12253,21 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) "ieQ" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 6 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/effect/floor_decal/borderfloorblack/corner2, -/obj/effect/floor_decal/corner/brown/bordercorner2, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/monodark, /area/quartermaster/foyer) "ifE" = ( -/obj/effect/floor_decal/spline/plain, -/obj/structure/flora/grass/event/full_grass1, -/turf/simulated/floor/grass, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) "ifT" = ( /obj/structure/cable{ @@ -12443,13 +12395,11 @@ /turf/simulated/floor/plating, /area/quartermaster/miningdock) "ili" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/obj/machinery/camera/network/civilian{ +/obj/structure/window/reinforced{ dir = 8 }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) +/turf/simulated/floor/tiled/dark, +/area/quartermaster/warehouse) "ilD" = ( /obj/machinery/door/airlock/glass/civilian{ name = "Crew Cryo Bay" @@ -12480,6 +12430,9 @@ dir = 1; icon_state = "pipe-c" }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "imX" = ( @@ -12499,7 +12452,7 @@ dir = 8 }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) "inx" = ( /turf/simulated/wall/prepainted, @@ -12756,27 +12709,20 @@ /turf/simulated/wall/prepainted/security, /area/security/breakroom) "izr" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 1 - }, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/belterdock/refinery) +/obj/structure/window/reinforced, +/obj/machinery/lathe/autolathe, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/warehouse) "izO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, /obj/effect/floor_decal/borderfloorblack/corner{ - dir = 1 + dir = 4 }, /obj/effect/floor_decal/corner/brown/bordercorner{ - dir = 1 + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "iAo" = ( @@ -12856,18 +12802,15 @@ /turf/simulated/floor/grass, /area/security/brig) "iDE" = ( -/obj/machinery/door/blast/shutters{ - density = 0; - dir = 2; - icon_state = "shutter0"; - id = "cargo_line_shutter"; - name = "Cargo Line shutter"; - opacity = 0 +/obj/machinery/button/remote/airlock{ + id = "dormx"; + name = "Room 1 Lock"; + pixel_x = -26; + pixel_y = -7; + specialfunctions = 4 }, -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, -/turf/simulated/floor/plating, -/area/quartermaster/delivery) +/turf/simulated/floor/wood, +/area/maintenance/cargo) "iDZ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -13011,7 +12954,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/maintenance/bar/lower) "iIU" = ( /obj/machinery/camera/network/civilian{ @@ -13233,14 +13176,27 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "iSL" = ( -/obj/structure/window/reinforced{ - dir = 4 +/obj/item/folder/white, +/obj/structure/table/reinforced, +/obj/machinery/door/window{ + dir = 8; + req_one_access = list(31) }, -/obj/structure/window/reinforced{ +/obj/item/paper_bin{ + pixel_x = -1; + pixel_y = 4 + }, +/obj/item/pen, +/obj/machinery/door/firedoor{ dir = 8 }, -/obj/structure/flora/grass/event/sunny_bush1, -/turf/simulated/floor/grass/indoors, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/monodark, /area/quartermaster/foyer) "iSP" = ( /obj/machinery/computer/supplycomp/control{ @@ -13388,13 +13344,13 @@ /turf/simulated/floor/crystal, /area/endeavour/hallway/d3fwdhall) "jag" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/machinery/power/apc/east_mount, -/obj/structure/cable/green{ - icon_state = "0-8" +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/quartermaster/belterdock/gear) +/obj/structure/window/reinforced, +/obj/structure/filingcabinet/chestdrawer, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/warehouse) "jaT" = ( /obj/machinery/holopad, /obj/structure/cable/green{ @@ -13425,14 +13381,11 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "jbh" = ( -/obj/machinery/sheet_silo{ - obj_persist_static_id = "sheet-silo-mining" - }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 9 - }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/belterdock/refinery) +/obj/item/tool/wrench, +/obj/structure/table/reinforced, +/obj/item/tool/wirecutters, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) "jbI" = ( /obj/machinery/light, /obj/structure/cable/orange{ @@ -13472,6 +13425,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "jdI" = ( @@ -13565,10 +13521,8 @@ /turf/simulated/floor/wood, /area/security/lobby) "jhH" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/dark, +/obj/landmark/spawnpoint/job/cargo_technician, +/turf/simulated/floor/tiled/monodark, /area/quartermaster/foyer) "jhI" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -13925,38 +13879,24 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "jtk" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 10 - }, /obj/machinery/requests_console/preset/cargo{ pixel_x = -31; pixel_y = -1 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 8 + }, +/turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "jtn" = ( -/obj/structure/table/rack/steel, -/obj/item/cartridge/quartermaster{ - pixel_x = 6; - pixel_y = 2 - }, -/obj/item/cartridge/quartermaster{ - pixel_x = -3; - pixel_y = 2 - }, -/obj/item/cartridge/quartermaster{ - pixel_x = -3; - pixel_y = -5 - }, -/obj/item/cartridge/quartermaster{ - pixel_x = 6; - pixel_y = -5 +/obj/structure/railing, +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 }, -/turf/simulated/floor/wood, -/area/quartermaster/qm) +/obj/random/maintenance/medical, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "jtu" = ( /obj/structure/window/basic{ dir = 1 @@ -14032,27 +13972,26 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "jwr" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 8 +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 }, -/obj/structure/table/wooden_reinforced, -/obj/machinery/microwave, -/turf/simulated/floor/wood, -/area/endeavour/surfacebase/mining_main/break_room) -"jwx" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/machinery/holopad, /obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/door/airlock/mining{ + name = "Cargo Airlock"; + req_one_access = null }, -/turf/simulated/floor/tiled/white, -/area/quartermaster/belterdock/gear) +/obj/map_helper/access_helper/airlock/station/supply/cargo_bay, +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/foyer) +"jwx" = ( +/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/quartermaster/warehouse) "jwQ" = ( /obj/structure/table/rack/shelf, /obj/item/radio{ @@ -14150,12 +14089,7 @@ /turf/simulated/floor/carpet, /area/security/detectives_office) "jAA" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/machinery/camera/network/cargo{ - dir = 8 - }, -/obj/machinery/fire_alarm/east_mount, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/plating, /area/quartermaster/belterdock/gear) "jAH" = ( /obj/structure/poster{ @@ -14165,15 +14099,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar/lounge) "jBe" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/quartermaster/belterdock/gear) +/turf/simulated/wall/prepainted/cargo, +/area/quartermaster/foyer) "jBD" = ( /obj/structure/table/marble, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -14246,8 +14173,11 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "jDP" = ( -/turf/simulated/wall/prepainted, -/area/security/nuke_storage) +/obj/structure/bed/double/padded, +/obj/item/bedsheet/browndouble, +/obj/structure/curtain/open/bed, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "jEn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -14255,11 +14185,10 @@ /turf/simulated/floor/tiled, /area/hydroponics) "jEN" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/machinery/air_alarm{ - pixel_y = 22 +/obj/structure/poster/preset/tgstation/tg_9{ + pixel_y = 32 }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/plating, /area/quartermaster/belterdock/gear) "jFV" = ( /obj/machinery/computer/guestpass{ @@ -14280,19 +14209,6 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) -"jGc" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/fire_alarm/north_mount, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/belterdock/refinery) "jGe" = ( /turf/space/basic, /area/endeavour/command/turrets) @@ -14442,21 +14358,13 @@ /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "jLP" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/mining{ - name = "Cargo Airlock"; - req_one_access = null +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/obj/map_helper/access_helper/airlock/station/supply/cargo_bay, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/delivery) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "jMc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -14542,16 +14450,10 @@ /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "jPs" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "jQE" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -14922,8 +14824,10 @@ /turf/simulated/floor/tiled, /area/hydroponics) "kdZ" = ( -/turf/simulated/floor/carpet/blue, -/area/crew_quarters/sleep/Dorm_11) +/obj/structure/table/wooden_reinforced, +/obj/item/storage/box/donkpockets, +/turf/simulated/floor/wood, +/area/maintenance/cargo) "keU" = ( /obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks, /obj/map_helper/electrochromatic_linker{ @@ -15170,11 +15074,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/fitness) "kow" = ( -/obj/machinery/mineral/input, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 1 - }, -/turf/simulated/floor/tiled/monodark, +/turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "koL" = ( /obj/structure/cable/green{ @@ -15287,10 +15187,23 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "kur" = ( -/obj/effect/floor_decal/spline/plain, -/obj/structure/flora/grass/event/purple_flowers1, -/turf/simulated/floor/grass, -/area/quartermaster/warehouse) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_13) "kuG" = ( /obj/landmark/spawnpoint/latejoin/station/cryogenics, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -15325,29 +15238,6 @@ /obj/machinery/camera/network/civilian, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) -"kwo" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window{ - dir = 8; - req_one_access = list(31) - }, -/obj/item/paper_bin{ - pixel_x = -1; - pixel_y = 4 - }, -/obj/item/folder/white, -/obj/item/pen, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 4 - }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/delivery) "kwF" = ( /obj/structure/stairs/spawner/north{ dir = 2; @@ -15416,10 +15306,10 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "kBv" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/ore_box, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/belterdock/refinery) +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/tiled/white, +/area/quartermaster/warehouse) "kBD" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -15539,11 +15429,9 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "kDo" = ( -/obj/machinery/vending/nifsoft_shop, -/obj/machinery/camera/network/cargo{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/machinery/suit_storage_unit/mining, +/turf/simulated/floor/tiled/white, /area/quartermaster/warehouse) "kDu" = ( /obj/structure/disposalpipe/segment{ @@ -15572,11 +15460,11 @@ /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "kDM" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/structure/flora/grass/event/sparse_grass2, -/turf/simulated/floor/grass, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) "kEf" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -15637,6 +15525,9 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 1 }, +/obj/structure/sign/department/mail{ + pixel_y = 32 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "kGS" = ( @@ -15715,13 +15606,9 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "kKO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/wall/r_wall/prepainted/cargo, -/area/quartermaster/foyer) +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "kKQ" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -15808,26 +15695,16 @@ /turf/simulated/floor/wood, /area/maintenance/dormitory) "kOw" = ( -/obj/structure/table/steel_reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/item/hand_labeler{ - pixel_y = 8 - }, -/obj/item/hand_labeler{ - pixel_y = 5 - }, -/obj/item/hand_labeler{ - pixel_y = 2 +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/machinery/door/airlock/glass/mining{ + name = "Mining Prep Room"; + req_one_access = null }, -/obj/item/hand_labeler{ - pixel_y = -1 +/obj/map_helper/access_helper/airlock/station/supply/mining, +/obj/machinery/door/firedoor{ + dir = 8 }, -/turf/simulated/floor/tiled/techmaint, +/turf/simulated/floor/tiled/white, /area/quartermaster/warehouse) "kPK" = ( /obj/machinery/door/blast/regular{ @@ -15871,9 +15748,14 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "kQS" = ( -/obj/effect/floor_decal/spline/plain, -/turf/simulated/floor/grass, -/area/quartermaster/warehouse) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/foyer) "kRb" = ( /obj/machinery/door/firedoor/glass, /obj/structure/cable/green{ @@ -15899,10 +15781,12 @@ /turf/simulated/floor/airless, /area/shuttle/mining_ship/general) "kRu" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/structure/closet/secure_closet/miner, -/obj/item/binoculars, -/turf/simulated/floor/tiled/white, +/obj/structure/poster/preset/baystation/bay_50{ + pixel_y = -32 + }, +/obj/structure/table, +/obj/structure/dancepole, +/turf/simulated/floor/tiled/dark, /area/quartermaster/belterdock/gear) "kRM" = ( /obj/machinery/door/firedoor, @@ -15962,6 +15846,9 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "kTd" = ( @@ -16049,16 +15936,6 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled/dark, /area/security/hallway) -"kXD" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/flora/grass/event/sparse_grass2, -/turf/simulated/floor/grass, -/area/quartermaster/foyer) "kXK" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -16108,11 +15985,14 @@ /turf/simulated/floor/wood, /area/crew_quarters/game_room) "kZu" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/brown/border, -/obj/machinery/light, -/turf/simulated/floor/tiled, -/area/endeavour/surfacebase/mining_main/break_room) +/obj/structure/bed/chair/comfy/beige{ + dir = 4 + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/carpet/turcarpet, +/area/crew_quarters/sleep/Dorm_13) "kZA" = ( /obj/effect/floor_decal/corner/green/full{ dir = 1 @@ -16140,21 +16020,12 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "lag" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "belter_docking"; - name = "Belting Dock Controller"; - pixel_x = 1; - pixel_y = -24; - req_one_access = list(13,31) +/obj/machinery/conveyor{ + dir = 8; + id = "mining_interior" }, -/obj/structure/table/reinforced, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/turf/simulated/floor/reinforced, +/obj/machinery/mineral/input, +/turf/simulated/floor/tiled/monodark, /area/quartermaster/miningdock) "laD" = ( /obj/structure/cable{ @@ -16268,14 +16139,6 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) -"leF" = ( -/obj/machinery/air_alarm/east_mount, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/simulated/floor/wood, -/area/quartermaster/qm) "leL" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -16302,13 +16165,6 @@ /obj/machinery/light, /turf/simulated/floor/tiled/old_cargo/white, /area/security/forensics) -"lfJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/foyer) "lfS" = ( /obj/machinery/light{ dir = 1 @@ -16341,21 +16197,9 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "lgM" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/structure/window/reinforced, -/obj/machinery/door/window{ - dir = 4; - req_one_access = list(31) - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotechmaint, -/area/quartermaster/belterdock/refinery) +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "lgT" = ( /obj/structure/table/marble, /obj/machinery/door/blast/shutters{ @@ -16412,13 +16256,6 @@ "lif" = ( /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) -"lin" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/machinery/computer/timeclock/premade/east, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) "liu" = ( /obj/structure/cable{ icon_state = "4-8" @@ -16450,12 +16287,8 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "lkP" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/monodark, +/obj/structure/salvageable/machine, +/turf/simulated/floor/plating, /area/quartermaster/delivery) "lly" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, @@ -16475,24 +16308,10 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3fwdmaint) "lmr" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/borderfloorblack/corner2, -/obj/effect/floor_decal/corner/brown/bordercorner2, -/obj/effect/floor_decal/corner/brown/border, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/foyer) +/obj/structure/railing, +/obj/random/mouseremains, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "lmD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -16509,12 +16328,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/security/lobby) -"lnj" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/brown/border, -/obj/structure/window/reinforced/survival_pod, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/warehouse) "lnp" = ( /obj/structure/cable{ icon_state = "1-4" @@ -16902,10 +16715,8 @@ /turf/simulated/floor/tiled, /area/crew_quarters/fitness) "lAm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/brown/border, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "lAo" = ( @@ -17070,18 +16881,9 @@ /turf/simulated/wall/r_wall/prepainted/engineering, /area/endeavour/hallway/d3aftmaint) "lGM" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/structure/flora/grass/event/generic_bush1, -/turf/simulated/floor/grass, -/area/quartermaster/foyer) +/obj/machinery/vending/fitness, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "lGQ" = ( /turf/simulated/floor/tiled/techmaint, /area/security/brig) @@ -17183,14 +16985,14 @@ /turf/simulated/wall/r_wall/prepainted/engineering, /area/security/forensics) "lKH" = ( +/obj/structure/closet/secure_closet/cargotech, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/structure/bed/chair/sofa/black/left, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) "lKR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -17229,14 +17031,6 @@ /obj/landmark/spawnpoint/job/entertainer, /turf/simulated/floor/carpet/bcarpet, /area/tether/surfacebase/entertainment) -"lNT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/belterdock/refinery) "lNU" = ( /obj/structure/table/gamblingtable, /obj/item/deck/cards, @@ -17297,6 +17091,7 @@ /obj/effect/floor_decal/corner/brown/border, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light, /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "lQs" = ( @@ -17312,24 +17107,17 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "lRw" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 8 - }, +/obj/structure/table/steel_reinforced, +/obj/machinery/recharger, /turf/simulated/floor/reinforced, /area/quartermaster/miningdock) "lRx" = ( -/obj/structure/sign/warning/moving_parts{ - pixel_y = 32 - }, -/obj/machinery/conveyor_switch/oneway{ - tag = "mailroom"; - id = "DLBelt" - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/machinery/mineral/input, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 }, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/delivery) +/area/quartermaster/miningdock) "lRP" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -17436,16 +17224,8 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "lUu" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 6 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 6 - }, -/obj/structure/bed/chair/sofa/black/corner{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/quartermaster/foyer) "lUH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -17655,12 +17435,17 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_5) "mbv" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloorblack{ dir = 4 }, -/obj/landmark/spawnpoint/job/shaft_miner, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/belterdock/refinery) +/obj/effect/floor_decal/corner/brown/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/warehouse) "mbJ" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -17718,13 +17503,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 10 - }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "mfm" = ( /obj/structure/disposalpipe/segment, @@ -17781,6 +17560,14 @@ "mhO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/brown/border, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/brown/bordercorner2{ + dir = 9 + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "mhY" = ( @@ -17809,6 +17596,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/brown/border, /turf/simulated/floor/tiled/monodark, /area/quartermaster/foyer) "miu" = ( @@ -17849,28 +17638,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/brig) -"miH" = ( -/obj/machinery/light_switch{ - dir = 1; - pixel_x = -5; - pixel_y = -28 - }, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/button/remote/airlock{ - id = "dorm12"; - name = "Room 12 Lock"; - pixel_x = 5; - pixel_y = -27; - specialfunctions = 4 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) "mjB" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 5 @@ -17944,16 +17711,20 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "mlk" = ( -/obj/structure/cable/green{ - icon_state = "2-8" +/obj/effect/floor_decal/borderfloor{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/brown/border{ + dir = 10 }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/delivery) +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/brown/bordercorner2{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/endeavour/surfacebase/mining_main/break_room) "mll" = ( /obj/machinery/light{ dir = 1 @@ -18071,17 +17842,16 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "moz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/vending/cola, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/structure/bed/chair/sofa/black/right, -/obj/machinery/newscaster{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) "moE" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -18238,11 +18008,17 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "mti" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 10 + }, +/obj/machinery/light, +/obj/machinery/vending/wallmed1{ + dir = 4; + pixel_x = -24; + pixel_y = 2 }, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) +/area/endeavour/surfacebase/mining_main/break_room) "mty" = ( /turf/simulated/floor/tiled/old_cargo/white, /area/security/forensics) @@ -18282,29 +18058,9 @@ /turf/simulated/floor/tiled/monotile, /area/endeavour/hallway/d3afthall) "mwk" = ( -/obj/item/storage/box/nifsofts_mining{ - pixel_x = -3 - }, -/obj/item/suit_cooling_unit{ - pixel_x = -4 - }, -/obj/item/suit_cooling_unit{ - pixel_x = -4 - }, -/obj/item/duct_tape_roll{ - pixel_x = -4 - }, -/obj/structure/table/reinforced, -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/item/stack/flag/green{ - pixel_x = 7; - pixel_y = 1 - }, -/obj/item/stack/flag/green{ - pixel_x = 7; - pixel_y = 2 - }, -/turf/simulated/floor/tiled/white, +/obj/item/banner/cargo, +/obj/machinery/light/small, +/turf/simulated/floor/plating, /area/quartermaster/belterdock/gear) "mwA" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -18379,9 +18135,6 @@ }, /turf/simulated/floor/wood, /area/endeavour/surfacebase/bar_backroom) -"mzJ" = ( -/turf/simulated/floor/tiled, -/area/maintenance/bar/lower) "mAl" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -18468,9 +18221,10 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "mEb" = ( -/obj/machinery/mineral/equipment_vendor, -/obj/effect/floor_decal/corner/brown/diagonal, -/turf/simulated/floor/tiled/white, +/obj/structure/poster/preset/baystation/bay_8{ + pixel_y = 32 + }, +/turf/simulated/floor/plating, /area/quartermaster/belterdock/gear) "mEG" = ( /obj/structure/bed/chair/office/dark{ @@ -18484,17 +18238,11 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) -"mGq" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) "mGv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -18561,14 +18309,9 @@ /turf/simulated/floor/plating, /area/maintenance/cargo) "mIN" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/obj/structure/bed/chair{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/endeavour/surfacebase/mining_main/break_room) +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/quartermaster/foyer) "mIP" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/beastybrown, @@ -18904,18 +18647,10 @@ /turf/simulated/floor/tiled/dark, /area/security/tactical) "mXi" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/turf/simulated/floor/tiled/steel, -/area/endeavour/hallway/d3portforhall) +/obj/machinery/mineral/equipment_vendor, +/obj/effect/floor_decal/corner/brown/diagonal, +/turf/simulated/floor/tiled/white, +/area/quartermaster/warehouse) "mXn" = ( /obj/structure/table/steel, /obj/item/flashlight/lamp, @@ -19118,10 +18853,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 }, @@ -19253,23 +18984,10 @@ /area/crew_quarters/sleep/Dorm_4) "nin" = ( /obj/machinery/power/apc/north_mount, -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 4 - }, -/obj/effect/floor_decal/corner/brown/bordercorner2{ - dir = 4 - }, /obj/structure/cable/green{ icon_state = "0-2" }, -/obj/machinery/camera/network/cargo, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "niA" = ( /obj/structure/cable/green{ @@ -19356,12 +19074,15 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "nme" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/dispenser/oxygen, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/foyer) +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/warehouse) "nmv" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -19519,42 +19240,13 @@ }, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) -"nrZ" = ( -/obj/structure/table/steel_reinforced, -/obj/item/duct_tape_roll{ - pixel_x = -8; - pixel_y = 5 - }, -/obj/item/stamp/cargo{ - pixel_x = 7; - pixel_y = 8 - }, -/obj/item/stamp/denied{ - pixel_x = 7; - pixel_y = -1 - }, -/obj/item/duct_tape_roll{ - pixel_x = -8; - pixel_y = -4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/techmaint, -/area/quartermaster/warehouse) "nsH" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/structure/table/wooden_reinforced, +/obj/machinery/light/small{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/delivery) +/turf/simulated/floor/plating, +/area/maintenance/cargo) "nta" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -19811,7 +19503,10 @@ /area/endeavour/hallway/d3starboardamidhall) "nDz" = ( /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "nEe" = ( /obj/machinery/light/small, @@ -19953,20 +19648,16 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "nJE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/machinery/air_alarm{ + dir = 8; + pixel_x = 25 }, -/obj/machinery/door/firedoor{ - dir = 8 +/obj/item/paper/crumpled{ + name = "Hastily crumpled schematics"; + info = "Right - the equipment's all set and ready to go - as long as you can keep the ship in the drydock for another few days, we can get in, get out, and be gone before we're missed. Map's attached. Burn this if you think you're about to get pinched-" }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) +/turf/simulated/floor/plating, +/area/maintenance/cargo) "nJF" = ( /obj/machinery/computer/supplycomp/control, /obj/machinery/light{ @@ -20441,13 +20132,16 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "nVC" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/mineral/output, +/obj/machinery/light{ + dir = 4; + use_power = 0 }, -/obj/effect/floor_decal/borderfloorblack/corner, -/obj/effect/floor_decal/corner/brown/bordercorner, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/warehouse) +/obj/machinery/conveyor{ + id = "mining_interior" + }, +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/miningdock) "nVP" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -20456,11 +20150,7 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/recreation_area) "nWc" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/item/stool/padded{ - pixel_y = 13 - }, -/turf/simulated/floor/tiled/white, +/turf/simulated/floor/tiled/dark, /area/quartermaster/belterdock/gear) "nWj" = ( /obj/machinery/computer/roguezones{ @@ -20501,15 +20191,10 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/Dorm_9) "nYH" = ( -/obj/machinery/mineral/unloading_machine, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 1 - }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/belterdock/refinery) +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/reinforced, +/area/quartermaster/miningdock) "nYR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -21105,13 +20790,10 @@ /turf/simulated/wall/prepainted/security, /area/security/brig) "osx" = ( -/obj/machinery/conveyor{ - dir = 8; - id = "mining_interior" - }, -/obj/machinery/mineral/input, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/belterdock/refinery) +/obj/machinery/door/airlock/mining, +/obj/map_helper/access_helper/airlock/station/supply/mining, +/turf/simulated/floor/plating, +/area/endeavour/surfacebase/mining_main/break_room) "osL" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -21143,6 +20825,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Refinery"; + dir = 8 + }, +/obj/map_helper/access_helper/airlock/station/supply/mining, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/break_room) "otM" = ( @@ -21411,11 +21098,8 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portamidhall) "oBE" = ( @@ -21822,10 +21506,12 @@ /turf/simulated/floor/tiled/dark, /area/security/brig) "oOy" = ( -/obj/structure/dispenser/oxygen, -/obj/effect/floor_decal/industrial/warning/cee, -/turf/simulated/floor/tiled/monotechmaint, -/area/quartermaster/belterdock/refinery) +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/item/stool, +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/foyer) "oOG" = ( /obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ @@ -21913,18 +21599,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) "oUd" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 6 - }, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/borderfloor/corner2, -/obj/effect/floor_decal/corner/brown/bordercorner2, -/obj/structure/flora/pottedplant/minitree, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/belterdock/refinery) +/obj/structure/table/standard, +/obj/item/hand_labeler, +/obj/item/hand_labeler, +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/foyer) "oUr" = ( /obj/machinery/power/sensor{ name = "Powernet Sensor - Solar Farm Input"; @@ -21992,9 +21671,23 @@ /turf/simulated/floor/tiled, /area/security/hanger) "oXi" = ( -/obj/machinery/mineral/processing_unit, +/obj/structure/table/standard, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/destTagger, +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -24 + }, +/obj/machinery/camera/network/cargo{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/belterdock/refinery) +/area/quartermaster/foyer) "oXu" = ( /obj/structure/cable/orange{ icon_state = "1-2" @@ -22034,6 +21727,9 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "oYK" = ( @@ -22146,30 +21842,16 @@ /turf/simulated/floor/carpet, /area/security/detectives_office) "pdF" = ( -/obj/structure/sign/department/mail{ - pixel_x = -32 - }, -/obj/structure/table/standard, -/obj/item/packageWrap, -/obj/item/packageWrap, -/obj/item/packageWrap, -/obj/item/destTagger, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -24 - }, +/obj/structure/frame, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) +"pdT" = ( +/obj/effect/floor_decal/corner/brown/diagonal, /obj/machinery/camera/network/cargo{ - dir = 4 - }, -/obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/delivery) -"pdT" = ( -/obj/structure/table/steel_reinforced, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/techmaint, +/obj/machinery/fire_alarm/east_mount, +/turf/simulated/floor/tiled/white, /area/quartermaster/warehouse) "ped" = ( /obj/landmark/observer_spawn, @@ -22450,23 +22132,18 @@ /turf/simulated/wall/prepainted/civilian, /area/crew_quarters/kitchen) "pkW" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/closet/firecloset, +/obj/machinery/light{ + dir = 1 }, -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/warehouse) "plt" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -22614,16 +22291,8 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "pqk" = ( -/obj/effect/floor_decal/spline/fancy/wood, -/obj/structure/table/wooden_reinforced, -/obj/machinery/chemical_dispenser/catering/bar_soft{ - dir = 1 - }, -/obj/item/storage/box/glasses/square{ - pixel_x = -25; - pixel_y = 6 - }, -/turf/simulated/floor/wood, +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, /area/endeavour/surfacebase/mining_main/break_room) "pqE" = ( /obj/machinery/vending/hydroseeds, @@ -22633,12 +22302,9 @@ /turf/simulated/floor/tiled/dark, /area/security/brig) "pqO" = ( -/obj/structure/bed/chair/comfy/teal, -/obj/machinery/light/small{ - dir = 1 - }, +/obj/structure/undies_wardrobe, /turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) +/area/maintenance/cargo) "pqT" = ( /obj/effect/floor_decal/corner/red{ dir = 6 @@ -22722,16 +22388,15 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "prw" = ( -/obj/machinery/mineral/output, -/obj/machinery/light{ - dir = 4; - use_power = 0 - }, -/obj/machinery/conveyor{ - id = "mining_interior" - }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/belterdock/refinery) +/obj/machinery/light, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/structure/table/reinforced, +/turf/simulated/floor/reinforced, +/area/quartermaster/miningdock) "prZ" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -22780,7 +22445,7 @@ /obj/structure/disposalpipe/segment{ dir = 8 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/maintenance/bar/lower) "puT" = ( /obj/machinery/door/firedoor/glass, @@ -22801,16 +22466,13 @@ /turf/simulated/floor/tiled/monotile, /area/security/brig) "pvB" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/brown/border{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, -/obj/structure/bed/chair/sofa/black/right{ +/obj/structure/bed/chair/comfy{ dir = 4 }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "pvX" = ( /obj/effect/floor_decal/corner/green{ @@ -22824,8 +22486,9 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "pwn" = ( -/turf/simulated/wall/prepainted/cargo, -/area/quartermaster/delivery) +/obj/spawner/window/low_wall/full/firelocks/nogrille, +/turf/simulated/floor/plating, +/area/crew_quarters/sleep/Dorm_13) "pwo" = ( /turf/simulated/wall/r_wall/prepainted/civilian, /area/crew_quarters/game_room) @@ -22866,30 +22529,17 @@ "pxU" = ( /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/heads/hos) -"pyb" = ( -/obj/structure/table/steel_reinforced, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/fiftyspawner/tritium, -/obj/fiftyspawner/tritium, -/obj/fiftyspawner/tritium, -/obj/fiftyspawner/tritium, -/obj/fiftyspawner/tritium, -/turf/simulated/floor/tiled/techmaint, -/area/quartermaster/warehouse) "pyh" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/obj/effect/floor_decal/corner/brown/border{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 }, -/obj/structure/bed/chair/comfy/brown{ +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/monodark, /area/quartermaster/foyer) "pyZ" = ( /obj/structure/cable/green{ @@ -22949,42 +22599,21 @@ "pCQ" = ( /turf/simulated/wall/r_wall/prepainted, /area/maintenance/dormitory) -"pDb" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/warehouse) "pDe" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/riot_control) "pDn" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 5 - }, /obj/machinery/vending/coffee, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/dark, /area/endeavour/surfacebase/mining_main/break_room) "pDx" = ( /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/monotile, +/obj/effect/floor_decal/spline/fancy/wood, +/turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "pDN" = ( /obj/machinery/door/firedoor/glass, @@ -23128,8 +22757,11 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "pHB" = ( -/obj/structure/table/steel_reinforced, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/structure/table/reinforced, +/obj/machinery/recharger, +/obj/machinery/light, +/turf/simulated/floor/tiled/white, /area/quartermaster/warehouse) "pIT" = ( /obj/structure/cable{ @@ -23192,12 +22824,6 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "pJR" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -23208,6 +22834,12 @@ dir = 2; icon_state = "pipe-j2" }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "pKe" = ( @@ -23223,9 +22855,15 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "pMS" = ( -/obj/structure/closet/wardrobe, -/turf/simulated/floor/carpet/blue, -/area/crew_quarters/sleep/Dorm_11) +/obj/machinery/power/apc/west_mount{ + cell_type = /obj/item/cell/super + }, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/carpet/turcarpet, +/area/crew_quarters/sleep/Dorm_13) "pNn" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/machinery/light/small{ @@ -23306,9 +22944,13 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/security/security_processing) "pOK" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/tiled/white, +/obj/item/skub, +/obj/item/material/twohanded/baseballbat{ + pixel_x = -6; + pixel_y = 9 + }, +/obj/structure/table/fancyblack, +/turf/simulated/floor/plating, /area/quartermaster/belterdock/gear) "pON" = ( /obj/machinery/floodlight, @@ -23463,19 +23105,12 @@ /turf/simulated/floor/plating, /area/maintenance/substation/civilian) "pUj" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/bed/chair/comfy/black{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/monodark, /area/quartermaster/foyer) "pUu" = ( /obj/machinery/light{ @@ -23507,15 +23142,6 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"pVz" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/foyer) "pWD" = ( /obj/structure/table/rack, /obj/effect/floor_decal/industrial/outline/yellow, @@ -23555,7 +23181,7 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/maintenance/bar/lower) "pXE" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -23797,21 +23423,27 @@ /turf/simulated/floor/plating, /area/maintenance/cargo) "qek" = ( +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-4" + }, /obj/effect/floor_decal/borderfloor{ - dir = 1 + dir = 9 }, /obj/effect/floor_decal/corner/brown/border{ - dir = 1 + dir = 9 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, /obj/effect/floor_decal/corner/brown/bordercorner2{ - dir = 1 + dir = 10 }, -/obj/machinery/power/apc/north_mount, -/obj/structure/cable/green{ - icon_state = "0-4" +/obj/effect/floor_decal/corner/brown/bordercorner2{ + dir = 1 }, /turf/simulated/floor/tiled, /area/endeavour/surfacebase/mining_main/break_room) @@ -23884,12 +23516,8 @@ /turf/simulated/floor/carpet/bcarpet, /area/quartermaster/qm) "qiz" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/item/stool/padded, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, +/obj/structure/table/borosilicate, +/turf/simulated/floor/tiled/dark, /area/quartermaster/belterdock/gear) "qjv" = ( /obj/effect/floor_decal/industrial/warning/full, @@ -23994,14 +23622,10 @@ /turf/simulated/floor/tiled/old_tile/gray, /area/security/range) "qmQ" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 4 - }, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/dark, +/obj/effect/paint/beastybrown, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, /area/quartermaster/warehouse) "qmV" = ( /obj/structure/cable{ @@ -24115,10 +23739,9 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/bedrooms) "qoU" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, -/turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/obj/structure/table/gamblingtable, +/turf/simulated/floor/wood, +/area/endeavour/surfacebase/mining_main/break_room) "qoW" = ( /obj/structure/table/woodentable, /obj/machinery/microwave, @@ -24142,24 +23765,12 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "qpd" = ( -/obj/machinery/camera/network/civilian{ - dir = 8 - }, -/obj/machinery/newscaster{ - pixel_x = 30 - }, -/obj/structure/flora/pottedplant/fern, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) +/obj/structure/disposalpipe/segment, +/turf/simulated/wall/r_wall/prepainted/cargo, +/area/quartermaster/foyer) "qpi" = ( -/obj/structure/bed/chair/comfy/beige{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/carpet/turcarpet, -/area/crew_quarters/recreation_area) +/turf/simulated/floor/reinforced, +/area/quartermaster/qm) "qpE" = ( /obj/structure/table/steel_reinforced, /obj/machinery/cell_charger, @@ -24263,14 +23874,6 @@ /obj/machinery/holopad, /turf/simulated/floor/tiled/dark, /area/security/lobby) -"qvo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/foyer) "qvz" = ( /obj/item/stool/padded, /obj/effect/floor_decal/spline/fancy/wood{ @@ -24419,17 +24022,10 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_5) "qAh" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/borderfloorblack/corner{ - dir = 4 - }, -/obj/effect/floor_decal/corner/brown/bordercorner{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/foyer) +/obj/structure/closet/firecloset/full/double, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "qAl" = ( /obj/machinery/conveyor{ dir = 4; @@ -24532,45 +24128,18 @@ /turf/simulated/floor/tiled, /area/security/lobby) "qDe" = ( -/obj/structure/table/steel_reinforced, -/obj/item/storage/toolbox/electrical{ - pixel_y = 1 +/obj/machinery/door/airlock{ + id_tag = "dormx"; + name = "Maintenance Access" }, -/turf/simulated/floor/tiled/techmaint, -/area/quartermaster/warehouse) +/turf/simulated/floor/plating, +/area/maintenance/cargo) "qDH" = ( /turf/simulated/wall/r_wall, /area/space) "qDS" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 1 - }, -/obj/item/clothing/accessory/permit/gun/planetside, -/obj/item/clothing/accessory/permit/gun/planetside, -/obj/item/clothing/accessory/permit/gun/planetside, -/obj/item/clothing/accessory/permit/gun/planetside, -/obj/structure/table/reinforced, -/obj/machinery/door/window/southright{ - req_one_access = list(48) - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 - }, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/gun/energy/kinetic_accelerator, -/obj/item/gun/energy/kinetic_accelerator, -/obj/effect/floor_decal/corner/brown/diagonal, -/turf/simulated/floor/tiled/white, +/obj/item/banner/cargo, +/turf/simulated/floor/tiled/dark, /area/quartermaster/belterdock/gear) "qEf" = ( /turf/simulated/wall/prepainted, @@ -24669,12 +24238,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/hallway) -"qIo" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/reinforced, -/area/quartermaster/miningdock) "qIr" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/brown/border, @@ -24753,16 +24316,6 @@ /obj/effect/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/qm) -"qLx" = ( -/obj/machinery/status_display/supply_display{ - mode = 99; - pixel_y = 32 - }, -/obj/structure/table/wooden_reinforced, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/fiftyspawner/steel, -/turf/simulated/floor/wood, -/area/quartermaster/office) "qLB" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/structure/cable/green{ @@ -24807,17 +24360,10 @@ /turf/simulated/floor/carpet, /area/security/detectives_office) "qMz" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 1 - }, -/obj/machinery/air_alarm{ - pixel_y = 22 - }, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/belterdock/refinery) +/obj/machinery/suit_storage_unit/mining, +/obj/effect/floor_decal/corner/brown/diagonal, +/turf/simulated/floor/tiled/white, +/area/quartermaster/warehouse) "qMN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -24838,28 +24384,21 @@ /turf/simulated/floor/tiled/dark, /area/prison/cell_block) "qMP" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/techmaint, -/area/quartermaster/warehouse) -"qNE" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 6 - }, -/obj/machinery/vending/snack, -/turf/simulated/floor/wood, -/area/endeavour/surfacebase/mining_main/break_room) -"qNM" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/structure/extinguisher_cabinet{ + pixel_x = 27 }, -/obj/structure/disposalpipe/segment{ +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal, +/obj/machinery/camera/network/civilian{ dir = 8 }, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) +/area/crew_quarters/recreation_area) +"qNM" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/beastybrown, +/turf/simulated/floor/plating, +/area/quartermaster/miningdock) "qOp" = ( /obj/structure/table/reinforced, /obj/item/mass_spectrometer/adv, @@ -24884,20 +24423,12 @@ /turf/simulated/floor/tiled, /area/crew_quarters/recreation_area) "qPi" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4 +/obj/structure/lattice, +/obj/machinery/camera/network/outside{ + dir = 1 }, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/warehouse) +/turf/simulated/floor/airless/ceiling, +/area/space) "qPw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -25021,17 +24552,16 @@ /turf/simulated/floor/tiled/dark, /area/security/lobby) "qVI" = ( -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil{ + pixel_y = 4 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/item/stack/cable_coil{ + pixel_y = -5 }, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/belterdock/refinery) +/obj/structure/table/reinforced, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) "qVJ" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1379; @@ -25048,11 +24578,12 @@ /turf/simulated/wall/r_wall/prepainted/engineering, /area/security/hallway) "qWd" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/delivery) +/turf/simulated/floor/tiled/white, +/area/quartermaster/warehouse) "qXh" = ( /obj/machinery/light/small{ dir = 8 @@ -25411,14 +24942,6 @@ }, /turf/simulated/floor/airless, /area/space) -"rlz" = ( -/obj/effect/floor_decal/borderfloorblack/corner, -/obj/effect/floor_decal/corner/brown/bordercorner, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/warehouse) "rlJ" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass{ @@ -25428,14 +24951,9 @@ /turf/simulated/floor/crystal, /area/endeavour/hallway/d3fwdhall) "rmb" = ( -/obj/structure/catwalk, -/obj/machinery/door/airlock/maintenance, -/obj/map_helper/access_helper/airlock/station/supply/maintenance, -/obj/machinery/door/firedoor{ - dir = 8 - }, +/obj/machinery/light, /turf/simulated/floor/plating, -/area/quartermaster/foyer) +/area/endeavour/surfacebase/mining_main/break_room) "rme" = ( /obj/structure/table/woodentable, /obj/machinery/recharger, @@ -25709,11 +25227,16 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) "rvC" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "2-8" }, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/belterdock/refinery) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/foyer) "rvT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -25911,8 +25434,15 @@ /turf/simulated/wall/prepainted, /area/maintenance/cargo) "rBZ" = ( -/turf/simulated/wall/r_wall/prepainted, -/area/crew_quarters/sleep/Dorm_11) +/obj/structure/bed/chair/comfy/brown, +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/bordercorner{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/foyer) "rCI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -25988,11 +25518,11 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "rDV" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ - dir = 8 +/obj/structure/bed/chair/comfy/brown{ + dir = 4 }, -/turf/simulated/floor/carpet/blue, -/area/crew_quarters/sleep/Dorm_11) +/turf/simulated/floor/wood, +/area/maintenance/cargo) "rEa" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -26024,18 +25554,6 @@ "rEk" = ( /turf/simulated/wall/r_wall, /area/maintenance/bar/catwalk) -"rEu" = ( -/obj/machinery/sheet_silo_loader{ - dir = 1 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning/dust{ - dir = 8 - }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/belterdock/refinery) "rEv" = ( /obj/structure/cable/green{ icon_state = "0-8" @@ -26161,12 +25679,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/landmark/spawnpoint/job/shaft_miner, /obj/structure/disposalpipe/segment{ dir = 1; icon_state = "pipe-c" }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 4 + }, +/turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "rLt" = ( /obj/structure/closet/secure_closet/brig{ @@ -26224,10 +25744,13 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "rMY" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/closet/crate/large, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/warehouse) +/obj/structure/table/fancyblack, +/obj/item/kit/paint/ripley/arnold, +/obj/item/kit/paint/ripley/flames_red, +/obj/item/kit/paint/ripley/flames_blue, +/obj/item/kit/paint/ripley/dreadnought, +/turf/simulated/floor/plating, +/area/quartermaster/belterdock/gear) "rNH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -26300,7 +25823,9 @@ /obj/effect/floor_decal/corner/brown/bordercorner2{ dir = 8 }, -/obj/structure/window/reinforced/survival_pod, +/obj/structure/poster/preset/baystation/bay_58{ + pixel_x = -31 + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "rOR" = ( @@ -26314,22 +25839,11 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/starboardsolar) "rOW" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/brown/border, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/camera/network/civilian{ dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/belterdock/refinery) +/turf/simulated/floor/wood, +/area/crew_quarters/sleep/Dorm_13) "rPa" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/navblue/border, @@ -26343,9 +25857,8 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/security/security_processing) "rPE" = ( -/obj/machinery/suit_storage_unit/mining, -/obj/effect/floor_decal/corner/brown/diagonal, -/turf/simulated/floor/tiled/white, +/obj/machinery/vending/sovietsoda, +/turf/simulated/floor/plating, /area/quartermaster/belterdock/gear) "rPF" = ( /obj/structure/cable/orange{ @@ -26378,7 +25891,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "rQE" = ( /obj/structure/table/woodentable, @@ -26471,14 +25984,13 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "rTD" = ( +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/item/stool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 8 }, -/turf/simulated/floor/carpet/blue, -/area/crew_quarters/sleep/Dorm_11) +/turf/simulated/floor/tiled/white, +/area/quartermaster/warehouse) "rTM" = ( /obj/machinery/light/small, /turf/simulated/floor/tiled/white, @@ -26561,6 +26073,10 @@ }, /obj/structure/table/steel_reinforced, /obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/machinery/status_display/supply_display{ + mode = 99; + pixel_y = 32 + }, /turf/simulated/floor/tiled/monodark, /area/quartermaster/foyer) "rXe" = ( @@ -26711,16 +26227,9 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "sbx" = ( -/obj/structure/table/steel_reinforced, -/obj/fiftyspawner/steel, -/obj/fiftyspawner/steel, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/landmark/spawnpoint/job/shaft_miner, +/turf/simulated/floor/tiled/white, /area/quartermaster/warehouse) "scb" = ( /obj/structure/table/woodentable, @@ -26966,11 +26475,16 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/security/evidence_storage) "sjO" = ( -/obj/structure/closet/firecloset, -/obj/machinery/light{ +/obj/effect/floor_decal/borderfloorblack{ dir = 1 }, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "sky" = ( /obj/structure/table/woodentable, @@ -27057,8 +26571,10 @@ /turf/simulated/floor/tiled, /area/security/hanger) "sms" = ( -/obj/structure/closet/wardrobe/black, -/turf/simulated/floor/carpet/turcarpet, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/wall/r_wall/prepainted, /area/crew_quarters/recreation_area) "smC" = ( /obj/structure/cable/green{ @@ -27464,12 +26980,19 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "sxc" = ( -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 1 +/obj/machinery/conveyor{ + dir = 6; + id = "mining_interior" }, -/obj/machinery/recharge_station, -/turf/simulated/floor/tiled/monotechmaint, -/area/quartermaster/belterdock/refinery) +/obj/structure/plasticflaps/mining, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 8 + }, +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/miningdock) "sxq" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -27600,14 +27123,10 @@ /turf/space/basic, /area/security/range) "sDb" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/belterdock/refinery) +/obj/structure/catwalk, +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "sDc" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, @@ -27706,17 +27225,12 @@ /turf/simulated/floor/wood, /area/quartermaster/office) "sFX" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/machinery/door/firedoor, /turf/simulated/floor/tiled/monotile, /area/quartermaster/belterdock/refinery) "sFZ" = ( @@ -27755,13 +27269,16 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "sGH" = ( -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/machinery/conveyor_switch/oneway{ + id = "mining_interior"; + name = "refining conveyor"; + pixel_y = 2; + pixel_x = -11 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 1 }, -/turf/simulated/floor/reinforced, +/turf/simulated/floor/tiled/monodark, /area/quartermaster/miningdock) "sHr" = ( /obj/machinery/light{ @@ -27858,14 +27375,8 @@ /turf/simulated/floor/tiled/dark, /area/maintenance/starboardsolar) "sMN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/monodark, +/obj/structure/salvageable/computer, +/turf/simulated/floor/plating, /area/quartermaster/delivery) "sNh" = ( /obj/structure/disposalpipe/segment, @@ -27907,13 +27418,8 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "sOt" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, +/obj/structure/window/reinforced, +/turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) "sOD" = ( /obj/item/stool/padded, @@ -28011,12 +27517,6 @@ /turf/space, /area/space) "sTs" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 4 }, @@ -28024,6 +27524,12 @@ dir = 4 }, /obj/structure/disposalpipe/junction, +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "sTR" = ( @@ -28072,18 +27578,16 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "sVr" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 1 - }, -/obj/structure/bed/chair/sofa/black/left, /obj/machinery/light{ dir = 1; pixel_y = 20 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 1 + }, +/obj/structure/table/wooden_reinforced, +/obj/machinery/microwave, +/turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "sVD" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -28265,9 +27769,6 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 1 }, -/obj/structure/sign/department/cargo{ - pixel_y = 32 - }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "taa" = ( @@ -28341,11 +27842,11 @@ /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "tcb" = ( -/obj/structure/window/reinforced/survival_pod{ - dir = 4 +/obj/effect/floor_decal/industrial/outline{ + color = "#D6DBDB" }, -/obj/structure/dispenser/oxygen, -/turf/simulated/floor/tiled/techmaint, +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/tiled/monodark, /area/quartermaster/warehouse) "tcl" = ( /obj/structure/closet/wardrobe, @@ -28354,17 +27855,6 @@ /obj/machinery/power/apc/south_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_10) -"tdf" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/brown/border, -/obj/machinery/status_display/supply_display{ - pixel_y = -32 - }, -/obj/structure/bed/chair/sofa/black{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/foyer) "tdj" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -28372,12 +27862,6 @@ /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "tdk" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, @@ -28395,19 +27879,10 @@ /turf/simulated/floor/wood, /area/quartermaster/office) "tds" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/machinery/door/airlock/glass/mining{ - name = "Mining Prep Room"; - req_one_access = null - }, -/obj/map_helper/access_helper/airlock/station/supply/mining, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/white, +/obj/machinery/door/airlock/mining, +/obj/map_helper/access_helper/airlock/station/supply/mining, +/turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "tdG" = ( /turf/simulated/wall/r_wall/prepainted/cargo, @@ -28451,14 +27926,12 @@ /turf/simulated/floor/tiled, /area/security/hanger) "tgP" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/brown/border{ +/obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/structure/bed/chair/sofa/black, -/turf/simulated/floor/tiled, +/obj/structure/table/wooden_reinforced, +/obj/machinery/chemical_dispenser/catering/bar_coffee, +/turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "thy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -28507,11 +27980,10 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "til" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/delivery) +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/machinery/suit_cycler/mining, +/turf/simulated/floor/tiled/white, +/area/quartermaster/warehouse) "tix" = ( /obj/structure/filingcabinet/security{ name = "Security Records" @@ -28593,21 +28065,9 @@ /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) "tkT" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 4 - }, -/obj/machinery/power/apc/east_mount, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/structure/bed/chair/sofa/black/right{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/foyer) +/obj/structure/salvageable/server, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) "tle" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/structure/table/woodentable, @@ -28634,12 +28094,12 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "tmi" = ( -/obj/machinery/conveyor{ - dir = 5; - id = "mining_interior" +/obj/machinery/light_switch{ + pixel_x = -26; + pixel_y = 4 }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/belterdock/refinery) +/turf/simulated/floor/wood, +/area/maintenance/cargo) "tne" = ( /obj/machinery/door/firedoor{ dir = 1 @@ -28669,7 +28129,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/maintenance/bar/lower) "tos" = ( /obj/machinery/ai_status_display{ @@ -28879,22 +28339,20 @@ /turf/simulated/floor/tiled/monodark, /area/quartermaster/warehouse) "twA" = ( -/obj/structure/table/standard, -/obj/item/paper_bin, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 10 - }, -/obj/effect/floor_decal/corner/brown/bordercorner2{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/camera/network/cargo{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/light{ +/obj/structure/disposalpipe/segment{ dir = 8 }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/delivery) +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area) "twR" = ( /turf/simulated/wall/r_wall/prepainted/cargo, /area/quartermaster/qm) @@ -28979,7 +28437,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/turf/simulated/floor/tiled, +/obj/structure/bed/chair/comfy{ + dir = 8 + }, +/turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "tBs" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, @@ -29080,17 +28541,19 @@ /turf/simulated/floor/tiled/old_cargo/white, /area/security/forensics) "tEQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled/dark, +/obj/machinery/door/blast/shutters{ + density = 0; + dir = 2; + icon_state = "shutter0"; + id = "cargo_line_shutter"; + name = "Cargo Line shutter"; + opacity = 0 + }, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/beastybrown, +/turf/simulated/floor/plating, /area/quartermaster/foyer) "tES" = ( -/obj/machinery/light{ - dir = 1; - pixel_y = 20 - }, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -29100,6 +28563,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "tGi" = ( @@ -29147,10 +28611,6 @@ }, /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) -"tHq" = ( -/obj/landmark/spawnpoint/job/cargo_technician, -/turf/simulated/floor/tiled/techmaint, -/area/quartermaster/warehouse) "tHC" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, @@ -29552,17 +29012,13 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "tVX" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 8 - }, -/obj/machinery/camera/network/cargo{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/borderfloorblack/corner, +/obj/effect/floor_decal/corner/brown/bordercorner, /turf/simulated/floor/tiled/dark, -/area/quartermaster/foyer) +/area/quartermaster/warehouse) "tWm" = ( /obj/structure/closet/l3closet/security, /obj/machinery/air_alarm{ @@ -29670,13 +29126,7 @@ req_access = list(); pixel_y = -26 }, -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 10 - }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "tZY" = ( /obj/machinery/computer/security{ @@ -29915,9 +29365,10 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "uhE" = ( -/obj/landmark/spawnpoint/job/cargo_technician, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/delivery) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/ore_box, +/turf/simulated/floor/reinforced, +/area/quartermaster/miningdock) "uhW" = ( /obj/item/bedsheet/purpledouble, /obj/structure/bed/double/padded, @@ -29959,23 +29410,18 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "uiJ" = ( -/obj/spawner/window/low_wall/reinforced/full/firelocks, -/obj/effect/paint/beastybrown, -/turf/simulated/floor/plating, -/area/quartermaster/delivery) -"uiK" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "2-8" }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 1 +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 }, -/obj/effect/floor_decal/corner/brown/bordercorner2{ - dir = 1 +/obj/effect/floor_decal/corner/brown/bordercorner{ + dir = 8 }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/foyer) +"uiK" = ( /obj/machinery/light{ dir = 1 }, @@ -29983,7 +29429,7 @@ dir = 2; icon_state = "pipe-c" }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "uiN" = ( /obj/structure/cable/green{ @@ -30051,14 +29497,11 @@ /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "ukf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3portforhall) +/obj/item/tool/crowbar/red, +/obj/structure/table/reinforced, +/obj/item/tool/screwdriver, +/turf/simulated/floor/plating, +/area/quartermaster/delivery) "ukT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -30086,18 +29529,12 @@ /turf/simulated/floor/crystal, /area/endeavour/hallway/d3fwdhall) "ulx" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/brown/border, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/brown/bordercorner2{ - dir = 9 +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/item/stool/padded{ + pixel_y = 13 }, -/obj/structure/table/steel_reinforced, -/obj/item/storage/box/lights/mixed, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/belterdock/refinery) +/turf/simulated/floor/tiled/white, +/area/quartermaster/warehouse) "ulH" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -30131,9 +29568,21 @@ /turf/simulated/floor/tiled/dark, /area/security/armoury) "umx" = ( -/obj/machinery/lathe/autolathe, -/obj/machinery/light, -/turf/simulated/floor/tiled/techmaint, +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/item/stack/flag/yellow{ + pixel_x = 42; + pixel_y = 1 + }, +/obj/item/stack/flag/yellow{ + pixel_x = 42; + pixel_y = 2 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/white, /area/quartermaster/warehouse) "umX" = ( /obj/machinery/fire_alarm/east_mount, @@ -30180,13 +29629,11 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/security/evidence_storage) "upo" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = 27 +/obj/machinery/air_alarm{ + pixel_y = 22 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) +/turf/simulated/floor/reinforced, +/area/quartermaster/qm) "upw" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -30223,29 +29670,10 @@ /turf/simulated/floor/carpet, /area/security/detectives_office) "uqr" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/warehouse) +/obj/structure/closet/emcloset, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "url" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor{ @@ -30433,15 +29861,6 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) -"uwI" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/fire_alarm/west_mount{ - pixel_x = -24 - }, -/turf/simulated/floor/carpet/blue, -/area/crew_quarters/sleep/Dorm_11) "uwR" = ( /obj/structure/cable/orange{ icon_state = "1-2" @@ -30457,13 +29876,10 @@ /turf/simulated/floor/plating, /area/security/hallway) "uxX" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/obj/structure/sign/directions/roomnum{ - dir = 4; - pixel_y = 24 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) +/obj/structure/window/reinforced, +/obj/landmark/spawnpoint/job/cargo_technician, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/warehouse) "uxZ" = ( /obj/structure/table/bench/steel, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -30509,18 +29925,14 @@ /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "uzS" = ( +/obj/machinery/recharge_station, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, -/obj/structure/bed/chair/sofa/black/left, -/obj/machinery/status_display/supply_display{ - mode = 99; - pixel_y = 32 - }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) "uAl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -30552,12 +29964,18 @@ /turf/simulated/floor/carpet, /area/security/detectives_office) "uAU" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/brown/border, -/obj/structure/table/steel_reinforced, -/obj/machinery/recharger, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/belterdock/refinery) +/obj/structure/sign/warning/moving_parts{ + pixel_y = 32 + }, +/obj/machinery/conveyor_switch/oneway{ + tag = "mailroom"; + id = "DLBelt" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/foyer) "uBK" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -30754,9 +30172,8 @@ /turf/simulated/floor, /area/security/brig) "uJr" = ( -/obj/machinery/fire_alarm/west_mount, -/turf/simulated/floor/tiled/techmaint, -/area/quartermaster/warehouse) +/turf/simulated/floor/wood, +/area/maintenance/cargo) "uJv" = ( /obj/machinery/holopad, /turf/simulated/floor/tiled, @@ -30964,16 +30381,13 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) "uNM" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 1 - }, /obj/machinery/camera/network/cargo, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/spline/fancy/wood{ + dir = 5 + }, +/turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "uOI" = ( /obj/machinery/door/firedoor, @@ -31057,15 +30471,12 @@ /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3aftmaint) "uRz" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/turf/simulated/floor/tiled/white, +/obj/machinery/light/small, +/turf/simulated/floor/plating, /area/quartermaster/belterdock/gear) "uRN" = ( -/obj/machinery/power/apc/north_mount, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/turf/simulated/floor/tiled/monodark, +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, /area/quartermaster/delivery) "uSv" = ( /obj/structure/table/woodentable, @@ -31328,18 +30739,10 @@ /turf/simulated/floor/plating, /area/crew_quarters/recreation_area) "vaA" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/brown/border, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/air_alarm{ + pixel_y = 22 }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "vaR" = ( /obj/structure/sign/securearea{ @@ -31401,14 +30804,8 @@ /turf/simulated/floor/tiled/dark, /area/security/warden) "veW" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 1 - }, -/obj/structure/table/woodentable, -/obj/structure/flora/pottedplant/smallcactus{ - pixel_y = 12 - }, -/turf/simulated/floor/wood, +/obj/machinery/vending/fitness, +/turf/simulated/floor/tiled/dark, /area/endeavour/surfacebase/mining_main/break_room) "vfa" = ( /turf/simulated/floor/carpet/purcarpet, @@ -31668,15 +31065,8 @@ /turf/simulated/floor/plating, /area/security/brig) "vlO" = ( +/obj/structure/window/reinforced, /obj/structure/table/steel_reinforced, -/obj/fiftyspawner/glass, -/obj/fiftyspawner/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) "vmT" = ( @@ -31703,19 +31093,14 @@ /turf/simulated/floor/tiled/dark, /area/security/tactical) "vng" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 }, -/obj/structure/bed/chair/comfy/brown{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/monodark, /area/quartermaster/foyer) "vnn" = ( /turf/simulated/wall/r_wall/prepainted/security, @@ -32080,9 +31465,7 @@ /turf/simulated/floor/tiled/dark, /area/security/warden) "vyv" = ( -/obj/effect/floor_decal/spline/fancy/wood, -/obj/machinery/light, -/turf/simulated/floor/wood, +/turf/simulated/floor/plating, /area/endeavour/surfacebase/mining_main/break_room) "vyR" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -32199,14 +31582,12 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "vAk" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = 32 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/effect/floor_decal/industrial/outline{ + color = "#D6DBDB" }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) +/obj/structure/reagent_dispensers/fueltank, +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/warehouse) "vAp" = ( /obj/structure/window/basic{ dir = 1 @@ -32324,14 +31705,17 @@ /area/crew_quarters/sleep/bedrooms) "vCC" = ( /obj/effect/floor_decal/borderfloorblack{ - dir = 1 + dir = 6 }, /obj/effect/floor_decal/corner/brown/border{ - dir = 1 + dir = 6 }, -/obj/structure/bed/chair/sofa/black/right, +/obj/structure/bed/chair/sofa/black/corner{ + dir = 8 + }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, -/area/quartermaster/warehouse) +/area/quartermaster/foyer) "vCG" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -32342,6 +31726,9 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "vDg" = ( @@ -32505,12 +31892,6 @@ /obj/item/reagent_containers/glass/bucket, /turf/simulated/floor/tiled/dark, /area/janitor) -"vGd" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/belterdock/refinery) "vGl" = ( /obj/machinery/chem_master, /turf/simulated/floor/tiled/old_cargo/white, @@ -32539,9 +31920,6 @@ }, /turf/simulated/floor/tiled/old_cargo/white, /area/security/forensics) -"vIe" = ( -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) "vIs" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/darkred, @@ -32698,10 +32076,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/tactical) -"vMr" = ( -/obj/structure/closet/secure_closet/cargotech, -/turf/simulated/floor/tiled/techmaint, -/area/quartermaster/warehouse) "vMB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -32900,7 +32274,7 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/maintenance/bar/lower) "vSl" = ( /turf/simulated/wall/r_wall/prepainted/cargo, @@ -33147,18 +32521,12 @@ /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "vZG" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 1 - }, -/obj/machinery/status_display/supply_display{ - mode = 99; - pixel_y = 32 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/foyer) +/obj/machinery/computer/timeclock/premade/north, +/turf/simulated/floor/wood, +/area/crew_quarters/recreation_area_hallway) "vZR" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central6{ dir = 4 @@ -33394,14 +32762,22 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "wku" = ( -/obj/machinery/light/small{ - dir = 1 +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/landmark/spawnpoint/job/shaft_miner, +/obj/item/stool/padded{ + pixel_y = 13 }, -/turf/simulated/floor/plating, -/area/maintenance/bar/catwalk) +/turf/simulated/floor/tiled/white, +/area/quartermaster/warehouse) "wkw" = ( /obj/structure/table/marble, /obj/machinery/cash_register/civilian{ @@ -33417,7 +32793,9 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 4 }, -/obj/machinery/fire_alarm/east_mount, +/obj/structure/bed/chair/sofa/black/right{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "wkY" = ( @@ -33481,11 +32859,10 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) "wmU" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 5 - }, -/obj/structure/flora/grass/event/purple_flowers1, -/turf/simulated/floor/grass, +/obj/structure/table/steel_reinforced, +/obj/fiftyspawner/glass, +/obj/fiftyspawner/glass, +/turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) "wns" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -33521,10 +32898,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) "woK" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -33636,12 +33009,15 @@ /turf/simulated/floor/carpet/purcarpet, /area/maintenance/dormitory) "wrG" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/machinery/vending/coffee, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/quartermaster/belterdock/gear) +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/quartermaster/warehouse) "wrN" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -33824,14 +33200,9 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "wxp" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/corner/brown/bordercorner{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/belterdock/refinery) +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/space) "wxK" = ( /obj/structure/cable{ icon_state = "4-8" @@ -33860,19 +33231,11 @@ /turf/simulated/floor/tiled/dark, /area/security/tactical) "wzB" = ( -/obj/machinery/conveyor{ - dir = 6; - id = "mining_interior" - }, -/obj/structure/plasticflaps/mining, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/warning/dust{ +/obj/effect/floor_decal/industrial/warning{ dir = 8 }, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/belterdock/refinery) +/area/quartermaster/foyer) "wzV" = ( /turf/simulated/wall/r_wall/prepainted/cargo, /area/quartermaster/belterdock) @@ -33888,11 +33251,9 @@ /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "wAQ" = ( -/obj/machinery/camera/network/civilian{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) +/obj/item/storage/box/monkeycubes, +/turf/simulated/floor/plating, +/area/quartermaster/belterdock/gear) "wAR" = ( /obj/item/radio/intercom{ pixel_y = -24 @@ -33942,9 +33303,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/sign/department/miner_dock{ - pixel_y = 32 - }, /turf/simulated/floor/reinforced, /area/quartermaster/miningdock) "wCJ" = ( @@ -33986,10 +33344,20 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/kitchen) "wEw" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/structure/table/steel_reinforced, +/obj/item/hand_labeler{ + pixel_y = -1 }, -/turf/simulated/floor/grass, +/obj/item/hand_labeler{ + pixel_y = 2 + }, +/obj/item/hand_labeler{ + pixel_y = 5 + }, +/obj/item/hand_labeler{ + pixel_y = 8 + }, +/turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) "wEW" = ( /obj/structure/bed/double, @@ -34116,10 +33484,13 @@ /turf/simulated/floor/tiled/dark, /area/janitor) "wHG" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ +/obj/machinery/mineral/output, +/obj/effect/floor_decal/industrial/loading{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/window/reinforced, +/turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) "wIy" = ( /obj/map_helper/airlock/door/simple, @@ -34148,17 +33519,15 @@ /turf/simulated/floor/carpet/blue, /area/crew_quarters/sleep/Dorm_3) "wIT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/structure/railing{ + dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/structure/railing{ + dir = 4 }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) +/obj/effect/floor_decal/rust, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "wJO" = ( /obj/structure/table/woodentable, /obj/item/storage/box/donkpockets, @@ -34252,15 +33621,14 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "wOA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/door/firedoor{ + dir = 8 }, -/obj/machinery/light/small, /turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) +/area/crew_quarters/recreation_area) "wQt" = ( /obj/structure/table/woodentable, /obj/item/clothing/accessory/permit/gun, @@ -34362,12 +33730,10 @@ /turf/simulated/floor/tiled, /area/crew_quarters/fitness) "wRS" = ( -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/brown/border, -/obj/structure/window/reinforced/survival_pod, -/obj/machinery/light{ - pixel_y = 7 +/obj/machinery/door/airlock/multi_tile/glass{ + name = "Warehouse" }, +/obj/map_helper/access_helper/airlock/station/supply/department, /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "wTk" = ( @@ -34533,7 +33899,9 @@ pixel_x = -32 }, /obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/dark, +/obj/structure/window/reinforced, +/obj/machinery/vending/nifsoft_shop, +/turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) "wYW" = ( /obj/structure/railing/grey{ @@ -34651,28 +34019,15 @@ /turf/simulated/floor/plating, /area/security/hallway) "xcE" = ( -/obj/item/folder/white, -/obj/structure/table/reinforced, -/obj/machinery/door/window{ - dir = 8; - req_one_access = list(31) - }, -/obj/item/paper_bin{ - pixel_x = -1; - pixel_y = 4 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/item/pen, -/obj/machinery/door/firedoor{ +/obj/effect/floor_decal/industrial/warning/cee{ dir = 8 }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 4 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 4 - }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/delivery) +/obj/structure/dispenser/oxygen, +/turf/simulated/floor/reinforced, +/area/quartermaster/miningdock) "xdM" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_3) @@ -34794,11 +34149,15 @@ /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "xgT" = ( -/obj/structure/bed/chair/comfy/teal{ - dir = 1 +/obj/structure/cable/green{ + icon_state = "2-8" }, -/turf/simulated/floor/wood, -/area/crew_quarters/sleep/Dorm_11) +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 4 + }, +/obj/machinery/recharge_station, +/turf/simulated/floor/reinforced, +/area/quartermaster/miningdock) "xhD" = ( /obj/machinery/air_alarm{ dir = 4; @@ -34901,20 +34260,22 @@ /obj/effect/floor_decal/corner_oldtile/white/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) -"xlv" = ( -/obj/machinery/status_display/supply_display{ - pixel_y = -32 - }, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/foyer) "xlC" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/table/standard, +/obj/item/paper_bin, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 }, -/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ +/obj/effect/floor_decal/corner/brown/bordercorner2{ + dir = 10 + }, +/obj/machinery/camera/network/cargo{ dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/monodark, /area/quartermaster/foyer) "xlR" = ( /obj/machinery/power/apc/south_mount, @@ -34946,8 +34307,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/table/wooden_reinforced, -/turf/simulated/floor/tiled/dark, +/turf/simulated/wall/r_wall/prepainted/cargo, /area/quartermaster/foyer) "xnF" = ( /obj/structure/window/reinforced{ @@ -35040,12 +34400,15 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "xue" = ( -/obj/effect/floor_decal/spline/fancy/wood{ - dir = 4 +/obj/machinery/door/firedoor, +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/machinery/door/airlock/glass/mining{ + name = "Mining Prep Room"; + req_one_access = null }, -/obj/machinery/vending/fitness, -/turf/simulated/floor/wood, -/area/endeavour/surfacebase/mining_main/break_room) +/obj/map_helper/access_helper/airlock/station/supply/mining, +/turf/simulated/floor/tiled/white, +/area/quartermaster/belterdock) "xus" = ( /obj/machinery/light/small{ dir = 8 @@ -35255,9 +34618,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 }, /turf/simulated/floor/wood, /area/quartermaster/qm) @@ -35278,7 +34641,7 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/maintenance/bar/lower) "xzh" = ( /obj/machinery/door/airlock/maintenance/engi{ @@ -35341,12 +34704,6 @@ /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "xCV" = ( -/obj/effect/floor_decal/borderfloorblack/corner{ - dir = 8 - }, -/obj/effect/floor_decal/corner/brown/bordercorner{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, @@ -35384,17 +34741,6 @@ /obj/machinery/smartfridge, /turf/simulated/floor/tiled/monotile, /area/crew_quarters/kitchen) -"xDr" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/foyer) -"xDs" = ( -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/belterdock/refinery) "xDS" = ( /obj/machinery/newscaster{ pixel_y = 32 @@ -35510,6 +34856,10 @@ /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/machinery/air_alarm{ + dir = 4; + pixel_x = -23 + }, /turf/simulated/floor/wood, /area/quartermaster/qm) "xJv" = ( @@ -35530,6 +34880,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/sign/department/miner_dock{ + pixel_y = 32; + pixel_x = -4 + }, /turf/simulated/floor/reinforced, /area/quartermaster/miningdock) "xJx" = ( @@ -35617,18 +34971,13 @@ /turf/simulated/floor/reinforced, /area/quartermaster/miningdock) "xMc" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 1 - }, -/obj/item/radio/intercom{ +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/structure/closet/secure_closet/miner, +/obj/machinery/light{ dir = 1; - name = "Station Intercom (General)"; - pixel_y = 26 + pixel_y = 20 }, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/tiled/white, /area/quartermaster/warehouse) "xMm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -35734,13 +35083,9 @@ /area/crew_quarters/bar) "xPu" = ( /obj/effect/floor_decal/spline/fancy/wood{ - dir = 9 - }, -/obj/machinery/vending/wallmed1{ - dir = 4; - pixel_x = -24; - pixel_y = 2 + dir = 6 }, +/obj/structure/flora/pottedplant/minitree, /turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "xPB" = ( @@ -35754,17 +35099,20 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "xPU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 + dir = 8 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/light/small{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/vending/fitness, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area) +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/foyer) "xQu" = ( /obj/machinery/recharger/wallcharger{ pixel_x = 32; @@ -35817,15 +35165,6 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) -"xSu" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/machinery/door/firedoor{ - dir = 8 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/recreation_area_hallway) "xSF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -35859,12 +35198,8 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_1) "xTv" = ( -/obj/machinery/camera/network/cargo{ - dir = 1 - }, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/effect/floor_decal/industrial/outline/blue, -/turf/simulated/floor/reinforced, +/obj/machinery/mineral/processing_unit, +/turf/simulated/floor/tiled/monodark, /area/quartermaster/miningdock) "xTD" = ( /obj/machinery/camera/network/security, @@ -36184,10 +35519,16 @@ /turf/simulated/wall/prepainted/security, /area/crew_quarters/heads/hos) "yfx" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/machinery/atmospherics/component/unary/vent_pump/on, -/turf/simulated/floor/tiled/white, -/area/quartermaster/belterdock/gear) +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "yfy" = ( /obj/structure/bed/chair/comfy/purp{ dir = 8 @@ -36199,18 +35540,12 @@ /turf/simulated/floor/tiled/dark, /area/security/brig) "yfX" = ( -/obj/effect/floor_decal/borderfloor/corner, -/obj/effect/floor_decal/corner/brown/bordercorner, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-4" - }, +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "0-4" }, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/belterdock/refinery) +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/foyer) "ygd" = ( /obj/effect/floor_decal/corner_steel_grid{ dir = 1 @@ -36258,12 +35593,14 @@ /turf/simulated/floor/tiled/steel, /area/shuttle/mining_ship/general) "yhp" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/machinery/sheet_silo{ + obj_persist_static_id = "sheet-silo-mining" + }, +/obj/effect/floor_decal/industrial/warning/dust{ + dir = 9 }, -/obj/item/stool, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/delivery) +/area/quartermaster/miningdock) "yhH" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -36277,15 +35614,13 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "yhJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 }, -/turf/simulated/floor/tiled/monotile, -/area/quartermaster/belterdock/refinery) +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/crew_quarters/recreation_area_hallway) "yil" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 6 @@ -36341,8 +35676,7 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/security/lobby) "ykp" = ( -/obj/structure/closet/wardrobe/green, -/turf/simulated/floor/carpet/turcarpet, +/turf/simulated/floor/plating, /area/crew_quarters/recreation_area) "ykx" = ( /obj/structure/table/rack/shelf/steel, @@ -36426,12 +35760,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) -"ymc" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 6 - }, -/turf/simulated/floor/grass, -/area/quartermaster/warehouse) "ymh" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -44673,7 +44001,7 @@ qLS qLS qLS qLS -wku +qLS eZz esB naI @@ -45251,16 +44579,16 @@ iXY iXY iXY wuh -rPE -rPE -rPE +rMY +pOK +jAA rPE qJB -jGc +jPs mff -sxc -oOy -lgM +kow +kow +kow aDU gwe leL @@ -45446,14 +44774,14 @@ iXY ehr wuh jEN -yfx -wrG +jAA +jAA uRz -qoU +qJB jPs -wxp -sDb -sDb +kow +kow +kow tZV aDU bbL @@ -45640,15 +44968,15 @@ vSl iXY wuh blB -ePx +jAA qiz -kRu -qoU +fRP +qJB jPs -rvC -kBv -xDs -uAU +kow +kow +kow +kow aDU kgM fPG @@ -45833,18 +45161,18 @@ wGx vSl iXY wuh -kRu +wAQ nWc -gnO +qiz kRu -qoU +qJB jPs -mbv -kBv -vGd -ulx -qoU -mzJ +kow +kow +kow +kow +aDU +xZH puP pir cUi @@ -46028,14 +45356,14 @@ vSl mcn wuh bWp -pOK -jBe +nWc +fRP fRP qJB uiK bpu -yhJ -qVI +rQs +rQs rQs hDH iIN @@ -46222,17 +45550,17 @@ vSl iXY wuh mEb -uRz -jwx -acY +jAA +jAA +jAA tds -lNT -yfX -drV -drV -oUd -qoU -mzJ +kow +kow +kow +kow +kow +aDU +xZH xzc pir sRJ @@ -46417,14 +45745,14 @@ ehr wuh qDS jAA -jag +nWc mwk qJB nin -rOW -jbh -rEu -wzB +kow +kow +kow +kow aDU xZH tol @@ -46610,15 +45938,15 @@ vSl iXY wuh dPs +osx dPs dPs dPs -dPs -izr +qJB vaA -aDw -qoU -cdn +kow +kow +kow aDU sDq tol @@ -46807,12 +46135,12 @@ aBc cEd pvB jtk -dPs -qMz -vaA -biZ -aDU -oXi +mti +qJB +kow +kow +kow +kow aDU kgM buX @@ -46998,15 +46326,15 @@ vSl iXY wuh dVA -ekD -eHs +qcx +qoU dqA dTQ bQe -vaA kow -qoU -osx +kow +kow +kow aDU kgM pXt @@ -47192,15 +46520,15 @@ vSl iXY wuh tgP -ekD +qcx hwP gQF pDx sFX -dcu -nYH -prw -tmi +kow +kow +kow +kow aDU kgM pYt @@ -47386,13 +46714,13 @@ iXY iXY wuh sVr -eHs +qcx tBn -kZu -dPs -fmj -fmj +qcx +dTQ dPs +vyv +vyv aDU aDU aDU @@ -47577,16 +46905,16 @@ iXY iXY iXY iXY -iXY +nYH wuh uNM nDz rLo -aFS +ePx xPu -jwr -fsN dPs +vyv +vyv lMH lMH lMH @@ -47771,14 +47099,14 @@ iXY iXY iXY iXY -mcn +prw wuh aGE -hwN +vyv otl -aFS -mIN -qcx +dPs +dPs +dPs pqk dPs lMH @@ -47965,16 +47293,16 @@ iXY iXY iXY iXY -iXY +nWj wuh qek -eHs +hwN xkg -aFS +mlk veW -qcx -hWB dPs +vyv +vyv lMH hMP evn @@ -48166,9 +47494,9 @@ dZs jCu aFS bol -qcx -vyv dPs +vyv +rmb lMH lMH lCU @@ -48350,19 +47678,19 @@ feE rYq iXY iXY -iXY -iXY -iXY -ufN +mLl +nmv +nmv +gUu wuh wHf eHs xkg aZK pDn -xue -qNE dPs +vyv +vyv lMH vIC vmT @@ -48540,14 +47868,14 @@ uDB hUh lIA twR -ufN +xcE eFf iXY iXY -iXY -iXY -iXY ufN +iXY +uhE +uhE wuh vkn uJx @@ -48555,8 +47883,8 @@ aHA vkn vkn vkn -vkn -vkn +vyv +vyv lMH cgt fCZ @@ -48734,14 +48062,14 @@ oMq qia rdb twR -fip +xgT phB uOU iXY -iXY -iXY -iXY ufN +yhp +eHQ +sxc wuh sBr mLm @@ -48750,7 +48078,7 @@ tBN fNj wzV cNA -wzV +cNA lMH ukb ukb @@ -48929,12 +48257,12 @@ jAe bhw twR twR -twR +qpi vMB gqj gUu sGH -nmv +qNM avQ wuh bBM @@ -48944,7 +48272,7 @@ vdN ipL wzV cNA -wzV +cNA lMH vxy ukb @@ -49122,13 +48450,13 @@ heJ lCC heJ xJa -jtn twR +upo fko iXY -qIo -ufN iXY +cDv +wuh xTv wuh jwQ @@ -49138,7 +48466,7 @@ bTA mmw wzV cNA -wzV +cNA lMH iON ukb @@ -49316,23 +48644,23 @@ szw qbG iTn ejk -nNn twR +qpi wCE pmy -xMm -ufN iXY +lRx +qNM lag wuh kNT fTB fRJ heO -fGh +oNw wzV cNA -wzV +cNA lMH new ukb @@ -49510,14 +48838,14 @@ nNn nNn vxE xyJ -leF twR +qpi sTR -iXY +biZ lRw fSr -iXY -nWj +nVC +evc wuh dVh npS @@ -49525,8 +48853,8 @@ fLU aBU uMs wzV -oNw -wzV +cNA +cNA lMH evB ukb @@ -49713,14 +49041,14 @@ wuh wuh wuh wuh -wzV +xue wzV mIP kad xYM wzV cNA -wzV +cNA lMH skT ukb @@ -49902,19 +49230,19 @@ vRv tbF pJe rOM -gLK +mSw etR kDo -uJr -juy -feq +kDo +qMz +hlc mSw ekJ xLm gXm hdh -wnA -hdh +hzu +hzu lMH nqP ukb @@ -50086,29 +49414,29 @@ pRW jON pRW mSw -bgH -txc -txc -bPg +wrG +rER +pOu +rER sOt ldo hkm hkm atT itn -rER -rER -pOu -rER -rER +kOw +hlc +kBv +hlc +qWd hlc jon gNj wnA tqv hdh -xlg -hdh +hzu +hzu lMH cBD ukb @@ -50281,28 +49609,28 @@ fDw pRW mSw moz -txc -txc -txc -gqw +gdU +gdU +jSX +rER vsY txc txc fYP lQq -gdU -gdU -gdU -jSX -rER -rER +mSw +xMc +wku +hlc +rTD +dAP jon aHh atw nfA hdh -xlv -hdh +hzu +hzu cJJ cJJ cJJ @@ -50474,38 +49802,38 @@ pRW jON pRW jon -bHV -txc -dHW +pkW +vDo +pfu kDM -ccA +ibL vsY sxY sWe pJe -wRS -sjO -vDo -pfu -pyb +itn +mSw +dAP +ulx +hlc gtZ -pHB +dAP jon wjW wnA lXM hdh -xlg -hdh -nCY -che -dOT -hvh -dOT -che -wgN -eyn -mXi +hzu +hzu +eNB +fsN +tkT +aIZ +qVI +jbh +ukf +eNB +txu ndp sid syH @@ -50669,38 +49997,38 @@ kYu fDw jon lKH -txc +rER wEw -kur -ccA +ptR +vlO vsY uUl uUl pJe -lnj -vMr -rER +itn +mSw +til fJl -vlO -rER +hlc +fgA pHB mSw oGT xlg dIt hdh -wnA -hdh -pwn -pwn -lRx -yhp -aaY -pwn -pwn +hzu +hzu +eNB +aIZ +aIZ +aIZ +aIZ +aIZ +aIZ eNB rcz -kXK +xiG avK syH kSn @@ -50862,33 +50190,33 @@ pRW jON pRW mSw -xMc -txc +lKH +rER hDl -kQS -ccA +ptR +izr vsY qzI qzI pJe -lnj -vMr -rER -qDe +itn +mSw +mXi +hlc sbx -rER +bqs umx mSw noW pzs bLd hdh -hmk -hdh +hzu +hzu uRN -twA aIZ -uhE +aIZ +aIZ aIZ aIZ pdF @@ -51056,39 +50384,39 @@ pRW jON pRW jon -vCC -txc +lKH +nVg bhP ifE -ccA +jag vsY lKt uUl pJe -lnj -vMr -nVg +itn +mSw +hXO pdT -nrZ +hlc etZ ffW jon waA xlg -daE +dIt hdh -wnA -hrS -til +hzu +hzu +eNB +aIZ aIZ aIZ -qWd aIZ aIZ ays -iDE +eNB tBY -xiG +kXK jbI syH kSn @@ -51251,36 +50579,36 @@ fDw pRW jon bHV -txc +rER wmU -ymc -ccA +ptR +uxX vsY -uUl +oOV tvT pJe -wRS -evc -rER -pHB +qIr +mSw +mSw +mSw kOw -rER -rER -jon +mSw +mSw +mSw rXa wnA mii -kKO -qvo -wfZ -mlk -lkP +hdh +hzu +hzu +eNB +aIZ lkP -nsH -sMN +aIZ sMN -gLZ -jLP +aIZ +pdF +eNB eja vCG swv @@ -51445,38 +50773,38 @@ xeo jYr mSw uzS -txc -txc -txc +rER +rER +ptR wHG vsY txc txc pJe -lnj -eIB -rER -rER -ptR -tHq -rER +rjY +sUL +sUL +sUL +sUL +sUL +sUL jon -waA +rBZ xlg -lmr +dIt hdh hzu -hrS -aIZ -aIZ -aIZ -dZb -aIZ -aIZ -aIZ -iDE -ujU -xiG +hdh +eNB +eNB +eNB +eNB +eNB +eNB +eNB +eNB +gKi +kXK hLN syH kSn @@ -51638,39 +50966,39 @@ pRW jYr aKn mSw -bgH +nme +rER +rER +juy +aaY +vsY txc txc +pJe txc txc -vsY txc txc -pJe -lnj -tcb -egp -egp -bqs -qMP -fgA -mSw -vZG +txc +txc +txc +wRS +xlg wnA lXM hdh boI -hdh -eNB -eNB -uiJ -kwo -uiJ -xcE -uiJ -eNB +qpd +nCY +che +dOT +hvh +dOT +che +wgN +hOq tES -xiG +drV avK syH kSn @@ -51832,36 +51160,36 @@ pRW xeo jYr mSw -mJv -txc -txc -txc +sjO +ili txc +ili +ili rZY -rMY +qmY qmY shT xCV tdk tdk -tdk +tVX sTs pJR -tdk +mbv hrc izO pZg cmi dyR -vKr -tVX -vKr -vKr -vKr -vKr -apt -vKr -gal +hWB +hdh +jBe +jBe +uAU +oOy +wzB +jBe +jBe hdh sZQ xiG @@ -52037,28 +51365,28 @@ txc sEz shF uhv -hOq -nVC -qPi -uqr -pDb -hLw -qAh -jhH +aec +sSl +ldm +uKk +ldm +ldm +mjB +hUF dLj aDs -jhH -pVz -jhH +lAm +hdh +yfX xlC +xlg jhH -jhH -fva -jhH -jhH -nme -ukf -emK +xlg +xlg +oXi +hdh +cjH +xiG bAI syH kSn @@ -52231,25 +51559,25 @@ txc txc poa txc -rlz -sSl +wAe ldm -uKk ldm +oXV +hJm ldm -mjB -hUF -qwK +cmw +cmw +bJS wki mhO -xDr -mhO -lAm -hzi -hzi -lfJ -hzi +hrS +dZb +xlg +xlg hzi +xlg +xlg +oUd tEQ dns xlf @@ -52425,26 +51753,26 @@ ubA ubA poa ubA -wAe -ldm -ldm -oXV -hJm +des ldm -cmw -cmw +sDc +orm +nFa +nzA +omy +rxO nKd -rwh +gLK wnA -nkT -trd -hUF +wfZ +rvC +pUj pUj pyh -hUF +vng vng ieQ -hdh +jwr nJu nQm wtj @@ -52609,8 +51937,8 @@ kYu fDw mSw mJv -uUl -uUl +vAk +tcb uUl ccA scZ @@ -52619,25 +51947,25 @@ kxv kxv poa kxv -des +laQ ldm -sDc -orm -nFa +eDd +eKq nzA -omy -rxO +qlg +ffP +cmw bJS -rwh -wnA -nkT -hXO -lGM -kXD +xPU +dcu +hdh +hdh +hdh +hrS bvE -dAP +hrS iSL -bvE +hrS hdh lye kMk @@ -52813,19 +52141,19 @@ lEM lEM ldK kTN -laQ +mpt ldm -eDd +sFW eKq nzA -qlg -ffP +ate +iSP cmw bJS rwh -wnA -nkT -cDv +uiJ +egp +vKr vKr apt vKr @@ -53007,25 +52335,25 @@ tbK tbK ccA tbK -mpt +qIr ldm -sFW -eKq +gnO +xTf +nFa nzA -ate -iSP -cmw +omy +rxO bJS cmE pZg jdF -pZg +kQS mFW -pZg -pZg +kQS +kQS oYC -pZg -pZg +kQS +kQS flt fTy imI @@ -53201,15 +52529,15 @@ tbK tbK ccA tbK -qIr +elJ ldm -qLx -xTf -nFa -nzA -omy -rxO -bJS +ldm +lqE +sXC +ldm +cmw +cmw +feq jPe wnA nkT @@ -53395,19 +52723,19 @@ aOG aOG ccA aOG -elJ +rjY +xai ldm +tdr ldm -lqE -sXC ldm -cmw -cmw -nKd +oOI +vKr +oyU jPe -wnA -nkT trd +cdn +hUF hUF fDt vZr @@ -53589,20 +52917,20 @@ txc txc aUM xGr +txc rjY -xai -ldm -tdr -ldm -ldm -oOI -vKr +cyr +sUL +sUL +aqN oyU -jPe wnA -nkT +wnA +jPe jYU +xng hdh +mIN hdh hdh hdh @@ -53784,24 +53112,24 @@ txc ouS txc txc -rjY -cyr -sUL -sUL -eBl -oyU +txc +txc +txc +txc +txc +wnA wnA pQh nyi -wnA -xng kPT -hdh -rMi -rMi -rMi -rMi +xng +hzu +lUu rMi +ovN +qVv +xhD +xvZ rMi wqp eTr @@ -53987,15 +53315,15 @@ qwK qSv qSv nAS -wnA -xng qBU -hdh +xng +hzu +lUu rMi -ovN -qVv -xhD -xvZ +nBf +vfa +vfa +vfa rMi jMM oxG @@ -54181,15 +53509,15 @@ rdv pWS pWS kWu -wnA +dld xng -tdf -hdh +hzu +lUu rMi -nBf -vfa -vfa -vfa +edb +adB +bno +kaW rMi bCv aCi @@ -54370,20 +53698,20 @@ aaK csb aaK csb -mSw +jwx vvO ciU agT wkI -hUF -tkT -lUu +vCC hdh +lUu +lUu rMi -edb -adB -bno -kaW +kke +qsL +crj +qwY rMi nEQ bBc @@ -54563,21 +53891,21 @@ aaK aaK aaK aaK -aaK +qPi mSw -hrS hdh hdh hdh -rmb hdh hdh hdh +lUu +hzu +iID +iID +rMi +gTq rMi -kke -qsL -crj -qwY rMi sTd bBc @@ -54758,21 +54086,21 @@ csb csb csb csb -csb -cih -eAp -fju +kKO fju mIk +mIk +sDb +mIk +mIk +mIk fju -yab -yab -iID -iID -rMi -gTq -rMi -rMi +hFO +kZu +pMS +kur +rOW +pwn sTd bBc sid @@ -54952,20 +54280,20 @@ csb csb csb csb -csb -csb -eAp +kKO fju fju +fju +yab mIk fju -ewu ykp -eHQ -qpi -aqN -pkW -wAQ +ykp +ewu +uIh +oyF +jvb +rks vaf sTd bBc @@ -55146,20 +54474,20 @@ csb csb csb csb -csb -csb -eAp +kKO +fju fju fju +yab mIk fju ewu sms -fUB -uIh +ewu +rme oyF -jvb -rks +mkn +jHr vaf sTd oxG @@ -55340,18 +54668,18 @@ csb poe csb csb -csb -csb -eAp +fva fju fju +fju +yab mIk fju -ewu -ibL -fUB -rme -oyF +soz +lfy +lfy +tkJ +cBe mkn jHr vaf @@ -55534,21 +54862,21 @@ csb csb csb csb -csb -csb -eAp -fju -fju +fva +nJE +fGh +acY +yab mIk mIk -soz -lfy -lfy -tkJ -cBe +ewu +pgJ +syZ +syZ +rEX mkn jHr -vaf +pwq sTd bBc sid @@ -55728,21 +55056,21 @@ csb csb csb csb -csb -csb -eAp -fju -fju -fju +fva +fva +yab +yab +yab fju +mIk ewu -pgJ -syZ -syZ +tQn syZ -mkn -jHr -pwq +lGM +eGx +eTv +cLn +qQD sXK bBc sid @@ -55925,18 +55253,18 @@ csb csb csb eAp -eAp -eAp -eAp -eAp +lmr +fju +fju +mIk ewu -tQn syZ -eGx -rEX -eTv -cLn -qQD +qMP +hmk +jLP +nvp +mwA +sQO oBe qBQ xXa @@ -56118,19 +55446,19 @@ lIp aDe csb csb -csb -csb -csb -csb -cih +eAp +jtn +fju +fju +mIk ewu -ili -upo -xPU -lin -nvp -mwA -sQO +eVN +eVN +eVN +eVN +wOA +twA +eVN woK nTO thA @@ -56311,19 +55639,19 @@ mDp mDp aDe csb -csb -csb -csb -csb -csb -csb +cih +eAp +yfx +fju +fju +mIk mfy +viP +miE +lpl qbT -qbT -qbT -qbT -xSu -nJE +bzu +iPO jiy eUA pAU @@ -56506,18 +55834,18 @@ qDH aDe csb csb -csb -csb -csb -csb -csb +eAp +fju +fju +mIk +mIk mfy -viP -miE -lpl +shN +shN +wZP qbT -bzu -iPO +vZG +pPi jiy fpw nkY @@ -56700,17 +56028,17 @@ pRW pRW csb csb -csb -csb -csb -csb -csb +eAp +lgM +fju +mIk +eyn mfy -shN -shN -wZP +cjp +agG +edp qbT -mti +jUs pPi jiy tMK @@ -56894,18 +56222,18 @@ pRW pRW csb csb -csb -csb -csb -csb -csb +eAp +fju +fju +mIk +qAh mfy -cjp -agG -edp -qbT -jUs -pPi +vXB +uAl +rEa +stc +xut +emK jiy xxb nTO @@ -57088,17 +56416,17 @@ pRW pRW csb csb -csb -csb -csb -csb -csb +eAp +fju +fju +mIk +uqr mfy -vXB -uAl -rEa -stc -xut +dKV +hHX +qaZ +qbT +hoH hgm jiy tMK @@ -57282,18 +56610,18 @@ pRW pRW csb csb -csb -csb -csb -csb -csb +eAp +fju +fju +fju +wIT mfy -dKV -hHX -qaZ qbT -hoH -iPO +qbT +qbT +qbT +yhJ +jiy jiy luz nTO @@ -57476,19 +56804,19 @@ pRW pRW csb csb -csb -csb -csb -csb -csb -rBZ -fOe -fOe -fOe -fOe -vAk +eAp +fju +fju +fju +mIk +mIk +mIk +mIk +mIk +mIk +fju dky -jiy +rBG sBa oxV rCX @@ -57668,21 +56996,21 @@ mDp mDp pRW pRW -pRW -pRW -pRW jGe jYr -csb -cPI -fOe -pMS -uwI -miH -fOe -mti -qNM -jiy +eAp +fju +fju +fju +fju +fju +fju +fju +fju +mIk +mIk +fju +rBG tMK nTO nRf @@ -57862,21 +57190,21 @@ pRW pRW pRW pRW -pRW -pRW -pRW jYr aKn -cPI -jDP -fOe -elQ -rTD -wIT -htn -hFO -mGq -jiy +eAp +rBG +rBG +rBG +qDe +rBG +rBG +rBG +rBG +fju +mIk +fju +rBG spd nTO eNl @@ -58058,19 +57386,19 @@ pRW pRW pRW pRW -pRW -pRW -cPI -cPI -jDP -fOe +wxp +hLw +fju +iDE +fju +tmi fBG rDV -gKi -fOe -uxX -wOA -jiy +rBG +fju +mIk +fju +rBG saE bLl vEs @@ -58252,19 +57580,19 @@ pRW pRW pRW pRW -pRW -cPI -cPI -jDP -jDP -fOe +wxp +fju +uJr +fju +fju +uJr crM kdZ -ebz -fOe -vIe -dld -jiy +rBG +fju +mIk +fju +rBG dfD nkY xIv @@ -58446,19 +57774,19 @@ pRW pRW pRW pRW -cPI -cPI -jDP -jDP +wxp +nsH jDP +fju +bPg fOe pqO dPi -xgT -fOe -vIe -qpd -jiy +rBG +fju +mIk +fju +rBG fqc pAU iIc @@ -58634,7 +57962,7 @@ pRW pRW pRW pRW -pRW +eIB pRW pRW pRW @@ -58650,8 +57978,8 @@ cPI cPI cPI rBG -qdW -rBG +mIk +fju rBG uOQ nTO From bfdee9aca06904dc91a179efb828b9f6b7f943f2 Mon Sep 17 00:00:00 2001 From: GySgtMurphy Date: Tue, 17 Dec 2024 23:39:58 -0500 Subject: [PATCH 3/9] aaa forgot something in space, fixed some walls --- maps/endeavour/levels/deck3.dmm | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/maps/endeavour/levels/deck3.dmm b/maps/endeavour/levels/deck3.dmm index 61f91403d467..469a725697f8 100644 --- a/maps/endeavour/levels/deck3.dmm +++ b/maps/endeavour/levels/deck3.dmm @@ -3938,9 +3938,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/security/hallway) -"cPI" = ( -/turf/simulated/wall/r_wall/prepainted, -/area/security/nuke_storage) "cPN" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -7143,13 +7140,6 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/mining_ship/general) -"eIB" = ( -/obj/structure/catwalk, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/space) "eIC" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -57962,21 +57952,21 @@ pRW pRW pRW pRW -eIB pRW pRW pRW pRW pRW +pRW +vRl +vRl +vRl +vRl vRl vRl vRl vRl vRl -cPI -cPI -cPI -cPI rBG mIk fju From 24a5b28dfe0e9e06cebfeedf4608c36ab78aed5f Mon Sep 17 00:00:00 2001 From: GySgtMurphy Date: Wed, 18 Dec 2024 23:15:38 -0500 Subject: [PATCH 4/9] Tweaks based on feedback, filled more of maints. --- maps/endeavour/levels/deck3.dmm | 2776 ++++++++++++++++++++----------- 1 file changed, 1823 insertions(+), 953 deletions(-) diff --git a/maps/endeavour/levels/deck3.dmm b/maps/endeavour/levels/deck3.dmm index 469a725697f8..3585461e450b 100644 --- a/maps/endeavour/levels/deck3.dmm +++ b/maps/endeavour/levels/deck3.dmm @@ -63,6 +63,10 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) +"acO" = ( +/obj/random/trash_pile, +/turf/simulated/floor/plating, +/area/quartermaster/belterdock) "acT" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/structure/table/woodentable, @@ -72,11 +76,17 @@ /obj/structure/table/reinforced, /obj/item/clothing/glasses/welding, /obj/item/weldingtool/largetank, +/obj/random/coin, /turf/simulated/floor/plating, /area/maintenance/cargo) "adf" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/hallwayaux) +"adi" = ( +/obj/machinery/floodlight, +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/quartermaster/belterdock) "adB" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -227,6 +237,10 @@ /obj/structure/adherent_bath, /turf/simulated/floor/crystal, /area/endeavour/hallway/d3fwdhall) +"akl" = ( +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/endeavour/surfacebase/mining_main/break_room) "akA" = ( /obj/structure/bed/chair{ dir = 4 @@ -282,11 +296,36 @@ }, /turf/simulated/floor/tiled, /area/security/lobby) +"amY" = ( +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/bordercorner{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/foyer) "anL" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monotile, /area/security/hallway) +"anU" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor/hole{ + dir = 8 + }, +/obj/machinery/recharge_station, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/bar/catwalk) "aoe" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -453,6 +492,11 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) +"atU" = ( +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/turf/simulated/floor/plating, +/area/quartermaster/foyer) "aup" = ( /obj/machinery/computer/guestpass{ dir = 1; @@ -542,6 +586,14 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) +"awd" = ( +/obj/vehicle/sealed/mecha/combat/fighter/cludge{ + dir = 1; + name = "\improper NLS Legal Salvage"; + desc = "A heater, nozzle, and fuel tank strapped together. There are exposed wires strewn about it. Hastily scrawled along the portside cockpit entrance using big, blocky script (in what appears to be crayon?) is the name 'NLS LEGAL SALVAGE'" + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/warehouse) "awm" = ( /obj/machinery/door/airlock{ id_tag = "dorm3"; @@ -672,6 +724,13 @@ }, /turf/simulated/floor/wood, /area/security/lobby) +"aAy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/quartermaster/foyer) "aAA" = ( /obj/machinery/camera/network/civilian{ dir = 1 @@ -745,6 +804,10 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/quartermaster/belterdock) +"aCg" = ( +/obj/structure/closet/emcloset, +/turf/simulated/floor/plating, +/area/quartermaster/belterdock/refinery) "aCi" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -1182,6 +1245,15 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/dark, /area/endeavour/station/stairs_three) +"aTk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/warehouse) "aTm" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -1550,6 +1622,25 @@ }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) +"bcS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/grass, +/area/quartermaster/foyer) "bed" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -1934,11 +2025,13 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "boI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/machinery/door/firedoor{ + dir = 8 }, /obj/machinery/door/airlock/maintenance, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plating, /area/quartermaster/foyer) "boM" = ( @@ -1976,6 +2069,10 @@ /area/security/brig) "bpu" = ( /obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "bqn" = ( @@ -2056,6 +2153,10 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) +"bsN" = ( +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/maintenance/bar/catwalk) "bsV" = ( /obj/spawner/window/borosillicate/reinforced/full/firelocks, /turf/simulated/floor/plating, @@ -2105,6 +2206,15 @@ }, /turf/simulated/floor/tiled, /area/hydroponics) +"bug" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/grass, +/area/quartermaster/warehouse) "buq" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2171,17 +2281,18 @@ /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "buX" = ( -/obj/structure/disposalpipe/segment{ +/obj/random/trash_pile, +/obj/structure/railing{ dir = 8 }, -/obj/machinery/light{ - dir = 1 +/obj/structure/railing{ + dir = 4 }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/railing{ + dir = 1 }, /turf/simulated/floor/plating, -/area/maintenance/bar/lower) +/area/endeavour/surfacebase/mining_main/break_room) "bvs" = ( /obj/machinery/air_alarm{ dir = 4; @@ -2527,6 +2638,22 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) +"bJh" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/map_helper/access_helper/airlock/station/supply/cargo_bay, +/obj/machinery/door/airlock/glass/mining{ + name = "Magmatic Rift Leap Pad"; + req_one_access = null + }, +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/foyer) "bJy" = ( /obj/machinery/door/airlock/maintenance, /obj/map_helper/access_helper/airlock/station/engineering/department, @@ -2679,6 +2806,7 @@ pixel_x = 25 }, /obj/structure/table/wooden_reinforced, +/obj/random/coin, /turf/simulated/floor/wood, /area/maintenance/cargo) "bPr" = ( @@ -2756,6 +2884,14 @@ }, /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/sleep/Dorm_6) +"bTd" = ( +/obj/machinery/door/airlock/glass/mining{ + name = "Magmatic Rift Leap Pad"; + req_one_access = null + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/foyer) "bTj" = ( /obj/machinery/computer/security/wooden_tv, /turf/simulated/floor/carpet, @@ -2908,6 +3044,13 @@ "bWK" = ( /turf/simulated/wall/prepainted, /area/endeavour/station/stairs_three) +"bWR" = ( +/obj/random/trash_pile, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/quartermaster/belterdock/refinery) "bXD" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/palebottlegreen, @@ -3012,15 +3155,15 @@ /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "cdn" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/effect/floor_decal/borderfloorblack{ dir = 4 }, /obj/effect/floor_decal/corner/brown/border{ dir = 4 }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "cdy" = ( @@ -3207,6 +3350,15 @@ /obj/structure/disposalpipe/junction/flipped{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/machinery/door/firedoor{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "cmR" = ( @@ -3217,6 +3369,19 @@ }, /turf/simulated/floor/tiled/steel, /area/shuttle/mining_ship/general) +"cna" = ( +/obj/structure/sign/warning/moving_parts{ + pixel_y = 32 + }, +/obj/machinery/conveyor_switch/oneway{ + tag = "mailroom"; + id = "DLBelt" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/delivery) "cnc" = ( /obj/structure/table/woodentable, /turf/simulated/floor/carpet/bcarpet, @@ -3536,6 +3701,12 @@ /obj/machinery/vending/loadout/loadout_misc, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) +"cBK" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 6 + }, +/turf/simulated/floor/grass, +/area/quartermaster/warehouse) "cBR" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -3634,6 +3805,11 @@ }, /turf/simulated/floor/tiled/monodark, /area/quartermaster/miningdock) +"cDY" = ( +/obj/random/trash_pile, +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/quartermaster/belterdock) "cEd" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 @@ -3809,7 +3985,7 @@ /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_1) "cJJ" = ( -/turf/simulated/wall/r_wall/prepainted/cargo, +/turf/simulated/wall/r_wall/prepainted, /area/vacant/vacant_shop) "cKe" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -3928,6 +4104,36 @@ "cNA" = ( /turf/simulated/floor/plating, /area/quartermaster/belterdock) +"cPy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/foyer) +"cPz" = ( +/obj/structure/table/standard, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/packageWrap, +/obj/item/destTagger, +/obj/machinery/air_alarm{ + dir = 1; + pixel_y = -24 + }, +/obj/machinery/camera/network/cargo{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/delivery) "cPE" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -3986,6 +4192,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/belterdock) "cQn" = ( @@ -4152,8 +4361,22 @@ /obj/effect/floor_decal/corner/navblue/border{ dir = 1 }, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) +"cWd" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/closet/crate, +/obj/random/maintenance/clean, +/obj/random/maintenance/cargo, +/obj/random/maintenance/research, +/turf/simulated/floor/plating, +/area/maintenance/bar/catwalk) "cWp" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/effect/floor_decal/spline/plain{ @@ -4369,13 +4592,12 @@ /turf/simulated/floor/tiled, /area/hydroponics) "dcu" = ( -/obj/structure/cable/green{ - icon_state = "1-4" +/obj/effect/floor_decal/borderfloorblack/corner{ + dir = 8 + }, +/obj/effect/floor_decal/corner/brown/bordercorner{ + dir = 8 }, -/obj/effect/floor_decal/borderfloorblack, -/obj/effect/floor_decal/corner/brown/border, -/obj/effect/floor_decal/borderfloorblack/corner2, -/obj/effect/floor_decal/corner/brown/bordercorner2, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "dcx" = ( @@ -4440,9 +4662,6 @@ "des" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/brown/border, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/structure/extinguisher_cabinet{ pixel_y = -31 }, @@ -4701,6 +4920,10 @@ /area/crew_quarters/toilet) "dkO" = ( /obj/machinery/door/firedoor, +/obj/machinery/door/airlock/glass/mining{ + name = "Magmatic Rift Leap Pad"; + req_one_access = null + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "dld" = ( @@ -4714,6 +4937,10 @@ }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) +"dlE" = ( +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/quartermaster/belterdock) "dlG" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4781,6 +5008,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 1 }, +/obj/structure/sign/department/mail{ + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "dnz" = ( @@ -4856,7 +5086,7 @@ /turf/simulated/open, /area/endeavour/hallway/d3aftmaint) "dqA" = ( -/obj/structure/bed/chair/comfy{ +/obj/structure/bed/chair/sofa/black{ dir = 1 }, /turf/simulated/floor/wood, @@ -4875,6 +5105,17 @@ }, /turf/simulated/floor/tiled, /area/security/security_lockerroom) +"dru" = ( +/obj/effect/floor_decal/industrial/outline/red{ + color = "#AF0000" + }, +/obj/vehicle/sealed/mecha/combat/fighter/cludge{ + dir = 1; + name = "\improper NLS Legal Salvage"; + desc = "A heater, nozzle, and fuel tank strapped together. There are exposed wires strewn about it. Hastily scrawled along the portside cockpit entrance using big, blocky script (in what appears to be crayon?) is the name 'NLS LEGAL SALVAGE'" + }, +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/warehouse) "drJ" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -4901,15 +5142,14 @@ /turf/simulated/wall/r_wall/prepainted/cargo, /area/shuttle/mining_ship/general) "drV" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/vehicle/sealed/mecha/combat/fighter/cludge{ + dir = 1; + name = "\improper NLS Legal Salvage"; + desc = "A heater, nozzle, and fuel tank strapped together. There are exposed wires strewn about it. Hastily scrawled along the portside cockpit entrance using big, blocky script (in what appears to be crayon?) is the name 'NLS LEGAL SALVAGE'" }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3portforhall) +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/warehouse) "dsm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -5318,6 +5558,12 @@ /obj/effect/floor_decal/corner_oldtile/white/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) +"dJc" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/warehouse) "dJV" = ( /obj/machinery/light{ dir = 1; @@ -5361,9 +5607,6 @@ /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_12) "dLj" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/structure/cable/green{ icon_state = "2-8" }, @@ -5403,6 +5646,18 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) +"dMH" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/machinery/atmospheric_field_generator/perma, +/obj/machinery/shield_diffuser, +/obj/machinery/door/blast/regular{ + name = "Salvager Launch Blast Door"; + id = "salvage_launch" + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/warehouse) "dMY" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -5705,6 +5960,18 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) +"dTZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/foyer) "dUd" = ( /obj/structure/cable/orange{ icon_state = "2-8" @@ -6134,13 +6401,7 @@ /turf/simulated/floor/wood, /area/maintenance/dormitory) "egp" = ( -/obj/structure/cable/green{ - icon_state = "1-4" - }, -/obj/effect/floor_decal/borderfloorblack{ - dir = 8 - }, -/obj/effect/floor_decal/corner/brown/border{ +/obj/machinery/door/firedoor{ dir = 8 }, /turf/simulated/floor/tiled/dark, @@ -6224,6 +6485,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "ejd" = ( @@ -6518,8 +6780,18 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "esB" = ( -/turf/simulated/wall/prepainted/cargo, -/area/maintenance/lower/trash_pit) +/obj/effect/floor_decal/techfloor{ + dir = 8 + }, +/obj/structure/closet, +/obj/random/maintenance/clean, +/obj/random/maintenance/clean, +/obj/item/duct_tape_roll, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/bar/catwalk) "esO" = ( /obj/structure/bed/chair/comfy/teal, /obj/machinery/light_switch{ @@ -6638,7 +6910,7 @@ name = "Station Intercom (General)"; pixel_y = 26 }, -/obj/machinery/vending/loadout/clothing, +/obj/machinery/vending/loadout/costume, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "evH" = ( @@ -6863,6 +7135,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/belterdock) "eBO" = ( @@ -7458,6 +7733,9 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portamidhall) +"eVb" = ( +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/bar/catwalk) "eVd" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock{ @@ -7555,6 +7833,10 @@ }, /turf/simulated/floor/tiled/old_cargo/red, /area/security/security_processing) +"eXx" = ( +/obj/structure/closet/crate/trashcart, +/turf/simulated/floor, +/area/maintenance/bar/catwalk) "eXS" = ( /obj/structure/cable/green{ icon_state = "0-8" @@ -8097,16 +8379,15 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "flt" = ( -/obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/airlock/multi_tile/glass{ - name = "Foyer" - }, /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/obj/structure/disposalpipe/segment, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/beastybrown, +/turf/simulated/floor/plating, /area/quartermaster/foyer) "flS" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -8118,6 +8399,10 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"fml" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/warehouse) "fmB" = ( /obj/machinery/air_alarm{ dir = 1; @@ -8273,9 +8558,9 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "fsN" = ( -/obj/structure/salvageable/bliss, +/obj/random/trash_pile, /turf/simulated/floor/plating, -/area/quartermaster/delivery) +/area/quartermaster/foyer) "fta" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/crystal, @@ -8361,6 +8646,16 @@ }, /turf/simulated/floor/tiled/dark, /area/security/interrogation) +"fzr" = ( +/obj/effect/floor_decal/techfloor{ + dir = 6 + }, +/obj/random/cutout, +/obj/landmark{ + name = "morphspawn" + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/bar/catwalk) "fzD" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -8589,6 +8884,13 @@ /obj/effect/floor_decal/spline/fancy/wood, /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) +"fLp" = ( +/obj/structure/closet/largecardboard, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/quartermaster/belterdock/refinery) "fLu" = ( /obj/structure/cable/orange{ icon_state = "1-2" @@ -9055,10 +9357,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/belterdock) "fRP" = ( /obj/structure/table/borosilicate, +/obj/machinery/floor_light/changing/prebuilt{ + on = 1 + }, /turf/simulated/floor/plating, /area/quartermaster/belterdock/gear) "fSo" = ( @@ -9793,7 +10101,6 @@ /obj/machinery/door/firedoor{ dir = 8 }, -/obj/map_helper/access_helper/airlock/station/supply/mining, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -9906,14 +10213,14 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/disposalpipe/junction/yjunction{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "guu" = ( @@ -10106,6 +10413,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/starboardsolar) +"gFc" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/item/stool, +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/delivery) "gFf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -10273,9 +10587,6 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/cable/green{ - icon_state = "1-4" - }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "gLU" = ( @@ -10406,7 +10717,7 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/bed/chair/comfy{ +/obj/structure/bed/chair/sofa/black/right{ dir = 1 }, /turf/simulated/floor/wood, @@ -10710,6 +11021,16 @@ }, /turf/simulated/floor/tiled/dark, /area/maintenance/starboardsolar) +"han" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/vehicle/sealed/mecha/combat/fighter/cludge{ + dir = 1; + name = "\improper NLS Legal Salvage"; + desc = "A heater, nozzle, and fuel tank strapped together. There are exposed wires strewn about it. Hastily scrawled along the portside cockpit entrance using big, blocky script (in what appears to be crayon?) is the name 'NLS LEGAL SALVAGE'" + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/warehouse) "haF" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/maintenance/starboardsolar) @@ -10866,6 +11187,15 @@ }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/belterdock) +"hfw" = ( +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/brown/border, +/obj/machinery/light, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/warehouse) "hgm" = ( /obj/machinery/light/small, /turf/simulated/floor/wood, @@ -11121,6 +11451,12 @@ /obj/structure/closet/crate, /turf/simulated/floor/tiled/steel, /area/shuttle/belter) +"hpG" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/catwalk) "hqP" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/showers) @@ -11880,6 +12216,16 @@ /obj/machinery/power/apc/south_mount, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_6) +"hUc" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/obj/machinery/computer/supplycomp, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/foyer) "hUg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11969,6 +12315,9 @@ dir = 8; icon_state = "pipe-c" }, +/obj/effect/floor_decal/borderfloorblack/corner2{ + dir = 9 + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "hWG" = ( @@ -12628,9 +12977,17 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/security/security_processing) "iwp" = ( -/obj/effect/floor_decal/techfloor/corner, +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 8 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, -/area/vacant/vacant_shop) +/area/quartermaster/foyer) "iwD" = ( /obj/effect/floor_decal/spline/plain, /turf/simulated/floor/tiled/dark, @@ -12703,6 +13060,16 @@ /obj/machinery/lathe/autolathe, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) +"izs" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/flora/ausbushes/ywflowers, +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/turf/simulated/floor/grass, +/area/quartermaster/warehouse) "izO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12996,7 +13363,7 @@ /turf/simulated/wall/prepainted, /area/endeavour/station/stairs_three) "iJR" = ( -/obj/structure/plasticflaps, +/obj/structure/plasticflaps/mining, /obj/structure/disposalpipe/trunk{ dir = 4 }, @@ -13083,7 +13450,7 @@ /obj/structure/noticeboard{ pixel_y = 32 }, -/obj/machinery/vending/loadout, +/obj/machinery/vending/loadout/accessory, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "iPK" = ( @@ -13194,6 +13561,9 @@ }, /turf/simulated/floor/wood, /area/quartermaster/office) +"iTk" = ( +/turf/simulated/floor/wood, +/area/quartermaster/belterdock/refinery) "iTn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -13264,6 +13634,13 @@ }, /turf/simulated/floor/tiled/dark, /area/prison/cell_block) +"iWE" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 1 + }, +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/grass, +/area/quartermaster/warehouse) "iWF" = ( /obj/structure/table/steel, /obj/structure/bedsheetbin, @@ -13333,6 +13710,12 @@ }, /turf/simulated/floor/crystal, /area/endeavour/hallway/d3fwdhall) +"iZj" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/foyer) "jag" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -13371,11 +13754,12 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "jbh" = ( -/obj/item/tool/wrench, -/obj/structure/table/reinforced, -/obj/item/tool/wirecutters, -/turf/simulated/floor/plating, -/area/quartermaster/delivery) +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/foyer) "jbI" = ( /obj/machinery/light, /obj/structure/cable/orange{ @@ -13409,16 +13793,26 @@ /turf/simulated/floor/wood, /area/quartermaster/qm) "jdF" = ( -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/flora/ausbushes/stalkybush, /obj/structure/cable/green{ - icon_state = "2-4" + icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/grass, /area/quartermaster/foyer) "jdI" = ( /obj/machinery/camera/network/civilian{ @@ -13510,8 +13904,19 @@ }, /turf/simulated/floor/wood, /area/security/lobby) +"jgF" = ( +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/quartermaster/belterdock/refinery) "jhH" = ( -/obj/landmark/spawnpoint/job/cargo_technician, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/monodark, /area/quartermaster/foyer) "jhI" = ( @@ -13794,6 +14199,17 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) +"joO" = ( +/obj/vehicle/sealed/mecha/combat/fighter/cludge{ + dir = 1; + name = "\improper NLS Legal Salvage"; + desc = "A heater, nozzle, and fuel tank strapped together. There are exposed wires strewn about it. Hastily scrawled along the portside cockpit entrance using big, blocky script (in what appears to be crayon?) is the name 'NLS LEGAL SALVAGE'" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/warehouse) "jpo" = ( /obj/machinery/conveyor{ dir = 8; @@ -13868,6 +14284,12 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"jst" = ( +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/warehouse) "jtk" = ( /obj/machinery/requests_console/preset/cargo{ pixel_x = -31; @@ -13876,6 +14298,9 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, +/obj/structure/bed/chair/sofa/black/corner{ + dir = 4 + }, /turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "jtn" = ( @@ -13899,6 +14324,10 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"jtW" = ( +/obj/structure/salvageable/server, +/turf/simulated/floor/plating, +/area/vacant/vacant_shop) "jua" = ( /turf/simulated/floor/carpet/purcarpet, /area/maintenance/dormitory) @@ -13962,21 +14391,18 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "jwr" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/mining{ - name = "Cargo Airlock"; - req_one_access = null - }, -/obj/map_helper/access_helper/airlock/station/supply/cargo_bay, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/foyer) +/obj/structure/closet, +/obj/random/maintenance/medical, +/obj/random/maintenance/clean, +/obj/item/reagent_containers/food/drinks/bottle/rum{ + desc = "TASTE DEMOCRACY"; + name = "Managed Democra-cider" + }, +/obj/random/contraband, +/obj/random/cigarettes, +/obj/random/maintenance/security, +/turf/simulated/floor/plating, +/area/quartermaster/belterdock/refinery) "jwx" = ( /obj/effect/paint/beastybrown, /obj/spawner/window/low_wall/reinforced/full/firelocks, @@ -14089,8 +14515,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/bar/lounge) "jBe" = ( -/turf/simulated/wall/prepainted/cargo, -/area/quartermaster/foyer) +/obj/item/tool/wrench, +/obj/structure/table/reinforced, +/obj/item/tool/wirecutters, +/turf/simulated/floor/plating, +/area/vacant/vacant_shop) "jBD" = ( /obj/structure/table/marble, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -14322,6 +14751,11 @@ /obj/effect/floor_decal/corner/navblue/border, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3fwdhall) +"jKP" = ( +/obj/structure/catwalk, +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/maintenance/bar/catwalk) "jKX" = ( /obj/item/radio/intercom{ dir = 4; @@ -14339,12 +14773,15 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_4) "jLH" = ( -/obj/map_helper/access_helper/airlock/station/supply/maintenance, /obj/structure/catwalk, /obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment{ dir = 1 }, +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "jLP" = ( @@ -14443,6 +14880,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "jQE" = ( @@ -14460,6 +14898,12 @@ /obj/map_helper/access_helper/airlock/station/security/general, /turf/simulated/floor/tiled/dark, /area/security/interrogation) +"jRe" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/warehouse) "jRg" = ( /obj/structure/cable/green{ icon_state = "0-2" @@ -14574,6 +15018,16 @@ /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) +"jVx" = ( +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/obj/machinery/space_heater, +/obj/landmark{ + name = "blobstart" + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/bar/catwalk) "jWp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -14780,6 +15234,12 @@ /obj/machinery/media/jukebox, /turf/simulated/floor/wood, /area/security/breakroom) +"kdG" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 10 + }, +/turf/simulated/floor/grass, +/area/quartermaster/warehouse) "kdS" = ( /obj/machinery/door/airlock/command{ id_tag = "HoSdoor"; @@ -14902,7 +15362,7 @@ /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_10) "kgM" = ( -/turf/simulated/wall/prepainted/cargo, +/turf/simulated/wall/r_wall/prepainted, /area/maintenance/bar/lower) "khP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -14998,6 +15458,12 @@ }, /turf/simulated/floor/carpet, /area/security/detectives_office) +"kkx" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/bar/catwalk) "klc" = ( /obj/structure/cable/green{ icon_state = "2-8" @@ -15374,6 +15840,13 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) +"kCu" = ( +/obj/structure/catwalk, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/catwalk) "kCG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -15447,6 +15920,7 @@ /obj/structure/railing{ dir = 4 }, +/obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "kDM" = ( @@ -15499,6 +15973,15 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) +"kFu" = ( +/obj/machinery/button/remote/blast_door{ + id = "salvage_launch"; + name = "Salvager Bay Doors"; + pixel_y = -5; + req_access = list(19) + }, +/turf/simulated/wall/r_wall/prepainted/cargo, +/area/quartermaster/warehouse) "kGf" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -15515,9 +15998,6 @@ /obj/effect/floor_decal/corner/navblue/bordercorner2{ dir = 1 }, -/obj/structure/sign/department/mail{ - pixel_y = 32 - }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "kGS" = ( @@ -15531,6 +16011,12 @@ }, /turf/simulated/floor/tiled/old_cargo/gray, /area/prison/cell_block) +"kIg" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/grass, +/area/quartermaster/warehouse) "kIm" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -15744,7 +16230,17 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/flora/ausbushes/sparsegrass, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/grass, /area/quartermaster/foyer) "kRb" = ( /obj/machinery/door/firedoor/glass, @@ -15776,6 +16272,9 @@ }, /obj/structure/table, /obj/structure/dancepole, +/obj/machinery/floor_light/changing/prebuilt{ + on = 1 + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/belterdock/gear) "kRM" = ( @@ -16034,9 +16533,6 @@ "laQ" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/brown/border, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/item/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -26 @@ -16115,6 +16611,12 @@ }, /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) +"lea" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/warehouse) "len" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ @@ -16244,6 +16746,8 @@ /turf/simulated/floor/tiled/monotile, /area/endeavour/hallway/d3afthall) "lif" = ( +/obj/random/junk, +/obj/random/maintenance, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "liu" = ( @@ -16646,21 +17150,9 @@ /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "lye" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1; - pixel_y = 20 - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3portforhall) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/foyer) "lyz" = ( /obj/structure/table/rack{ dir = 8; @@ -16775,6 +17267,9 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) +"lDd" = ( +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/delivery) "lDq" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -17490,10 +17985,7 @@ /turf/simulated/floor/tiled, /area/security/lobby) "mff" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/plating, +/turf/simulated/wall/r_wall/prepainted, /area/quartermaster/belterdock/refinery) "mfm" = ( /obj/structure/disposalpipe/segment, @@ -17552,12 +18044,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/brown/border, -/obj/effect/floor_decal/borderfloorblack/corner2{ - dir = 9 - }, -/obj/effect/floor_decal/corner/brown/bordercorner2{ - dir = 9 - }, +/obj/effect/floor_decal/borderfloorblack/corner2, +/obj/effect/floor_decal/corner/brown/bordercorner2, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "mhY" = ( @@ -17574,20 +18062,15 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "2-4" - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/brown/border, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/monodark, /area/quartermaster/foyer) "miu" = ( @@ -17628,6 +18111,10 @@ }, /turf/simulated/floor/tiled/dark, /area/security/brig) +"mjy" = ( +/obj/structure/closet/firecloset, +/turf/simulated/floor/plating, +/area/quartermaster/belterdock/refinery) "mjB" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 5 @@ -17864,9 +18351,7 @@ /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/brown/border, /obj/machinery/power/apc/south_mount, -/obj/structure/cable/green{ - icon_state = "0-8" - }, +/obj/structure/cable/green, /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "mpy" = ( @@ -17958,6 +18443,12 @@ }, /turf/simulated/floor/tiled/old_cargo/gray, /area/prison/cell_block) +"mrn" = ( +/obj/machinery/floor_light/changing/prebuilt{ + on = 1 + }, +/turf/simulated/floor/plating, +/area/quartermaster/belterdock/gear) "mrw" = ( /obj/structure/flora/pottedplant/orientaltree, /obj/machinery/camera/network/civilian{ @@ -18151,6 +18642,10 @@ }, /turf/simulated/floor/plating, /area/maintenance/substation/civilian) +"mBo" = ( +/obj/structure/railing, +/turf/simulated/floor/plating, +/area/quartermaster/belterdock/refinery) "mBA" = ( /obj/structure/cable{ icon_state = "4-8" @@ -18222,6 +18717,18 @@ }, /turf/simulated/floor/carpet, /area/security/detectives_office) +"mFc" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospheric_field_generator/perma, +/obj/machinery/shield_diffuser, +/obj/machinery/door/blast/regular{ + name = "Salvager Launch Blast Door"; + id = "salvage_launch" + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/warehouse) "mFW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -18231,7 +18738,17 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/flora/ausbushes/brflowers, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/grass, /area/quartermaster/foyer) "mGv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -18298,6 +18815,10 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/cargo) +"mIG" = ( +/obj/structure/closet/largecardboard, +/turf/simulated/floor/plating, +/area/quartermaster/belterdock/refinery) "mIN" = ( /obj/machinery/door/airlock/maintenance, /turf/simulated/floor/plating, @@ -18328,6 +18849,12 @@ }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/belterdock) +"mJQ" = ( +/obj/effect/floor_decal/techfloor, +/obj/effect/floor_decal/techfloor/hole, +/obj/machinery/space_heater, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/bar/catwalk) "mKJ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 @@ -18423,6 +18950,23 @@ }, /turf/simulated/floor/tiled/dark, /area/security/brig) +"mNz" = ( +/obj/effect/floor_decal/industrial/hatch{ + color = "#AF0000" + }, +/obj/vehicle/sealed/mecha/combat/fighter/cludge{ + dir = 1; + name = "\improper NLS Legal Salvage"; + desc = "A heater, nozzle, and fuel tank strapped together. There are exposed wires strewn about it. Hastily scrawled along the portside cockpit entrance using big, blocky script (in what appears to be crayon?) is the name 'NLS LEGAL SALVAGE'" + }, +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/warehouse) +"mNI" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/quartermaster/foyer) "mNL" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -18743,6 +19287,14 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) +"nay" = ( +/obj/random/maintenance, +/obj/structure/closet/largecardboard, +/obj/structure/railing{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/quartermaster/belterdock/refinery) "naA" = ( /obj/effect/floor_decal/industrial/danger{ dir = 9 @@ -18761,6 +19313,7 @@ /obj/structure/railing{ dir = 4 }, +/obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "nbL" = ( @@ -18889,10 +19442,10 @@ /obj/machinery/status_display/supply_display{ pixel_y = 32 }, -/obj/machinery/vending/loadout/accessory, /obj/machinery/light{ dir = 1 }, +/obj/machinery/vending/loadout/clothing, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "nfA" = ( @@ -18977,6 +19530,7 @@ /obj/structure/cable/green{ icon_state = "0-2" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "niA" = ( @@ -18994,6 +19548,18 @@ /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/dark, /area/endeavour/hallway/d3fwdhall) +"njM" = ( +/obj/effect/floor_decal/techfloor{ + dir = 1 + }, +/obj/effect/floor_decal/techfloor/hole/right{ + dir = 1 + }, +/obj/structure/table/steel, +/obj/machinery/recharger, +/obj/random/coin, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/bar/catwalk) "njT" = ( /obj/structure/table/marble, /obj/machinery/door/blast/shutters{ @@ -19073,6 +19639,10 @@ }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) +"nms" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/endeavour/surfacebase/mining_main/break_room) "nmv" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -19221,15 +19791,9 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "nqP" = ( -/obj/machinery/computer/security/telescreen{ - pixel_y = 32 - }, -/obj/machinery/vending/loadout/gadget, -/obj/effect/floor_decal/techfloor/corner{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/vacant/vacant_shop) +/obj/random/trash_pile, +/turf/simulated/floor/plating, +/area/quartermaster/belterdock/refinery) "nsH" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/light/small{ @@ -19338,7 +19902,7 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "nxz" = ( -/turf/simulated/wall/r_wall/prepainted/cargo, +/turf/simulated/wall/r_wall/prepainted, /area/maintenance/lower/trash_pit) "nxT" = ( /obj/machinery/camera/network/civilian{ @@ -19555,6 +20119,18 @@ }, /turf/simulated/floor/tiled, /area/security/security_lockerroom) +"nHC" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/grass, +/area/quartermaster/warehouse) "nIf" = ( /obj/structure/bed/chair/sofa/right, /turf/simulated/floor/carpet/bcarpet, @@ -19635,6 +20211,10 @@ dir = 4 }, /obj/machinery/fire_alarm/north_mount, +/obj/machinery/light{ + dir = 1; + pixel_y = 20 + }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "nJE" = ( @@ -19660,7 +20240,6 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) "nKd" = ( -/obj/machinery/computer/supplycomp, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -20438,6 +21017,10 @@ }, /turf/simulated/floor/tiled/old_tile/gray, /area/security/range) +"ogP" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/warehouse) "ogR" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 4 @@ -21402,6 +21985,10 @@ "oMq" = ( /turf/simulated/floor/carpet/bcarpet, /area/quartermaster/qm) +"oNa" = ( +/obj/structure/frame, +/turf/simulated/floor/plating, +/area/vacant/vacant_shop) "oNp" = ( /obj/machinery/newscaster{ pixel_y = 32 @@ -21496,12 +22083,9 @@ /turf/simulated/floor/tiled/dark, /area/security/brig) "oOy" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/item/stool, +/obj/landmark/spawnpoint/job/cargo_technician, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/foyer) +/area/quartermaster/delivery) "oOG" = ( /obj/machinery/power/apc/west_mount, /obj/structure/cable/green{ @@ -21661,23 +22245,17 @@ /turf/simulated/floor/tiled, /area/security/hanger) "oXi" = ( -/obj/structure/table/standard, -/obj/item/packageWrap, -/obj/item/packageWrap, -/obj/item/packageWrap, -/obj/item/destTagger, -/obj/machinery/air_alarm{ - dir = 1; - pixel_y = -24 - }, -/obj/machinery/camera/network/cargo{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/light{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/foyer) +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/warehouse) "oXu" = ( /obj/structure/cable/orange{ icon_state = "1-2" @@ -21720,7 +22298,17 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/turf/simulated/floor/tiled/dark, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/flora/ausbushes/ppflowers, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/grass, /area/quartermaster/foyer) "oYK" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -22459,7 +23047,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, -/obj/structure/bed/chair/comfy{ +/obj/structure/bed/chair/sofa/black/left{ dir = 4 }, /turf/simulated/floor/wood, @@ -22975,6 +23563,9 @@ /area/security/hallway) "pQh" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "pQv" = ( @@ -23171,6 +23762,9 @@ /obj/structure/cable/green{ icon_state = "2-8" }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plating, /area/maintenance/bar/lower) "pXE" = ( @@ -23224,6 +23818,10 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) +"pZR" = ( +/obj/random/trash_pile, +/turf/simulated/floor/plating, +/area/crew_quarters/recreation_area) "qaT" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -23507,6 +24105,9 @@ /area/quartermaster/qm) "qiz" = ( /obj/structure/table/borosilicate, +/obj/machinery/floor_light/changing/prebuilt{ + on = 1 + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/belterdock/gear) "qjv" = ( @@ -23579,6 +24180,9 @@ }, /turf/simulated/floor/wood, /area/quartermaster/office) +"qlx" = ( +/turf/simulated/wall/prepainted/cargo, +/area/quartermaster/delivery) "qlP" = ( /obj/machinery/fitness/heavy/lifter, /obj/effect/floor_decal/corner_steel_grid{ @@ -23626,9 +24230,9 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "qmY" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/warehouse) +/obj/random/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "qmZ" = ( /obj/item/stool/padded, /obj/landmark/spawnpoint/job/entertainer, @@ -23907,10 +24511,6 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "qwg" = ( -/obj/machinery/power/apc/north_mount, -/obj/structure/cable/green{ - icon_state = "0-2" - }, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, @@ -24201,6 +24801,13 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) +"qHt" = ( +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/delivery) "qHy" = ( /obj/structure/table/steel, /obj/item/storage/firstaid/regular, @@ -24542,14 +25149,10 @@ /turf/simulated/floor/tiled/dark, /area/security/lobby) "qVI" = ( -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil{ - pixel_y = 4 - }, -/obj/item/stack/cable_coil{ - pixel_y = -5 +/obj/machinery/door/airlock/maintenance, +/obj/machinery/door/firedoor{ + dir = 8 }, -/obj/structure/table/reinforced, /turf/simulated/floor/plating, /area/quartermaster/delivery) "qVJ" = ( @@ -24891,6 +25494,12 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) +"rku" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/catwalk) "rkz" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 @@ -24942,6 +25551,7 @@ /area/endeavour/hallway/d3fwdhall) "rmb" = ( /obj/machinery/light, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/endeavour/surfacebase/mining_main/break_room) "rme" = ( @@ -25253,16 +25863,12 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "rwh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 4; + icon_state = "pipe-c" }, -/turf/simulated/floor/tiled/dark, +/obj/structure/catwalk, +/turf/simulated/floor/plating, /area/quartermaster/foyer) "rwx" = ( /obj/effect/floor_decal/spline/fancy/wood{ @@ -25310,6 +25916,12 @@ }, /turf/simulated/floor/tiled, /area/quartermaster/office) +"ryd" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/delivery) "ryu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -25433,6 +26045,10 @@ }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) +"rCg" = ( +/obj/random/maintenance, +/turf/simulated/floor/plating, +/area/quartermaster/belterdock/refinery) "rCI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -25542,7 +26158,7 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "rEk" = ( -/turf/simulated/wall/r_wall, +/turf/simulated/wall/r_wall/prepainted, /area/maintenance/bar/catwalk) "rEv" = ( /obj/structure/cable/green{ @@ -25612,6 +26228,18 @@ }, /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) +"rHI" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/foyer) "rIA" = ( /obj/structure/table/rack, /turf/simulated/floor/plating, @@ -25881,6 +26509,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "rQE" = ( @@ -25953,6 +26582,12 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) +"rSZ" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/quartermaster/belterdock/refinery) "rTm" = ( /obj/structure/cable/green{ icon_state = "0-2" @@ -26337,16 +26972,17 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/security/lobby) "shF" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/flora/ausbushes/ywflowers, +/obj/effect/floor_decal/spline/plain{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/grass, /area/quartermaster/warehouse) "shG" = ( /obj/machinery/holopad, @@ -26493,7 +27129,7 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, -/obj/machinery/vending/loadout/costume, +/obj/machinery/vending/loadout/gadget, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "slv" = ( @@ -26630,6 +27266,9 @@ /obj/map_helper/access_helper/airlock/station/supply/maintenance, /turf/simulated/floor/plating, /area/crew_quarters/recreation_area) +"soE" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/quartermaster/foyer) "soV" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -27252,6 +27891,12 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hos) +"sGw" = ( +/obj/structure/table, +/obj/random/tetheraid, +/obj/random/maintenance/security, +/turf/simulated/floor/wood, +/area/quartermaster/belterdock/refinery) "sGz" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 @@ -27294,6 +27939,16 @@ }, /turf/simulated/floor/tiled/dark, /area/security/hallwayaux) +"sIY" = ( +/obj/effect/floor_decal/industrial/outline{ + color = "#D6DBDB" + }, +/obj/structure/closet/crate/large, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/warehouse) "sJu" = ( /obj/structure/lattice, /turf/space, @@ -27591,6 +28246,12 @@ }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) +"sVH" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 9 + }, +/turf/simulated/floor/grass, +/area/quartermaster/warehouse) "sWa" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -27883,6 +28544,26 @@ }, /turf/simulated/floor/tiled, /area/security/hanger) +"teD" = ( +/obj/effect/floor_decal/techfloor{ + dir = 4 + }, +/obj/effect/floor_decal/techfloor/hole{ + dir = 4 + }, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/bar/catwalk) +"teG" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 5 + }, +/obj/vehicle/sealed/mecha/combat/fighter/cludge{ + dir = 1; + name = "\improper NLS Legal Salvage"; + desc = "A heater, nozzle, and fuel tank strapped together. There are exposed wires strewn about it. Hastily scrawled along the portside cockpit entrance using big, blocky script (in what appears to be crayon?) is the name 'NLS LEGAL SALVAGE'" + }, +/turf/simulated/floor/grass, +/area/quartermaster/warehouse) "tfn" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/detectives_office) @@ -28055,9 +28736,16 @@ /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/recreation_area) "tkT" = ( -/obj/structure/salvageable/server, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil{ + pixel_y = 4 + }, +/obj/item/stack/cable_coil{ + pixel_y = -5 + }, +/obj/structure/table/reinforced, /turf/simulated/floor/plating, -/area/quartermaster/delivery) +/area/vacant/vacant_shop) "tle" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/structure/table/woodentable, @@ -28154,6 +28842,12 @@ }, /turf/simulated/floor/airless, /area/space) +"toS" = ( +/obj/machinery/floor_light/changing/prebuilt{ + on = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/belterdock/gear) "tpm" = ( /obj/machinery/camera/network/civilian, /obj/effect/floor_decal/borderfloorblack{ @@ -28326,6 +29020,9 @@ color = "#D6DBDB" }, /obj/structure/closet/crate/science, +/obj/machinery/door/firedoor{ + dir = 8 + }, /turf/simulated/floor/tiled/monodark, /area/quartermaster/warehouse) "twA" = ( @@ -28343,6 +29040,13 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) +"twO" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/quartermaster/belterdock/refinery) "twR" = ( /turf/simulated/wall/r_wall/prepainted/cargo, /area/quartermaster/qm) @@ -28384,6 +29088,25 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) +"tyl" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/flora/ausbushes/ywflowers, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/grass, +/area/quartermaster/foyer) "tzm" = ( /obj/structure/disposalpipe/junction{ dir = 8 @@ -28544,18 +29267,11 @@ /turf/simulated/floor/plating, /area/quartermaster/foyer) "tES" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/navblue/border{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/effect/floor_decal/industrial/warning{ + dir = 6 }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3portforhall) +/turf/simulated/floor/reinforced, +/area/quartermaster/warehouse) "tGi" = ( /obj/structure/table/woodentable, /obj/item/handcuffs/legcuffs/fuzzy, @@ -29001,6 +29717,18 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"tVF" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/foyer) "tVX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -29112,10 +29840,10 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "tZV" = ( -/obj/item/radio/intercom{ - req_access = list(); - pixel_y = -26 - }, +/obj/structure/table/steel, +/obj/random/cigarettes, +/obj/random/maintenance/security, +/obj/random/coin, /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "tZY" = ( @@ -29400,17 +30128,9 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "uiJ" = ( -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/obj/effect/floor_decal/borderfloorblack/corner{ - dir = 8 - }, -/obj/effect/floor_decal/corner/brown/bordercorner{ - dir = 8 - }, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/foyer) +/obj/random/trash_pile, +/turf/simulated/floor/plating, +/area/maintenance/bar/catwalk) "uiK" = ( /obj/machinery/light{ dir = 1 @@ -29419,6 +30139,7 @@ dir = 2; icon_state = "pipe-c" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "uiN" = ( @@ -29487,11 +30208,9 @@ /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "ukf" = ( -/obj/item/tool/crowbar/red, -/obj/structure/table/reinforced, -/obj/item/tool/screwdriver, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/quartermaster/delivery) +/area/quartermaster/belterdock) "ukT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -29543,6 +30262,13 @@ /obj/structure/table/rack, /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) +"umo" = ( +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/quartermaster/belterdock/refinery) "umw" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 5 @@ -29783,6 +30509,17 @@ }, /turf/simulated/floor/tiled/monotile, /area/security/hallway) +"uuE" = ( +/obj/random/trash_pile, +/obj/structure/railing, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/endeavour/surfacebase/mining_main/break_room) "uvh" = ( /obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -29954,17 +30691,15 @@ /turf/simulated/floor/carpet, /area/security/detectives_office) "uAU" = ( -/obj/structure/sign/warning/moving_parts{ - pixel_y = 32 - }, -/obj/machinery/conveyor_switch/oneway{ - tag = "mailroom"; - id = "DLBelt" - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/lower/trash_pit) +"uAV" = ( +/obj/structure/railing{ + dir = 1 }, -/turf/simulated/floor/tiled/monodark, +/obj/random/trash_pile, +/turf/simulated/floor/plating, /area/quartermaster/foyer) "uBK" = ( /obj/structure/cable/green{ @@ -30433,6 +31168,12 @@ /obj/machinery/computer/arcade/battle, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"uPG" = ( +/obj/item/tool/crowbar/red, +/obj/structure/table/reinforced, +/obj/item/tool/screwdriver, +/turf/simulated/floor/plating, +/area/vacant/vacant_shop) "uPY" = ( /obj/item/material/ashtray/bronze, /obj/structure/cable/green{ @@ -30465,8 +31206,7 @@ /turf/simulated/floor/plating, /area/quartermaster/belterdock/gear) "uRN" = ( -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/plating, +/turf/simulated/wall/r_wall/prepainted, /area/quartermaster/delivery) "uSv" = ( /obj/structure/table/woodentable, @@ -30732,6 +31472,7 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, +/obj/random/trash_pile, /turf/simulated/floor/plating, /area/quartermaster/belterdock/refinery) "vaR" = ( @@ -30745,6 +31486,10 @@ /obj/effect/paint/beastybrown, /turf/simulated/floor/plating, /area/quartermaster/warehouse) +"vbg" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/maintenance/bar/catwalk) "vbj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -31033,6 +31778,13 @@ }, /turf/simulated/floor/tiled/dark, /area/crew_quarters/bar) +"vlq" = ( +/obj/structure/closet/crate/solar, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/catwalk) "vlu" = ( /obj/structure/window/reinforced{ dir = 4 @@ -31189,6 +31941,16 @@ }, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"voE" = ( +/obj/effect/floor_decal/techfloor{ + dir = 5 + }, +/obj/effect/floor_decal/techfloor/hole{ + dir = 4 + }, +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/bar/catwalk) "voJ" = ( /obj/structure/table/woodentable, /obj/machinery/recharger, @@ -31429,7 +32191,7 @@ /obj/machinery/air_alarm{ pixel_y = 22 }, -/obj/machinery/vending/nifsoft_shop, +/obj/machinery/vending/loadout, /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "vxE" = ( @@ -31717,7 +32479,8 @@ icon_state = "1-4" }, /obj/structure/disposalpipe/segment{ - dir = 8 + dir = 8; + icon_state = "pipe-c" }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) @@ -32260,7 +33023,6 @@ sortType = "Trash"; dir = 8 }, -/obj/machinery/light, /obj/structure/cable/green{ icon_state = "1-4" }, @@ -32465,6 +33227,11 @@ /obj/structure/undies_wardrobe, /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_12) +"vXN" = ( +/obj/effect/floor_decal/spline/plain, +/obj/structure/flora/ausbushes/brflowers, +/turf/simulated/floor/grass, +/area/quartermaster/warehouse) "vYG" = ( /obj/structure/table/woodentable, /obj/item/storage/box/donkpockets, @@ -32613,12 +33380,29 @@ }, /turf/simulated/floor/tiled/dark, /area/security/hallway) -"wcT" = ( -/obj/structure/disposalpipe/segment{ +"wcc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/vacant/vacant_shop) +/obj/structure/flora/ausbushes/fullgrass, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/grass, +/area/quartermaster/foyer) +"wcT" = ( +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/quartermaster/belterdock/refinery) "wdk" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -33221,20 +34005,26 @@ /turf/simulated/floor/tiled/dark, /area/security/tactical) "wzB" = ( -/obj/effect/floor_decal/industrial/warning{ +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor{ dir = 8 }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/foyer) +/turf/simulated/floor/tiled/dark, +/area/quartermaster/warehouse) "wzV" = ( /turf/simulated/wall/r_wall/prepainted/cargo, /area/quartermaster/belterdock) "wAe" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/brown/border, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/machinery/camera/network/cargo{ dir = 1 }, @@ -33329,6 +34119,23 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/security/hallway) +"wDp" = ( +/obj/structure/table/standard, +/obj/item/paper_bin, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/brown/bordercorner2{ + dir = 10 + }, +/obj/machinery/camera/network/cargo{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/delivery) "wEv" = ( /obj/machinery/gibber, /turf/simulated/floor/tiled/freezer, @@ -33526,6 +34333,25 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_3) +"wKr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/flora/ausbushes/grassybush, +/obj/machinery/door/firedoor{ + dir = 1 + }, +/turf/simulated/floor/grass, +/area/quartermaster/foyer) "wKM" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -33726,6 +34552,12 @@ /obj/map_helper/access_helper/airlock/station/supply/department, /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) +"wTc" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/quartermaster/belterdock/refinery) "wTk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -34155,6 +34987,9 @@ }, /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/sleep/Dorm_13) +"xhN" = ( +/turf/simulated/wall/r_wall/prepainted, +/area/endeavour/surfacebase/mining_main/break_room) "xiG" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -34251,22 +35086,23 @@ /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) "xlC" = ( -/obj/structure/table/standard, -/obj/item/paper_bin, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 10 - }, -/obj/effect/floor_decal/corner/brown/bordercorner2{ - dir = 10 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/camera/network/cargo{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/light{ +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ dir = 8 }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/foyer) +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "xlR" = ( /obj/machinery/power/apc/south_mount, /obj/structure/cable/green{ @@ -34538,6 +35374,15 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardamidhall) +"xyh" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/warehouse) "xyl" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 1 @@ -34763,6 +35608,16 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"xEQ" = ( +/obj/effect/floor_decal/techfloor{ + dir = 9 + }, +/obj/structure/table/steel, +/obj/item/storage/toolbox/mechanical, +/obj/item/stack/cable_coil, +/obj/random/drinkbottle, +/turf/simulated/floor/tiled/techfloor, +/area/maintenance/bar/catwalk) "xFB" = ( /obj/effect/floor_decal/corner/red{ dir = 6 @@ -34797,6 +35652,10 @@ }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"xHO" = ( +/obj/structure/salvageable/bliss, +/turf/simulated/floor/plating, +/area/vacant/vacant_shop) "xHY" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, @@ -34945,6 +35804,7 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) "xLN" = ( @@ -35050,6 +35910,10 @@ }, /turf/simulated/floor/tiled/dark, /area/security/brig) +"xNI" = ( +/obj/random/toy, +/turf/simulated/floor/plating, +/area/quartermaster/belterdock/refinery) "xPj" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -35089,20 +35953,20 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "xPU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/green{ - icon_state = "2-8" - }, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/foyer) +/obj/structure/closet/toolcloset, +/obj/random/tool, +/obj/random/tool, +/obj/random/tool, +/obj/random/tool, +/obj/random/tool, +/obj/random/tool, +/obj/item/stack/cable_coil/random, +/obj/item/stack/cable_coil/random, +/obj/item/stack/cable_coil/random, +/obj/item/stack/cable_coil/random, +/obj/random/coin, +/turf/simulated/floor, +/area/maintenance/bar/catwalk) "xQu" = ( /obj/machinery/recharger/wallcharger{ pixel_x = 32; @@ -35530,12 +36394,9 @@ /turf/simulated/floor/tiled/dark, /area/security/brig) "yfX" = ( -/obj/machinery/power/apc/north_mount, -/obj/structure/cable/green{ - icon_state = "0-4" - }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/foyer) +/obj/machinery/vending/nifsoft_shop, +/turf/simulated/floor/tiled/dark, +/area/vacant/vacant_shop) "ygd" = ( /obj/effect/floor_decal/corner_steel_grid{ dir = 1 @@ -35750,6 +36611,15 @@ }, /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) +"ymb" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/turf/simulated/floor/grass, +/area/quartermaster/warehouse) "ymh" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -42436,7 +43306,7 @@ gNV kbt uzm iaP -qLS +rku qLS qLS tXh @@ -43014,15 +43884,15 @@ pRW jYr aKn rEk -qLS -qLS -qLS -qLS -qLS -qLS -qLS +xEQ +anU +esB +jVx +rEk +cWd +bsN eZz -qLS +uiJ qCs bje rTq @@ -43208,13 +44078,13 @@ pRW jGe jYr rEk -qLS -qLS -qLS -qLS -qLS -qLS -qLS +njM +eVb +eVb +mJQ +rEk +uiJ +bsN eZz eZz qCs @@ -43402,19 +44272,19 @@ pRW pRW pRW rEk -qLS -qLS -qLS -qLS -qLS +voE +kkx +teD +fzr +rEk qLS qLS qLS eZz -esB +nxz xLD -lif -lif +uAU +uAU nxz xZH leL @@ -43596,18 +44466,18 @@ pRW pRW pRW rEk -qLS -qLS -qLS -qLS -qLS +rEk +rEk +vbg +rEk +rEk qLS qLS qLS eZz -esB -lif +nxz lif +uAU lif nxz xZH @@ -43790,19 +44660,19 @@ pRW pRW pRW rEk +xPU qLS +eZz +hpG qLS -qLS -qLS -qLS -qLS -qLS -qLS +kCu +kCu eZz -esB -lif -lif +jKP +nxz lif +uAU +uAU nxz xZH leL @@ -43984,16 +44854,16 @@ pRW pRW pRW rEk +eXx qLS -qLS -qLS -qLS -qLS -qLS +eZz +eZz +eZz +eZz qLS qLS eZz -esB +nxz naI iJR kDx @@ -44178,11 +45048,11 @@ pRW pRW pRW rEk +vlq qLS qLS qLS -qLS -qLS +uiJ qLS qLS qLS @@ -44381,11 +45251,11 @@ tOv tOv aDU gqQ -aDU -aDU -aDU -aDU -aDU +mff +mff +mff +mff +mff xZH leL pir @@ -44576,10 +45446,10 @@ rPE qJB jPs mff -kow -kow -kow -aDU +sGw +xNI +jwr +mff gwe leL pir @@ -44769,11 +45639,11 @@ jAA uRz qJB jPs -kow -kow -kow +mff +rSZ +iTk tZV -aDU +mff bbL leL uvj @@ -44958,16 +45828,16 @@ vSl iXY wuh blB -jAA +mrn qiz fRP qJB jPs -kow -kow -kow -kow -aDU +mff +mff +jgF +mff +mff kgM fPG pir @@ -45152,16 +46022,16 @@ vSl iXY wuh wAQ -nWc +toS qiz kRu qJB jPs -kow -kow -kow -kow -aDU +bWR +fLp +wcT +nay +mff xZH puP pir @@ -45346,7 +46216,7 @@ vSl mcn wuh bWp -nWc +toS fRP fRP qJB @@ -45544,13 +46414,13 @@ jAA jAA jAA tds +wcT +twO kow +wcT kow -kow -kow -kow -aDU -xZH +mff +fSt xzc pir sRJ @@ -45739,11 +46609,11 @@ nWc mwk qJB nin +umo kow -kow -kow -kow -aDU +wcT +nqP +mff xZH tol pir @@ -45934,10 +46804,10 @@ dPs dPs qJB vaA +rCg +wcT kow -kow -kow -aDU +mff sDq tol pir @@ -46127,13 +46997,13 @@ pvB jtk mti qJB +wTc +wTc +wcT kow -kow -kow -kow -aDU +mff kgM -buX +xzc xbH xZH qXh @@ -46321,11 +47191,11 @@ qoU dqA dTQ bQe -kow -kow -kow -kow -aDU +wcT +wcT +wcT +rCg +nqP kgM pXt fTU @@ -46515,11 +47385,11 @@ hwP gQF pDx sFX +wcT +mBo kow kow -kow -kow -aDU +aCg kgM pYt pYt @@ -46709,11 +47579,11 @@ tBn qcx dTQ dPs -vyv -vyv -aDU -aDU -aDU +nms +akl +kow +mIG +mjy kgM pYt wHF @@ -46903,11 +47773,11 @@ rLo ePx xPu dPs +nms vyv -vyv -lMH -lMH -lMH +cJJ +cJJ +cJJ lMH pYt sKV @@ -47098,8 +47968,8 @@ dPs dPs dPs pqk -dPs -lMH +xhN +cJJ gic qBI lMH @@ -47291,8 +48161,8 @@ xkg mlk veW dPs -vyv -vyv +nms +nms lMH hMP evn @@ -47485,7 +48355,7 @@ jCu aFS bol dPs -vyv +uuE rmb lMH lMH @@ -47679,8 +48549,8 @@ xkg aZK pDn dPs -vyv -vyv +nms +nms lMH vIC vmT @@ -47873,8 +48743,8 @@ aHA vkn vkn vkn -vyv -vyv +nms +buX lMH cgt fCZ @@ -48067,10 +48937,10 @@ cZe tBN fNj wzV -cNA -cNA +ukf +ukf lMH -ukb +yfX ukb vOS pYt @@ -48261,8 +49131,8 @@ cQm vdN ipL wzV -cNA -cNA +cDY +ukf lMH vxy ukb @@ -48455,8 +49325,8 @@ eBy bTA mmw wzV -cNA -cNA +dlE +ukf lMH iON ukb @@ -48649,8 +49519,8 @@ fRJ heO oNw wzV -cNA -cNA +adi +ukf lMH new ukb @@ -48660,7 +49530,7 @@ mlz xgS lMH cVy -rqN +xlC cpz syH nKI @@ -48844,7 +49714,7 @@ aBU uMs wzV cNA -cNA +ukf lMH evB ukb @@ -49037,8 +49907,8 @@ mIP kad xYM wzV -cNA -cNA +acO +ukf lMH skT ukb @@ -49232,15 +50102,15 @@ xLm gXm hdh hzu -hzu +lUu lMH -nqP -ukb -wcT -ukb +cBD ukb -iwp -lMH +ghV +jYY +kff +fUR +hkE qwg gLQ aAA @@ -49425,16 +50295,16 @@ gNj wnA tqv hdh -hzu -hzu -lMH -cBD -ukb -ghV -jYY -kff -fUR -hkE +lUu +lUu +cJJ +cJJ +cJJ +cJJ +cJJ +cJJ +cJJ +cJJ cnt lRP tlS @@ -49603,7 +50473,7 @@ gdU gdU jSX rER -vsY +xyh txc txc fYP @@ -49619,15 +50489,15 @@ aHh atw nfA hdh -hzu +lUu hzu cJJ -cJJ -cJJ -cJJ -cJJ -cJJ -cJJ +xHO +jtW +oNa +tkT +jBe +uPG cJJ xtI rZg @@ -49813,16 +50683,16 @@ wjW wnA lXM hdh +lUu hzu -hzu -eNB -fsN -tkT +uRN aIZ -qVI -jbh -ukf -eNB +aIZ +aIZ +aIZ +aIZ +aIZ +uRN txu ndp sid @@ -50007,16 +50877,16 @@ oGT xlg dIt hdh -hzu -hzu -eNB -aIZ +lUu +mNI +qVI aIZ aIZ aIZ aIZ aIZ -eNB +ays +uRN rcz xiG avK @@ -50201,16 +51071,16 @@ noW pzs bLd hdh -hzu -hzu +lUu +uAV uRN aIZ +lkP aIZ -aIZ -aIZ +sMN aIZ pdF -eNB +uRN uZv esx qBG @@ -50395,16 +51265,16 @@ waA xlg dIt hdh -hzu -hzu -eNB -aIZ -aIZ -aIZ -aIZ -aIZ -ays -eNB +lUu +soE +uRN +uRN +uRN +uRN +uRN +uRN +uRN +uRN tBY kXK jbI @@ -50573,11 +51443,11 @@ rER wmU ptR uxX -vsY -oOV +xyh +sIY tvT -pJe -qIr +wzB +hfw mSw mSw mSw @@ -50586,19 +51456,19 @@ mSw mSw mSw rXa -wnA +lye mii hdh -hzu -hzu -eNB -aIZ -lkP -aIZ -sMN -aIZ -pdF -eNB +rwh +qpd +nCY +che +dOT +hvh +dOT +che +wgN +hOq eja vCG swv @@ -50783,18 +51653,18 @@ rBZ xlg dIt hdh -hzu +aAy hdh -eNB -eNB -eNB -eNB -eNB -eNB -eNB +qlx +qlx +cna +gFc +ryd +qlx +qlx eNB gKi -kXK +xiG hLN syH kSn @@ -50978,17 +51848,17 @@ wnA lXM hdh boI -qpd -nCY -che -dOT -hvh -dOT -che -wgN -hOq -tES -drV +hdh +qHt +wDp +lDd +oOy +lDd +lDd +cPz +eNB +qxm +xiG avK syH kSn @@ -51152,12 +52022,12 @@ jYr mSw sjO ili -txc +jst ili ili rZY -qmY -qmY +txc +txc shT xCV tdk @@ -51172,15 +52042,15 @@ pZg cmi dyR hWB -hdh -jBe -jBe -uAU -oOy -wzB -jBe -jBe -hdh +hrS +dZb +xlg +xlg +hzi +xlg +xlg +oUd +tEQ sZQ xiG vzm @@ -51341,20 +52211,20 @@ pRW pRW pRW pRW -fDw pRW -mSw -gSF -eWe -uUl -uUl +pRW +kFu +mJv txc -scZ txc txc -sEz +txc +txc +txc +sVH +ymb shF -uhv +kdG aec sSl ldm @@ -51365,16 +52235,16 @@ mjB hUF dLj aDs -lAm -hdh -yfX -xlC -xlg -jhH -xlg -xlg -oXi -hdh +wnA +wfZ +rvC +pUj +pUj +pyh +vng +vng +ieQ +bJh cjH xiG bAI @@ -51535,20 +52405,20 @@ pRW pRW pRW pRW -jON -tUu -mSw -bgH -uUl -uUl -uVS +pRW +pRW +mFc +lea +joO txc -scZ txc txc txc -poa txc +iWE +kIg +bug +vXN wAe ldm ldm @@ -51557,18 +52427,18 @@ hJm ldm cmw cmw -bJS +hUc wki mhO -hrS -dZb +hdh xlg xlg -hzi xlg +iZj xlg -oUd -tEQ +xlg +xlg +hdh dns xlf swv @@ -51729,20 +52599,20 @@ pRW pRW pRW pRW -jON pRW -mSw -lwA +pRW +dMH +jRe +tES txc txc txc -vVA -scZ txc -ubA -ubA -poa -ubA +txc +teG +izs +nHC +cBK des ldm sDc @@ -51753,16 +52623,16 @@ omy rxO nKd gLK -wnA -wfZ -rvC -pUj -pUj -pyh -vng -vng -ieQ -jwr +lAm +hdh +hdh +hdh +hrS +bvE +hrS +iSL +hrS +hdh nJu nQm wtj @@ -51923,20 +52793,20 @@ pRW pRW pRW pRW -kYu -fDw +pRW +pRW mSw -mJv -vAk -tcb -uUl -ccA +gSF +txc +txc +txc +txc scZ txc -kxv -kxv -poa -kxv +awd +dJc +aTk +txc laQ ldm eDd @@ -51946,18 +52816,18 @@ qlg ffP cmw bJS -xPU +gLK dcu -hdh -hdh -hdh -hrS -bvE -hrS -iSL -hrS -hdh -lye +iwp +vKr +vKr +apt +vKr +vKr +apt +gal +atU +qxm kMk kYx syH @@ -52118,19 +52988,19 @@ pRW pRW pRW jON -pRW +tUu mSw bgH -oOV +eWe uUl uUl -kpn -dgn -czr -lEM -lEM -ldK -kTN +txc +scZ +txc +awd +sEz +oXi +uhv mpt ldm sFW @@ -52140,17 +53010,17 @@ ate iSP cmw bJS -rwh -uiJ +gLK +wnA egp -vKr -vKr -apt -vKr -vKr -apt -gal -hdh +wnA +wnA +wnA +wnA +wnA +wnA +wnA +bTd kGf kSN prZ @@ -52314,17 +53184,17 @@ pRW jON pRW mSw -ncP -txc -txc -txc -tbT +lwA +uUl +uUl +uVS +vVA scZ txc -tbK -tbK -ccA -tbK +dru +ubA +poa +ubA qIr ldm gnO @@ -52333,16 +53203,16 @@ nFa nzA omy rxO -bJS +rHI cmE -pZg +cPy jdF -kQS +wKr mFW -kQS -kQS +bcS +wcc oYC -kQS +tyl kQS flt fTy @@ -52509,16 +53379,16 @@ fDw pRW jon mJv -lKt -oOV -uUl -tbT -scZ txc -tbK -tbK +txc +txc ccA -tbK +scZ +txc +mNz +kxv +poa +kxv elJ ldm ldm @@ -52528,9 +53398,9 @@ ldm cmw cmw feq -jPe +dTZ wnA -nkT +egp wnA tdj wnA @@ -52702,17 +53572,17 @@ pRW fDw pRW jon -edk -uUl +bgH +vAk +tcb uUl -lKt -tbT -scZ -txc -aOG -aOG -ccA -aOG +kpn +dgn +czr +han +lEM +ldK +kTN rjY xai ldm @@ -52721,8 +53591,8 @@ ldm ldm oOI vKr -oyU -jPe +amY +tVF trd cdn hUF @@ -52896,17 +53766,17 @@ pRW kYu lIp jon -xKi -txc -txc -txc -mKJ +ncP +oOV +uUl +uUl +tbT scZ txc -txc -txc -aUM -xGr +drV +tbK +ccA +tbK txc rjY cyr @@ -52915,10 +53785,10 @@ sUL aqN oyU wnA -wnA +nkT jPe jYU -xng +hdh hdh mIN hdh @@ -53090,21 +53960,21 @@ pRW jON pRW mSw -tXt -txc -txc -aec -fil -jzp -rlm +mJv txc txc -ouS -txc txc +tbT +scZ txc +drV +tbK +ccA +tbK txc txc +ogP +ogP txc txc wnA @@ -53112,7 +53982,7 @@ wnA pQh nyi kPT -xng +hdh hzu lUu rMi @@ -53284,30 +54154,30 @@ pRW jON tUu mSw -neg -nbW -qGu -buN -mSw -hus -xPj -kcR -xPj -rrZ -dSm -rrZ -rrZ -rrZ -rrZ -xPj +edk +lKt +oOV +uUl +tbT +scZ +txc +aOG +aOG +ccA +aOG +txc +txc +ogP +ogP +txc qmQ qwK qSv -qSv +jbh nAS qBU -xng -hzu +hdh +fsN lUu rMi nBf @@ -53478,26 +54348,26 @@ pRW jON pRW mSw -mSw -mSw -jon -jon -mSw -wIy -nRo -jon -hcH -wQu -oFO -oFO -oFO -oFO -vZR -oFO +xKi +uUl +uUl +lKt +mKJ +scZ +txc +txc +txc +aUM +xGr +txc +txc +fml +fml +txc mSw rdv pWS -pWS +jhH kWu dld xng @@ -53671,23 +54541,23 @@ pRW pRW jON mDp -csb -aaK -csb -aaK -csb -jon -qAl -rJy -jon -rJy -jpo -oFO -csb -aaK -csb -aaK -csb +mSw +tXt +txc +txc +aec +fil +jzp +rlm +txc +txc +ouS +txc +txc +txc +txc +txc +txc jwx vvO ciU @@ -53865,23 +54735,23 @@ pRW pRW fDw fDw -aaK -aaK -aaK -aaK -aaK -vaR -bMN -epe -vaR -epe -wZh -vaR -aaK -aaK -aaK -aaK -qPi +mSw +neg +nbW +qGu +buN +mSw +hus +xPj +kcR +xPj +rrZ +dSm +rrZ +rrZ +rrZ +xPj +xPj mSw hdh hdh @@ -54059,23 +54929,23 @@ pRW pRW pRW pRW -csb -csb -csb -csb -csb -csb -csb -csb -csb -csb -csb -csb -csb -csb -csb -csb -csb +mSw +mSw +mSw +jon +jon +mSw +wIy +nRo +jon +hcH +wQu +oFO +oFO +oFO +oFO +vZR +oFO kKO fju mIk @@ -54253,22 +55123,22 @@ pRW pRW pRW pRW -qDH -mDp -mDp -aDe -csb -csb -csb -csb -csb -csb -csb csb +aaK csb +aaK csb +jon +qAl +rJy +jon +rJy +jpo +oFO csb +aaK csb +aaK csb kKO fju @@ -54278,7 +55148,7 @@ yab mIk fju ykp -ykp +pZR ewu uIh oyF @@ -54447,23 +55317,23 @@ pRW pRW pRW pRW -lIp -mDp -mDp -aDe -csb -csb -csb -csb -csb -csb -csb -csb -csb -csb -csb -csb -csb +aaK +aaK +aaK +aaK +aaK +vaR +bMN +epe +vaR +epe +wZh +vaR +aaK +aaK +aaK +aaK +qPi kKO fju fju @@ -54542,80 +55412,37 @@ pRW pRW pRW pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -"} -(98,1,1) = {" -mDp -mDp -mDp -mDp -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +mDp mDp mDp mDp @@ -54626,6 +55453,8 @@ mDp mDp mDp mDp +"} +(98,1,1) = {" mDp mDp mDp @@ -54641,10 +55470,52 @@ pRW pRW pRW pRW -lIp +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW mDp mDp -aDe +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +mDp +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +pRW +csb +csb +csb +csb +csb csb csb csb @@ -54655,7 +55526,6 @@ csb csb csb csb -poe csb csb fva @@ -54836,8 +55706,8 @@ pRW pRW pRW qDH -lIp -lIp +mDp +mDp aDe csb csb @@ -55032,7 +55902,7 @@ pRW lIp mDp mDp -lIp +aDe csb csb csb @@ -55226,8 +56096,7 @@ pRW lIp mDp mDp -lIp -csb +aDe csb csb csb @@ -55238,6 +56107,7 @@ csb csb csb csb +poe csb csb csb @@ -55418,24 +56288,24 @@ mDp pRW pRW qDH -mDp -mDp -lIp -aDe -aDe -aDe -lIp -aDe -aDe -aDe -aDe -aDe -aDe lIp lIp aDe csb csb +csb +csb +csb +csb +csb +csb +csb +csb +csb +csb +csb +csb +csb eAp jtn fju @@ -55615,19 +56485,19 @@ lIp mDp mDp lIp -mDp -mDp -lIp -mDp -mDp -mDp -mDp -mDp -lIp -mDp -mDp -mDp -aDe +csb +csb +csb +csb +csb +csb +csb +csb +csb +csb +csb +csb +csb csb cih eAp @@ -55806,22 +56676,22 @@ mDp pRW pRW lIp +mDp +mDp lIp -lIp -qDH -lIp -lIp -qDH -lIp -lIp -qDH -lIp -lIp -qDH -lIp -lIp -qDH -aDe +csb +csb +csb +csb +csb +csb +csb +csb +csb +csb +csb +csb +csb csb csb eAp @@ -55999,23 +56869,23 @@ pRW mDp mDp mDp +qDH mDp mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -pRW -pRW -pRW -pRW -pRW -pRW -pRW -pRW +lIp +aDe +aDe +aDe +lIp +aDe +aDe +aDe +aDe +aDe +aDe +lIp +lIp +aDe csb csb eAp @@ -56193,23 +57063,23 @@ pRW mDp mDp mDp +lIp mDp mDp +lIp mDp mDp +lIp mDp -gtM mDp mDp mDp mDp +lIp mDp -pRW -pRW -pRW -pRW -pRW -pRW +mDp +mDp +aDe csb csb eAp @@ -56387,27 +57257,27 @@ pRW mDp mDp mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -mDp -pRW -pRW +lIp +lIp +lIp +qDH +lIp +lIp +qDH +lIp +lIp +qDH +lIp +lIp +qDH +lIp +lIp +qDH +aDe csb csb eAp -fju +qmY fju mIk uqr @@ -56989,7 +57859,7 @@ pRW jGe jYr eAp -fju +qmY fju fju fju @@ -57387,7 +58257,7 @@ rDV rBG fju mIk -fju +qmY rBG saE bLl @@ -57579,7 +58449,7 @@ uJr crM kdZ rBG -fju +qmY mIk fju rBG @@ -58745,7 +59615,7 @@ wLe vRl vRl mIk -fju +qmY rBG lDx nTO From 960bb95146807bfed0a225ef59641e2f341a4c8d Mon Sep 17 00:00:00 2001 From: GySgtMurphy Date: Wed, 18 Dec 2024 23:19:44 -0500 Subject: [PATCH 5/9] no, i didn't mean to PACK Cargo with small craft like it's a goddamned aircraft carrier --- maps/endeavour/levels/deck3.dmm | 68 ++++----------------------------- 1 file changed, 7 insertions(+), 61 deletions(-) diff --git a/maps/endeavour/levels/deck3.dmm b/maps/endeavour/levels/deck3.dmm index 3585461e450b..ff0db0be5774 100644 --- a/maps/endeavour/levels/deck3.dmm +++ b/maps/endeavour/levels/deck3.dmm @@ -586,14 +586,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) -"awd" = ( -/obj/vehicle/sealed/mecha/combat/fighter/cludge{ - dir = 1; - name = "\improper NLS Legal Salvage"; - desc = "A heater, nozzle, and fuel tank strapped together. There are exposed wires strewn about it. Hastily scrawled along the portside cockpit entrance using big, blocky script (in what appears to be crayon?) is the name 'NLS LEGAL SALVAGE'" - }, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/warehouse) "awm" = ( /obj/machinery/door/airlock{ id_tag = "dorm3"; @@ -5105,17 +5097,6 @@ }, /turf/simulated/floor/tiled, /area/security/security_lockerroom) -"dru" = ( -/obj/effect/floor_decal/industrial/outline/red{ - color = "#AF0000" - }, -/obj/vehicle/sealed/mecha/combat/fighter/cludge{ - dir = 1; - name = "\improper NLS Legal Salvage"; - desc = "A heater, nozzle, and fuel tank strapped together. There are exposed wires strewn about it. Hastily scrawled along the portside cockpit entrance using big, blocky script (in what appears to be crayon?) is the name 'NLS LEGAL SALVAGE'" - }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/warehouse) "drJ" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -5141,15 +5122,6 @@ }, /turf/simulated/wall/r_wall/prepainted/cargo, /area/shuttle/mining_ship/general) -"drV" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/vehicle/sealed/mecha/combat/fighter/cludge{ - dir = 1; - name = "\improper NLS Legal Salvage"; - desc = "A heater, nozzle, and fuel tank strapped together. There are exposed wires strewn about it. Hastily scrawled along the portside cockpit entrance using big, blocky script (in what appears to be crayon?) is the name 'NLS LEGAL SALVAGE'" - }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/warehouse) "dsm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -11021,16 +10993,6 @@ }, /turf/simulated/floor/tiled/dark, /area/maintenance/starboardsolar) -"han" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/vehicle/sealed/mecha/combat/fighter/cludge{ - dir = 1; - name = "\improper NLS Legal Salvage"; - desc = "A heater, nozzle, and fuel tank strapped together. There are exposed wires strewn about it. Hastily scrawled along the portside cockpit entrance using big, blocky script (in what appears to be crayon?) is the name 'NLS LEGAL SALVAGE'" - }, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/warehouse) "haF" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/maintenance/starboardsolar) @@ -18950,17 +18912,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/brig) -"mNz" = ( -/obj/effect/floor_decal/industrial/hatch{ - color = "#AF0000" - }, -/obj/vehicle/sealed/mecha/combat/fighter/cludge{ - dir = 1; - name = "\improper NLS Legal Salvage"; - desc = "A heater, nozzle, and fuel tank strapped together. There are exposed wires strewn about it. Hastily scrawled along the portside cockpit entrance using big, blocky script (in what appears to be crayon?) is the name 'NLS LEGAL SALVAGE'" - }, -/turf/simulated/floor/tiled/monodark, -/area/quartermaster/warehouse) "mNI" = ( /obj/structure/railing{ dir = 1 @@ -28557,11 +28508,6 @@ /obj/effect/floor_decal/spline/plain{ dir = 5 }, -/obj/vehicle/sealed/mecha/combat/fighter/cludge{ - dir = 1; - name = "\improper NLS Legal Salvage"; - desc = "A heater, nozzle, and fuel tank strapped together. There are exposed wires strewn about it. Hastily scrawled along the portside cockpit entrance using big, blocky script (in what appears to be crayon?) is the name 'NLS LEGAL SALVAGE'" - }, /turf/simulated/floor/grass, /area/quartermaster/warehouse) "tfn" = ( @@ -52803,7 +52749,7 @@ txc txc scZ txc -awd +txc dJc aTk txc @@ -52997,7 +52943,7 @@ uUl txc scZ txc -awd +txc sEz oXi uhv @@ -53191,7 +53137,7 @@ uVS vVA scZ txc -dru +ubA ubA poa ubA @@ -53385,7 +53331,7 @@ txc ccA scZ txc -mNz +kxv kxv poa kxv @@ -53579,7 +53525,7 @@ uUl kpn dgn czr -han +lEM lEM ldK kTN @@ -53773,7 +53719,7 @@ uUl tbT scZ txc -drV +tbK tbK ccA tbK @@ -53967,7 +53913,7 @@ txc tbT scZ txc -drV +tbK tbK ccA tbK From 8b3a70d7337a9b31c83a4a0df6e03462286b0194 Mon Sep 17 00:00:00 2001 From: GySgtMurphy Date: Thu, 19 Dec 2024 00:34:38 -0500 Subject: [PATCH 6/9] tuned some green space --- maps/endeavour/levels/deck3.dmm | 71 +++++---------------------------- 1 file changed, 9 insertions(+), 62 deletions(-) diff --git a/maps/endeavour/levels/deck3.dmm b/maps/endeavour/levels/deck3.dmm index ff0db0be5774..366b4cbb7a7d 100644 --- a/maps/endeavour/levels/deck3.dmm +++ b/maps/endeavour/levels/deck3.dmm @@ -1614,25 +1614,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/riot_control) -"bcS" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/machinery/door/firedoor{ - dir = 1 - }, -/turf/simulated/floor/grass, -/area/quartermaster/foyer) "bed" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -16192,17 +16173,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/flora/ausbushes/sparsegrass, -/obj/machinery/door/firedoor{ - dir = 1 - }, -/turf/simulated/floor/grass, +/turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "kRb" = ( /obj/machinery/door/firedoor/glass, @@ -18700,17 +18671,7 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/flora/ausbushes/brflowers, -/obj/machinery/door/firedoor{ - dir = 1 - }, -/turf/simulated/floor/grass, +/turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "mGv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -22259,6 +22220,9 @@ /obj/machinery/door/firedoor{ dir = 1 }, +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/simulated/floor/grass, /area/quartermaster/foyer) "oYK" = ( @@ -29051,6 +29015,7 @@ /obj/machinery/door/firedoor{ dir = 1 }, +/obj/structure/window/reinforced, /turf/simulated/floor/grass, /area/quartermaster/foyer) "tzm" = ( @@ -33326,25 +33291,6 @@ }, /turf/simulated/floor/tiled/dark, /area/security/hallway) -"wcc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/flora/ausbushes/fullgrass, -/obj/machinery/door/firedoor{ - dir = 1 - }, -/turf/simulated/floor/grass, -/area/quartermaster/foyer) "wcT" = ( /obj/structure/catwalk, /turf/simulated/floor/plating, @@ -34296,6 +34242,7 @@ /obj/machinery/door/firedoor{ dir = 1 }, +/obj/structure/window/reinforced, /turf/simulated/floor/grass, /area/quartermaster/foyer) "wKM" = ( @@ -53155,8 +53102,8 @@ cPy jdF wKr mFW -bcS -wcc +kQS +kQS oYC tyl kQS From 28fb0b5fa1fd54922fa1fefe1f9a3753072fabf9 Mon Sep 17 00:00:00 2001 From: GySgtMurphy Date: Thu, 19 Dec 2024 17:58:16 -0500 Subject: [PATCH 7/9] wire checks, pipes, and area fixes --- maps/endeavour/levels/deck3.dmm | 2375 +++++++++++++++++-------------- 1 file changed, 1343 insertions(+), 1032 deletions(-) diff --git a/maps/endeavour/levels/deck3.dmm b/maps/endeavour/levels/deck3.dmm index 366b4cbb7a7d..5c1169c235ac 100644 --- a/maps/endeavour/levels/deck3.dmm +++ b/maps/endeavour/levels/deck3.dmm @@ -66,7 +66,7 @@ "acO" = ( /obj/random/trash_pile, /turf/simulated/floor/plating, -/area/quartermaster/belterdock) +/area/endeavour/hallway/d3aftmaint) "acT" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/structure/table/woodentable, @@ -86,7 +86,7 @@ /obj/machinery/floodlight, /obj/structure/railing, /turf/simulated/floor/plating, -/area/quartermaster/belterdock) +/area/endeavour/hallway/d3aftmaint) "adB" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -238,9 +238,14 @@ /turf/simulated/floor/crystal, /area/endeavour/hallway/d3fwdhall) "akl" = ( -/obj/structure/railing, -/turf/simulated/floor/plating, -/area/endeavour/surfacebase/mining_main/break_room) +/obj/machinery/button/remote/blast_door{ + id = "salvage_launch"; + name = "Salvager Bay Doors"; + pixel_y = -5; + req_access = list(19) + }, +/turf/simulated/wall/r_wall/prepainted/cargo, +/area/quartermaster/miningdock) "akA" = ( /obj/structure/bed/chair{ dir = 4 @@ -481,6 +486,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monodark, /area/quartermaster/foyer) +"atS" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "atT" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -488,8 +505,12 @@ /obj/structure/cable/green{ icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "atU" = ( @@ -572,7 +593,7 @@ /obj/machinery/mineral/output, /obj/machinery/light, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/miningdock) +/area/quartermaster/belterdock/refinery) "avW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -680,7 +701,7 @@ "ays" = ( /obj/structure/salvageable/autolathe, /turf/simulated/floor/plating, -/area/quartermaster/delivery) +/area/endeavour/hallway/d3aftmaint) "ayC" = ( /obj/structure/toilet{ dir = 8 @@ -798,8 +819,9 @@ /area/quartermaster/belterdock) "aCg" = ( /obj/structure/closet/emcloset, +/obj/machinery/light/small, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "aCi" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -836,18 +858,18 @@ /turf/space, /area/space) "aDs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable/green{ icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "aDU" = ( @@ -878,7 +900,7 @@ /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/brown/border, /turf/simulated/floor/tiled, -/area/endeavour/surfacebase/mining_main/break_room) +/area/quartermaster/cargo_shelter_dock) "aGh" = ( /obj/effect/floor_decal/corner/blue{ dir = 4 @@ -929,7 +951,7 @@ pixel_y = 22 }, /turf/simulated/wall/prepainted/cargo, -/area/endeavour/surfacebase/mining_main/break_room) +/area/quartermaster/cargo_shelter_dock) "aGV" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -988,7 +1010,7 @@ dir = 4 }, /turf/simulated/floor/tiled, -/area/endeavour/surfacebase/mining_main/break_room) +/area/quartermaster/cargo_shelter_dock) "aHR" = ( /obj/effect/floor_decal/corner/green{ dir = 9 @@ -1047,8 +1069,11 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "aIZ" = ( +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, -/area/quartermaster/delivery) +/area/endeavour/hallway/d3aftmaint) "aKg" = ( /obj/machinery/washing_machine, /turf/simulated/floor/tiled/white, @@ -1263,7 +1288,6 @@ dir = 8 }, /obj/machinery/door/airlock/maintenance, -/obj/map_helper/access_helper/airlock/station/maintenance, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/bar/catwalk) @@ -1490,7 +1514,7 @@ use_power = 0 }, /turf/simulated/floor/tiled, -/area/endeavour/surfacebase/mining_main/break_room) +/area/quartermaster/cargo_shelter_dock) "aZS" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -1918,7 +1942,7 @@ /obj/structure/mopbucket, /obj/item/mop, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/gear) +/area/quartermaster/storage) "blM" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -1981,7 +2005,7 @@ "bol" = ( /obj/machinery/vending/snack, /turf/simulated/floor/tiled/dark, -/area/endeavour/surfacebase/mining_main/break_room) +/area/quartermaster/cargo_shelter_dock) "box" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -2046,8 +2070,11 @@ icon_state = "2-4" }, /obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "bqn" = ( /obj/structure/sign/directions/cryo{ dir = 4; @@ -2072,18 +2099,12 @@ /area/endeavour/hallway/d3afthall) "bqs" = ( /obj/effect/floor_decal/corner/brown/diagonal, -/obj/machinery/holopad, +/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 + icon_state = "1-4" }, /turf/simulated/floor/tiled/white, -/area/quartermaster/warehouse) +/area/quartermaster/belterdock/gear) "brs" = ( /obj/machinery/power/terminal, /obj/structure/cable{ @@ -2180,14 +2201,15 @@ /turf/simulated/floor/tiled, /area/hydroponics) "bug" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/structure/catwalk, +/obj/structure/railing{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "2-4" }, -/turf/simulated/floor/grass, -/area/quartermaster/warehouse) +/turf/simulated/floor/plating, +/area/maintenance/bar/catwalk) "buq" = ( /obj/structure/cable{ icon_state = "4-8" @@ -2265,7 +2287,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/endeavour/surfacebase/mining_main/break_room) +/area/endeavour/hallway/d3aftmaint) "bvs" = ( /obj/machinery/air_alarm{ dir = 4; @@ -2295,7 +2317,7 @@ dir = 4 }, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/foyer) +/area/quartermaster/delivery) "bvI" = ( /obj/machinery/light/small{ dir = 8 @@ -2331,6 +2353,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/reinforced, /area/quartermaster/miningdock) "byF" = ( @@ -2410,9 +2435,7 @@ /obj/effect/floor_decal/corner/navblue/border, /obj/effect/floor_decal/borderfloorblack/corner2, /obj/effect/floor_decal/corner/navblue/bordercorner2, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "bBc" = ( @@ -2626,7 +2649,7 @@ req_one_access = null }, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/foyer) +/area/quartermaster/delivery) "bJy" = ( /obj/machinery/door/airlock/maintenance, /obj/map_helper/access_helper/airlock/station/engineering/department, @@ -2794,7 +2817,7 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/multi_tile/metal/mait, /turf/simulated/floor/tiled/monotile, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "bQp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -3012,8 +3035,11 @@ /obj/machinery/light/small{ dir = 1 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/gear) +/area/quartermaster/storage) "bWK" = ( /turf/simulated/wall/prepainted, /area/endeavour/station/stairs_three) @@ -3023,7 +3049,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "bXD" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/palebottlegreen, @@ -3225,7 +3251,7 @@ desc = "Heavy duty, airtight, plastic flaps." }, /turf/simulated/floor/plating, -/area/quartermaster/delivery) +/area/endeavour/hallway/d3aftmaint) "chh" = ( /turf/simulated/floor/tiled/techfloor, /area/security/lobby) @@ -3306,6 +3332,9 @@ /obj/effect/floor_decal/corner/brown/bordercorner{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "cmw" = ( @@ -3675,10 +3704,8 @@ /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "cBK" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 6 - }, -/turf/simulated/floor/grass, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "cBR" = ( /obj/structure/disposalpipe/segment{ @@ -3777,16 +3804,19 @@ dir = 1 }, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/miningdock) +/area/quartermaster/belterdock/refinery) "cDY" = ( /obj/random/trash_pile, /obj/structure/railing, /turf/simulated/floor/plating, -/area/quartermaster/belterdock) +/area/endeavour/hallway/d3aftmaint) "cEd" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "cEz" = ( @@ -4008,6 +4038,12 @@ }, /turf/simulated/floor/tiled/old_cargo/gray, /area/prison/cell_block) +"cLq" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/miningdock) "cLH" = ( /obj/machinery/status_display{ pixel_y = 32 @@ -4075,8 +4111,12 @@ /turf/simulated/floor/tiled/dark, /area/security/armoury) "cNA" = ( -/turf/simulated/floor/plating, -/area/quartermaster/belterdock) +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/quartermaster/belterdock/gear) "cPy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -4395,9 +4435,6 @@ /obj/machinery/door/firedoor, /obj/machinery/door/airlock/maintenance, /obj/structure/catwalk, -/obj/structure/cable/green{ - icon_state = "4-8" - }, /obj/map_helper/access_helper/airlock/station/maintenance, /turf/simulated/floor/plating, /area/crew_quarters/bar/lounge) @@ -4911,9 +4948,10 @@ /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "dlE" = ( -/obj/structure/railing, -/turf/simulated/floor/plating, -/area/quartermaster/belterdock) +/obj/structure/lattice, +/obj/structure/grille, +/turf/space/basic, +/area/space) "dlG" = ( /obj/structure/cable{ icon_state = "1-2" @@ -4950,12 +4988,15 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "dmA" = ( -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/bar/catwalk) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/quartermaster/belterdock/gear) "dmR" = ( /obj/machinery/light_switch{ pixel_y = -23 @@ -4977,13 +5018,12 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "dns" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, /obj/structure/sign/department/mail{ pixel_y = 32 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portforhall) "dnz" = ( @@ -5050,6 +5090,13 @@ "dqd" = ( /turf/simulated/floor/tiled/dark, /area/security/range) +"dqn" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/bar/catwalk) "dqu" = ( /obj/effect/floor_decal/industrial/hatch/yellow, /obj/structure/lattice, @@ -5062,6 +5109,9 @@ /obj/structure/bed/chair/sofa/black{ dir = 1 }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "dqN" = ( @@ -5285,7 +5335,7 @@ /obj/effect/floor_decal/corner/brown/diagonal, /obj/structure/closet/secure_closet/miner, /turf/simulated/floor/tiled/white, -/area/quartermaster/warehouse) +/area/quartermaster/belterdock/gear) "dAT" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -5419,12 +5469,17 @@ /turf/simulated/floor/carpet, /area/crew_quarters/sleep/Dorm_10) "dGV" = ( -/obj/structure/cable/green{ - icon_state = "1-8" +/obj/effect/floor_decal/industrial/warning{ + dir = 4 }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/maintenance/bar/catwalk) +/obj/machinery/atmospheric_field_generator/perma, +/obj/machinery/shield_diffuser, +/obj/machinery/door/blast/regular{ + name = "Salvager Launch Blast Door"; + id = "salvage_launch" + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/miningdock) "dHD" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -5517,16 +5572,37 @@ }, /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) -"dJV" = ( -/obj/machinery/light{ - dir = 1; - pixel_y = 20 +"dJG" = ( +/obj/structure/sign/directions/cargo{ + dir = 8; + pixel_y = 32 + }, +/obj/structure/sign/directions/cryo{ + dir = 4; + pixel_y = 25 + }, +/obj/structure/sign/directions/engineering{ + dir = 4; + pixel_y = 38 + }, +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portamidhall) +"dJV" = ( +/obj/structure/catwalk, /obj/structure/cable/green{ - icon_state = "4-8" + icon_state = "1-8" }, -/turf/simulated/floor/reinforced, -/area/quartermaster/miningdock) +/turf/simulated/floor/plating, +/area/maintenance/cargo) "dJX" = ( /obj/structure/table/marble, /obj/machinery/door/blast/shutters{ @@ -5600,17 +5676,12 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "dMH" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 - }, -/obj/machinery/atmospheric_field_generator/perma, -/obj/machinery/shield_diffuser, -/obj/machinery/door/blast/regular{ - name = "Salvager Launch Blast Door"; - id = "salvage_launch" +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "1-4" }, -/turf/simulated/floor/reinforced, -/area/quartermaster/warehouse) +/turf/simulated/floor/plating, +/area/maintenance/cargo) "dMY" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -5737,7 +5808,7 @@ id = "DLBelt" }, /turf/simulated/floor/plating, -/area/quartermaster/delivery) +/area/endeavour/hallway/d3aftmaint) "dPb" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass/security{ @@ -6157,14 +6228,13 @@ icon_state = "4-8" }, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/foyer) +/area/quartermaster/delivery) "dZs" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on, /obj/structure/cable/green{ icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/endeavour/surfacebase/mining_main/break_room) +/area/quartermaster/cargo_shelter_dock) "eau" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/floor_decal/borderfloorblack, @@ -6452,17 +6522,11 @@ /turf/simulated/floor/tiled/techfloor, /area/crew_quarters/sleep/cryo) "ejk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/camera/network/cargo{ + dir = 8 }, -/turf/simulated/floor/wood, -/area/quartermaster/qm) +/turf/simulated/floor/reinforced, +/area/quartermaster/miningdock) "ekc" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -6793,7 +6857,7 @@ pixel_y = 22 }, /turf/simulated/floor/tiled/white, -/area/quartermaster/warehouse) +/area/quartermaster/belterdock/gear) "etU" = ( /obj/machinery/light/small{ dir = 4 @@ -6820,7 +6884,7 @@ icon_state = "0-8" }, /turf/simulated/floor/tiled/white, -/area/quartermaster/warehouse) +/area/quartermaster/belterdock/gear) "eum" = ( /obj/structure/cable{ icon_state = "4-8" @@ -6842,7 +6906,7 @@ id = "mining_interior" }, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/miningdock) +/area/quartermaster/belterdock/refinery) "evi" = ( /obj/item/bedsheet/browndouble, /obj/structure/bed/double/padded, @@ -7277,6 +7341,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/reinforced, /area/quartermaster/miningdock) "eFA" = ( @@ -7338,8 +7405,9 @@ /turf/simulated/floor/tiled/dark, /area/security/warden) "eHs" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled, -/area/endeavour/surfacebase/mining_main/break_room) +/area/quartermaster/cargo_shelter_dock) "eHQ" = ( /obj/machinery/sheet_silo_loader{ dir = 1 @@ -7351,7 +7419,7 @@ dir = 8 }, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/miningdock) +/area/quartermaster/belterdock/refinery) "eHT" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -7560,6 +7628,7 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 4 }, +/obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "ePB" = ( @@ -7788,6 +7857,10 @@ /area/security/security_processing) "eXx" = ( /obj/structure/closet/crate/trashcart, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-2" + }, /turf/simulated/floor, /area/maintenance/bar/catwalk) "eXS" = ( @@ -8060,7 +8133,7 @@ pixel_y = 2 }, /turf/simulated/floor/tiled/white, -/area/quartermaster/warehouse) +/area/quartermaster/belterdock/gear) "fgj" = ( /obj/machinery/camera/network/civilian{ dir = 1 @@ -8076,15 +8149,8 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) "fgA" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/quartermaster/warehouse) +/turf/simulated/wall/prepainted/cargo, +/area/quartermaster/cargo_shelter_dock) "fgJ" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -8154,11 +8220,20 @@ /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "fip" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /obj/structure/cable/green{ - icon_state = "2-8" + icon_state = "4-8" }, -/turf/simulated/floor/reinforced, -/area/quartermaster/miningdock) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/foyer) "fiy" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor{ @@ -8241,8 +8316,8 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardamidhall) "fjp" = ( -/obj/structure/closet/secure_closet/quartermaster, /obj/item/clothing/accessory/poncho/roles/cloak/qm, +/obj/structure/closet/secure_closet/quartermaster, /turf/simulated/floor/wood, /area/quartermaster/qm) "fju" = ( @@ -8494,7 +8569,7 @@ "fsa" = ( /obj/structure/catwalk, /turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) +/area/maintenance/trash_pit) "fsu" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -8511,9 +8586,11 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3afthall) "fsN" = ( -/obj/random/trash_pile, -/turf/simulated/floor/plating, -/area/quartermaster/foyer) +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/miningdock) "fta" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/crystal, @@ -8805,7 +8882,7 @@ /obj/effect/floor_decal/corner/brown/diagonal, /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/white, -/area/quartermaster/warehouse) +/area/quartermaster/belterdock/gear) "fJn" = ( /obj/machinery/light{ dir = 1 @@ -8843,7 +8920,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "fLu" = ( /obj/structure/cable/orange{ icon_state = "1-2" @@ -9321,7 +9398,7 @@ on = 1 }, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/gear) +/area/quartermaster/storage) "fSo" = ( /obj/machinery/door/airlock{ id_tag = "dorm2"; @@ -9347,7 +9424,7 @@ dir = 1 }, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/miningdock) +/area/quartermaster/belterdock/refinery) "fSt" = ( /obj/machinery/light/small{ dir = 1 @@ -9599,12 +9676,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "fYR" = ( @@ -10058,8 +10131,11 @@ dir = 4 }, /obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "gqT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -10143,12 +10219,9 @@ "gtZ" = ( /obj/effect/floor_decal/corner/brown/diagonal, /obj/item/stool/padded, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, /obj/landmark/spawnpoint/job/shaft_miner, /turf/simulated/floor/tiled/white, -/area/quartermaster/warehouse) +/area/quartermaster/belterdock/gear) "gug" = ( /obj/machinery/light/small{ dir = 8 @@ -10346,6 +10419,9 @@ }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/belterdock) +"gDV" = ( +/turf/simulated/floor/reinforced, +/area/quartermaster/belterdock/refinery) "gDZ" = ( /obj/structure/dogbed, /turf/simulated/floor/plating, @@ -10668,7 +10744,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/bed/chair/sofa/black/right{ dir = 1 @@ -10814,6 +10892,9 @@ /obj/structure/cable/green{ icon_state = "1-8" }, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, /turf/simulated/floor/reinforced, /area/quartermaster/miningdock) "gUM" = ( @@ -10977,6 +11058,15 @@ "haF" = ( /turf/simulated/wall/r_wall/prepainted/engineering, /area/maintenance/starboardsolar) +"haN" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/ore_box, +/obj/machinery/power/apc/south_mount, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/belterdock/refinery) "hbD" = ( /obj/machinery/computer/timeclock/premade/south, /obj/effect/floor_decal/borderfloorblack, @@ -11210,13 +11300,8 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "hkm" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/warehouse) +/turf/simulated/wall/prepainted/cargo, +/area/quartermaster/storage) "hky" = ( /obj/structure/window/reinforced{ dir = 8 @@ -11234,16 +11319,13 @@ /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "hkN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "2-4" - }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/machinery/light{ + dir = 1; + pixel_y = 20 }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar/lounge) +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/reinforced, +/area/quartermaster/miningdock) "hkY" = ( /obj/structure/sign/directions/evac{ dir = 4 @@ -11253,7 +11335,7 @@ "hlc" = ( /obj/effect/floor_decal/corner/brown/diagonal, /turf/simulated/floor/tiled/white, -/area/quartermaster/warehouse) +/area/quartermaster/belterdock/gear) "hlx" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -11414,13 +11496,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "hrS" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/beastybrown, /turf/simulated/floor/plating, -/area/quartermaster/foyer) +/area/quartermaster/delivery) "hrV" = ( /obj/effect/floor_decal/steeldecal/steel_decals5{ dir = 4 @@ -11457,6 +11542,10 @@ /obj/effect/floor_decal/corner/navgold/border, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/sign/directions/cryo{ + dir = 1; + pixel_y = -25 + }, /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardafthall) "hup" = ( @@ -11532,7 +11621,7 @@ id = "DLBelt" }, /turf/simulated/floor/plating, -/area/quartermaster/delivery) +/area/endeavour/hallway/d3aftmaint) "hvn" = ( /obj/structure/table/rack/shelf/steel, /obj/effect/floor_decal/industrial/outline/red, @@ -11595,18 +11684,21 @@ "hwN" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled, -/area/endeavour/surfacebase/mining_main/break_room) +/area/quartermaster/cargo_shelter_dock) "hwP" = ( /obj/structure/cable/green{ icon_state = "2-4" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, /obj/structure/table/gamblingtable, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "hxO" = ( @@ -11655,7 +11747,7 @@ dir = 4 }, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/foyer) +/area/quartermaster/delivery) "hzs" = ( /obj/machinery/computer/secure_data, /obj/machinery/light{ @@ -11664,8 +11756,9 @@ /turf/simulated/floor/tiled/old_cargo/red, /area/security/security_processing) "hzu" = ( +/obj/machinery/air_alarm/north_mount, /turf/simulated/floor/plating, -/area/quartermaster/foyer) +/area/endeavour/hallway/d3aftmaint) "hBC" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -11756,7 +11849,7 @@ /obj/machinery/door/airlock/maintenance, /obj/machinery/door/firedoor, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "hEc" = ( /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) @@ -12053,7 +12146,7 @@ /obj/effect/paint/beastybrown, /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, -/area/quartermaster/delivery) +/area/endeavour/hallway/d3aftmaint) "hOu" = ( /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/red/bordercorner, @@ -12149,6 +12242,13 @@ /obj/structure/ore_box, /turf/simulated/floor/tiled/steel, /area/shuttle/belter) +"hSq" = ( +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 4 + }, +/obj/machinery/recharge_station, +/turf/simulated/floor/reinforced, +/area/quartermaster/qm) "hTz" = ( /turf/simulated/wall/r_wall/prepainted, /area/crew_quarters/sleep/Dorm_6) @@ -12167,6 +12267,9 @@ dir = 1 }, /obj/machinery/computer/supplycomp, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "hUg" = ( @@ -12261,6 +12364,9 @@ /obj/effect/floor_decal/borderfloorblack/corner2{ dir = 9 }, +/obj/effect/floor_decal/corner/brown/bordercorner2{ + dir = 9 + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "hWG" = ( @@ -12316,7 +12422,7 @@ /obj/item/gun/energy/kinetic_accelerator, /obj/effect/floor_decal/corner/brown/diagonal, /turf/simulated/floor/tiled/white, -/area/quartermaster/warehouse) +/area/quartermaster/belterdock/gear) "hXW" = ( /obj/structure/table/steel, /obj/machinery/recharger, @@ -12543,11 +12649,13 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/foyer) +/area/quartermaster/delivery) "ifE" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) @@ -13004,15 +13112,13 @@ /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) "izs" = ( +/obj/structure/catwalk, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/structure/flora/ausbushes/ywflowers, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/grass, -/area/quartermaster/warehouse) +/obj/machinery/air_alarm/north_mount, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "izO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -13023,6 +13129,9 @@ /obj/effect/floor_decal/corner/brown/bordercorner{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "iAo" = ( @@ -13212,8 +13321,11 @@ /obj/structure/disposalpipe/segment{ dir = 1 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) +/area/maintenance/trash_pit) "iIs" = ( /obj/effect/floor_decal/industrial/danger{ dir = 6 @@ -13314,7 +13426,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) +/area/maintenance/trash_pit) "iKe" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -13497,7 +13609,7 @@ dir = 4 }, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/foyer) +/area/quartermaster/delivery) "iSP" = ( /obj/machinery/computer/supplycomp/control{ dir = 4 @@ -13506,12 +13618,13 @@ /area/quartermaster/office) "iTk" = ( /turf/simulated/floor/wood, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "iTn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/carpet/bcarpet, -/area/quartermaster/qm) +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/miningdock) "iTp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -13578,12 +13691,11 @@ /turf/simulated/floor/tiled/dark, /area/prison/cell_block) "iWE" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/obj/structure/flora/ausbushes/brflowers, -/turf/simulated/floor/grass, -/area/quartermaster/warehouse) +/turf/simulated/floor/reinforced, +/area/quartermaster/miningdock) "iWF" = ( /obj/structure/table/steel, /obj/structure/bedsheetbin, @@ -13658,7 +13770,7 @@ dir = 8 }, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/foyer) +/area/quartermaster/delivery) "jag" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 @@ -13731,6 +13843,10 @@ /turf/simulated/floor/tiled/monotile, /area/security/hallway) "jcl" = ( +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/north_mount, /obj/structure/closet, /obj/item/storage/backpack/dufflebag, /turf/simulated/floor/wood, @@ -13853,7 +13969,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "jhH" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/disposalpipe/segment, @@ -14143,16 +14259,11 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/toilet) "joO" = ( -/obj/vehicle/sealed/mecha/combat/fighter/cludge{ - dir = 1; - name = "\improper NLS Legal Salvage"; - desc = "A heater, nozzle, and fuel tank strapped together. There are exposed wires strewn about it. Hastily scrawled along the portside cockpit entrance using big, blocky script (in what appears to be crayon?) is the name 'NLS LEGAL SALVAGE'" - }, -/obj/effect/floor_decal/industrial/warning{ - dir = 10 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/reinforced, -/area/quartermaster/warehouse) +/turf/simulated/floor/plating, +/area/maintenance/bar/catwalk) "jpo" = ( /obj/machinery/conveyor{ dir = 8; @@ -14270,7 +14381,7 @@ "jtW" = ( /obj/structure/salvageable/server, /turf/simulated/floor/plating, -/area/vacant/vacant_shop) +/area/endeavour/hallway/d3aftmaint) "jua" = ( /turf/simulated/floor/carpet/purcarpet, /area/maintenance/dormitory) @@ -14345,7 +14456,7 @@ /obj/random/cigarettes, /obj/random/maintenance/security, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "jwx" = ( /obj/effect/paint/beastybrown, /obj/spawner/window/low_wall/reinforced/full/firelocks, @@ -14448,8 +14559,11 @@ /turf/simulated/floor/carpet, /area/security/detectives_office) "jAA" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/gear) +/area/quartermaster/storage) "jAH" = ( /obj/structure/poster{ pixel_x = 32 @@ -14462,7 +14576,7 @@ /obj/structure/table/reinforced, /obj/item/tool/wirecutters, /turf/simulated/floor/plating, -/area/vacant/vacant_shop) +/area/endeavour/hallway/d3aftmaint) "jBD" = ( /obj/structure/table/marble, /obj/machinery/atmospherics/component/unary/vent_pump/on{ @@ -14478,15 +14592,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/green{ icon_state = "1-4" }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled, -/area/endeavour/surfacebase/mining_main/break_room) +/area/quartermaster/cargo_shelter_dock) "jCV" = ( /obj/structure/window/basic{ dir = 1 @@ -14551,7 +14667,7 @@ pixel_y = 32 }, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/gear) +/area/quartermaster/storage) "jFV" = ( /obj/machinery/computer/guestpass{ dir = 1; @@ -14697,6 +14813,9 @@ "jKP" = ( /obj/structure/catwalk, /obj/machinery/light/small, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/plating, /area/maintenance/bar/catwalk) "jKX" = ( @@ -14725,8 +14844,11 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) +/area/maintenance/trash_pit) "jLP" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -14824,8 +14946,11 @@ dir = 4 }, /obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "jQE" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 4 @@ -14842,11 +14967,12 @@ /turf/simulated/floor/tiled/dark, /area/security/interrogation) "jRe" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 4 +/obj/machinery/camera/network/outside{ + dir = 1 }, -/turf/simulated/floor/reinforced, -/area/quartermaster/warehouse) +/obj/structure/lattice, +/turf/space/basic, +/area/space) "jRg" = ( /obj/structure/cable/green{ icon_state = "0-2" @@ -14886,11 +15012,11 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "jSX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 }, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) @@ -15178,11 +15304,9 @@ /turf/simulated/floor/wood, /area/security/breakroom) "kdG" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 10 - }, -/turf/simulated/floor/grass, -/area/quartermaster/warehouse) +/obj/machinery/air_alarm/north_mount, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "kdS" = ( /obj/machinery/door/airlock/command{ id_tag = "HoSdoor"; @@ -15473,8 +15597,9 @@ /turf/simulated/floor/tiled, /area/crew_quarters/fitness) "kow" = ( +/obj/machinery/light/small, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "koL" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -15708,7 +15833,7 @@ /obj/effect/floor_decal/corner/brown/diagonal, /obj/machinery/atmospherics/component/unary/vent_pump/on, /turf/simulated/floor/tiled/white, -/area/quartermaster/warehouse) +/area/quartermaster/belterdock/gear) "kBD" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -15788,6 +15913,9 @@ /obj/structure/railing{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/plating, /area/maintenance/bar/catwalk) "kCG" = ( @@ -15838,7 +15966,7 @@ /obj/effect/floor_decal/corner/brown/diagonal, /obj/machinery/suit_storage_unit/mining, /turf/simulated/floor/tiled/white, -/area/quartermaster/warehouse) +/area/quartermaster/belterdock/gear) "kDu" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -15865,7 +15993,7 @@ }, /obj/random/junk, /turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) +/area/maintenance/trash_pit) "kDM" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -15917,14 +16045,20 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "kFu" = ( -/obj/machinery/button/remote/blast_door{ - id = "salvage_launch"; - name = "Salvager Bay Doors"; - pixel_y = -5; - req_access = list(19) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/turf/simulated/wall/r_wall/prepainted/cargo, -/area/quartermaster/warehouse) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/foyer) "kGf" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -15958,7 +16092,8 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/turf/simulated/floor/grass, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "kIm" = ( /obj/machinery/door/firedoor, @@ -16123,8 +16258,20 @@ /obj/machinery/door/firedoor{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/white, -/area/quartermaster/warehouse) +/area/quartermaster/belterdock/gear) "kPK" = ( /obj/machinery/door/blast/regular{ name = "Fighter Hanger Blast Door"; @@ -16209,7 +16356,7 @@ on = 1 }, /turf/simulated/floor/tiled/dark, -/area/quartermaster/belterdock/gear) +/area/quartermaster/storage) "kRM" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -16448,7 +16595,7 @@ }, /obj/machinery/mineral/input, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/miningdock) +/area/quartermaster/belterdock/refinery) "laD" = ( /obj/structure/cable{ icon_state = "4-8" @@ -16525,13 +16672,13 @@ /obj/structure/cable/green{ icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/tiled/dark, @@ -16545,10 +16692,14 @@ /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "lea" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 }, -/turf/simulated/floor/reinforced, +/obj/effect/floor_decal/corner/brown/border{ + dir = 1 + }, +/obj/machinery/fire_alarm/north_mount, +/turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "len" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -16682,7 +16833,7 @@ /obj/random/junk, /obj/random/maintenance, /turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) +/area/maintenance/trash_pit) "liu" = ( /obj/structure/cable{ icon_state = "4-8" @@ -16716,7 +16867,7 @@ "lkP" = ( /obj/structure/salvageable/machine, /turf/simulated/floor/plating, -/area/quartermaster/delivery) +/area/endeavour/hallway/d3aftmaint) "lly" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/darkred, @@ -17144,15 +17295,15 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "lAL" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 }, -/obj/machinery/light{ - dir = 1; - pixel_y = 20 +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/reinforced, -/area/quartermaster/miningdock) +/turf/simulated/floor/tiled, +/area/endeavour/hallway/d3portforhall) "lCj" = ( /obj/structure/table/woodentable, /obj/machinery/chemical_dispenser/catering/bar_soft{ @@ -17535,7 +17686,7 @@ dir = 1 }, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/miningdock) +/area/quartermaster/belterdock/refinery) "lRP" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -17643,8 +17794,11 @@ /area/security/hallway) "lUu" = ( /obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, -/area/quartermaster/foyer) +/area/maintenance/cargo) "lUH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -17862,6 +18016,9 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "mbJ" = ( @@ -17918,8 +18075,12 @@ /turf/simulated/floor/tiled, /area/security/lobby) "mff" = ( -/turf/simulated/wall/r_wall/prepainted, -/area/quartermaster/belterdock/refinery) +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/quartermaster/belterdock/gear) "mfm" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, @@ -17973,8 +18134,6 @@ /turf/simulated/floor/tiled/dark, /area/security/hallwayaux) "mhO" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/brown/border, /obj/effect/floor_decal/borderfloorblack/corner2, @@ -18047,7 +18206,7 @@ "mjy" = ( /obj/structure/closet/firecloset, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "mjB" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 5 @@ -18134,7 +18293,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/endeavour/surfacebase/mining_main/break_room) +/area/quartermaster/cargo_shelter_dock) "mll" = ( /obj/machinery/light{ dir = 1 @@ -18252,15 +18411,13 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "moz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/vending/cola, /obj/effect/floor_decal/borderfloorblack{ dir = 1 }, /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, +/obj/machinery/vending/cola, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) "moE" = ( @@ -18381,7 +18538,7 @@ on = 1 }, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/gear) +/area/quartermaster/storage) "mrw" = ( /obj/structure/flora/pottedplant/orientaltree, /obj/machinery/camera/network/civilian{ @@ -18475,7 +18632,7 @@ /obj/item/banner/cargo, /obj/machinery/light/small, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/gear) +/area/quartermaster/storage) "mwA" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -18576,9 +18733,9 @@ /turf/simulated/floor/plating, /area/maintenance/substation/civilian) "mBo" = ( -/obj/structure/railing, -/turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/warehouse) "mBA" = ( /obj/structure/cable{ icon_state = "4-8" @@ -18642,8 +18799,11 @@ /obj/structure/poster/preset/baystation/bay_8{ pixel_y = 32 }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/gear) +/area/quartermaster/storage) "mEG" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -18651,17 +18811,11 @@ /turf/simulated/floor/carpet, /area/security/detectives_office) "mFc" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 8 - }, -/obj/machinery/atmospheric_field_generator/perma, -/obj/machinery/shield_diffuser, -/obj/machinery/door/blast/regular{ - name = "Salvager Launch Blast Door"; - id = "salvage_launch" +/obj/structure/cable/green{ + icon_state = "1-4" }, -/turf/simulated/floor/reinforced, -/area/quartermaster/warehouse) +/turf/simulated/floor/plating, +/area/quartermaster/storage) "mFW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -18671,6 +18825,9 @@ /obj/structure/cable/green{ icon_state = "1-2" }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "mGv" = ( @@ -18741,11 +18898,14 @@ "mIG" = ( /obj/structure/closet/largecardboard, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "mIN" = ( /obj/machinery/door/airlock/maintenance, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, -/area/quartermaster/foyer) +/area/maintenance/cargo) "mIP" = ( /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/beastybrown, @@ -18874,11 +19034,10 @@ /turf/simulated/floor/tiled/dark, /area/security/brig) "mNI" = ( -/obj/structure/railing{ - dir = 1 - }, +/obj/structure/catwalk, +/obj/machinery/air_alarm/north_mount, /turf/simulated/floor/plating, -/area/quartermaster/foyer) +/area/endeavour/hallway/d3aftmaint) "mNL" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -18975,6 +19134,12 @@ dir = 4; icon_state = "pipe-c" }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/plating, /area/maintenance/bar/catwalk) "mVA" = ( @@ -19096,7 +19261,7 @@ /obj/machinery/mineral/equipment_vendor, /obj/effect/floor_decal/corner/brown/diagonal, /turf/simulated/floor/tiled/white, -/area/quartermaster/warehouse) +/area/quartermaster/belterdock/gear) "mXn" = ( /obj/structure/table/steel, /obj/item/flashlight/lamp, @@ -19206,7 +19371,7 @@ dir = 4 }, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "naA" = ( /obj/effect/floor_decal/industrial/danger{ dir = 9 @@ -19227,7 +19392,7 @@ }, /obj/random/junk, /turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) +/area/maintenance/trash_pit) "nbL" = ( /turf/simulated/floor/airless, /area/space) @@ -19364,15 +19529,15 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/brown/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/tiled/monodark, /area/quartermaster/foyer) "nfG" = ( @@ -19444,7 +19609,7 @@ }, /obj/structure/catwalk, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "niA" = ( /obj/structure/cable/green{ icon_state = "0-8" @@ -19553,8 +19718,11 @@ /area/quartermaster/warehouse) "nms" = ( /obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plating, -/area/endeavour/surfacebase/mining_main/break_room) +/area/endeavour/hallway/d3aftmaint) "nmv" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -19572,6 +19740,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/hydroponics) +"nnu" = ( +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/machinery/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/quartermaster/belterdock/gear) "nnI" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -19703,9 +19879,26 @@ /turf/simulated/floor/plating, /area/endeavour/hallway/d3aftmaint) "nqP" = ( -/obj/random/trash_pile, -/turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/obj/effect/floor_decal/borderfloorblack{ + dir = 8 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/warehouse) "nsH" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/light/small{ @@ -19815,7 +20008,7 @@ /area/endeavour/hallway/d3starboardafthall) "nxz" = ( /turf/simulated/wall/r_wall/prepainted, -/area/maintenance/lower/trash_pit) +/area/maintenance/trash_pit) "nxT" = ( /obj/machinery/camera/network/civilian{ dir = 4 @@ -19930,7 +20123,7 @@ }, /obj/structure/disposaloutlet, /turf/simulated/floor/plating, -/area/quartermaster/delivery) +/area/endeavour/hallway/d3aftmaint) "nCZ" = ( /obj/structure/table/marble, /obj/machinery/door/firedoor{ @@ -20032,17 +20225,9 @@ /turf/simulated/floor/tiled, /area/security/security_lockerroom) "nHC" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/grass, -/area/quartermaster/warehouse) +/obj/structure/lattice, +/turf/simulated/floor/plating, +/area/space) "nIf" = ( /obj/structure/bed/chair/sofa/right, /turf/simulated/floor/carpet/bcarpet, @@ -20152,17 +20337,13 @@ /turf/simulated/floor/wood, /area/crew_quarters/heads/hos) "nKd" = ( -/obj/effect/floor_decal/borderfloorblack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/brown/border{ - dir = 1 - }, -/obj/machinery/light{ +/obj/machinery/camera/network/outside{ dir = 1 }, -/turf/simulated/floor/tiled/dark, -/area/quartermaster/foyer) +/obj/structure/lattice, +/obj/structure/grille, +/turf/space/basic, +/area/space) "nKw" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -31 @@ -20288,8 +20469,10 @@ /turf/simulated/floor/carpet, /area/security/detectives_office) "nNn" = ( -/turf/simulated/floor/wood, -/area/quartermaster/qm) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/foyer) "nND" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/effect/floor_decal/spline/plain{ @@ -20622,7 +20805,7 @@ id = "mining_interior" }, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/miningdock) +/area/quartermaster/belterdock/refinery) "nVP" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 @@ -20632,7 +20815,7 @@ /area/crew_quarters/recreation_area) "nWc" = ( /turf/simulated/floor/tiled/dark, -/area/quartermaster/belterdock/gear) +/area/quartermaster/storage) "nWj" = ( /obj/machinery/computer/roguezones{ dir = 1 @@ -21277,6 +21460,9 @@ "osx" = ( /obj/machinery/door/airlock/mining, /obj/map_helper/access_helper/airlock/station/supply/mining, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/plating, /area/endeavour/surfacebase/mining_main/break_room) "osL" = ( @@ -21316,7 +21502,7 @@ }, /obj/map_helper/access_helper/airlock/station/supply/mining, /turf/simulated/floor/tiled, -/area/endeavour/surfacebase/mining_main/break_room) +/area/quartermaster/cargo_shelter_dock) "otM" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/effect/floor_decal/spline/plain, @@ -21900,7 +22086,7 @@ "oNa" = ( /obj/structure/frame, /turf/simulated/floor/plating, -/area/vacant/vacant_shop) +/area/endeavour/hallway/d3aftmaint) "oNp" = ( /obj/machinery/newscaster{ pixel_y = 32 @@ -22089,7 +22275,7 @@ /obj/item/hand_labeler, /obj/item/hand_labeler, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/foyer) +/area/quartermaster/delivery) "oUr" = ( /obj/machinery/power/sensor{ name = "Powernet Sensor - Solar Farm Input"; @@ -22335,9 +22521,10 @@ /turf/simulated/floor/carpet, /area/security/detectives_office) "pdF" = ( -/obj/structure/frame, +/obj/spawner/window/low_wall/reinforced/full/firelocks, +/obj/effect/paint/beastybrown, /turf/simulated/floor/plating, -/area/quartermaster/delivery) +/area/quartermaster/belterdock/gear) "pdT" = ( /obj/effect/floor_decal/corner/brown/diagonal, /obj/machinery/camera/network/cargo{ @@ -22345,7 +22532,7 @@ }, /obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/white, -/area/quartermaster/warehouse) +/area/quartermaster/belterdock/gear) "ped" = ( /obj/landmark/observer_spawn, /obj/effect/floor_decal/spline/fancy/wood, @@ -22474,15 +22661,15 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "phB" = ( -/obj/structure/cable/green{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/reinforced, /area/quartermaster/miningdock) "phI" = ( @@ -22784,9 +22971,11 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3starboardforhall) "pqk" = ( -/obj/machinery/door/airlock/maintenance, -/turf/simulated/floor/plating, -/area/endeavour/surfacebase/mining_main/break_room) +/obj/structure/lattice, +/obj/structure/lattice, +/obj/structure/grille, +/turf/space/basic, +/area/space) "pqE" = ( /obj/machinery/vending/hydroseeds, /obj/effect/floor_decal/corner/green{ @@ -22965,6 +23154,13 @@ /obj/structure/bed/chair/sofa/black/left{ dir = 4 }, +/obj/machinery/power/apc/west_mount, +/obj/structure/cable/green{ + icon_state = "0-4" + }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "pvX" = ( @@ -23033,7 +23229,7 @@ dir = 8 }, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/foyer) +/area/quartermaster/delivery) "pyZ" = ( /obj/structure/cable/green{ icon_state = "2-4" @@ -23098,7 +23294,7 @@ "pDn" = ( /obj/machinery/vending/coffee, /turf/simulated/floor/tiled/dark, -/area/endeavour/surfacebase/mining_main/break_room) +/area/quartermaster/cargo_shelter_dock) "pDx" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -23255,7 +23451,7 @@ /obj/machinery/recharger, /obj/machinery/light, /turf/simulated/floor/tiled/white, -/area/quartermaster/warehouse) +/area/quartermaster/belterdock/gear) "pIT" = ( /obj/structure/cable{ icon_state = "4-8" @@ -23333,6 +23529,12 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "pKe" = ( @@ -23444,7 +23646,7 @@ }, /obj/structure/table/fancyblack, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/gear) +/area/quartermaster/storage) "pON" = ( /obj/machinery/floodlight, /turf/simulated/floor/plating, @@ -23607,7 +23809,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/foyer) +/area/quartermaster/delivery) "pUu" = ( /obj/machinery/light{ dir = 4 @@ -23728,15 +23930,37 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "pZg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, -/area/quartermaster/foyer) +/area/quartermaster/warehouse) "pZR" = ( -/obj/random/trash_pile, -/turf/simulated/floor/plating, -/area/crew_quarters/recreation_area) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloorblack, +/obj/effect/floor_decal/corner/brown/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/monodark, +/area/quartermaster/foyer) "qaT" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -23949,7 +24173,7 @@ dir = 1 }, /turf/simulated/floor/tiled, -/area/endeavour/surfacebase/mining_main/break_room) +/area/quartermaster/cargo_shelter_dock) "qeD" = ( /obj/machinery/power/port_gen/pacman/mrs{ anchored = 1 @@ -24024,7 +24248,7 @@ on = 1 }, /turf/simulated/floor/tiled/dark, -/area/quartermaster/belterdock/gear) +/area/quartermaster/storage) "qjv" = ( /obj/effect/floor_decal/industrial/warning/full, /obj/machinery/atmospherics/pipe/zpipe/down/scrubbers{ @@ -24249,6 +24473,12 @@ /area/crew_quarters/sleep/bedrooms) "qoU" = ( /obj/structure/table/gamblingtable, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "qoW" = ( @@ -24276,10 +24506,11 @@ "qpd" = ( /obj/structure/disposalpipe/segment, /turf/simulated/wall/r_wall/prepainted/cargo, -/area/quartermaster/foyer) +/area/endeavour/hallway/d3aftmaint) "qpi" = ( +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/reinforced, -/area/quartermaster/qm) +/area/quartermaster/miningdock) "qpE" = ( /obj/structure/table/steel_reinforced, /obj/machinery/cell_charger, @@ -24645,7 +24876,7 @@ "qDS" = ( /obj/item/banner/cargo, /turf/simulated/floor/tiled/dark, -/area/quartermaster/belterdock/gear) +/area/quartermaster/storage) "qEf" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_2) @@ -24810,7 +25041,7 @@ /area/endeavour/hallway/d3afthall) "qJB" = ( /turf/simulated/wall/prepainted/cargo, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "qJM" = ( /turf/simulated/wall/r_wall/prepainted, /area/endeavour/hallway/d3fwdhall) @@ -24875,7 +25106,7 @@ /obj/machinery/suit_storage_unit/mining, /obj/effect/floor_decal/corner/brown/diagonal, /turf/simulated/floor/tiled/white, -/area/quartermaster/warehouse) +/area/quartermaster/belterdock/gear) "qMN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -24910,7 +25141,7 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/beastybrown, /turf/simulated/floor/plating, -/area/quartermaster/miningdock) +/area/quartermaster/belterdock/refinery) "qOp" = ( /obj/structure/table/reinforced, /obj/item/mass_spectrometer/adv, @@ -25064,12 +25295,12 @@ /turf/simulated/floor/tiled/dark, /area/security/lobby) "qVI" = ( -/obj/machinery/door/airlock/maintenance, -/obj/machinery/door/firedoor{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "1-2" }, +/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/quartermaster/delivery) +/area/maintenance/cargo) "qVJ" = ( /obj/machinery/door/airlock/glass_external{ frequency = 1379; @@ -25086,12 +25317,12 @@ /turf/simulated/wall/r_wall/prepainted/engineering, /area/security/hallway) "qWd" = ( -/obj/effect/floor_decal/corner/brown/diagonal, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "2-4" }, -/turf/simulated/floor/tiled/white, -/area/quartermaster/warehouse) +/turf/simulated/floor/plating, +/area/maintenance/cargo) "qXh" = ( /obj/machinery/light/small{ dir = 8 @@ -25465,10 +25696,12 @@ /turf/simulated/floor/crystal, /area/endeavour/hallway/d3fwdhall) "rmb" = ( -/obj/machinery/light, /obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "1-2" + }, /turf/simulated/floor/plating, -/area/endeavour/surfacebase/mining_main/break_room) +/area/maintenance/bar/catwalk) "rme" = ( /obj/structure/table/woodentable, /obj/machinery/recharger, @@ -25527,7 +25760,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled, -/area/endeavour/surfacebase/mining_main/break_room) +/area/quartermaster/cargo_shelter_dock) "rpK" = ( /turf/simulated/floor/wood, /area/maintenance/dormitory) @@ -25747,11 +25980,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/foyer) +/area/quartermaster/delivery) "rvT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -25778,13 +26008,17 @@ /turf/simulated/floor/tiled/dark, /area/security/nuke_storage) "rwh" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/effect/floor_decal/industrial/warning{ + dir = 8 }, -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/quartermaster/foyer) +/obj/machinery/atmospheric_field_generator/perma, +/obj/machinery/shield_diffuser, +/obj/machinery/door/blast/regular{ + name = "Salvager Launch Blast Door"; + id = "salvage_launch" + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/miningdock) "rwx" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 10 @@ -25963,7 +26197,7 @@ "rCg" = ( /obj/random/maintenance, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "rCI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -26042,6 +26276,7 @@ /obj/structure/bed/chair/comfy/brown{ dir = 4 }, +/obj/machinery/air_alarm/west_mount, /turf/simulated/floor/wood, /area/maintenance/cargo) "rEa" = ( @@ -26283,18 +26518,19 @@ /obj/item/kit/paint/ripley/flames_blue, /obj/item/kit/paint/ripley/dreadnought, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/gear) +/area/quartermaster/storage) "rNH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/security/lobby) "rOn" = ( +/obj/structure/catwalk, /obj/structure/cable/green{ - icon_state = "1-4" + icon_state = "2-8" }, -/turf/simulated/floor/reinforced, -/area/quartermaster/miningdock) +/turf/simulated/floor/plating, +/area/maintenance/cargo) "rOs" = ( /obj/machinery/camera/network/civilian{ dir = 1 @@ -26392,7 +26628,7 @@ "rPE" = ( /obj/machinery/vending/sovietsoda, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/gear) +/area/quartermaster/storage) "rPF" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -26426,7 +26662,7 @@ }, /obj/structure/catwalk, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "rQE" = ( /obj/structure/table/woodentable, /obj/item/tape_recorder{ @@ -26502,7 +26738,7 @@ dir = 1 }, /turf/simulated/floor/wood, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "rTm" = ( /obj/structure/cable/green{ icon_state = "0-2" @@ -26526,11 +26762,8 @@ "rTD" = ( /obj/effect/floor_decal/corner/brown/diagonal, /obj/item/stool/padded, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, /turf/simulated/floor/tiled/white, -/area/quartermaster/warehouse) +/area/quartermaster/belterdock/gear) "rTM" = ( /obj/machinery/light/small, /turf/simulated/floor/tiled/white, @@ -26653,6 +26886,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/reinforced, /area/quartermaster/miningdock) "rYD" = ( @@ -26769,8 +27005,21 @@ "sbx" = ( /obj/effect/floor_decal/corner/brown/diagonal, /obj/landmark/spawnpoint/job/shaft_miner, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled/white, -/area/quartermaster/warehouse) +/area/quartermaster/belterdock/gear) "scb" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood, @@ -26887,18 +27136,8 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/security/lobby) "shF" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/grass, -/area/quartermaster/warehouse) +/turf/simulated/wall/r_wall/prepainted/cargo, +/area/quartermaster/storage) "shG" = ( /obj/machinery/holopad, /obj/structure/cable/green{ @@ -27182,8 +27421,20 @@ /turf/simulated/floor/plating, /area/crew_quarters/recreation_area) "soE" = ( -/turf/simulated/wall/r_wall/prepainted, -/area/quartermaster/foyer) +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/quartermaster/warehouse) "soV" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -27536,7 +27787,7 @@ dir = 8 }, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/miningdock) +/area/quartermaster/belterdock/refinery) "sxq" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -27610,11 +27861,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/quartermaster/qm) "sAp" = ( -/obj/machinery/power/apc/north_mount, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/structure/catwalk, +/obj/machinery/air_alarm/north_mount, /turf/simulated/floor/plating, /area/maintenance/bar/catwalk) "sAz" = ( @@ -27776,7 +28023,7 @@ }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/monotile, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "sFZ" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/random/cutout, @@ -27811,7 +28058,7 @@ /obj/random/tetheraid, /obj/random/maintenance/security, /turf/simulated/floor/wood, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "sGz" = ( /obj/effect/floor_decal/spline/fancy/wood{ dir = 9 @@ -27829,7 +28076,7 @@ dir = 1 }, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/miningdock) +/area/quartermaster/belterdock/refinery) "sHr" = ( /obj/machinery/light{ dir = 1 @@ -27937,7 +28184,7 @@ "sMN" = ( /obj/structure/salvageable/computer, /turf/simulated/floor/plating, -/area/quartermaster/delivery) +/area/endeavour/hallway/d3aftmaint) "sNh" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -28090,6 +28337,9 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "sTR" = ( @@ -28162,11 +28412,8 @@ /turf/simulated/floor/tiled, /area/endeavour/hallway/d3portamidhall) "sVH" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 9 - }, -/turf/simulated/floor/grass, -/area/quartermaster/warehouse) +/turf/simulated/wall/r_wall/prepainted/cargo, +/area/crew_quarters/sleep/Dorm_13) "sWa" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -28425,6 +28672,9 @@ /obj/machinery/atmospherics/component/unary/vent_pump/on{ dir = 8 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "tdk" = ( @@ -28449,7 +28699,7 @@ /obj/machinery/door/airlock/mining, /obj/map_helper/access_helper/airlock/station/supply/mining, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/area/quartermaster/storage) "tdG" = ( /turf/simulated/wall/r_wall/prepainted/cargo, /area/shuttle/mining_ship/general) @@ -28469,11 +28719,12 @@ /turf/simulated/floor/tiled/techfloor, /area/maintenance/bar/catwalk) "teG" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 5 +/obj/structure/sign/directions/cryo{ + dir = 8; + pixel_y = 10 }, -/turf/simulated/floor/grass, -/area/quartermaster/warehouse) +/turf/simulated/wall/prepainted, +/area/crew_quarters/sleep/cryo) "tfn" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/security/detectives_office) @@ -28512,6 +28763,9 @@ }, /obj/structure/table/wooden_reinforced, /obj/machinery/chemical_dispenser/catering/bar_coffee, +/obj/machinery/air_alarm{ + pixel_y = 22 + }, /turf/simulated/floor/wood, /area/endeavour/surfacebase/mining_main/break_room) "thy" = ( @@ -28564,7 +28818,7 @@ /obj/effect/floor_decal/corner/brown/diagonal, /obj/machinery/suit_cycler/mining, /turf/simulated/floor/tiled/white, -/area/quartermaster/warehouse) +/area/quartermaster/belterdock/gear) "tix" = ( /obj/structure/filingcabinet/security{ name = "Security Records" @@ -28655,7 +28909,7 @@ }, /obj/structure/table/reinforced, /turf/simulated/floor/plating, -/area/vacant/vacant_shop) +/area/endeavour/hallway/d3aftmaint) "tle" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/structure/table/woodentable, @@ -28757,7 +29011,7 @@ on = 1 }, /turf/simulated/floor/tiled/dark, -/area/quartermaster/belterdock/gear) +/area/quartermaster/storage) "tpm" = ( /obj/machinery/camera/network/civilian, /obj/effect/floor_decal/borderfloorblack{ @@ -28956,7 +29210,7 @@ }, /obj/structure/catwalk, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "twR" = ( /turf/simulated/wall/r_wall/prepainted/cargo, /area/quartermaster/qm) @@ -29078,7 +29332,7 @@ /area/quartermaster/belterdock) "tBY" = ( /obj/structure/sign/directions/cargo{ - dir = 1; + dir = 4; pixel_y = 32 }, /obj/structure/sign/directions/cryo{ @@ -29176,13 +29430,14 @@ /obj/spawner/window/low_wall/reinforced/full/firelocks, /obj/effect/paint/beastybrown, /turf/simulated/floor/plating, -/area/quartermaster/foyer) +/area/quartermaster/delivery) "tES" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 6 +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "1-2" }, -/turf/simulated/floor/reinforced, -/area/quartermaster/warehouse) +/turf/simulated/floor/plating, +/area/maintenance/cargo) "tGi" = ( /obj/structure/table/woodentable, /obj/item/handcuffs/legcuffs/fuzzy, @@ -29352,6 +29607,21 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/airless, /area/shuttle/mining_ship/general) +"tMd" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 1 + }, +/obj/effect/floor_decal/corner/navblue/border{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/sign/directions/cryo{ + pixel_y = 25 + }, +/turf/simulated/floor/tiled/steel, +/area/endeavour/hallway/d3portforhall) "tMx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -29671,12 +29941,14 @@ /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) "tXh" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 1 }, -/obj/structure/catwalk, /turf/simulated/floor/plating, -/area/maintenance/bar/catwalk) +/area/endeavour/hallway/d3aftmaint) "tXo" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark, @@ -29756,7 +30028,7 @@ /obj/random/maintenance/security, /obj/random/coin, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "tZY" = ( /obj/machinery/computer/security{ dir = 4 @@ -29997,7 +30269,7 @@ /obj/effect/floor_decal/industrial/outline/yellow, /obj/structure/ore_box, /turf/simulated/floor/reinforced, -/area/quartermaster/miningdock) +/area/quartermaster/belterdock/refinery) "uhW" = ( /obj/item/bedsheet/purpledouble, /obj/structure/bed/double/padded, @@ -30043,16 +30315,16 @@ /turf/simulated/floor/plating, /area/maintenance/bar/catwalk) "uiK" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, /obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "2-8" + }, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "uiN" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -30119,9 +30391,18 @@ /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "ukf" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/quartermaster/belterdock) +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/quartermaster/cargo_shelter_dock) "ukT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -30154,7 +30435,7 @@ pixel_y = 13 }, /turf/simulated/floor/tiled/white, -/area/quartermaster/warehouse) +/area/quartermaster/belterdock/gear) "ulH" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -30179,7 +30460,7 @@ }, /obj/structure/catwalk, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "umw" = ( /obj/effect/floor_decal/corner_techfloor_grid{ dir = 5 @@ -30204,13 +30485,12 @@ pixel_x = 42; pixel_y = 2 }, -/obj/structure/cable/green{ - icon_state = "1-2" +/obj/structure/disposalpipe/trunk{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/disposal, /turf/simulated/floor/tiled/white, -/area/quartermaster/warehouse) +/area/quartermaster/belterdock/gear) "umX" = ( /obj/machinery/fire_alarm/east_mount, /turf/simulated/floor/tiled/dark, @@ -30256,11 +30536,12 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/security/evidence_storage) "upo" = ( -/obj/machinery/air_alarm{ - pixel_y = 22 +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "1-8" }, -/turf/simulated/floor/reinforced, -/area/quartermaster/qm) +/turf/simulated/floor/plating, +/area/maintenance/bar/catwalk) "upw" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -30430,7 +30711,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/endeavour/surfacebase/mining_main/break_room) +/area/endeavour/hallway/d3aftmaint) "uvh" = ( /obj/machinery/fire_alarm/east_mount, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -30570,6 +30851,7 @@ /obj/effect/floor_decal/corner/brown/border{ dir = 1 }, +/obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) "uAl" = ( @@ -30604,14 +30886,14 @@ "uAU" = ( /obj/random/junk, /turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) +/area/maintenance/trash_pit) "uAV" = ( /obj/structure/railing{ dir = 1 }, /obj/random/trash_pile, /turf/simulated/floor/plating, -/area/quartermaster/foyer) +/area/endeavour/hallway/d3aftmaint) "uBK" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -30819,7 +31101,7 @@ dir = 8 }, /turf/simulated/floor/tiled, -/area/endeavour/surfacebase/mining_main/break_room) +/area/quartermaster/cargo_shelter_dock) "uJM" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -30878,6 +31160,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, /turf/simulated/floor/reinforced, /area/quartermaster/miningdock) "uKP" = ( @@ -31083,8 +31368,11 @@ /obj/item/tool/crowbar/red, /obj/structure/table/reinforced, /obj/item/tool/screwdriver, +/obj/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/plating, -/area/vacant/vacant_shop) +/area/endeavour/hallway/d3aftmaint) "uPY" = ( /obj/item/material/ashtray/bronze, /obj/structure/cable/green{ @@ -31115,10 +31403,18 @@ "uRz" = ( /obj/machinery/light/small, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/gear) +/area/quartermaster/storage) "uRN" = ( -/turf/simulated/wall/r_wall/prepainted, -/area/quartermaster/delivery) +/obj/vehicle/sealed/mecha/combat/fighter/cludge{ + dir = 1; + name = "\improper NLS Legal Salvage"; + desc = "A heater, nozzle, and fuel tank strapped together. There are exposed wires strewn about it. Hastily scrawled along the portside cockpit entrance using big, blocky script (in what appears to be crayon?) is the name 'NLS LEGAL SALVAGE'" + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/miningdock) "uSv" = ( /obj/structure/table/woodentable, /obj/machinery/microwave, @@ -31385,7 +31681,7 @@ }, /obj/random/trash_pile, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "vaR" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; @@ -31452,7 +31748,7 @@ "veW" = ( /obj/machinery/vending/fitness, /turf/simulated/floor/tiled/dark, -/area/endeavour/surfacebase/mining_main/break_room) +/area/quartermaster/cargo_shelter_dock) "vfa" = ( /turf/simulated/floor/carpet/purcarpet, /area/crew_quarters/sleep/Dorm_13) @@ -31655,7 +31951,7 @@ /area/security/hallway) "vkn" = ( /turf/simulated/wall/r_wall/prepainted/cargo, -/area/endeavour/surfacebase/mining_main/break_room) +/area/quartermaster/cargo_shelter_dock) "vkR" = ( /obj/structure/catwalk, /obj/machinery/light/small{ @@ -31754,7 +32050,7 @@ icon_state = "1-2" }, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/foyer) +/area/quartermaster/delivery) "vnn" = ( /turf/simulated/wall/r_wall/prepainted/security, /area/crew_quarters/heads/hos) @@ -32106,10 +32402,12 @@ /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "vxE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ dir = 4 }, -/turf/simulated/floor/wood, +/turf/simulated/floor/carpet/bcarpet, /area/quartermaster/qm) "vxL" = ( /obj/structure/closet/crate/secure, @@ -32129,7 +32427,7 @@ /area/security/warden) "vyv" = ( /turf/simulated/floor/plating, -/area/endeavour/surfacebase/mining_main/break_room) +/area/quartermaster/cargo_shelter_dock) "vyR" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 8 @@ -33139,10 +33437,17 @@ /turf/simulated/floor/carpet/sblucarpet, /area/crew_quarters/sleep/Dorm_12) "vXN" = ( -/obj/effect/floor_decal/spline/plain, -/obj/structure/flora/ausbushes/brflowers, -/turf/simulated/floor/grass, -/area/quartermaster/warehouse) +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/machinery/door/airlock/glass/mining{ + name = "Mining Prep Room"; + req_one_access = null + }, +/obj/map_helper/access_helper/airlock/station/supply/mining, +/obj/machinery/door/firedoor{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/quartermaster/belterdock/gear) "vYG" = ( /obj/structure/table/woodentable, /obj/item/storage/box/donkpockets, @@ -33292,9 +33597,14 @@ /turf/simulated/floor/tiled/dark, /area/security/hallway) "wcT" = ( -/obj/structure/catwalk, -/turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/miningdock) "wdk" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 4 @@ -33341,11 +33651,8 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - icon_state = "1-2" - }, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/foyer) +/area/quartermaster/delivery) "wgN" = ( /obj/structure/disposalpipe/trunk, /obj/machinery/conveyor{ @@ -33356,7 +33663,7 @@ dir = 1 }, /turf/simulated/floor/plating, -/area/quartermaster/delivery) +/area/endeavour/hallway/d3aftmaint) "wiJ" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -33422,18 +33729,18 @@ /turf/simulated/floor/plating, /area/maintenance/dormitory) "wki" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/structure/cable/green{ icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "wku" = ( @@ -33443,7 +33750,7 @@ pixel_y = 13 }, /turf/simulated/floor/tiled/white, -/area/quartermaster/warehouse) +/area/quartermaster/belterdock/gear) "wkw" = ( /obj/structure/table/marble, /obj/machinery/cash_register/civilian{ @@ -33924,8 +34231,12 @@ /area/quartermaster/warehouse) "wAQ" = ( /obj/item/storage/box/monkeycubes, +/obj/machinery/power/apc/north_mount, +/obj/structure/cable/green{ + icon_state = "0-4" + }, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/gear) +/area/quartermaster/storage) "wAR" = ( /obj/item/radio/intercom{ pixel_y = -24 @@ -34151,7 +34462,7 @@ /obj/structure/flora/pottedplant/stoutbush, /obj/machinery/fire_alarm/north_mount, /turf/simulated/floor/tiled, -/area/endeavour/surfacebase/mining_main/break_room) +/area/quartermaster/cargo_shelter_dock) "wHm" = ( /obj/structure/reagent_dispensers/water_cooler, /obj/item/reagent_containers/glass/cooler_bottle, @@ -34450,7 +34761,7 @@ dir = 8 }, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "wTk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -34609,13 +34920,13 @@ /obj/effect/floor_decal/corner/brown/bordercorner2{ dir = 10 }, +/obj/structure/disposalpipe/segment, +/obj/structure/window/reinforced, +/obj/machinery/vending/nifsoft_shop, /obj/machinery/status_display/supply_display{ mode = 99; pixel_x = -32 }, -/obj/structure/disposalpipe/segment, -/obj/structure/window/reinforced, -/obj/machinery/vending/nifsoft_shop, /turf/simulated/floor/tiled/techmaint, /area/quartermaster/warehouse) "wYW" = ( @@ -34734,15 +35045,17 @@ /turf/simulated/floor/plating, /area/security/hallway) "xcE" = ( +/obj/effect/floor_decal/borderfloorblack{ + dir = 4 + }, +/obj/effect/floor_decal/corner/brown/border{ + dir = 4 + }, /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 8 - }, -/obj/structure/dispenser/oxygen, -/turf/simulated/floor/reinforced, -/area/quartermaster/miningdock) +/turf/simulated/floor/tiled/dark, +/area/quartermaster/foyer) "xdM" = ( /turf/simulated/wall/prepainted, /area/crew_quarters/sleep/Dorm_3) @@ -34864,13 +35177,10 @@ /turf/simulated/floor/tiled/dark, /area/vacant/vacant_shop) "xgT" = ( -/obj/structure/cable/green{ - icon_state = "2-8" - }, /obj/effect/floor_decal/industrial/warning/cee{ - dir = 4 + dir = 8 }, -/obj/machinery/recharge_station, +/obj/structure/dispenser/oxygen, /turf/simulated/floor/reinforced, /area/quartermaster/miningdock) "xhD" = ( @@ -34882,7 +35192,7 @@ /area/crew_quarters/sleep/Dorm_13) "xhN" = ( /turf/simulated/wall/r_wall/prepainted, -/area/endeavour/surfacebase/mining_main/break_room) +/area/endeavour/hallway/d3aftmaint) "xiG" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -34917,17 +35227,15 @@ /obj/structure/cable/green{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, -/area/endeavour/surfacebase/mining_main/break_room) +/area/quartermaster/cargo_shelter_dock) "xkB" = ( /obj/structure/bed/chair/office/dark{ dir = 1 @@ -34941,14 +35249,8 @@ /turf/simulated/floor/tiled, /area/security/lobby) "xlf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/green{ - icon_state = "4-8" - }, -/turf/simulated/floor/tiled, -/area/endeavour/hallway/d3portforhall) +/turf/simulated/floor/plating, +/area/quartermaster/storage) "xlg" = ( /turf/simulated/floor/tiled/monodark, /area/quartermaster/foyer) @@ -35027,7 +35329,7 @@ icon_state = "4-8" }, /turf/simulated/wall/r_wall/prepainted/cargo, -/area/quartermaster/foyer) +/area/maintenance/cargo) "xnF" = ( /obj/structure/window/reinforced{ dir = 8 @@ -35162,12 +35464,10 @@ /turf/simulated/floor/plating, /area/security/range) "xuV" = ( -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/machinery/power/apc/north_mount, -/turf/simulated/floor/wood, -/area/quartermaster/qm) +/obj/structure/lattice, +/obj/machinery/shield_diffuser, +/turf/simulated/floor/plating, +/area/space) "xvZ" = ( /obj/machinery/computer/ship/navigation/telescreen{ pixel_y = -37 @@ -35226,11 +35526,11 @@ /area/crew_quarters/heads/hos) "xxb" = ( /obj/structure/sign/directions/cargo{ - dir = 1; + dir = 8; pixel_y = 32 }, /obj/structure/sign/directions/cryo{ - dir = 4; + dir = 8; pixel_y = 25 }, /obj/structure/sign/directions/engineering{ @@ -35337,14 +35637,14 @@ /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3starboardafthall) "xyJ" = ( -/obj/structure/cable/green{ - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 +/obj/structure/cable/green{ + icon_state = "4-8" }, /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -35429,8 +35729,10 @@ dir = 8; icon_state = "pipe-c" }, +/obj/machinery/power/apc/east_mount, +/obj/structure/cable/green, /turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) +/area/maintenance/trash_pit) "xCV" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -35548,7 +35850,7 @@ "xHO" = ( /obj/structure/salvageable/bliss, /turf/simulated/floor/plating, -/area/vacant/vacant_shop) +/area/endeavour/hallway/d3aftmaint) "xHY" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, @@ -35699,20 +36001,17 @@ }, /obj/random/junk, /turf/simulated/floor/plating, -/area/maintenance/lower/trash_pit) +/area/maintenance/trash_pit) "xLN" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/wood, /area/crew_quarters/bar/lounge) "xMb" = ( -/obj/machinery/camera/network/cargo{ - dir = 8 - }, -/obj/structure/cable/green{ - icon_state = "1-2" - }, -/turf/simulated/floor/reinforced, -/area/quartermaster/miningdock) +/obj/random/junk, +/obj/random/maintenance, +/obj/machinery/air_alarm/north_mount, +/turf/simulated/floor/plating, +/area/maintenance/trash_pit) "xMc" = ( /obj/effect/floor_decal/corner/brown/diagonal, /obj/structure/closet/secure_closet/miner, @@ -35721,7 +36020,7 @@ pixel_y = 20 }, /turf/simulated/floor/tiled/white, -/area/quartermaster/warehouse) +/area/quartermaster/belterdock/gear) "xMm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -35806,7 +36105,7 @@ "xNI" = ( /obj/random/toy, /turf/simulated/floor/plating, -/area/quartermaster/belterdock/refinery) +/area/endeavour/hallway/d3aftmaint) "xPj" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -35947,7 +36246,7 @@ "xTv" = ( /obj/machinery/mineral/processing_unit, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/miningdock) +/area/quartermaster/belterdock/refinery) "xTD" = ( /obj/machinery/camera/network/security, /turf/simulated/floor/tiled, @@ -36344,7 +36643,7 @@ dir = 9 }, /turf/simulated/floor/tiled/monodark, -/area/quartermaster/miningdock) +/area/quartermaster/belterdock/refinery) "yhH" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -36420,8 +36719,21 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/security/lobby) "ykp" = ( -/turf/simulated/floor/plating, -/area/crew_quarters/recreation_area) +/obj/effect/floor_decal/corner/brown/diagonal, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/quartermaster/belterdock/gear) "ykx" = ( /obj/structure/table/rack/shelf/steel, /obj/effect/floor_decal/industrial/outline/blue, @@ -36505,14 +36817,13 @@ /turf/simulated/floor/tiled/dark, /area/security/security_lockerroom) "ymb" = ( +/obj/machinery/power/apc/north_mount, /obj/structure/cable/green{ - icon_state = "4-8" - }, -/obj/effect/floor_decal/spline/plain{ - dir = 8 + icon_state = "0-2" }, -/turf/simulated/floor/grass, -/area/quartermaster/warehouse) +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "ymh" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -42620,7 +42931,7 @@ xEe hKd xEe xEe -hkN +xEe eWz xEe fxn @@ -42814,7 +43125,7 @@ uzm tab uzm rlf -bwN +uzm uzm uzm uzm @@ -43202,7 +43513,7 @@ iaP rku qLS qLS -tXh +eZz gDZ qCs qCs @@ -43394,9 +43705,9 @@ ddU piG iaP sAp -dmA -dmA -dGV +qLS +qLS +eZz gDZ qCs nUf @@ -44364,7 +44675,7 @@ rEk vbg rEk rEk -qLS +sAp qLS qLS eZz @@ -44558,12 +44869,12 @@ qLS eZz hpG qLS +bug kCu -kCu -eZz +rmb jKP nxz -lif +xMb uAU uAU nxz @@ -44748,14 +45059,14 @@ pRW pRW rEk eXx -qLS -eZz -eZz -eZz -eZz +joO +rmb +rmb +rmb +upo qLS qLS -eZz +dqn nxz naI iJR @@ -45138,17 +45449,17 @@ wuh wuh wuh wuh -tOv -tOv -tOv -tOv -aDU +shF +shF +shF +shF +shF gqQ -mff -mff -mff -mff -mff +xhN +xhN +xhN +xhN +xhN xZH leL pir @@ -45334,15 +45645,15 @@ iXY wuh rMY pOK -jAA +xlf rPE -qJB +hkm jPs -mff +xhN sGw xNI jwr -mff +xhN gwe leL pir @@ -45512,31 +45823,31 @@ iUL fDw wuh iXY +vSl +lYO +lYO +lYO +vSl +iXY +iXY tdG sKL sKL sKL tdG -iXY -iXY -iXY -iXY -iXY -iXY -iXY ehr wuh jEN -jAA -jAA +xlf +xlf uRz -qJB +hkm jPs -mff +xhN rSZ iTk tZV -mff +xhN bbL leL uvj @@ -45706,31 +46017,31 @@ vjg tUu wuh gmZ +vSl +oaN +ctb +wGx +vSl +iXY +iXY tdG jAa qAH uWE tdG iXY -iXY -vSl -lYO -lYO -lYO -vSl -iXY wuh blB mrn qiz fRP -qJB +hkm jPs -mff -mff +xhN +xhN jgF -mff -mff +xhN +xhN kgM fPG pir @@ -45900,31 +46211,31 @@ vjg pRW wuh iXY +vSl +tYv +dym +qmc +vSl +rXr +xMm tdG ubg lwX gpG tdG -rXr -xMm -vSl -oaN -ctb -wGx -vSl iXY wuh wAQ toS qiz kRu -qJB +hkm jPs bWR fLp -wcT +cZa nay -mff +xhN xZH puP pir @@ -46094,25 +46405,25 @@ fDw pRW wuh ptj +vSl +aKj +qIH +qIH +vSl +iXY +wAS tdG ygR muW jhZ tdG -iXY -wAS -vSl -tYv -dym -qmc -vSl mcn wuh bWp toS fRP fRP -qJB +hkm uiK bpu rQs @@ -46287,32 +46598,32 @@ pRW fDw pRW wuh -mLl +iXY +vSl +hRx +qIH +hpq +vSl +sij +uKF mne ceU tpp kxI tdG -sij -uKF -vSl -aKj -qIH -qIH -vSl iXY wuh mEb -jAA -jAA -jAA +mFc +xlf +xlf tds -wcT +cZa twO -kow -wcT -kow -mff +kSn +cZa +kSn +xhN fSt xzc pir @@ -46481,32 +46792,32 @@ pRW xeo jYr wuh -ufN +iXY +xXl +fTI +qIH +iVL +vSl +iXY +eFf tdG gOb iRB jeT tdG -iXY -eFf -vSl -hRx -qIH -hpq -vSl ehr wuh qDS jAA nWc mwk -qJB +hkm nin umo -kow -wcT -nqP -mff +kSn +cZa +acO +xhN xZH tol pir @@ -46675,20 +46986,20 @@ pRW jYr aKn wuh -ufN +iXY +vSl +aKK +qIH +agW +vSl +iXY +eFf tdG sHr ifT eIe tdG iXY -eFf -xXl -fTI -qIH -iVL -vSl -iXY wuh dPs osx @@ -46698,9 +47009,9 @@ dPs qJB vaA rCg -wcT +cZa kow -mff +xhN sDq tol pir @@ -46869,19 +47180,19 @@ pRW xeo jYr wuh -ufN -tdG -cmR -ifT -eIe -tdG iXY -eFf vSl -aKK +ufL qIH agW vSl +iXY +eFf +tdG +cmR +ifT +eIe +tdG oDU wuh aBc @@ -46890,11 +47201,11 @@ pvB jtk mti qJB +tXh wTc -wTc -wcT -kow -mff +cZa +kSn +xhN kgM xzc xbH @@ -47060,23 +47371,23 @@ pRW pRW pRW pRW -fDw +dlE pRW wuh -ufN +iXY +vSl +vSl +vSl +vSl +vSl +iXY +eFf tdG tdG eum ofW tdG iXY -eFf -vSl -ufL -qIH -agW -vSl -iXY wuh dVA qcx @@ -47084,11 +47395,11 @@ qoU dqA dTQ bQe -wcT -wcT -wcT +cZa +cZa +cZa rCg -nqP +acO kgM pXt fTU @@ -47254,23 +47565,23 @@ pRW pRW pRW pRW -vjg +pqk pRW wuh -dJV +gmZ +iXY +tqt +kLg +tqt +iXY +iXY +eFf tdG kRn bgM tMa tdG iXY -eFf -vSl -vSl -vSl -vSl -vSl -iXY wuh tgP qcx @@ -47278,10 +47589,10 @@ hwP gQF pDx sFX -wcT -mBo -kow -kow +cZa +cEH +kSn +kSn aCg kgM pYt @@ -47448,23 +47759,23 @@ pRW pRW pRW pRW -vjg -tUu -wuh -ufN +xuV +nKd +akl +iXY +iXY +iXY +iXY +iXY +iXY +iXY +eFf tdG tdG xJx cRB tdG iXY -eFf -iXY -tqt -kLg -tqt -iXY -iXY wuh sVr qcx @@ -47472,9 +47783,9 @@ tBn qcx dTQ dPs -nms -akl -kow +cZa +cEH +kSn mIG mjy kgM @@ -47642,22 +47953,22 @@ pRW pRW pRW pRW -vjg pRW -wuh -ufN +pRW +rwh +iWE +uRN +iXY +iXY +iXY +iXY +rXr +bxW gCW buL qSx drT tdG -rXr -bxW -iXY -iXY -iXY -iXY -iXY nYH wuh uNM @@ -47666,8 +47977,8 @@ rLo ePx xPu dPs -nms -vyv +cZa +kSn cJJ cJJ cJJ @@ -47836,31 +48147,31 @@ pRW pRW pRW pRW -fDw pRW -wuh -ufN -iXY -rAq -rAq -rAq +pRW +dGV +fsN +iTn iXY iXY -eFf iXY iXY iXY +eFf iXY +rAq +rAq +rAq iXY prw wuh aGE vyv otl -dPs -dPs -dPs -pqk +fgA +fgA +fgA +oRw xhN cJJ gic @@ -48030,16 +48341,16 @@ pRW pRW mDp mDp -vjg -lIp +xuV +aDe wuh -fip -nmv -nmv -nmv -nmv -xMb -rOn +iXY +iXY +iXY +iXY +iXY +iXY +iXY eFf iXY iXY @@ -48050,12 +48361,12 @@ nWj wuh qek hwN -xkg +ukf mlk veW -dPs -nms -nms +fgA +cZa +cZa lMH hMP evn @@ -48226,14 +48537,14 @@ mDp mDp vjg mDp -twR -twR -twR -twR -twR -twR -twR -lAL +wuh +iXY +iXY +iXY +iXY +ejk +iXY +iXY eFf iXY iXY @@ -48247,9 +48558,9 @@ dZs jCu aFS bol -dPs +fgA uuE -rmb +cZa lMH lMH lCU @@ -48421,29 +48732,29 @@ mDp vjg mDp twR -bOW -cyG -fvb -jrK -ePB twR -feE +twR +twR +twR +twR +twR +hkN rYq iXY iXY mLl nmv nmv -gUu +wcT wuh wHf eHs xkg aZK pDn -dPs -nms -nms +fgA +cZa +cZa lMH vIC vmT @@ -48615,21 +48926,21 @@ mDp lIp mDp twR -nJF -oMq -uDB -hUh -lIA +bOW +cyG +fvb +jrK +ePB twR -xcE +feE eFf iXY iXY ufN -iXY -uhE +gDV uhE -wuh +haN +aDU vkn uJx aHA @@ -48809,11 +49120,11 @@ pRW xeo jYr twR -oWf -oMq +nJF oMq -qia -rdb +uDB +hUh +lIA twR xgT phB @@ -48823,15 +49134,15 @@ ufN yhp eHQ sxc -wuh +aDU sBr mLm cZe tBN fNj wzV -ukf -ukf +cZa +cZa lMH yfX ukb @@ -49003,21 +49314,21 @@ pRW jYr aKn twR -wqT +oWf oMq -tGp -jAe -bhw -twR +oMq +qia +rdb twR -qpi +hSq +iXY vMB gqj gUu sGH qNM avQ -wuh +aDU bBM gDP cQm @@ -49025,7 +49336,7 @@ vdN ipL wzV cDY -ukf +cZa lMH vxy ukb @@ -49197,29 +49508,29 @@ pRW xeo jYr twR -xuV -heJ -heJ -lCC -heJ -xJa +wqT +oMq +tGp +jAe +bhw twR -upo +twR +ptj fko iXY iXY cDv -wuh +aDU xTv -wuh +aDU jwQ mJK eBy bTA mmw wzV -dlE -ukf +cEH +cZa lMH iON ukb @@ -49392,20 +49703,20 @@ fDw pRW twR jcl -djB -szw -qbG -iTn -ejk +heJ +heJ +lCC +heJ +xJa twR -qpi +iXY wCE pmy -iXY +cLq lRx qNM lag -wuh +aDU kNT fTB fRJ @@ -49413,7 +49724,7 @@ heO oNw wzV adi -ukf +cZa lMH new ukb @@ -49586,9 +49897,9 @@ jON tUu twR fjp -nNn -nNn -nNn +djB +szw +qbG vxE xyJ twR @@ -49599,15 +49910,15 @@ lRw fSr nVC evc -wuh +aDU dVh npS fLU aBU uMs wzV -cNA -ukf +kSn +cZa lMH evB ukb @@ -49786,14 +50097,14 @@ qKQ twR mYS twR -twR -xJv -wuh -wuh -wuh wuh +xJv wuh wuh +aDU +aDU +aDU +aDU xue wzV mIP @@ -49801,7 +50112,7 @@ kad xYM wzV acO -ukf +cZa lMH skT ukb @@ -49983,19 +50294,19 @@ vRv tbF pJe rOM -mSw +tOv etR kDo kDo qMz hlc -mSw +tOv ekJ xLm gXm hdh -hzu -lUu +bUP +cZa lMH cBD ukb @@ -50173,23 +50484,23 @@ pOu rER sOt ldo -hkm -hkm +uhv +uhv atT itn -kOw +vXN hlc kBv +cNA hlc -qWd hlc -jon +pdF gNj wnA tqv hdh -lUu -lUu +cZa +cZa cJJ cJJ cJJ @@ -50362,36 +50673,36 @@ fDw pRW mSw moz -gdU -gdU -jSX rER -xyh -txc -txc +rER +jSX +gdU +soE +lEM +lEM fYP lQq -mSw +tOv xMc wku -hlc +mff rTD dAP -jon +pdF aHh atw nfA hdh -lUu -hzu -cJJ +mNI +kSn +xhN xHO jtW oNa tkT jBe uPG -cJJ +xhN xtI rZg swv @@ -50565,27 +50876,27 @@ sxY sWe pJe itn -mSw +tOv dAP ulx -hlc +nnu gtZ dAP -jon +pdF wjW wnA -lXM +pZR hdh -lUu +cZa +kSn +xhN hzu -uRN -aIZ -aIZ -aIZ -aIZ -aIZ -aIZ -uRN +kSn +kSn +kSn +kSn +kSn +xhN txu ndp sid @@ -50759,27 +51070,27 @@ uUl uUl pJe itn -mSw +tOv til fJl +dmA hlc -fgA pHB -mSw +tOv oGT xlg dIt hdh -lUu -mNI -qVI -aIZ -aIZ -aIZ -aIZ -aIZ +cZa +mnn +jgF +kSn +kSn +kSn +kSn +kSn ays -uRN +xhN rcz xiG avK @@ -50953,27 +51264,27 @@ qzI qzI pJe itn -mSw +tOv mXi hlc sbx bqs umx -mSw +tOv noW pzs bLd hdh -lUu +cZa uAV -uRN -aIZ +xhN +bUP lkP -aIZ +kSn sMN aIZ -pdF -uRN +oNa +xhN uZv esx qBG @@ -51147,27 +51458,27 @@ lKt uUl pJe itn -mSw +tOv hXO pdT -hlc +ykp etZ ffW -jon +pdF waA xlg dIt hdh -lUu -soE -uRN -uRN -uRN -uRN -uRN -uRN -uRN -uRN +cZa +xhN +xhN +xhN +xhN +xhN +xhN +xhN +xhN +xhN tBY kXK jbI @@ -51334,25 +51645,25 @@ jon bHV rER wmU -ptR +rER uxX xyh sIY tvT wzB hfw -mSw -mSw -mSw +tOv +tOv +tOv kOw -mSw -mSw -mSw +tOv +tOv +tOv rXa lye mii hdh -rwh +fvQ qpd nCY che @@ -51528,7 +51839,7 @@ mSw uzS rER rER -ptR +rER wHG vsY txc @@ -51538,7 +51849,7 @@ rjY sUL sUL sUL -sUL +nqP sUL sUL jon @@ -51547,7 +51858,7 @@ xlg dIt hdh aAy -hdh +eNB qlx qlx cna @@ -51732,7 +52043,7 @@ txc txc txc txc -txc +pZg txc txc wRS @@ -51741,7 +52052,7 @@ wnA lXM hdh boI -hdh +eNB qHt wDp lDd @@ -51919,8 +52230,8 @@ jst ili ili rZY -txc -txc +mBo +mBo shT xCV tdk @@ -51931,17 +52242,17 @@ pJR mbv hrc izO -pZg +kQS cmi dyR hWB hrS dZb -xlg -xlg +lDd +lDd hzi -xlg -xlg +lDd +lDd oUd tEQ sZQ @@ -52104,9 +52415,9 @@ pRW pRW pRW pRW +fDw pRW -pRW -kFu +mSw mJv txc txc @@ -52114,10 +52425,10 @@ txc txc txc txc -sVH -ymb -shF -kdG +txc +dJc +aTk +txc aec sSl ldm @@ -52128,7 +52439,7 @@ mjB hUF dLj aDs -wnA +nNn wfZ rvC pUj @@ -52138,8 +52449,8 @@ vng vng ieQ bJh -cjH -xiG +lAL +atS bAI syH kSn @@ -52298,20 +52609,20 @@ pRW pRW pRW pRW +vjg pRW -pRW -mFc +mSw lea -joO -txc -txc +uUl +uUl +uUl txc txc txc -iWE +cBK kIg -bug -vXN +aTk +cBK wAe ldm ldm @@ -52323,18 +52634,18 @@ cmw hUc wki mhO -hdh -xlg -xlg -xlg +eNB +lDd +lDd +lDd iZj -xlg -xlg -xlg -hdh +lDd +lDd +lDd +eNB dns -xlf -swv +xiG +sid syH kSn syH @@ -52492,19 +52803,19 @@ pRW pRW pRW pRW +vjg pRW -pRW -dMH -jRe -tES -txc -txc +mSw +mJv +uUl +uUl +uUl txc txc txc -teG -izs -nHC +cBK +kIg +aTk cBK des ldm @@ -52514,18 +52825,18 @@ nFa nzA omy rxO -nKd -gLK +bJS +fip lAm -hdh -hdh -hdh +eNB +eNB +eNB hrS bvE hrS iSL hrS -hdh +eNB nJu nQm wtj @@ -52686,7 +52997,7 @@ pRW pRW pRW pRW -pRW +nHC pRW mSw gSF @@ -52696,10 +53007,10 @@ txc txc scZ txc -txc -dJc +cBK +kIg aTk -txc +cBK laQ ldm eDd @@ -52709,7 +53020,7 @@ qlg ffP cmw bJS -gLK +kFu dcu iwp vKr @@ -52880,8 +53191,8 @@ pRW pRW pRW pRW -jON -tUu +vjg +jRe mSw bgH eWe @@ -53074,7 +53385,7 @@ pRW pRW pRW pRW -jON +vjg pRW mSw lwA @@ -53268,7 +53579,7 @@ pRW pRW pRW pRW -fDw +nHC pRW jon mJv @@ -53462,7 +53773,7 @@ pRW pRW pRW pRW -fDw +nHC pRW jon bgH @@ -53489,7 +53800,7 @@ tVF trd cdn hUF -hUF +xcE fDt vZr fhx @@ -53681,15 +53992,15 @@ wnA nkT jPe jYU -hdh -hdh +fva +fva mIN -hdh -hdh -hdh -hdh -hdh -hdh +sVH +sVH +sVH +sVH +sVH +sVH hVB bBc bxI @@ -53875,8 +54186,8 @@ wnA pQh nyi kPT -hdh -hzu +fva +fju lUu rMi ovN @@ -54069,8 +54380,8 @@ qSv jbh nAS qBU -hdh -fsN +fva +qmY lUu rMi nBf @@ -54264,7 +54575,7 @@ jhH kWu dld xng -hzu +fju lUu rMi edb @@ -54278,7 +54589,7 @@ mdJ cGV cGV cGV -cGV +teG ilD tMF kKQ @@ -54457,9 +54768,9 @@ ciU agT wkI vCC -hdh -lUu -lUu +fva +qWd +dJV rMi kke qsL @@ -54651,16 +54962,16 @@ hdh hdh hdh hdh -hdh +fva lUu -hzu +fju iID iID rMi gTq rMi rMi -sTd +tMd bBc trg wXO @@ -54844,9 +55155,9 @@ fju mIk mIk sDb -mIk -mIk -mIk +qWd +tES +dJV fju hFO kZu @@ -55038,10 +55349,10 @@ fju fju fju yab -mIk +lUu fju -ykp -pZR +fju +qmY ewu uIh oyF @@ -55232,7 +55543,7 @@ fju fju fju yab -mIk +izs fju ewu sms @@ -55422,11 +55733,11 @@ csb csb csb fva +kdG fju -fju -fju +lgM yab -mIk +lUu fju soz lfy @@ -55620,8 +55931,8 @@ nJE fGh acY yab -mIk -mIk +rOn +dMH ewu pgJ syZ @@ -55815,7 +56126,7 @@ yab yab yab fju -mIk +lUu ewu tQn syZ @@ -56009,7 +56320,7 @@ eAp lmr fju fju -mIk +lUu ewu syZ qMP @@ -56203,7 +56514,7 @@ eAp jtn fju fju -mIk +lUu ewu eVN eVN @@ -56397,7 +56708,7 @@ eAp yfx fju fju -mIk +lUu mfy viP miE @@ -56588,10 +56899,10 @@ csb csb csb eAp -fju -fju -mIk -mIk +ymb +qVI +tES +dJV mfy shN shN @@ -57366,7 +57677,7 @@ csb eAp fju fju -fju +mIk wIT mfy qbT @@ -57560,7 +57871,7 @@ csb eAp fju fju -fju +mIk mIk mIk mIk @@ -58148,7 +58459,7 @@ tmi fBG rDV rBG -fju +kdG mIk qmY rBG @@ -58732,7 +59043,7 @@ vRl vRl rBG mIk -fju +qmY rBG uOQ nTO @@ -60286,7 +60597,7 @@ ncY fju mIk rBG -xxb +dJG nTO szv sJA @@ -60477,7 +60788,7 @@ vRl vRl vRl vRl -fju +kdG mIk rBG tMK From 9e85f90906ccaccddd60b3e8c71b1ce789cc4743 Mon Sep 17 00:00:00 2001 From: GySgtMurphy Date: Thu, 19 Dec 2024 18:22:01 -0500 Subject: [PATCH 8/9] Last updates --- maps/endeavour/levels/deck3.dmm | 92 ++++++++++++++++++++++++++------- 1 file changed, 74 insertions(+), 18 deletions(-) diff --git a/maps/endeavour/levels/deck3.dmm b/maps/endeavour/levels/deck3.dmm index 5c1169c235ac..85bdbf2120a1 100644 --- a/maps/endeavour/levels/deck3.dmm +++ b/maps/endeavour/levels/deck3.dmm @@ -6804,9 +6804,6 @@ /obj/random/maintenance/clean, /obj/random/maintenance/clean, /obj/item/duct_tape_roll, -/obj/machinery/light/small{ - dir = 8 - }, /turf/simulated/floor/tiled/techfloor, /area/maintenance/bar/catwalk) "esO" = ( @@ -8846,6 +8843,9 @@ /obj/structure/table/reinforced, /obj/item/storage/toolbox/syndicate, /obj/item/pickaxe/drill, +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plating, /area/maintenance/cargo) "fGL" = ( @@ -13815,6 +13815,12 @@ }, /turf/simulated/floor/tiled/monodark, /area/quartermaster/foyer) +"jbC" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "jbI" = ( /obj/machinery/light, /obj/structure/cable/orange{ @@ -25622,6 +25628,12 @@ }, /turf/simulated/floor/wood, /area/crew_quarters/sleep/Dorm_7) +"rjO" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/reinforced, +/area/quartermaster/miningdock) "rjY" = ( /obj/effect/floor_decal/borderfloorblack/corner{ dir = 8 @@ -29325,6 +29337,13 @@ /obj/structure/curtain/open/black, /turf/simulated/floor/plating, /area/crew_quarters/game_room) +"tBG" = ( +/obj/structure/catwalk, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "tBN" = ( /obj/structure/cable/green, /obj/machinery/power/apc/west_mount, @@ -30072,6 +30091,13 @@ /obj/effect/floor_decal/corner_oldtile/white/diagonal, /turf/simulated/floor/tiled/dark, /area/crew_quarters/kitchen) +"ubc" = ( +/obj/machinery/air_alarm/north_mount, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "ubg" = ( /obj/structure/closet/walllocker{ pixel_y = 32 @@ -31405,14 +31431,14 @@ /turf/simulated/floor/plating, /area/quartermaster/storage) "uRN" = ( -/obj/vehicle/sealed/mecha/combat/fighter/cludge{ - dir = 1; - name = "\improper NLS Legal Salvage"; - desc = "A heater, nozzle, and fuel tank strapped together. There are exposed wires strewn about it. Hastily scrawled along the portside cockpit entrance using big, blocky script (in what appears to be crayon?) is the name 'NLS LEGAL SALVAGE'" - }, /obj/effect/floor_decal/industrial/warning{ dir = 10 }, +/obj/vehicle/sealed/mecha/combat/fighter/pinnace{ + dir = 1; + desc = "A cramped ship's boat, capable of atmospheric and space flight. Not capable of mounting traditional weapons. Capable of fitting one pilot and one passenger. Hastily scrawled along the portside cockpit entrance using big, blocky script (in what appears to be crayon?) is the name 'NLS LEGAL SALVAGE'."; + name = "\improper NLS Legal Salvage" + }, /turf/simulated/floor/reinforced, /area/quartermaster/miningdock) "uSv" = ( @@ -33815,6 +33841,19 @@ /obj/effect/paint/palebottlegreen, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"wlM" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/endeavour/hallway/d3aftmaint) "wma" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -34004,6 +34043,16 @@ /obj/structure/flora/pottedplant/orientaltree, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/bar) +"wss" = ( +/obj/structure/catwalk, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "wsz" = ( /turf/simulated/wall/prepainted/security, /area/security/interrogation) @@ -36573,6 +36622,9 @@ dir = 8; layer = 2.9 }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plating, /area/maintenance/cargo) "yfy" = ( @@ -36697,6 +36749,10 @@ }, /turf/simulated/floor/wood, /area/endeavour/hallway/d3fwdhall) +"yiZ" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/maintenance/cargo) "yjd" = ( /obj/machinery/light{ dir = 1 @@ -45639,7 +45695,7 @@ iXY iXY iXY iXY -iXY +rjO iXY iXY wuh @@ -45842,7 +45898,7 @@ xlf xlf uRz hkm -jPs +wlM xhN rSZ iTk @@ -51275,7 +51331,7 @@ noW pzs bLd hdh -cZa +nms uAV xhN bUP @@ -54575,7 +54631,7 @@ jhH kWu dld xng -fju +jbC lUu rMi edb @@ -55152,11 +55208,11 @@ vZR oFO kKO fju -mIk +tBG mIk sDb qWd -tES +wss dJV fju hFO @@ -57869,13 +57925,13 @@ pRW csb csb eAp +jbC fju -fju -mIk mIk mIk mIk mIk +tBG mIk mIk fju @@ -60013,7 +60069,7 @@ gYF vRl vRl mIk -fju +yiZ rBG fqc pAU @@ -60788,7 +60844,7 @@ vRl vRl vRl vRl -kdG +ubc mIk rBG tMK From a5be7f4cbbb46c9978b3fcdf2023fd3ea70f9373 Mon Sep 17 00:00:00 2001 From: GySgtMurphy Date: Thu, 19 Dec 2024 18:51:22 -0500 Subject: [PATCH 9/9] last fix, moved belter console to less crap spot --- maps/endeavour/levels/deck3.dmm | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/maps/endeavour/levels/deck3.dmm b/maps/endeavour/levels/deck3.dmm index 85bdbf2120a1..07b3cab005df 100644 --- a/maps/endeavour/levels/deck3.dmm +++ b/maps/endeavour/levels/deck3.dmm @@ -6525,6 +6525,12 @@ /obj/machinery/camera/network/cargo{ dir = 8 }, +/obj/structure/table/reinforced, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack/oxygen, /turf/simulated/floor/reinforced, /area/quartermaster/miningdock) "ekc" = ( @@ -20824,9 +20830,11 @@ /area/quartermaster/storage) "nWj" = ( /obj/machinery/computer/roguezones{ - dir = 1 + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 8 }, -/obj/effect/floor_decal/industrial/warning/cee, /turf/simulated/floor/reinforced, /area/quartermaster/miningdock) "nWz" = ( @@ -23075,16 +23083,6 @@ }, /turf/simulated/floor/tiled/steel, /area/endeavour/hallway/d3portforhall) -"prw" = ( -/obj/machinery/light, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen, -/obj/structure/table/reinforced, -/turf/simulated/floor/reinforced, -/area/quartermaster/miningdock) "prZ" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -48025,7 +48023,7 @@ buL qSx drT tdG -nYH +iXY wuh uNM nDz @@ -48219,7 +48217,7 @@ rAq rAq rAq iXY -prw +mcn wuh aGE vyv @@ -48413,7 +48411,7 @@ iXY iXY iXY iXY -nWj +iXY wuh qek hwN @@ -48597,9 +48595,9 @@ wuh iXY iXY iXY -iXY +nYH ejk -iXY +nWj iXY eFf iXY