diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index b4a151d2905..43526592eca 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -1972,21 +1972,15 @@ /turf/open/floor/plasteel, /area/security/brig) "aeY" = ( -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=8"; +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack, +/obj/item/storage/belt/utility, +/obj/item/storage/toolbox/electrical, +/obj/item/radio, +/obj/item/hand_labeler, +/obj/machinery/airalarm{ dir = 8; - freq = 1400; - location = "QM #1" - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line, -/mob/living/simple_animal/bot/mulebot{ - beacon_freq = 1400; - home_destination = "QM #1"; - suffix = "#1" + pixel_x = 22 }, /turf/open/floor/plasteel, /area/storage/primary) @@ -2012,22 +2006,21 @@ /turf/open/floor/plasteel, /area/security/prison) "afb" = ( -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=8"; - dir = 8; - freq = 1400; - location = "QM #3" - }, /obj/machinery/light{ dir = 4 }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/structure/table/reinforced, +/obj/item/storage/box/lights/mixed, +/obj/item/stack/sheet/metal{ + amount = 30 }, -/mob/living/simple_animal/bot/mulebot{ - home_destination = "QM #3"; - suffix = "#3" +/obj/item/radio{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/stack/cable_coil, +/obj/structure/sign/poster/random{ + pixel_x = 32 }, /turf/open/floor/plasteel, /area/storage/primary) @@ -8619,6 +8612,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 10 + }, /turf/open/floor/plasteel, /area/quartermaster/warehouse) "ata" = ( @@ -10747,6 +10743,10 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ dir = 4 }, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, /turf/open/floor/plasteel, /area/construction/storage_wing) "ayx" = ( @@ -13691,9 +13691,6 @@ /obj/effect/landmark/start/depsec/supply, /turf/open/floor/plasteel, /area/security/checkpoint/supply) -"aFN" = ( -/turf/closed/wall, -/area/construction/storage_wing) "aFR" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -14739,6 +14736,8 @@ dir = 8; name = "storage wing camera" }, +/obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/trimline/brown/filled/corner, /turf/open/floor/plasteel, /area/construction/storage_wing) "aIA" = ( @@ -14756,18 +14755,15 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/command) -"aIB" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/plasteel, -/area/construction/storage_wing) "aIC" = ( -/obj/machinery/door/airlock/maintenance{ - req_one_access_txt = "12;63;48;50" +/obj/machinery/newscaster{ + pixel_y = 32 }, -/obj/structure/cable, -/turf/open/floor/plating, -/area/maintenance/port/fore) +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/toolbox/mechanical, +/obj/machinery/camera/autoname, +/turf/open/floor/plasteel, +/area/storage/primary) "aID" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, @@ -14782,7 +14778,13 @@ /turf/open/floor/plasteel, /area/construction/storage_wing) "aIF" = ( -/obj/item/kirbyplants/random, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light_switch{ + pixel_x = -26; + pixel_y = 28 + }, +/obj/item/clothing/gloves/color/fyellow, +/obj/item/stack/cable_coil, /turf/open/floor/plasteel, /area/storage/primary) "aII" = ( @@ -15155,23 +15157,19 @@ /turf/open/floor/plating, /area/storage/primary) "aJP" = ( -/obj/effect/turf_decal/trimline/brown/filled/corner, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/construction/storage_wing) "aJQ" = ( -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=8"; - dir = 8; - freq = 1400; - location = "QM #2" - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/event_spawn, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, +/obj/machinery/holopad, /turf/open/floor/plasteel, /area/storage/primary) "aJS" = ( @@ -15652,6 +15650,9 @@ pixel_x = 8; pixel_y = 27 }, +/obj/structure/closet/crate{ + icon_state = "crateopen" + }, /turf/open/floor/plasteel, /area/quartermaster/warehouse) "aLh" = ( @@ -15685,7 +15686,11 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "aLl" = ( -/obj/structure/plasticflaps/opaque, +/obj/machinery/door/airlock/maintenance{ + req_one_access_txt = "12;63;48;50" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, /turf/open/floor/plating, /area/storage/primary) "aLm" = ( @@ -16177,32 +16182,50 @@ /obj/effect/turf_decal/trimline/brown/filled/line{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ + dir = 8 + }, /turf/open/floor/plasteel, /area/construction/storage_wing) "aMC" = ( -/obj/machinery/door/airlock/mining{ - name = "Automated Delivery"; - req_one_access_txt = "31;48" - }, /obj/machinery/door/firedoor, +/obj/machinery/door/airlock/engineering/glass{ + name = "Primary Tool Storage" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 8 + }, /turf/open/floor/plasteel, /area/storage/primary) "aMD" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 8 + }, /turf/open/floor/plasteel, /area/storage/primary) "aME" = ( -/obj/machinery/navbeacon{ - codes_txt = "delivery;dir=8"; - dir = 8; - freq = 1400; - location = "QM #4" - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ - dir = 9 +/obj/structure/rack, +/obj/item/storage/box/lights/mixed, +/obj/item/clothing/gloves/color/fyellow, +/obj/item/stack/package_wrap, +/obj/item/stack/sheet/glass{ + amount = 30 }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/storage/primary) "aMF" = ( @@ -16724,6 +16747,7 @@ /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, /obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, /turf/open/floor/plasteel, /area/quartermaster/warehouse) "aNR" = ( @@ -16785,7 +16809,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ - dir = 10 + dir = 8 }, /turf/open/floor/plasteel, /area/quartermaster/warehouse) @@ -17342,12 +17366,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) -"aPi" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, -/turf/open/floor/plasteel, -/area/quartermaster/warehouse) "aPl" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ @@ -17357,31 +17375,70 @@ /turf/open/floor/plasteel, /area/quartermaster/warehouse) "aPo" = ( -/obj/structure/table, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -2; - pixel_y = 10 +/obj/structure/noticeboard{ + pixel_y = 31 }, -/obj/item/storage/toolbox/mechanical{ - pixel_x = -2; - pixel_y = 2 +/obj/item/reagent_containers/food/condiment/milk{ + pixel_x = 6; + pixel_y = 8 }, -/obj/machinery/light_switch{ - pixel_y = 28 +/obj/item/reagent_containers/food/condiment/sugar{ + pixel_y = 4 + }, +/obj/item/reagent_containers/food/condiment/soymilk{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/reagent_containers/food/drinks/ice{ + pixel_x = -4; + pixel_y = -2 + }, +/obj/item/reagent_containers/food/drinks/bottle/cream{ + pixel_x = 3; + pixel_y = -2 + }, +/obj/structure/table{ + name = "Jim Norton's Quebecois Coffee table" }, /turf/open/floor/plasteel/dark, -/area/storage/primary) +/area/crew_quarters/cafeteria) "aPp" = ( -/obj/structure/sign/poster/official/random{ +/obj/structure/sign/poster/contraband/robust_softdrinks{ + name = "Jim Norton's Quebecois Coffee"; pixel_y = 32 }, -/obj/structure/table, -/obj/item/analyzer, -/obj/item/screwdriver{ - pixel_y = 20 +/obj/item/seeds/coffee{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/seeds/coffee/robusta{ + pixel_x = -3; + pixel_y = -2 + }, +/obj/item/seeds/coffee{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/storage/box/drinkingglasses{ + pixel_x = 4; + pixel_y = 5 + }, +/obj/item/storage/pill_bottle/happinesspsych{ + pixel_x = -4; + pixel_y = -1 + }, +/obj/item/seeds/coffee{ + pixel_x = 4; + pixel_y = -2 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/table{ + name = "Jim Norton's Quebecois Coffee table" }, /turf/open/floor/plasteel/dark, -/area/storage/primary) +/area/crew_quarters/cafeteria) "aPq" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, @@ -17746,10 +17803,16 @@ /area/quartermaster/warehouse) "aQr" = ( /obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/start/cargo_technician, /obj/structure/cable, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + dir = 8; + freq = 1400; + location = "QM #4" + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 9 }, /turf/open/floor/plasteel, /area/quartermaster/warehouse) @@ -17758,6 +17821,9 @@ /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, /obj/item/airlock_painter/decal, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel, /area/quartermaster/warehouse) "aQt" = ( @@ -17777,31 +17843,32 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ dir = 4 }, +/obj/machinery/door/window/southright{ + dir = 8; + name = "Jim Norton's Quebecois Coffee"; + req_one_access_txt = "12;25;28;35;37" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/neutral/line, /turf/open/floor/plasteel/dark, -/area/storage/primary) +/area/crew_quarters/cafeteria) "aQw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/neutral/line, /turf/open/floor/plasteel/dark, -/area/storage/primary) +/area/crew_quarters/cafeteria) "aQx" = ( -/obj/structure/table, -/obj/item/wrench, -/obj/item/crowbar, -/obj/item/stack/cable_coil{ - pixel_x = 3; - pixel_y = 15 - }, -/obj/item/stack/cable_coil{ - pixel_y = 18 - }, -/obj/machinery/requests_console{ - department = "Tool Storage"; - pixel_x = 30 +/obj/machinery/newscaster{ + pixel_x = 28; + pixel_y = 1 }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/neutral/line, /turf/open/floor/plasteel/dark, -/area/storage/primary) +/area/crew_quarters/cafeteria) "aQy" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, @@ -18389,33 +18456,61 @@ /area/quartermaster/warehouse) "aRL" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/watertank, /obj/structure/cable, /obj/machinery/power/apc/auto_name/east, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + dir = 8; + freq = 1400; + location = "QM #3" + }, +/mob/living/simple_animal/bot/mulebot{ + home_destination = "QM #3"; + suffix = "#3" + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, /turf/open/floor/plasteel, /area/quartermaster/warehouse) "aRQ" = ( -/obj/structure/closet/crate/internals, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/trimline/neutral/filled/end{ - dir = 4 +/obj/structure/table/reinforced{ + name = "Jim Norton's Quebecois Coffee table" }, -/obj/effect/turf_decal/trimline/neutral/filled/end{ - dir = 4 +/obj/item/storage/fancy/donut_box, +/obj/item/paper{ + info = "Jim Norton's Quebecois Coffee. You see, in 2265 the Quebecois had finally had enough of Canada's shit, and went to the one place that wasn't corrupted by Canuckistan.Je vais au seul endroit qui n'a pas � corrompu par les Canadiens ... ESPACE."; + name = "Coffee Shop"; + pixel_x = -4; + pixel_y = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/turf_decal/trimline/neutral/line{ + dir = 1 }, /turf/open/floor/plasteel/dark, -/area/storage/primary) +/area/crew_quarters/cafeteria) "aRR" = ( -/obj/machinery/holopad, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 10 +/obj/structure/window/reinforced, +/obj/item/reagent_containers/food/drinks/mug/coco{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/reagent_containers/food/drinks/mug/tea{ + pixel_x = 4; + pixel_y = 2 + }, +/obj/item/reagent_containers/food/drinks/coffee{ + pixel_x = -3 + }, +/obj/structure/table/reinforced{ + name = "Jim Norton's Quebecois Coffee table" + }, +/obj/effect/turf_decal/trimline/neutral/line{ + dir = 1 }, /turf/open/floor/plasteel/dark, -/area/storage/primary) +/area/crew_quarters/cafeteria) "aRS" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate{ @@ -18848,53 +18943,56 @@ /turf/open/floor/plasteel/white, /area/science/research) "aTb" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ dir = 8 }, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, /turf/open/floor/plasteel, /area/construction/storage_wing) "aTc" = ( -/obj/structure/cable, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/storage/primary) +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/crew_quarters/cafeteria) "aTd" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/storage/primary) +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/open/floor/wood, +/area/crew_quarters/cafeteria) "aTe" = ( -/obj/structure/table, -/obj/item/assembly/igniter{ - pixel_x = -3; - pixel_y = -6 - }, -/obj/item/assembly/igniter{ - pixel_x = 9 - }, -/obj/item/t_scanner{ - pixel_x = -3; - pixel_y = 15 - }, /obj/item/radio/intercom{ dir = 4; pixel_x = 27 }, -/turf/open/floor/plasteel/dark, -/area/storage/primary) +/obj/effect/turf_decal/siding/wood{ + dir = 5 + }, +/obj/structure/chair/stool{ + name = "Jim Norton's Quebecois Coffee stool" + }, +/turf/open/floor/wood, +/area/crew_quarters/cafeteria) "aTf" = ( /obj/effect/turf_decal/trimline/brown/filled/corner{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/bar, /turf/open/floor/plasteel, /area/construction/storage_wing) "aTg" = ( @@ -19362,45 +19460,42 @@ /turf/open/floor/plasteel, /area/construction/storage_wing) "aUp" = ( -/obj/structure/rack, -/obj/item/storage/belt/utility, -/obj/item/screwdriver{ - pixel_y = 16 +/obj/structure/cable, +/obj/effect/turf_decal/siding/wood{ + dir = 8 }, -/turf/open/floor/plasteel/dark, -/area/storage/primary) +/turf/open/floor/wood, +/area/crew_quarters/cafeteria) "aUq" = ( -/obj/machinery/vending/assist, -/turf/open/floor/plasteel/dark, -/area/storage/primary) +/obj/structure/cable, +/obj/machinery/holopad, +/turf/open/floor/wood, +/area/crew_quarters/cafeteria) "aUs" = ( -/obj/structure/table, -/obj/item/storage/firstaid/regular{ +/obj/machinery/power/apc/auto_name/east, +/obj/structure/cable, +/obj/structure/table{ + name = "Jim Norton's Quebecois Coffee table" + }, +/obj/item/modular_computer/laptop{ + pixel_y = -4 + }, +/obj/item/reagent_containers/food/drinks/coffee{ + pixel_x = -3; + pixel_y = 9 + }, +/obj/item/reagent_containers/food/drinks/coffee{ pixel_x = 5; - pixel_y = -5 - }, -/obj/item/wirecutters{ - pixel_y = 25 - }, -/obj/item/assembly/signaler{ - pixel_x = -10; - pixel_y = 13 - }, -/obj/item/assembly/signaler{ - pixel_x = -8 - }, -/obj/item/assembly/prox_sensor{ pixel_y = 12 }, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, /obj/machinery/light{ dir = 4 }, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = 24 - }, -/turf/open/floor/plasteel/dark, -/area/storage/primary) +/turf/open/floor/wood, +/area/crew_quarters/cafeteria) "aUt" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -20078,20 +20173,30 @@ /turf/open/floor/plasteel, /area/construction/storage_wing) "aVR" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/plasteel/dark, -/area/storage/primary) +/obj/effect/turf_decal/siding/wood, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/crew_quarters/cafeteria) "aVS" = ( -/obj/structure/table, -/obj/item/clothing/gloves/color/fyellow{ - pixel_y = 6 +/obj/structure/sign/poster/official/cleanliness{ + pixel_x = 32 }, -/obj/item/clothing/gloves/color/fyellow, -/obj/machinery/light{ - dir = 4 +/obj/structure/sink{ + pixel_y = 22 + }, +/obj/effect/turf_decal/bot, +/obj/item/clothing/suit/apron/chef{ + name = "Jim Norton's Quebecois Coffee apron" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/camera/autoname{ + c_tag = "Jim Norton's Quebecois Coffee" }, /turf/open/floor/plasteel/dark, -/area/storage/primary) +/area/crew_quarters/cafeteria) "aVT" = ( /obj/machinery/door/airlock/maintenance{ req_one_access_txt = "12;63;48;50" @@ -20789,6 +20894,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ dir = 5 }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, /turf/open/floor/plasteel, /area/construction/storage_wing) "aXv" = ( @@ -20802,8 +20910,14 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer2{ dir = 1 }, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, /turf/open/floor/plasteel, -/area/construction/storage_wing) +/area/hallway/primary/central) "aXw" = ( /obj/structure/disposalpipe/segment{ dir = 10 @@ -20815,6 +20929,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ dir = 8 }, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aXx" = ( @@ -20825,6 +20945,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ dir = 8 }, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aXy" = ( @@ -20857,6 +20983,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ dir = 8 }, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "aXA" = ( @@ -21465,6 +21597,11 @@ dir = 8 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel, /area/construction/storage_wing) "aYM" = ( @@ -25075,6 +25212,9 @@ dir = 4 }, /obj/structure/cable, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, /turf/open/floor/plasteel/dark, /area/bridge) "bhj" = ( @@ -28815,7 +28955,21 @@ /area/crew_quarters/toilet/auxiliary) "bqk" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/reagent_dispensers/fueltank, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + dir = 8; + freq = 1400; + location = "QM #1" + }, +/mob/living/simple_animal/bot/mulebot{ + beacon_freq = 1400; + home_destination = "QM #1"; + suffix = "#1" + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, /turf/open/floor/plasteel, /area/quartermaster/warehouse) "bql" = ( @@ -28860,18 +29014,21 @@ /turf/open/floor/plasteel, /area/hallway/primary/port) "bqu" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/trimline/neutral/filled/end{ +/obj/structure/window/reinforced{ dir = 8 }, -/obj/effect/turf_decal/trimline/neutral/filled/end{ - dir = 8 +/obj/item/stack/spacecash/c1{ + pixel_y = 5 }, -/obj/structure/disposalpipe/trunk{ - dir = 4 +/obj/item/reagent_containers/glass/rag, +/obj/structure/table/reinforced{ + name = "Jim Norton's Quebecois Coffee table" + }, +/obj/effect/turf_decal/trimline/neutral/line{ + dir = 1 }, /turf/open/floor/plasteel/dark, -/area/storage/primary) +/area/crew_quarters/cafeteria) "bqv" = ( /obj/structure/disposalpipe/segment{ dir = 9 @@ -37709,6 +37866,7 @@ pixel_y = 28 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plasteel, /area/quartermaster/warehouse) "bOr" = ( @@ -42518,19 +42676,35 @@ /turf/open/floor/plasteel/white, /area/science/research) "caA" = ( -/obj/structure/table, -/obj/item/weldingtool{ - pixel_x = -5; - pixel_y = 6 +/obj/structure/window/reinforced, +/obj/item/food/cakeslice/pound_cake_slice{ + pixel_x = 8; + pixel_y = -2 }, -/obj/item/flashlight{ - pixel_x = 5; - pixel_y = 3 +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 22 + }, +/obj/structure/table/reinforced{ + name = "Jim Norton's Quebecois Coffee table" + }, +/obj/item/reagent_containers/food/snacks/poppypretzel{ + pixel_x = -8; + pixel_y = -3 + }, +/obj/item/reagent_containers/food/snacks/muffin/berry{ + pixel_x = -4; + pixel_y = 9 + }, +/obj/item/reagent_containers/food/snacks/hotcrossbun{ + pixel_x = 3; + pixel_y = 5 + }, +/obj/effect/turf_decal/trimline/neutral/line{ + dir = 1 }, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/east, /turf/open/floor/plasteel/dark, -/area/storage/primary) +/area/crew_quarters/cafeteria) "caB" = ( /obj/machinery/status_display/evac{ pixel_y = 32 @@ -62663,10 +62837,8 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "dhI" = ( -/obj/machinery/door/window/eastright{ - name = "MULEbot Access"; - req_one_access_txt = "31;48" - }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable, /turf/open/floor/plasteel, /area/storage/primary) "dhJ" = ( @@ -64203,21 +64375,23 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "dCt" = ( -/obj/structure/table, -/obj/item/clothing/gloves/color/fyellow{ - pixel_y = 9 +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/machinery/cell_charger{ - pixel_x = -3 +/obj/machinery/vending/coffee{ + custom_premium_price = 0; + custom_price = 0; + default_price = 0; + extra_price = 0; + fair_market_price = 0; + name = "\improper Jim Norton's Quebecois Coffee" }, -/obj/item/stock_parts/cell/high{ - charge = 100; - maxcharge = 15000; - pixel_x = -2; - pixel_y = -2 +/obj/machinery/light_switch{ + pixel_x = -6; + pixel_y = 27 }, /turf/open/floor/plasteel/dark, -/area/storage/primary) +/area/crew_quarters/cafeteria) "dCv" = ( /obj/effect/landmark/event_spawn, /obj/effect/decal/cleanable/dirt, @@ -65394,6 +65568,9 @@ }, /turf/open/floor/plasteel/dark, /area/chapel/office) +"eHe" = ( +/turf/closed/wall, +/area/crew_quarters/cafeteria) "eIt" = ( /obj/machinery/holopad, /obj/structure/cable, @@ -65782,6 +65959,15 @@ }, /turf/open/floor/plating, /area/maintenance/port/aft) +"fkb" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 4 + }, +/obj/effect/landmark/start/assistant, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/trimline/neutral/line, +/turf/open/floor/plasteel/dark, +/area/crew_quarters/cafeteria) "flL" = ( /obj/machinery/door/airlock/maintenance{ name = "Surgery C Maintenance"; @@ -65859,6 +66045,20 @@ }, /turf/open/floor/wood, /area/crew_quarters/bar) +"fok" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/navbeacon{ + codes_txt = "delivery;dir=8"; + dir = 8; + freq = 1400; + location = "QM #2" + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plasteel, +/area/quartermaster/warehouse) "fos" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -66995,9 +67195,13 @@ /turf/open/floor/plasteel/white, /area/medical/surgery/room_c) "gIg" = ( -/obj/machinery/vending/tool, -/turf/open/floor/plasteel/dark, -/area/storage/primary) +/obj/effect/turf_decal/siding/wood, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/crew_quarters/cafeteria) "gJs" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, @@ -67445,6 +67649,23 @@ /obj/structure/cable, /turf/open/floor/plating, /area/science/xenobiology) +"huV" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 10 + }, +/obj/machinery/disposal/bin{ + name = "Jim Norton's Quebecois Coffee disposal unit" + }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced, +/obj/effect/turf_decal/bot, +/turf/open/floor/wood, +/area/crew_quarters/cafeteria) "hvt" = ( /obj/structure/kitchenspike_frame, /obj/effect/decal/cleanable/blood/old, @@ -68049,6 +68270,11 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/central) +"ivz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/landmark/start/cargo_technician, +/turf/open/floor/plasteel, +/area/quartermaster/warehouse) "ivA" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -68311,6 +68537,10 @@ }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) +"iTU" = ( +/obj/structure/sign/poster/contraband/missing_gloves, +/turf/closed/wall, +/area/storage/primary) "iUc" = ( /obj/structure/chair{ dir = 4 @@ -68653,6 +68883,13 @@ /obj/structure/closet/l3closet, /turf/open/floor/plasteel/dark, /area/medical/medbay/central) +"jqa" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 9 + }, +/turf/open/floor/plasteel, +/area/storage/primary) "jqA" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -68787,6 +69024,16 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"jBW" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/construction/storage_wing) "jCZ" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue{ @@ -70336,6 +70583,13 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/fore) +"lxQ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/plasteel, +/area/quartermaster/warehouse) "lzk" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -72168,6 +72422,24 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/science/misc_lab/range) +"odi" = ( +/obj/structure/rack, +/obj/item/flashlight, +/obj/item/clothing/gloves/color/fyellow, +/obj/item/book/manual/wiki/engineering_hacking{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/book/manual/wiki/engineering_guide, +/obj/item/book/manual/wiki/engineering_construction{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/airlock_painter, +/obj/item/crowbar, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/plasteel, +/area/storage/primary) "oem" = ( /obj/structure/cable, /turf/open/floor/plasteel/dark, @@ -72980,6 +73252,21 @@ }, /turf/open/floor/plasteel, /area/hallway/secondary/service) +"pdZ" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/tile/bar{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/hallway/primary/central) "pgX" = ( /obj/machinery/holopad, /turf/open/floor/plasteel, @@ -74521,6 +74808,17 @@ /obj/structure/plasticflaps/opaque, /turf/open/floor/plating, /area/quartermaster/qm) +"qYx" = ( +/obj/effect/turf_decal/trimline/brown/filled/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, +/obj/structure/reagent_dispensers/fueltank, +/obj/item/weldingtool, +/obj/item/clothing/head/welding, +/turf/open/floor/plasteel, +/area/construction/storage_wing) "qZf" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, @@ -74907,6 +75205,19 @@ }, /turf/open/floor/plasteel/white, /area/security/checkpoint/medical) +"ruP" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2{ + dir = 8 + }, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/obj/effect/turf_decal/loading_area{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/crew_quarters/cafeteria) "rvk" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/stripes/line{ @@ -75913,6 +76224,10 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, /turf/open/floor/plasteel/dark, /area/engine/break_room) +"sTb" = ( +/obj/machinery/vending/assist, +/turf/open/floor/plasteel, +/area/storage/primary) "sUG" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -75931,6 +76246,12 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/aft) +"sVe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/belt/utility, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/plasteel, +/area/storage/primary) "sVR" = ( /obj/machinery/door/airlock/public/glass{ name = "Prison Cafeteria" @@ -76687,6 +77008,32 @@ /obj/structure/cable, /turf/open/floor/plasteel/white, /area/science/xenobiology) +"ucj" = ( +/obj/structure/table/reinforced, +/obj/item/flashlight, +/obj/item/analyzer{ + pixel_x = 7; + pixel_y = 3 + }, +/obj/item/assembly/signaler, +/obj/item/stack/rods{ + amount = 25 + }, +/obj/item/stack/cable_coil, +/obj/item/gps, +/obj/structure/cable, +/obj/structure/extinguisher_cabinet{ + dir = 4; + pixel_x = 24 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/item/clothing/gloves/color/fyellow, +/obj/item/gps, +/obj/machinery/power/apc/auto_name/north, +/turf/open/floor/plasteel, +/area/storage/primary) "ucX" = ( /obj/machinery/light/small{ dir = 4 @@ -77121,6 +77468,15 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"uLc" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/bar, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/plasteel, +/area/construction/storage_wing) "uLp" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -77941,6 +78297,13 @@ }, /turf/open/floor/plasteel/white, /area/medical/sleeper) +"vTs" = ( +/obj/machinery/vending/tool, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/plasteel, +/area/storage/primary) "vTD" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer4{ @@ -78219,13 +78582,6 @@ /obj/effect/decal/cleanable/food/flour, /turf/open/floor/plating, /area/maintenance/port/aft) -"wnR" = ( -/obj/effect/spawner/lootdrop/maintenance, -/obj/structure/rack, -/turf/open/floor/plating{ - icon_state = "platingdmg3" - }, -/area/maintenance/port/fore) "woz" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer4{ dir = 4 @@ -78460,11 +78816,10 @@ /area/medical/medbay/central) "wAq" = ( /obj/machinery/door/firedoor, -/obj/machinery/door/airlock/security{ - name = "Security-Storage Backroom"; - req_access_txt = "63" - }, /obj/structure/cable, +/obj/machinery/door/airlock/maintenance{ + req_one_access_txt = "12;63;48;50" + }, /turf/open/floor/plasteel/dark, /area/hallway/primary/fore) "wBb" = ( @@ -78566,6 +78921,11 @@ /obj/effect/turf_decal/stripes/line, /turf/closed/wall, /area/science/misc_lab/range) +"wKC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plasteel, +/area/quartermaster/warehouse) "wLG" = ( /obj/machinery/door/airlock/hatch{ name = "Test Chamber Maintenance"; @@ -78585,6 +78945,20 @@ }, /turf/open/floor/plasteel/white, /area/medical/chemistry) +"wNE" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack, +/obj/item/assembly/timer, +/obj/effect/spawner/lootdrop/maintenance, +/obj/item/storage/box/shipping, +/obj/item/storage/toolbox/mechanical, +/obj/item/radio{ + pixel_x = 5; + pixel_y = 5 + }, +/obj/item/wrench, +/turf/open/floor/plasteel, +/area/storage/primary) "wOc" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -79157,15 +79531,14 @@ /turf/open/floor/plating, /area/security/checkpoint/customs) "xzs" = ( -/obj/structure/rack, -/obj/item/storage/box/shipping{ - pixel_x = -6 +/obj/structure/chair/stool{ + name = "Jim Norton's Quebecois Coffee stool" }, -/obj/item/storage/box/lights/mixed{ - pixel_x = 9 +/obj/effect/turf_decal/siding/wood{ + dir = 6 }, -/turf/open/floor/plasteel/dark, -/area/storage/primary) +/turf/open/floor/wood, +/area/crew_quarters/cafeteria) "xAp" = ( /obj/structure/chair/comfy, /obj/machinery/power/apc/auto_name/north, @@ -79196,6 +79569,11 @@ }, /turf/open/floor/plating, /area/security/prison) +"xCf" = ( +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/wood, +/area/crew_quarters/cafeteria) "xCg" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -99487,7 +99865,7 @@ aKZ aNV aNP aPg -aQp +fok bqk aSZ nMU @@ -99743,7 +100121,7 @@ aSZ aLa aNW aNP -aQq +aQp aQq aRK aSZ @@ -99999,8 +100377,8 @@ iMF aSZ aLb aNX -aPi -aPi +aNP +aNP aQr aRL aSZ @@ -100257,7 +100635,7 @@ cTs aRS asY aNQ -aQq +lxQ aQs aSZ aSZ @@ -100514,7 +100892,7 @@ aSZ bOq aNY aNR -aQq +ivz aQt aSZ dhy @@ -100768,7 +101146,7 @@ aEH uqX dhG aSZ -aQq +wKC aPq aQy aQq @@ -101027,7 +101405,7 @@ aIw aSZ aLe aQq -aRS +aQq aPl aYJ aSZ @@ -101793,17 +102171,17 @@ awW awW lMJ aEH -aIB +aUm aIz aJP aMB -aMB +qYx aTf -aXo +uLc aYL -aXo +uLc aTb -aXo +jBW ayw aXu oYv @@ -102049,19 +102427,19 @@ aaa aaa aaa aaa -aFN -aHt -aFN +aJN +iTU +aJN aJO aMC -aMC +aJO aJN dCt aQv bqu aTc aUp -aJO +huV aXv enV baF @@ -102306,17 +102684,17 @@ aaa aaa aaa aaa -aFN -aHt -aFN +aJN +vTs +sTb aIF aMD -aMD +odi aJN aPo -aQv +fkb aRQ -aTc +ruP aUq gIg aXw @@ -102562,19 +102940,19 @@ aaa aaa aaa aaa -dne -dne +aaa +aJN aIC -dne +sVe aJQ -aMD +jqa aME aJN aPp aQw aRR aTd -aVR +xCf aVR aXx aYW @@ -102819,10 +103197,10 @@ aaa aaa aaa aaa -anb -doA -doJ -dne +aaa +aJN +ucj +wNE aeY dhI afb @@ -102833,7 +103211,7 @@ caA aTe aUs xzs -bWq +pdZ qHJ xYW rrB @@ -103076,20 +103454,20 @@ aaa aaa aaa aaa -anb -wnR -doJ dne aJN +aJN +aJN +aJN aLl aJN aJN -aJN -aJN -aJN -aJN -aJN -aJN +eHe +eHe +eHe +eHe +eHe +eHe aXz aYY baQ