diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 887dd64c25b..d76b589502d 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -1901,7 +1901,7 @@ /area/station/maintenance/solar_maintenance/fore_starboard) "asV" = ( /obj/machinery/economy/vending/detdrobe, -/obj/machinery/light{ +/obj/machinery/light/small{ dir = 8 }, /turf/simulated/floor/carpet/grimey, @@ -4466,9 +4466,6 @@ /area/station/hallway/primary/fore/north) "aKI" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/light{ - dir = 1 - }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/se) "aKK" = ( @@ -4655,6 +4652,7 @@ }, /obj/structure/table/reinforced, /obj/effect/turf_decal/tiles/department/engineering/side, +/obj/machinery/light, /turf/simulated/floor/plasteel/dark, /area/station/engineering/hardsuitstorage) "aLw" = ( @@ -5027,6 +5025,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light/floor, /turf/simulated/floor/plasteel{ icon_state = "cult" }, @@ -7289,6 +7288,7 @@ /obj/structure/sign/monkey_paint{ pixel_y = -32 }, +/obj/machinery/light/small, /turf/simulated/floor/wood, /area/station/service/bar) "bbF" = ( @@ -8364,6 +8364,7 @@ "bgq" = ( /obj/structure/rack, /obj/effect/spawner/random/tech_storage/supply, +/obj/machinery/light/small, /turf/simulated/floor/plasteel/dark, /area/station/engineering/tech_storage) "bgr" = ( @@ -9766,15 +9767,6 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard) -"bnh" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/tiles/department/engineering/corner{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/primary/starboard) "bni" = ( /obj/machinery/camera{ c_tag = "Starboard Primary Hallway - Auxiliary Tool Storage" @@ -12174,11 +12166,17 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = 32 }, +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/wood, /area/station/service/bar) "bxI" = ( /obj/structure/reagent_dispensers/beerkeg, /obj/structure/table/wood, +/obj/machinery/light/small{ + dir = 8 + }, /turf/simulated/floor/wood, /area/station/service/bar) "bxN" = ( @@ -13401,10 +13399,13 @@ /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "bCB" = ( -/obj/machinery/alarm/directional/west, /obj/effect/turf_decal/tiles/neutral/corner{ dir = 8 }, +/obj/item/radio/intercom{ + name = "west bump"; + pixel_x = -28 + }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/east) "bCC" = ( @@ -18068,6 +18069,9 @@ "cbx" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/plasteel/dark, /area/station/hallway/primary/central/sw) "cbz" = ( @@ -18859,6 +18863,7 @@ icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/light/floor, /turf/simulated/floor/plasteel, /area/station/supply/office) "cfW" = ( @@ -18929,6 +18934,9 @@ /obj/effect/turf_decal/tiles/department/science/side{ dir = 1 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/plasteel/white, /area/station/science/lobby) "cgA" = ( @@ -19974,6 +19982,7 @@ /turf/simulated/wall/r_wall, /area/station/science/rnd) "cmq" = ( +/obj/machinery/light/floor, /turf/simulated/floor/plasteel/white, /area/station/medical/reception) "cmr" = ( @@ -20116,6 +20125,10 @@ }, /turf/simulated/floor/plating, /area/station/medical/surgery/secondary) +"cne" = ( +/obj/machinery/light/floor, +/turf/simulated/floor/wood, +/area/station/service/bar) "cnj" = ( /obj/machinery/light, /obj/effect/turf_decal/tiles/neutral/corner{ @@ -22610,6 +22623,9 @@ /obj/effect/turf_decal/tiles/department/medical/side{ dir = 4 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/plasteel/white, /area/station/medical/storage) "czw" = ( @@ -22620,6 +22636,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, +/obj/machinery/light, /obj/effect/turf_decal/tiles/department/medical/side{ dir = 6 }, @@ -24055,6 +24072,9 @@ /obj/effect/turf_decal/tiles/department/command/side{ dir = 1 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/plasteel/dark, /area/station/hallway/primary/central/south) "cGY" = ( @@ -26996,6 +27016,7 @@ codes_txt = "patrol;next_patrol=14.8-Dorms-Lockers"; location = "14.5-Recreation" }, +/obj/machinery/light/floor, /turf/simulated/floor/plasteel, /area/station/public/fitness) "cYA" = ( @@ -27302,6 +27323,9 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4 }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plasteel/dark, /area/station/hallway/secondary/entry/west) "daw" = ( @@ -27862,9 +27886,6 @@ /turf/simulated/floor/carpet/grimey, /area/station/service/chapel/office) "deD" = ( -/obj/machinery/light{ - dir = 4 - }, /obj/structure/sign/directions/medical{ pixel_x = 32; pixel_y = 8 @@ -29007,6 +29028,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/light/floor, /turf/simulated/floor/plasteel, /area/station/supply/office) "dxa" = ( @@ -29590,6 +29612,21 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/engineering/ai_transit_tube) +"dIq" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/sortjunction, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/effect/mapping_helpers/sortjunc_helper/captains_office, +/turf/simulated/floor/plasteel, +/area/station/hallway/primary/central/east) "dIG" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -33402,6 +33439,13 @@ }, /turf/simulated/floor/plasteel, /area/station/science/robotics/showroom) +"eUl" = ( +/obj/effect/turf_decal/tiles/department/medical, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/hallway/primary/aft/south) "eUt" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -37424,6 +37468,9 @@ /obj/structure/cable/extra_insulated{ icon_state = "2-8" }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/east) "ghG" = ( @@ -39753,6 +39800,19 @@ /obj/structure/sign/medical/virology, /turf/simulated/wall/r_wall, /area/station/medical/virology) +"gUi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/light/floor, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "gUk" = ( /obj/structure/chair{ dir = 1 @@ -40329,6 +40389,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/light/floor, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard) "hfs" = ( @@ -41464,6 +41525,15 @@ }, /turf/simulated/floor/plasteel/white, /area/station/medical/cloning) +"hAU" = ( +/obj/effect/turf_decal/tiles/neutral/corner{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/station/hallway/primary/fore/west) "hBh" = ( /obj/structure/dispenser/oxygen, /obj/effect/turf_decal/tiles/department/cargo/side{ @@ -42425,6 +42495,19 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) +"hRu" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/light/floor, +/turf/simulated/floor/plasteel/dark, +/area/station/command/bridge) "hRC" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -42880,6 +42963,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/tiles/department/cargo/side, /obj/structure/closet/crate/sci, +/obj/machinery/light/small, /turf/simulated/floor/plasteel, /area/station/supply/warehouse) "hZJ" = ( @@ -43421,6 +43505,10 @@ /obj/effect/spawner/airlock/w_to_e/long, /turf/simulated/wall, /area/station/maintenance/asmaint) +"iiA" = ( +/obj/machinery/light/floor, +/turf/simulated/floor/plasteel/dark, +/area/station/security/main) "iiC" = ( /obj/structure/cable{ icon_state = "1-2" @@ -44873,7 +44961,6 @@ /obj/structure/table/wood, /obj/machinery/bottler, /obj/structure/sign/poster/random/directional/south, -/obj/machinery/light/small, /turf/simulated/floor/wood, /area/station/service/bar) "iGi" = ( @@ -46724,6 +46811,9 @@ /obj/effect/turf_decal/tiles/department/command/side{ dir = 1 }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plasteel/dark, /area/station/hallway/primary/central/south) "jll" = ( @@ -46783,6 +46873,9 @@ dir = 8 }, /obj/effect/turf_decal/tiles/neutral/corner, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft/north) "jmi" = ( @@ -50008,13 +50101,6 @@ }, /turf/simulated/floor/engine, /area/station/engineering/engine/reactor) -"khl" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tiles/neutral/corner, -/turf/simulated/floor/plasteel, -/area/station/hallway/primary/aft/south) "kht" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -55869,13 +55955,12 @@ /turf/simulated/floor/plating, /area/station/science/xenobiology) "mdE" = ( -/obj/item/radio/intercom{ - name = "west bump"; - pixel_x = -28 - }, /obj/effect/turf_decal/tiles/neutral/corner{ dir = 8 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/east) "mdF" = ( @@ -57603,7 +57688,7 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/light, +/obj/machinery/light/small, /turf/simulated/floor/carpet, /area/station/security/detective) "mLm" = ( @@ -58136,6 +58221,9 @@ /obj/structure/chair/sofa/corp/left, /obj/machinery/alarm/directional/north, /obj/effect/turf_decal/tiles/dark/checker, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/plasteel/white, /area/station/science/break_room) "mVp" = ( @@ -59900,15 +59988,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel/white, /area/station/medical/cloning) -"nyk" = ( -/obj/effect/turf_decal/tiles/neutral/corner{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/primary/central/sw) "nyv" = ( /obj/structure/cable/extra_insulated{ icon_state = "2-4" @@ -63358,6 +63437,15 @@ icon_state = "showroomfloor" }, /area/station/service/kitchen/freezer) +"oHx" = ( +/obj/effect/turf_decal/tiles/neutral/corner{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/hallway/primary/aft/south) "oHy" = ( /obj/structure/disposalpipe/junction{ dir = 8 @@ -63590,6 +63678,9 @@ /obj/effect/turf_decal/tiles/neutral/corner{ dir = 8 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/west) "oMk" = ( @@ -64581,6 +64672,11 @@ }, /turf/simulated/floor/plasteel, /area/station/public/locker) +"pbn" = ( +/obj/effect/turf_decal/tiles/department/security/corner, +/obj/machinery/alarm/directional/east, +/turf/simulated/floor/plasteel, +/area/station/hallway/primary/central/east) "pcm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -65569,6 +65665,9 @@ /obj/item/kirbyplants/large, /obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/stripes/red/corner, +/obj/machinery/light/small{ + dir = 4 + }, /turf/simulated/floor/plasteel/dark, /area/station/security/prison) "pvb" = ( @@ -66265,7 +66364,7 @@ /area/station/engineering/engine/reactor) "pFI" = ( /obj/machinery/dnaforensics, -/obj/machinery/light, +/obj/machinery/light/small, /turf/simulated/floor/carpet/grimey, /area/station/security/detective) "pFS" = ( @@ -68225,6 +68324,15 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/science/xenobiology) +"qoA" = ( +/obj/effect/turf_decal/tiles/department/engineering/corner{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/station/hallway/primary/starboard) "qoL" = ( /obj/machinery/light_switch{ name = "north bump"; @@ -69211,6 +69319,9 @@ /obj/effect/turf_decal/tiles/department/science/side{ dir = 8 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/plasteel/white, /area/station/science/toxins/mixing) "qGS" = ( @@ -69430,6 +69541,9 @@ /obj/effect/turf_decal/tiles/department/engineering/corner{ dir = 4 }, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos/distribution) "qKY" = ( @@ -69555,6 +69669,12 @@ }, /turf/simulated/floor/engine/vacuum, /area/station/maintenance/turbine) +"qMk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light/floor, +/turf/simulated/floor/wood, +/area/station/service/bar) "qMm" = ( /turf/simulated/floor/plating/airless, /area/station/maintenance/fore) @@ -69910,6 +70030,7 @@ /obj/structure/disposalpipe/junction/reversed{ dir = 2 }, +/obj/machinery/light/floor, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/ne) "qRI" = ( @@ -71193,15 +71314,6 @@ /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) -"roI" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/tiles/neutral/corner{ - dir = 4 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/primary/fore/west) "roQ" = ( /obj/item/storage/firstaid/regular{ pixel_x = -3; @@ -71856,6 +71968,11 @@ "rxc" = ( /turf/simulated/wall, /area/station/maintenance/abandonedservers) +"rxq" = ( +/obj/effect/turf_decal/tiles/department/virology/corner, +/obj/machinery/light, +/turf/simulated/floor/plasteel, +/area/station/hallway/primary/central/se) "rxr" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, @@ -74320,15 +74437,6 @@ /obj/effect/mapping_helpers/airlock/autoname, /turf/simulated/floor/plasteel, /area/station/maintenance/port) -"sns" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/turf_decal/tiles/neutral/corner{ - dir = 8 - }, -/turf/simulated/floor/plasteel, -/area/station/hallway/primary/central/west) "snI" = ( /turf/simulated/wall, /area/station/command/office/captain) @@ -76253,6 +76361,9 @@ /obj/effect/turf_decal/tiles/neutral/corner{ dir = 4 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/west) "sUn" = ( @@ -76378,6 +76489,15 @@ /obj/effect/turf_decal/tiles/neutral/corner, /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/north) +"sWs" = ( +/obj/effect/turf_decal/tiles/neutral/corner{ + dir = 1 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plasteel, +/area/station/hallway/primary/central/se) "sWF" = ( /obj/effect/mapping_helpers/airlock/access/all/science/robotics, /obj/machinery/door/airlock/research{ @@ -81903,6 +82023,7 @@ /obj/structure/cable/extra_insulated{ icon_state = "1-8" }, +/obj/machinery/light/floor, /turf/simulated/floor/plasteel, /area/station/public/fitness) "uOd" = ( @@ -82011,6 +82132,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/light/floor, /turf/simulated/floor/wood, /area/station/science/robotics/showroom) "uPH" = ( @@ -86628,9 +86750,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/xenobio_south) "woe" = ( -/obj/machinery/light{ - dir = 1 - }, /obj/effect/turf_decal/tiles/department/engineering/corner{ dir = 4 }, @@ -87168,9 +87287,6 @@ /obj/effect/turf_decal/tiles/department/command/side{ dir = 1 }, -/obj/machinery/light{ - dir = 1 - }, /turf/simulated/floor/plasteel/dark, /area/station/hallway/primary/central/south) "wxj" = ( @@ -89838,6 +89954,7 @@ /obj/item/storage/surgical_tray, /obj/structure/table, /obj/effect/turf_decal/tiles/department/science/side, +/obj/machinery/light, /turf/simulated/floor/plasteel/white, /area/station/science/robotics) "xkY" = ( @@ -90132,21 +90249,6 @@ /obj/effect/turf_decal/tiles/department/medical/corner, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/lounge) -"xpC" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/sortjunction, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/effect/mapping_helpers/sortjunc_helper/captains_office, -/turf/simulated/floor/plasteel, -/area/station/hallway/primary/central/east) "xpF" = ( /obj/structure/disposalpipe/segment/corner{ dir = 1 @@ -109535,7 +109637,7 @@ hFs nRb xrf aOA -bUs +hAU rbK dEB vdD @@ -110049,7 +110151,7 @@ lIM lIM lIM lIM -roI +bUs rbK xqq nrY @@ -111079,7 +111181,7 @@ lIM lIM cJI sTC -tDA +pgk nrY nrY nrY @@ -112887,7 +112989,7 @@ bnx bfw sSk boh -jij +edb boh mVp bES @@ -113401,7 +113503,7 @@ uzN nYO puo iKo -edb +jij boh rUC vEw @@ -113915,7 +114017,7 @@ xeM aXi jJu boh -jij +edb jeA bES bES @@ -115209,7 +115311,7 @@ jfN oMj jfN jfN -sns +jfN dKB jfN jfN @@ -115729,7 +115831,7 @@ sUc bRO bTC gzC -nyk +bMR bXT bNk bMR @@ -119783,7 +119885,7 @@ jMs mQc iGs aQs -lDa +iiA ect jMs txH @@ -119823,7 +119925,7 @@ abq bkW bpY boE -gDB +hRu bvW btU bwh @@ -119869,7 +119971,7 @@ cLd xvu cQt cQt -cQt +eUl bZU eGz bZU @@ -120132,13 +120234,13 @@ cns cMT iQm cns -cns +oHx lyp pXb cns mBr eNY -cns +oHx cEX tVJ qqM @@ -120647,7 +120749,7 @@ cRS cIt bIH lHZ -khl +lHZ tWQ mGK mLx @@ -120851,7 +120953,7 @@ abq bkW bqg boE -hht +gUi bvW btX bwk @@ -123699,7 +123801,7 @@ cdB bWZ bYo bZn -xki +sWs sZY eOI dbb @@ -125224,7 +125326,7 @@ bqu qif hFg hlD -xpC +dIq wFq rUD hlD @@ -125243,7 +125345,7 @@ tfp bfI qPB yhW -bZt +rxq cte cte cte @@ -125487,7 +125589,7 @@ dqx wgh wgh bIn -wgh +pbn wgh wgh dVU @@ -127017,17 +127119,17 @@ bgi bhE bjt hDH -bnh +bnr iTo uMR uWJ bGi -bEv +cne byK qFs qFs qFs -qFs +qMk bGd bHO pZK @@ -127531,7 +127633,7 @@ fso lpL bmQ bbH -bnr +qoA oGK bqA bHA