diff --git a/code/modules/materials/materials/metals/steel.dm b/code/modules/materials/materials/metals/steel.dm index ca323c8137..d8836af8c7 100644 --- a/code/modules/materials/materials/metals/steel.dm +++ b/code/modules/materials/materials/metals/steel.dm @@ -79,8 +79,10 @@ new /datum/stack_recipe("conveyor switch", /obj/machinery/conveyor_switch, 2, time = 20, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"), new /datum/stack_recipe("grenade casing", /obj/item/weapon/grenade/chem_grenade, recycle_material = "[name]"), new /datum/stack_recipe("light fixture frame", /obj/item/frame/light, 2, recycle_material = "[name]"), + new /datum/stack_recipe("floor light fixture frame", /obj/machinery/light_construct/floortube, 2, recycle_material = "[name]"), new /datum/stack_recipe("small light fixture frame", /obj/item/frame/light/small, 1, recycle_material = "[name]"), new /datum/stack_recipe("floor lamp fixture frame", /obj/machinery/light_construct/flamp, 2, recycle_material = "[name]"), + new /datum/stack_recipe("big floor lamp fixture frame", /obj/machinery/light_construct/bigfloorlamp, 3, recycle_material = "[name]"), new /datum/stack_recipe("apc frame", /obj/item/frame/apc, 2, recycle_material = "[name]"), new /datum/stack_recipe("desk bell", /obj/item/weapon/deskbell, 1, on_floor = 1, supplied_material = "[name]"), new /datum/stack_recipe("tanning rack", /obj/structure/tanning_rack, 3, one_per_turf = TRUE, time = 20, on_floor = TRUE, supplied_material = "[name]") diff --git a/code/modules/power/lighting_vr.dm b/code/modules/power/lighting_vr.dm index b7ea9a0fbd..4c13300a73 100644 --- a/code/modules/power/lighting_vr.dm +++ b/code/modules/power/lighting_vr.dm @@ -49,3 +49,82 @@ nightshift_range = 6 nightshift_power = 0.45 + +// Floor tube lights + +/obj/machinery/light/floortube + icon_state = "floortube1" + base_state = "floortube" + desc = "A tube light set into a floor fixture." + shows_alerts = FALSE + plane = TURF_PLANE + layer = ABOVE_TURF_LAYER + construct_type = /obj/machinery/light_construct/floortube + +/obj/machinery/light/floortube/flicker + auto_flicker = TRUE + +/obj/machinery/light_construct/floortube + name = "floor light fixture frame" + desc = "A floor light fixture under construction." + icon = 'icons/obj/lighting_vr.dmi' + icon_state = "floortube-construct-stage1" + stage = 1 + anchored = 0 + fixture_type = /obj/machinery/light/floortube + sheets_refunded = 2 + +/obj/machinery/light_construct/floortube/verb/rotate_clockwise() + set name = "Rotate Fixture Clockwise" + set category = "Object" + set src in view(1) + + if (usr.stat || usr.restrained() || anchored) + return + + src.set_dir(turn(src.dir, 270)) + +/obj/machinery/light_construct/floortube/update_icon() + switch(stage) + if(1) + icon_state = "floortube-construct-stage1" + if(2) + icon_state = "floortube-construct-stage2" + if(3) + icon_state = "floortube-empty" + +// Big Flamp + +/obj/machinery/light/bigfloorlamp + icon = 'icons/obj/lighting32x64.dmi' + icon_state = "big_flamp1" + base_state = "big_flamp" + desc = "A set of tube lights on a raised, solid fixture" + shows_alerts = FALSE + density = 1 + anchored = 1 + plane = MOB_PLANE + layer = ABOVE_MOB_LAYER + construct_type = /obj/machinery/light_construct/bigfloorlamp + +/obj/machinery/light/bigfloorlamp/flicker + auto_flicker = TRUE + +/obj/machinery/light_construct/bigfloorlamp + name = "big floor light fixture frame" + desc = "A big floor light fixture under construction." + icon = 'icons/obj/lighting32x64.dmi' + icon_state = "big_flamp-construct-stage1" + stage = 1 + anchored = 0 + fixture_type = /obj/machinery/light/bigfloorlamp + sheets_refunded = 3 + +/obj/machinery/light_construct/bigfloorlamp/update_icon() + switch(stage) + if(1) + icon_state = "big_flamp-construct-stage1" + if(2) + icon_state = "big_flamp-construct-stage2" + if(3) + icon_state = "big_flamp-empty" diff --git a/icons/obj/lighting32x64.dmi b/icons/obj/lighting32x64.dmi new file mode 100644 index 0000000000..1fe0dc024b Binary files /dev/null and b/icons/obj/lighting32x64.dmi differ diff --git a/maps/gateway_vr/variable/arynthilake_a.dmm b/maps/gateway_vr/variable/arynthilake_a.dmm index 03fa9a9ce3..2c982bab65 100644 --- a/maps/gateway_vr/variable/arynthilake_a.dmm +++ b/maps/gateway_vr/variable/arynthilake_a.dmm @@ -1006,7 +1006,7 @@ /area/gateway/arynthilake/engine) "pa" = ( /obj/random/mob/semirandom_mob_spawner/monster, -/turf/simulated/floor/tiled/eris/white/brown_platform{ +/turf/simulated/floor/tiled/eris/dark/brown_platform{ outdoors = 1 }, /area/gateway/arynthilake/dome) @@ -1238,6 +1238,11 @@ "tN" = ( /turf/simulated/floor/outdoors/grass, /area/gateway/arynthilake/caves) +"tS" = ( +/turf/simulated/floor/tiled/eris/dark/brown_platform{ + outdoors = 1 + }, +/area/gateway/arynthilake/dome) "tU" = ( /obj/structure/table/steel_reinforced, /obj/machinery/reagentgrinder, @@ -2256,10 +2261,6 @@ }, /turf/simulated/floor/tiled/eris/cafe, /area/gateway/arynthilake/dome) -"TI" = ( -/obj/random/mob/semirandom_mob_spawner/monster, -/turf/simulated/floor/tiled/eris/dark/monofloor, -/area/gateway/arynthilake/dome) "TR" = ( /turf/unsimulated/wall/planetary/normal{ desc = "Why would you want to go this way??!?"; @@ -5623,7 +5624,7 @@ qM bc bc bc -pb +tS yY hw fo @@ -5765,7 +5766,7 @@ aZ bc wm bc -pb +tS yY hw fo @@ -6333,7 +6334,7 @@ qM At Rm Er -pb +tS yY Nm Nm @@ -6475,7 +6476,7 @@ qM zQ zQ Er -pb +tS yY Nm Nm @@ -6611,7 +6612,7 @@ Qr Qr qM vG -TI +aY Vo qM AQ diff --git a/maps/gateway_vr/variable/arynthilake_b.dmm b/maps/gateway_vr/variable/arynthilake_b.dmm index 0b1878a26e..a56a67f1b3 100644 --- a/maps/gateway_vr/variable/arynthilake_b.dmm +++ b/maps/gateway_vr/variable/arynthilake_b.dmm @@ -29,10 +29,6 @@ }, /turf/simulated/floor/tiled/eris/white/brown_platform, /area/gateway/arynthilake/dome) -"bb" = ( -/obj/random/mob/semirandom_mob_spawner/monster/d, -/turf/simulated/floor/tiled/eris/dark/monofloor, -/area/gateway/arynthilake/dome) "bj" = ( /obj/machinery/light{ dir = 1 @@ -978,6 +974,11 @@ outdoors = 1 }, /area/gateway/arynthilake) +"tC" = ( +/turf/simulated/floor/tiled/eris/dark/brown_platform{ + outdoors = 1 + }, +/area/gateway/arynthilake/dome) "uj" = ( /obj/random/mob/semirandom_mob_spawner/humanoid, /turf/simulated/floor/carpet/sblucarpet, @@ -18089,7 +18090,7 @@ Qm Xz Xz HN -Kw +tC Ia lQ lQ @@ -18225,13 +18226,13 @@ ek ek Qm JT -bb +JT mq Qm kv kv Fi -Kw +tC Ia lQ lQ @@ -18373,7 +18374,7 @@ Qm qy RK Fi -Kw +tC Ia lQ lQ @@ -18941,7 +18942,7 @@ Dk nP nP nP -Kw +tC Ia nC iG @@ -19083,7 +19084,7 @@ Qm nP nP HN -Kw +tC Ia nC iG diff --git a/maps/gateway_vr/variable/arynthilakeunderground_b.dmm b/maps/gateway_vr/variable/arynthilakeunderground_b.dmm index fea5581135..8755d3a2a5 100644 --- a/maps/gateway_vr/variable/arynthilakeunderground_b.dmm +++ b/maps/gateway_vr/variable/arynthilakeunderground_b.dmm @@ -139,10 +139,6 @@ /area/gateway/arynthilake/underground/intocave{ enter_message = "There is some light filtering from the center of this patch of sand. You could probably climb up from there." }) -"ni" = ( -/obj/random/mob/semirandom_mob_spawner/robot, -/turf/simulated/floor/tiled/eris/steel/danger, -/area/gateway/arynthilake/engine) "oL" = ( /turf/simulated/floor/tiled/eris/steel/techfloor, /area/gateway/arynthilake/engine) @@ -197,10 +193,6 @@ "wi" = ( /turf/simulated/wall/r_wall, /area/gateway/arynthilake/underground/maintenance) -"wG" = ( -/obj/random/mob/semirandom_mob_spawner/robot, -/turf/simulated/floor/tiled/eris/steel/techfloor, -/area/gateway/arynthilake/engine) "xl" = ( /obj/random/awayloot, /obj/structure/table/rack/shelf/steel, @@ -442,7 +434,6 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/random/mob/semirandom_mob_spawner/robot, /turf/simulated/floor/tiled/eris/steel/techfloor, /area/gateway/arynthilake/engine) "ZX" = ( @@ -915,7 +906,7 @@ oZ oZ oZ oZ -cE +oZ oZ wi oZ @@ -2026,9 +2017,9 @@ bL bL bL kb -ni +fM Zl -ni +fM kb bL bL @@ -3480,7 +3471,7 @@ oZ oZ oZ oZ -cE +oZ cH Oe wi @@ -4162,7 +4153,7 @@ hy kb gk oL -wG +oL va kb bL @@ -4882,16 +4873,6 @@ oZ oZ wi oZ -oZ -oZ -oZ -oZ -oZ -oZ -oZ -oZ -oZ -oZ cE oZ oZ @@ -4900,6 +4881,16 @@ oZ oZ oZ oZ +oZ +oZ +oZ +oZ +oZ +oZ +oZ +oZ +oZ +oZ Ej wi bL @@ -5040,7 +5031,7 @@ oZ oZ oZ oZ -oZ +cE oZ Oe wi @@ -5174,7 +5165,7 @@ wi wi wi wi -cE +oZ oZ oZ oZ @@ -6057,7 +6048,7 @@ oZ wi oZ oZ -ID +oZ oZ oZ wi @@ -6471,7 +6462,7 @@ oZ oZ oZ oZ -ID +oZ Vj oZ oZ @@ -7431,7 +7422,7 @@ wi Mg oZ oZ -cE +oZ oZ oZ oZ @@ -12571,7 +12562,7 @@ oZ oZ oZ oZ -LQ +oZ oZ oZ oZ @@ -12865,7 +12856,7 @@ oZ oZ Vj oZ -LQ +oZ oZ oZ oZ @@ -14277,7 +14268,7 @@ oZ oZ wi wi -LQ +oZ oZ oZ wi @@ -15390,7 +15381,7 @@ oZ oZ oZ oZ -LQ +oZ oZ oZ wi @@ -19999,7 +19990,7 @@ oZ oZ Vj oZ -LQ +oZ oZ oZ oZ diff --git a/maps/gateway_vr/wildwest.dmm b/maps/gateway_vr/wildwest.dmm index 5d1c592ea6..c301808b40 100644 --- a/maps/gateway_vr/wildwest.dmm +++ b/maps/gateway_vr/wildwest.dmm @@ -1,13 +1,76 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "aa" = ( +/obj/effect/forcefield{ + desc = "You can't get in. Heh."; + layer = 1; + name = "Blocker" + }, /turf/space, -/area) +/area/space) "ab" = ( /turf/simulated/shuttle/wall, /area/awaymission/wwvault) +"ac" = ( +/turf/simulated/shuttle/wall/hard_corner, +/area/space) +"ad" = ( +/turf/simulated/mineral, +/area/space) +"ae" = ( +/obj/effect/forcefield{ + desc = "You can't get in. Heh."; + layer = 1; + name = "Blocker" + }, +/turf/simulated/mineral, +/area/space) +"af" = ( +/obj/structure/lattice, +/turf/space, +/area/space) +"ag" = ( +/obj/structure/window/reinforced{ + health = 1e+007 + }, +/turf/space, +/area/space) "ah" = ( /turf/simulated/wall/cult, /area/awaymission/wwvault) +"ai" = ( +/obj/structure/lattice, +/obj/structure/window/reinforced{ + health = 1e+007 + }, +/turf/space, +/area/space) +"aj" = ( +/obj/effect/floor_decal/corner/lightgrey/diagonal, +/mob/living/simple_mob/humanoid/merc/ranged, +/turf/simulated/floor/tiled/white, +/area/awaymission/wwmines) +"ak" = ( +/obj/structure/lattice, +/obj/structure/window/reinforced{ + dir = 4; + health = 1e+007 + }, +/turf/space, +/area/space) +"al" = ( +/obj/structure/window/reinforced{ + dir = 8; + health = 1e+007 + }, +/turf/space, +/area/space) +"am" = ( +/obj/structure/window/reinforced{ + dir = 4; + health = 1e+007 + }, +/turf/space, +/area/space) "an" = ( /obj/structure/cult/pylon, /turf/simulated/floor/cult, @@ -27,6 +90,19 @@ }, /turf/simulated/wall/cult, /area/awaymission/wwvault) +"aq" = ( +/obj/structure/lattice, +/obj/structure/window/reinforced{ + dir = 8; + health = 1e+007 + }, +/turf/space, +/area/space) +"ar" = ( +/obj/structure/lattice, +/obj/structure/lattice, +/turf/space, +/area/space) "as" = ( /obj/effect/gateway, /turf/simulated/floor/cult, @@ -50,6 +126,13 @@ /obj/machinery/gear_dispenser/adventure_box/weapon, /turf/simulated/floor/redgrid/off, /area/awaymission/wwvault) +"ax" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/mob/living/simple_mob/creature, +/turf/simulated/floor/tiled/eris/cafe, +/area/awaymission/wwgov) "ay" = ( /obj/machinery/gateway{ dir = 9 @@ -72,20 +155,66 @@ /mob/living/simple_mob/faithless, /turf/simulated/floor/cult, /area/awaymission/wwvault) +"aC" = ( +/obj/structure/window/reinforced{ + dir = 1; + health = 1e+007 + }, +/turf/space, +/area/space) +"aD" = ( +/obj/structure/lattice, +/obj/structure/window/reinforced{ + dir = 1; + health = 1e+007 + }, +/turf/space, +/area/space) +"aE" = ( +/obj/structure/window/reinforced{ + dir = 4; + health = 1e+007 + }, +/obj/structure/window/reinforced{ + dir = 1; + health = 1e+007 + }, +/turf/space, +/area/space) "aF" = ( /turf/simulated/floor/cult, /area/awaymission/wwvault) "aG" = ( -/turf/simulated/mineral, -/area) -"aH" = ( -/obj/effect/forcefield{ - desc = "You can't get in. Heh."; - layer = 1; - name = "Blocker" +/obj/structure/window/reinforced{ + dir = 8; + health = 1e+007 + }, +/obj/structure/window/reinforced{ + dir = 1; + health = 1e+007 }, /turf/space, -/area) +/area/space) +"aH" = ( +/obj/structure/window/reinforced{ + dir = 4; + health = 1e+007 + }, +/obj/structure/window/reinforced{ + health = 1e+007 + }, +/turf/space, +/area/space) +"aI" = ( +/obj/structure/window/reinforced{ + dir = 8; + health = 1e+007 + }, +/obj/structure/window/reinforced{ + health = 1e+007 + }, +/turf/space, +/area/space) "aJ" = ( /obj/item/weapon/paper{ info = "meat grinder requires sacri" @@ -109,9 +238,19 @@ }, /turf/simulated/mineral, /area/awaymission/wwmines) +"aM" = ( +/obj/structure/window/reinforced{ + dir = 8; + health = 1e+007 + }, +/turf/simulated/floor/airless, +/area/space) "aN" = ( /turf/simulated/mineral, /area/awaymission/wwmines) +"aO" = ( +/turf/simulated/floor/airless, +/area/space) "aP" = ( /obj/random/awayloot, /turf/simulated/floor/redgrid/off, @@ -149,10 +288,6 @@ /obj/effect/floor_decal/corner/lightgrey/diagonal, /turf/simulated/floor/tiled/white, /area/awaymission/wwmines) -"br" = ( -/obj/structure/lattice, -/turf/space, -/area) "bt" = ( /obj/effect/forcefield{ desc = "You can't get in. Heh."; @@ -217,13 +352,6 @@ "bY" = ( /turf/simulated/floor/carpet, /area/awaymission/wwgov) -"bZ" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+007 - }, -/turf/space, -/area) "ca" = ( /obj/machinery/gibber, /turf/simulated/floor/redgrid/off, @@ -480,19 +608,6 @@ /obj/machinery/light/small, /turf/simulated/floor/tiled/white, /area/awaymission/wwmines) -"ex" = ( -/obj/structure/window/reinforced{ - health = 1e+007 - }, -/turf/space, -/area) -"ey" = ( -/obj/structure/lattice, -/obj/structure/window/reinforced{ - health = 1e+007 - }, -/turf/space, -/area) "eC" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/effect/floor_decal/corner/lightgrey/diagonal, @@ -505,11 +620,6 @@ }, /turf/simulated/floor/tiled/white, /area/awaymission/wwmines) -"eE" = ( -/mob/living/simple_mob/humanoid/merc/ranged, -/obj/effect/floor_decal/corner/lightgrey/diagonal, -/turf/simulated/floor/tiled/white, -/area/awaymission/wwmines) "eI" = ( /obj/structure/closet/cabinet, /turf/simulated/floor/wood, @@ -525,9 +635,6 @@ /obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/awaymission/wwmines) -"eN" = ( -/turf/simulated/floor/airless, -/area) "eO" = ( /obj/structure/ore_box, /turf/simulated/floor/outdoors/ironsand, @@ -644,13 +751,6 @@ /mob/living/simple_mob/humanoid/merc/melee, /turf/simulated/floor/wood, /area/awaymission/wwmines) -"fv" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 1e+007 - }, -/turf/space, -/area) "fy" = ( /obj/machinery/door/window{ dir = 1 @@ -736,9 +836,7 @@ /turf/simulated/floor/wood, /area/awaymission/wwmines) "fW" = ( -/obj/structure/bookcase{ - = on_state = "book-5" - }, +/obj/structure/bookcase, /turf/simulated/floor/wood, /area/awaymission/wwgov) "fY" = ( @@ -802,13 +900,6 @@ }, /turf/simulated/floor/wood, /area/awaymission/wwgov) -"gn" = ( -/obj/structure/window/reinforced{ - dir = 1; - health = 1e+007 - }, -/turf/space, -/area) "go" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood, @@ -824,9 +915,7 @@ /turf/simulated/floor/tiled/eris/cafe, /area/awaymission/wwgov) "gs" = ( -/obj/structure/bookcase{ - = on_state = "book-5" - }, +/obj/structure/bookcase, /turf/simulated/floor/wood, /area/awaymission/wwmines) "gt" = ( @@ -856,11 +945,6 @@ /mob/living/simple_mob/creature, /turf/simulated/floor/carpet, /area/awaymission/wwgov) -"gC" = ( -/obj/structure/lattice, -/obj/structure/lattice, -/turf/space, -/area) "gE" = ( /obj/structure/bed/chair/wood/wings{ dir = 4 @@ -919,14 +1003,6 @@ }, /turf/simulated/floor/wood, /area/awaymission/wwmines) -"gX" = ( -/obj/effect/forcefield{ - desc = "You can't get in. Heh."; - layer = 1; - name = "Blocker" - }, -/turf/simulated/mineral, -/area) "gY" = ( /obj/structure/bed/chair/comfy/teal{ dir = 8 @@ -971,14 +1047,8 @@ /turf/simulated/floor/carpet, /area/awaymission/wwmines) "ia" = ( -/obj/effect/forcefield{ - desc = "You can't get in. Heh."; - layer = 1; - name = "Blocker" - }, -/obj/effect/overmap/visitable/sector/tether_gateway/wildwest, /turf/space, -/area) +/area/space) "iA" = ( /obj/structure/bed/chair/office/light{ dir = 4 @@ -1122,13 +1192,6 @@ /obj/structure/fans/tiny, /turf/simulated/floor/tiled/asteroid_steel, /area/awaymission/wwgov) -"pc" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+007 - }, -/turf/simulated/floor/airless, -/area) "pg" = ( /obj/structure/table/woodentable, /obj/item/toy/russian_revolver, @@ -1150,16 +1213,6 @@ oxygen = 0 }, /area/awaymission/wwvault) -"pM" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+007 - }, -/obj/structure/window/reinforced{ - health = 1e+007 - }, -/turf/space, -/area) "pN" = ( /obj/machinery/door/airlock/external, /obj/structure/fans/tiny, @@ -1423,17 +1476,6 @@ /obj/structure/bed/chair/comfy/brown, /turf/simulated/floor/wood, /area/awaymission/wwmines) -"zr" = ( -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+007 - }, -/obj/structure/window/reinforced{ - dir = 1; - health = 1e+007 - }, -/turf/space, -/area) "zt" = ( /obj/structure/cult/pylon, /turf/simulated/floor/redgrid/animated, @@ -1465,14 +1507,6 @@ /obj/item/weapon/reagent_containers/food/snacks/donut/jelly, /turf/simulated/floor/carpet, /area/awaymission/wwmines) -"Ag" = ( -/obj/structure/lattice, -/obj/structure/window/reinforced{ - dir = 8; - health = 1e+007 - }, -/turf/space, -/area) "AA" = ( /obj/machinery/light/small{ dir = 8 @@ -1541,17 +1575,6 @@ }, /turf/simulated/floor/wood, /area/awaymission/wwmines) -"Dy" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 1e+007 - }, -/obj/structure/window/reinforced{ - dir = 1; - health = 1e+007 - }, -/turf/space, -/area) "Ee" = ( /obj/effect/floor_decal/corner/lightgrey/diagonal, /obj/machinery/light/small, @@ -1757,16 +1780,6 @@ }, /turf/simulated/floor/grass, /area/awaymission/wwgov) -"JQ" = ( -/obj/structure/window/reinforced{ - dir = 4; - health = 1e+007 - }, -/obj/structure/window/reinforced{ - health = 1e+007 - }, -/turf/space, -/area) "JS" = ( /obj/structure/sign/double/maltesefalcon/right, /turf/simulated/wall/sandstone, @@ -1846,9 +1859,6 @@ /obj/machinery/light/small, /turf/simulated/floor/tiled/asteroid_steel, /area/awaymission/wwrefine) -"NY" = ( -/turf/simulated/shuttle/wall/hard_corner, -/area) "Oe" = ( /obj/machinery/light/small{ dir = 1 @@ -2001,13 +2011,6 @@ /obj/structure/sign/double/maltesefalcon/left, /turf/simulated/wall/sandstone, /area/awaymission/wwmines) -"Sy" = ( -/mob/living/simple_mob/creature, -/obj/machinery/light/small{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/cafe, -/area/awaymission/wwgov) "SC" = ( /obj/structure/bed/chair/comfy/beige{ dir = 4 @@ -2066,14 +2069,6 @@ }, /turf/simulated/floor/tiled/white, /area/awaymission/wwmines) -"Vg" = ( -/obj/structure/lattice, -/obj/structure/window/reinforced{ - dir = 1; - health = 1e+007 - }, -/turf/space, -/area) "Vn" = ( /obj/structure/toilet{ dir = 1 @@ -2124,14 +2119,6 @@ }, /turf/simulated/floor/tiled/eris/cafe, /area/awaymission/wwmines) -"Xs" = ( -/obj/structure/lattice, -/obj/structure/window/reinforced{ - dir = 4; - health = 1e+007 - }, -/turf/space, -/area) "XP" = ( /turf/simulated/shuttle/wall, /area/awaymission/wwrefine) @@ -2201,397 +2188,397 @@ /area/awaymission/wwgov) (1,1,1) = {" -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -ia +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} (2,1,1) = {" -aH aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +af +af +af +ar +af +af +af +af +af +af +af +af +af +ia +af +af +ia +ia +ia +ia +ia +ia +ia +ia +am +am +am +am +am +am +am +am +am +am +am +am +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -br -br -br -gC -br -br -br -br -br -br -br -br -br -aa -br -br -aa -aa -aa -aa -aa -aa -aa -aa -fv -fv -fv -fv -fv -fv -fv -fv -fv -fv -fv -fv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (3,1,1) = {" -aH aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -br -br -br -br -br -aa -aa -aa -br -aa -aa -br -aa -br -br -aa -aa -br -br -br -br -br -aa -aa -aa -aa -aa -aa -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +af +af +af +af +af +ia +ia +ia +af +ia +ia +af +ia +af +af +ia +ia +af +af +af +af +af +ia +ia +ia +ia +ia +ia +ag yf Sd Sd @@ -2604,136 +2591,136 @@ Sd Sd Sd QR -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (4,1,1) = {" -aH aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -br -Xs -fv -fv -fv -fv -Xs -fv -fv -Xs -Xs -fv -fv -fv -fv -fv -Xs -Xs -fv -fv -fv -aa -aa -br -aa -aa -aa -aa -aa -aa -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +af +ak +am +am +am +am +ak +am +am +ak +ak +am +am +am +am +am +ak +ak +am +am +am +ia +ia +af +ia +ia +ia +ia +ia +ia +ag Ui fL fL @@ -2746,106 +2733,106 @@ fL fL fL Em -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (5,1,1) = {" -aH aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +af +ag cx OU fH @@ -2866,16 +2853,16 @@ fH fH gF cx -gn -aa -br -br -aa -aa -aa -aa -aa -ex +aC +ia +af +af +ia +ia +ia +ia +ia +ag lI wa fL @@ -2888,106 +2875,106 @@ fL wa fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (6,1,1) = {" -aH aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ai fi dh dh @@ -3008,16 +2995,16 @@ dh dh dh fi -gn -aa -aa -br -aa -aa -aa -aa -aa -ex +aC +ia +ia +af +ia +ia +ia +ia +ia +ag lI wa fL @@ -3030,106 +3017,106 @@ fL wa fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (7,1,1) = {" -aH aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ai fm dh cx @@ -3150,16 +3137,16 @@ dh dh dh fm -gn -aa -aa -br -aa -aa -aa -aa -aa -ex +aC +ia +ia +af +ia +ia +ia +ia +ia +ag lI wa fL @@ -3172,106 +3159,106 @@ fL wa fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (8,1,1) = {" -aH aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ai fm dh cx @@ -3292,16 +3279,16 @@ dh dh dh fm -gn -aa -aa -br -aa -aa -aa -aa -aa -ex +aC +ia +ia +af +ia +ia +ia +ia +ia +ag lI wa fL @@ -3314,106 +3301,106 @@ fL wa fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (9,1,1) = {" -aH aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ai fm dh cx @@ -3434,16 +3421,16 @@ cx cx dh fm -gn -aa -aa -br -aa -aa -aa -aa -aa -ex +aC +ia +ia +af +ia +ia +ia +ia +ia +ag lI wa fL @@ -3456,106 +3443,106 @@ fL wa fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (10,1,1) = {" -aH aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ai fm dh cx @@ -3576,16 +3563,16 @@ Hi hD cL fm -gn -aa -aa -br -aa -aa -aa -aa -aa -ex +aC +ia +ia +af +ia +ia +ia +ia +ia +ag Ui fL fL @@ -3598,106 +3585,106 @@ fL fL fL Em -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (11,1,1) = {" -aH aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ai fm dh cx @@ -3718,16 +3705,16 @@ cx cx dh fm -gn -aa -aa -br -aa -aa -aa -aa -aa -ex +aC +ia +ia +af +ia +ia +ia +ia +ia +ag lI fL fL @@ -3740,106 +3727,106 @@ fL fL Fz OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (12,1,1) = {" -aH aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag fm dh cx @@ -3860,16 +3847,16 @@ dh dh dh fm -gn -aa -br -br -aa -aa -aa -aa -aa -ex +aC +ia +af +af +ia +ia +ia +ia +ia +ag lI fL fL @@ -3882,106 +3869,106 @@ fL fL fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (13,1,1) = {" -aH aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag fm dh cx @@ -4002,16 +3989,16 @@ dh dh dh fm -gn -br -br -aa -aa -aa -aa -aa -aa -ex +aC +af +af +ia +ia +ia +ia +ia +ia +ag lI fL fL @@ -4024,106 +4011,106 @@ fL fL fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (14,1,1) = {" -aH aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag fm dh cx @@ -4144,16 +4131,16 @@ dh dh dh fm -gn -br -aa -aa -aa -aa -aa -aa -aa -ex +aC +af +ia +ia +ia +ia +ia +ia +ia +ag lI fL fL @@ -4166,106 +4153,106 @@ fL fL fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (15,1,1) = {" -aH aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag fm dh cx @@ -4286,16 +4273,16 @@ dh dh dh fm -gn -br -aa -aa -aa -aa -aa -aa -aa -ex +aC +af +ia +ia +ia +ia +ia +ia +ia +ag lI fL fL @@ -4308,106 +4295,106 @@ fL fL fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (16,1,1) = {" -aH aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag fm dh cx @@ -4428,16 +4415,16 @@ dh dh dh fm -Vg -br -aa -aa -aa -aa -aa -aa -aa -ex +aD +af +ia +ia +ia +ia +ia +ia +ia +ag lI fL fL @@ -4450,106 +4437,106 @@ fK fL fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (17,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au au au au au +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ai fm dh cx @@ -4570,16 +4557,16 @@ dh dh dh xy -Dy -fv -fv -fv -fv -fv -fv -fv -fv -JQ +aE +am +am +am +am +am +am +am +am +aH Ui fL fL @@ -4592,71 +4579,71 @@ fL fL fL Em -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (18,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au au au au -aa -aa -aa -aa -aa -aa -aa -aa -aa +ia +ia +ia +ia +ia +ia +ia +ia +ia au au aF @@ -4664,34 +4651,34 @@ aF aF au au +ia +ia +ia +ia aa -aa -aa -aa -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ai fm dh cx @@ -4734,56 +4721,56 @@ fL fL fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (19,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au au au @@ -4791,14 +4778,14 @@ aF aF au au -aa -aa -aa -aa -aa -aa -aa -aa +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -4806,34 +4793,34 @@ ah aF aF au +ia +ia +ia +ia aa -aa -aa -aa -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag fm dh cx @@ -4876,55 +4863,55 @@ fL fL fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (20,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab au aF @@ -4934,13 +4921,13 @@ aF aF au au -aa -aa -aa -aa -aa -aa -aa +ia +ia +ia +ia +ia +ia +ia au aF ah @@ -4954,28 +4941,28 @@ au au bt wj -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +af +ag fm dh cx @@ -4996,16 +4983,16 @@ dh dh dh fi -zr -bZ -bZ -bZ -bZ -bZ -bZ -bZ -bZ -pM +aG +al +al +al +al +al +al +al +al +aI lI fL fL @@ -5018,55 +5005,55 @@ fL fL fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (21,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab au aF @@ -5077,12 +5064,12 @@ aF aF au au -aa -aa -aa -aa -aa -aa +ia +ia +ia +ia +ia +ia au aF aF @@ -5096,28 +5083,28 @@ aF aF ah wj -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -aa -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ia +ag fm dh cx @@ -5138,16 +5125,16 @@ dh dh dh fm -gn -aa -aa -aa -aa -aa -aa -aa -aa -ex +aC +ia +ia +ia +ia +ia +ia +ia +ia +ag lI fL fL @@ -5160,56 +5147,56 @@ fL fL fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (22,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au au aF @@ -5220,11 +5207,11 @@ aF aF au au -aa -aa -aa -aa -aa +ia +ia +ia +ia +ia au ab aF @@ -5239,27 +5226,27 @@ aF ah wj ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -br -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +af +ai fm dh cx @@ -5280,16 +5267,16 @@ dh dh dh fm -gn -aa -aa -aa -aa -aa -aa -aa -aa -ex +aC +ia +ia +ia +ia +ia +ia +ia +ia +ag lI fL fL @@ -5302,57 +5289,57 @@ fL fL fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (23,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -5381,27 +5368,27 @@ aF ah aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -aa -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ia +ag fm dh cx @@ -5422,16 +5409,16 @@ dh dh dh fm -gn -aa -aa -aa -aa -aa -aa -aa -aa -ex +aC +ia +ia +ia +ia +ia +ia +ia +ia +ag lI fL fL @@ -5444,57 +5431,57 @@ fL fL fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (24,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -5524,26 +5511,26 @@ ah aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +af +ag fm dh cx @@ -5564,16 +5551,16 @@ dh dh dh fm -gn -aa -aa -aa -aa -aa -aa -aa -aa -ex +aC +ia +ia +ia +ia +ia +ia +ia +ia +ag Ui fL OB @@ -5586,55 +5573,55 @@ fL fL fL Em -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (25,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au au bt @@ -5666,26 +5653,26 @@ ah aF aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag fm dh cx @@ -5706,16 +5693,16 @@ dh dh dh fm -gn -aa -aa -aa -aa -aa -aa -aa -aa -ex +aC +ia +ia +ia +ia +ia +ia +ia +ia +ag lI fL OB @@ -5728,51 +5715,51 @@ fL fL fL OB -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (26,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au au au @@ -5809,25 +5796,25 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag fm dh cx @@ -5848,16 +5835,16 @@ dh dh dh fm -gn -aa -aa -aa -aa -aa -aa -aa -aa -ex +aC +ia +ia +ia +ia +ia +ia +ia +ia +ag JN Wv KT @@ -5870,49 +5857,49 @@ Wv Wv Wv KT -gn +aC +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (27,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab au au @@ -5951,25 +5938,25 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ai fm dh cx @@ -5990,71 +5977,71 @@ dh dh dh fm -Vg -br +aD +af +ia +ia +ia +ia +ia +ia +ia +ia +aq +aq +aM +aO +aM +aq +al +al +al +al +al +al +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -Ag -Ag -pc -eN -pc -Ag -bZ -bZ -bZ -bZ -bZ -bZ -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (28,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au bt aF @@ -6094,24 +6081,24 @@ aF ab ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ai fm dh cx @@ -6132,70 +6119,70 @@ dh dh dh fm -gn -br +aC +af +ia +ia +ia +ia +ia +ia +ia +ia +af +af +aO +aO +aO +af +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -br -br -eN -eN -eN -br -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (29,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au bt ah @@ -6237,23 +6224,23 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ai fm dh cx @@ -6263,7 +6250,7 @@ Ek gj gj gj -Sy +ax gj co cx @@ -6274,69 +6261,69 @@ dh dh dh fm -gn -br +aC +af +ia +ia +ia +ia +ia +ia +ia +ia +af +af +aO +aO +af +af +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -br -br -eN -eN -br -br -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (30,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au au aF @@ -6379,23 +6366,23 @@ aF aF aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ai fm dh cx @@ -6416,67 +6403,67 @@ dh dh dh fm -gn -br +aC +af +ia +ia +ia +ia +ia +ia +ia +ia +af +af +af +af +af +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -br -br -br -br -br -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (31,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au au au @@ -6522,22 +6509,22 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ey +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ai fm dh cx @@ -6558,65 +6545,65 @@ dh dh dh fm -gn -br +aC +af +ia +ia +ia +ia +ia +ia +ia +ia +af +af +af +af +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -br -br -br -br -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (32,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au au au @@ -6664,22 +6651,22 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag fm dh cx @@ -6700,65 +6687,65 @@ dh dh dh fm -gn -br +aC +af +ia +ia +ia +ia +ia +ia +af +af +af +ia +af +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -br -br -br -aa -br -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (33,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -6806,22 +6793,22 @@ aF aF aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag fm dh cx @@ -6842,64 +6829,64 @@ dh dh dh fm -gn -br +aC +af +ia +ia +ia +ia +ia +ia +af +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -br -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (34,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au au aF @@ -6951,19 +6938,19 @@ ab pv pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag fm dh cx @@ -6984,63 +6971,63 @@ dh dh dh fm -Vg -aa -br -aa -aa +aD +ia +af +ia +ia QL dF QL +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (35,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au bt ah @@ -7090,22 +7077,22 @@ aF aF aF ab -aa -aa +ia +ia pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag xy dh dh @@ -7126,63 +7113,63 @@ dh dh dh xy -gn -aa -br -aa -aa +aC +ia +af +ia +ia yW ee yW +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (36,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF ah @@ -7232,22 +7219,22 @@ aF aF aF ab -aa -aa -aa +ia +ia +ia pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -ex +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ag cx OU fH @@ -7268,63 +7255,63 @@ fH fH gF cx -Vg -gC -br -aa -aa +aD +ar +af +ia +ia yW ee yW +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (37,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -7376,42 +7363,42 @@ aF ab pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -aa -bZ -bZ -bZ -Ag -Ag -Ag -bZ -bZ -bZ -bZ -bZ -Ag -Ag -Ag -bZ -bZ -bZ -bZ -bZ -bZ -br -br +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ia +al +al +al +aq +aq +aq +al +al +al +al +al +aq +aq +aq +al +al +al +al +al +al +af +af fM fM lh @@ -7429,44 +7416,44 @@ uO gd zS fM +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (38,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -7516,44 +7503,44 @@ aF aF aF ab -aa +ia pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -br -aa -aa -aa -aa -aa -br -aa -aa -aa -aa -br -br -aa -br -br -br -br -br -br -br -gC -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +af +ia +ia +ia +ia +ia +af +ia +ia +ia +ia +af +af +ia +af +af +af +af +af +af +af +ar +ad fM nd Gu @@ -7571,44 +7558,44 @@ nd nd nd QL -aa -aa -aa +ia +ia +ia XP XP XP XP XP +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (39,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -7663,38 +7650,38 @@ pv pv pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -aa -aa -aa -aa -aa -aa -br -gC -br -br -br -br -aa -aa -aa -aa -aa -br -br -aa -aa -aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ia +ia +ia +ia +ia +ia +af +ar +af +af +af +af +ia +ia +ia +ia +ia +af +af +ia +ia +ia fM fM nd @@ -7713,9 +7700,9 @@ nd nd nd yW -aa -aa -aa +ia +ia +ia XP za rh @@ -7725,32 +7712,32 @@ XP XP XP XP +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (40,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF ah @@ -7800,43 +7787,43 @@ aF aF aF ab -aa +ia pv pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -br -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +af +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN +aN +aN +aN fM Hl nd @@ -7867,32 +7854,32 @@ ly OH EW XP +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (41,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF ah @@ -7947,38 +7934,38 @@ pv pv pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -br -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +af +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN fM dA nd @@ -8009,32 +7996,32 @@ OH za EW jw +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (42,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF ah @@ -8084,35 +8071,35 @@ aF aF aF ab -aa -aa -aa -aa +ia +ia +ia +ia pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -aa -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ia +ia +ia +ia +ia +aN +aN dr dr dr @@ -8151,32 +8138,32 @@ uJ OH EW XP +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (43,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -8226,35 +8213,35 @@ aF aF aF ab -aa -aa -aa -aa +ia +ia +ia +ia pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -br -aa -aa -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +af +ia +ia +aN +aN +aN +aN dr dD ds @@ -8281,9 +8268,9 @@ nd nd nd Ni -aa -aa -aa +ia +ia +ia XP za hq @@ -8293,32 +8280,32 @@ XP XP XP XP +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (44,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -8375,28 +8362,28 @@ ab pv pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -aa -aa -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +ia +ia +aN +aN +aN +aN dr ds ds @@ -8423,44 +8410,44 @@ nd nd ND lh -aa -aa -aa +ia +ia +ia XP XP XP XP XP +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (45,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -8520,25 +8507,25 @@ pv pv pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -br -br -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +af +af +aN +aN +aN +aN +aN dr ei ds @@ -8565,44 +8552,44 @@ nd nd nd QL +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (46,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au bt ah @@ -8663,24 +8650,24 @@ pv pv pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN dr Iy ds @@ -8707,45 +8694,45 @@ nd nd nd yW +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (47,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia bt bt aF @@ -8804,25 +8791,25 @@ pv pv pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN dr ds ds @@ -8849,46 +8836,46 @@ nd nd nd Ni +ia +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aG -aG -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (48,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -8936,35 +8923,35 @@ aF aF aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN +aN +aN dr bT ds @@ -8991,46 +8978,46 @@ nd nd nd fM -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +ia +ia +aN +aN +aN +aN +aN +aN +aN +ia +aN +ia +ia +ia +ia +ia +ia +ia aa -aa -aG -aG -aG -aG -aG -aG -aG -aa -aG -aa -aa -aa -aa -aa -aa -aa -aH "} (49,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -9078,35 +9065,35 @@ aF aF aF ab -aa -aa +ia +ia pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aa -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +ia +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN dr ds ds @@ -9133,46 +9120,46 @@ nd sI nd fM -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aH "} (50,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -9223,30 +9210,30 @@ ab pv pv pv -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN dr dr dr @@ -9275,46 +9262,46 @@ fM fM fM fM -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG aN -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aH "} (51,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -9366,28 +9353,28 @@ pv pv pv pv -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN dr dr dD @@ -9415,48 +9402,48 @@ aN aL aL aL -aG -aG -aG -aG aN aN aN -aG -aG +aN +aN +aN +aN +aN +aN aL aL aL aL aL aL -gX -gX -gX +aL +aL +aL +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aH "} (52,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au aF aF @@ -9504,19 +9491,19 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN +aN dr dr dr @@ -9572,32 +9559,32 @@ gN gN aL aN -aG -aG -gX -gX +aN +aN +aL +aL +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aH "} (53,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia au au aF @@ -9648,13 +9635,13 @@ ab pv pv pv -aa -aa -aG -aG -aG -aG -aG +ia +ia +aN +aN +aN +aN +aN dr dr dr @@ -9714,31 +9701,31 @@ gN aL aL aL -aG -aG -aG -gX +aN +aN +aN +aL +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aH "} (54,1,1) = {" -aH aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -NY +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ac bt bt aF @@ -9784,17 +9771,17 @@ wj ab ab ab -aa +ia pv -aa -aa -aa +ia +ia +ia pv -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN dr dr dr @@ -9856,30 +9843,30 @@ gN aL gN aL -aG -aG -aG -gX -gX -gX +aN +aN +aN +aL +aL +aL +ia +ia +ia +ia aa -aa -aa -aa -aH "} (55,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia wj ap ah @@ -9923,17 +9910,17 @@ aF aF ab ab -aa -aa -aa -aa +ia +ia +ia +ia pv -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +aN +aN dr dr dr @@ -9998,29 +9985,29 @@ gN gN gN aL -aG -aG -aG -aG -aG -gX -gX +aN +aN +aN +aN +aN +aL +aL +ia +ia +ia aa -aa -aa -aH "} (56,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia ab wj ap @@ -10064,18 +10051,18 @@ aF aF ab ab -aa -aa -aa -aa -aa +ia +ia +ia +ia +ia pv pv pv -aa -aa -aG -aG +ia +ia +aN +aN dr dD ds @@ -10141,27 +10128,27 @@ gN gN aL aN -aG -aG -aG -aG -aG -gX -gX +aN +aN +aN +aN +aN +aL +aL +ia +ia aa -aa -aH "} (57,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia ab ab aF @@ -10205,19 +10192,19 @@ ah ah ah ab -aa -aa -aa -aa -aa -aa -aa -aa +ia +ia +ia +ia +ia +ia +ia +ia pv -aa -aG -aG -aG +ia +aN +aN +aN dr ds ds @@ -10283,26 +10270,26 @@ gN gN aL aN -aG -aG -aG -aG -aG -gX -gX +aN +aN +aN +aN +aN +aL +aL +ia +ia aa -aa -aH "} (58,1,1) = {" -aH -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia ab ab aF @@ -10347,18 +10334,18 @@ aF aF wj ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN dv dr ds @@ -10425,26 +10412,26 @@ gN gN aL aN -aG -aG -aG -aG -aG -gX +aN +aN +aN +aN +aN +aL +ia +ia +ia aa -aa -aa -aH "} (59,1,1) = {" -aH -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -10488,19 +10475,19 @@ aF aF aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN dv dr ds @@ -10567,25 +10554,25 @@ gM gM aL aN -aG -aG -aG -aG -aG -gX +aN +aN +aN +aN +aN +aL +ia +ia +ia aa -aa -aa -aH "} (60,1,1) = {" -aH -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia ab ab aF @@ -10630,19 +10617,19 @@ aF aF aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN dr dr ds @@ -10709,25 +10696,25 @@ gM gM aL aN -aG -aG -aG -aG -aG -gX +aN +aN +aN +aN +aN +aL +ia +ia +ia aa -aa -aa -aH "} (61,1,1) = {" -aH -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia ab aF aF @@ -10772,17 +10759,17 @@ aF aF aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN aL aL dw @@ -10850,26 +10837,26 @@ gN gN gN aL -aG -aG -aG -aG -aG -gX -gX +aN +aN +aN +aN +aN +aL +aL +ia +ia +ia aa -aa -aa -aH "} (62,1,1) = {" -aH -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia ab aF aF @@ -10914,16 +10901,16 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN aL aL gN @@ -10992,25 +10979,25 @@ gN gN gN aL -aG -aG -aG -aG -aG -gX +aN +aN +aN +aN +aN +aL +ia +ia +ia +ia aa -aa -aa -aa -aH "} (63,1,1) = {" -aH -aa -aa -aa -aa aa +ia +ia +ia +ia +ia ab ab aF @@ -11055,16 +11042,16 @@ aF aF ab ab -aa -aa -aa -aa -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN aN aL eO @@ -11134,25 +11121,25 @@ gN gN gN Jx -aG -aG -aG -aG -aG -gX -gX +aN +aN +aN +aN +aN +aL +aL +ia +ia +ia aa -aa -aa -aH "} (64,1,1) = {" -aH -aa -aa -aa -aa aa +ia +ia +ia +ia +ia ab aF aF @@ -11196,17 +11183,17 @@ ah ah ah ab -aa -aa -aG -aG -aG -aG -aG -aG -aG -aG -aG +ia +ia +aN +aN +aN +aN +aN +aN +aN +aN +aN aL aL dm @@ -11276,25 +11263,25 @@ aL gN gN aL -aG -aG -aG -aG -aG -aG -gX -gX +aN +aN +aN +aN +aN +aN +aL +aL +ia +ia aa -aa -aH "} (65,1,1) = {" -aH -aa -aa -aa -aa aa +ia +ia +ia +ia +ia ab aF aF @@ -11338,17 +11325,17 @@ aF aF aF ab -aa -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +ia +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN dm gN dm @@ -11418,25 +11405,25 @@ gN gN gN aL -aG -aG -aG -aG -aG -aG -aG -gX +aN +aN +aN +aN +aN +aN +aN +aL +ia +ia aa -aa -aH "} (66,1,1) = {" -aH -aa -aa -aa -aa aa +ia +ia +ia +ia +ia ab aF aF @@ -11480,17 +11467,17 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN dm gN gN @@ -11561,24 +11548,24 @@ gN pW aL aL -aG -aG -aG -aG -aG -aG -gX -gX +aN +aN +aN +aN +aN +aN +aL +aL +ia aa -aH "} (67,1,1) = {" -aH -aa -aa -aa -aa aa +ia +ia +ia +ia +ia ab aF aF @@ -11622,17 +11609,17 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -gX +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aL dm gN dO @@ -11703,24 +11690,24 @@ gN gN gN aL -aG -aG -aG -aG -aG -aG -aG -gX +aN +aN +aN +aN +aN +aN +aN +aL +ia aa -aH "} (68,1,1) = {" -aH -aa -aa -aa -aa aa +ia +ia +ia +ia +ia ab aF aF @@ -11764,16 +11751,16 @@ ah aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aL dm gN @@ -11845,23 +11832,23 @@ gN gN gN aL -aG -aG -aG -aG -aG -aG -aG -gX -gX -aH +aN +aN +aN +aN +aN +aN +aN +aL +aL +aa "} (69,1,1) = {" -aH -aa -aa -aa aa +ia +ia +ia +ia ab ab aF @@ -11906,16 +11893,16 @@ ah aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aL eO gN @@ -11987,23 +11974,23 @@ gN gN gN aL -aG -aG -aG -aG -aG -aG -aG -aG -gX -gX +aN +aN +aN +aN +aN +aN +aN +aN +aL +aL "} (70,1,1) = {" -aH -aa -aa -aa aa +ia +ia +ia +ia ab aF aF @@ -12049,15 +12036,15 @@ aF aB ab ab -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN aL dm gN @@ -12129,23 +12116,23 @@ gN gN gN aL -aG -aG -aG -aG -aG -aG -aG -aG -gX -gX +aN +aN +aN +aN +aN +aN +aN +aN +aL +aL "} (71,1,1) = {" -aH -aa -aa -aa aa +ia +ia +ia +ia ab aF aF @@ -12191,15 +12178,15 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN dk dm gN @@ -12271,23 +12258,23 @@ gN gN gN Jx -aG -aG -aG -aG -aG -aG -aG -gX -gX -aH +aN +aN +aN +aN +aN +aN +aN +aL +aL +aa "} (72,1,1) = {" -aH -aa -aa -aa aa +ia +ia +ia +ia ab aF aF @@ -12333,16 +12320,16 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN dm gN gN @@ -12413,23 +12400,23 @@ gN gN gN aL -aG -aG -aG -aG -aG -aG -gX -gX +aN +aN +aN +aN +aN +aN +aL +aL +ia aa -aH "} (73,1,1) = {" -aH -aa -aa -aa aa +ia +ia +ia +ia ab aF aF @@ -12475,16 +12462,16 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aL dm gN @@ -12555,23 +12542,23 @@ gN gN gN aL -aG -aG -aG -aG -gX -gX -gX +aN +aN +aN +aN +aL +aL +aL +ia +ia aa -aa -aH "} (74,1,1) = {" -aH -aa -aa -aa aa +ia +ia +ia +ia ab ab aF @@ -12617,16 +12604,16 @@ ap ap ap au -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL aL dm gN @@ -12697,24 +12684,24 @@ aL gN gN aL -aG -aG -aG -aG -gX +aN +aN +aN +aN +aL +ia +ia +ia +ia aa -aa -aa -aa -aH "} (75,1,1) = {" -aH -aa -aa -aa -aa aa +ia +ia +ia +ia +ia ab aF aF @@ -12759,17 +12746,17 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN dm gN gN @@ -12839,24 +12826,24 @@ aL gN gN aL -aG -aG -aG -aG -gX -gX +aN +aN +aN +aN +aL +aL +ia +ia +ia aa -aa -aa -aH "} (76,1,1) = {" -aH -aa -aa -aa -aa aa +ia +ia +ia +ia +ia ab aF aF @@ -12901,17 +12888,17 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN dm gN gN @@ -12927,7 +12914,7 @@ cA cA gN fS -eE +aj bo bo fI @@ -12948,7 +12935,7 @@ gN fS eD Ft -eE +aj Ft Ee fS @@ -12981,24 +12968,24 @@ gN gN gN aL -aG -aG -aG -gX -gX +aN +aN +aN +aL +aL +ia +ia +ia +ia aa -aa -aa -aa -aH "} (77,1,1) = {" -aH -aa -aa -aa -aa aa +ia +ia +ia +ia +ia ab aF aF @@ -13043,16 +13030,16 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aL dm gN @@ -13123,24 +13110,24 @@ gN gN gN aL -aG -aG -gX -gX +aN +aN +aL +aL +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aH "} (78,1,1) = {" -aH -aa -aa -aa -aa aa +ia +ia +ia +ia +ia ab ab aF @@ -13185,16 +13172,16 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN dm gN gN @@ -13265,25 +13252,25 @@ Jx gN gN aL -aG -aG -gX +aN +aN +aL +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aH "} (79,1,1) = {" -aH -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia ab ab aF @@ -13328,15 +13315,15 @@ aF aF ab ab -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN dm gN gN @@ -13407,26 +13394,26 @@ aL aL aL aL -aG -aG -gX +aN +aN +aL +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aH "} (80,1,1) = {" -aH -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -13471,14 +13458,14 @@ aF aF ab ab -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN aL gN gN @@ -13545,30 +13532,30 @@ gN gN aL aN -aG -aG -aG aN -aG -aG -gX +aN +aN +aN +aN +aN +aL +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aH "} (81,1,1) = {" -aH -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -13613,14 +13600,14 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN aL eO gN @@ -13686,31 +13673,31 @@ aL aL aL aL -aG -aG -aG -aG -aG -aG -gX -gX +aN +aN +aN +aN +aN +aN +aL +aL +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aH "} (82,1,1) = {" -aH -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -13756,13 +13743,13 @@ aF aF ab ab -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN aL aL gN @@ -13824,35 +13811,35 @@ gN gN gN aL -gX -gX -gX -aG -aG -aG -aG -aG -aG -gX -gX +aL +aL +aL +aN +aN +aN +aN +aN +aN +aL +aL +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aH "} (83,1,1) = {" -aH -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -13898,13 +13885,13 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN aN aL gN @@ -13966,35 +13953,35 @@ aL Jx aL aL +ia +ia +aL +aL +aL +aL +aL +aL +aL +aL +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -gX -gX -gX -gX -gX -gX -gX -gX -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (84,1,1) = {" -aH -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -14040,14 +14027,14 @@ as aF aF ab -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN aL gN gN @@ -14105,38 +14092,38 @@ bj gN gN aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +aL +aL +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -gX -gX -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (85,1,1) = {" -aH -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -14183,12 +14170,12 @@ aF aF ab ab -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN aL aL gN @@ -14247,38 +14234,38 @@ bj fS lZ aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (86,1,1) = {" -aH -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -14325,12 +14312,12 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN aL gN gN @@ -14389,38 +14376,38 @@ bj fS fS aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (87,1,1) = {" -aH -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia ab ab aF @@ -14467,12 +14454,12 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN aL aL gN @@ -14511,7 +14498,7 @@ fS Ft Ft Ft -eE +aj Ft fS Ht @@ -14531,39 +14518,39 @@ bj fS fS aL -aG -aG -aG -aG +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (88,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -14609,12 +14596,12 @@ aF aF aF ab -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN aL aL gN @@ -14673,39 +14660,39 @@ kZ fS gN aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (89,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -14752,11 +14739,11 @@ aF aF ab ab -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN aL gN gN @@ -14815,39 +14802,39 @@ bj fS gN aL -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (90,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -14894,11 +14881,11 @@ aF aF aF ab -aG -aG -aa -aa -aG +aN +aN +ia +ia +aN aL aL gN @@ -14958,38 +14945,38 @@ fS gN aL aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (91,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia ab aF av @@ -15036,11 +15023,11 @@ aF aF aF ab -aa -aa -aa -aG -aG +ia +ia +ia +aN +aN aL aL gN @@ -15100,38 +15087,38 @@ gN gN gN aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (92,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -15178,11 +15165,11 @@ aF ab ab ab -aa -aa -aG -aG -aG +ia +ia +aN +aN +aN aL gN gN @@ -15242,38 +15229,38 @@ fS gN gN aL -aG -aG +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (93,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -15318,13 +15305,13 @@ aF ab ab ab -aa -aa -aa -aa -aa -aa -aG +ia +ia +ia +ia +ia +ia +aN aL gN gN @@ -15384,38 +15371,38 @@ fS gN aL aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (94,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -15458,15 +15445,15 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aG +ia +ia +ia +ia +ia +ia +ia +ia +aN aL aL gN @@ -15525,39 +15512,39 @@ bj fS gN aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (95,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -15599,17 +15586,17 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN aL gN gN @@ -15667,39 +15654,39 @@ kZ fS gN aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (96,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -15740,18 +15727,18 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN aL gN gN @@ -15809,39 +15796,39 @@ bj kh gN aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (97,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -15881,19 +15868,19 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN aL gN gN @@ -15952,38 +15939,38 @@ ck gN aL aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (98,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia ab ab aF @@ -16022,20 +16009,20 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN aL aL gN @@ -16094,39 +16081,39 @@ ck gN gN aL -aG -aG -aG -aG +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (99,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -16163,21 +16150,21 @@ aF aF aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN aL gN gN @@ -16236,39 +16223,39 @@ fS gN gN aL -aG -aG -aG -aG +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (100,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -16305,21 +16292,21 @@ aF as aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN aL gN gN @@ -16378,39 +16365,39 @@ fS gN aL aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (101,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia ab ab aF @@ -16448,20 +16435,20 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN aL aL gN @@ -16520,40 +16507,40 @@ fS gN aL aL -aG -aG +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (102,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -16590,20 +16577,20 @@ aF aF aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN aL gN gN @@ -16662,40 +16649,40 @@ fS gN gN aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (103,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -16732,20 +16719,20 @@ aF aF aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN aL gN gN @@ -16804,40 +16791,40 @@ fS gN gN aL -aG -aG -aG -aG +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (104,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -16875,19 +16862,19 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN aL aL gN @@ -16947,39 +16934,39 @@ IC aL aL aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (105,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -17017,18 +17004,18 @@ aF aF aF ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN aL aL gN @@ -17089,39 +17076,39 @@ gN gN gN aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (106,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -17160,17 +17147,17 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN aL gN gN @@ -17231,39 +17218,39 @@ gN gN aL aL -aG -aG +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (107,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab ab aF @@ -17303,16 +17290,16 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN aL aL gN @@ -17372,41 +17359,41 @@ gN gN gN aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (108,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -17446,15 +17433,15 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +ia +ia +ia +aN +aN aL aL gN @@ -17514,41 +17501,41 @@ gN gN gN aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (109,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -17589,14 +17576,14 @@ aF aF ab ab -aa -aa -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +ia +ia +aN +aN aL gN gN @@ -17656,41 +17643,41 @@ gN gN aL aL -aG -aG +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (110,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -17731,14 +17718,14 @@ aF aF aF ab -aa -aa -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +ia +ia +aN +aN aL aL gN @@ -17798,41 +17785,41 @@ fS aL aL aL -aG -aG +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (111,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -17874,13 +17861,13 @@ aF aF ab ab -aa -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +ia +aN +aN aN aL aL @@ -17938,43 +17925,43 @@ Tz bj fS aL -aG -aG -aG -aG +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (112,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -18017,12 +18004,12 @@ aF aF ab ab -aa -aa -aa -aG -aG -aG +ia +ia +ia +aN +aN +aN aN aL gN @@ -18080,43 +18067,43 @@ bj bj fS aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (113,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -18159,12 +18146,12 @@ aF aF aF ab -aa -aa -aa -aG -aG -aG +ia +ia +ia +aN +aN +aN aL aL gN @@ -18222,43 +18209,43 @@ fp bj fS aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (114,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -18301,12 +18288,12 @@ aF aF aF ab -aa -aa -aa -aG -aG -aG +ia +ia +ia +aN +aN +aN aL gN gN @@ -18364,43 +18351,43 @@ eM bj fS aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (115,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -18443,12 +18430,12 @@ aF aF aF ab -aa -aa -aG -aG -aG -aG +ia +ia +aN +aN +aN +aN aL aL aL @@ -18506,43 +18493,43 @@ eM bj fS aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (116,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab ab aF @@ -18585,14 +18572,14 @@ aF aF aF ab -aa -aa -aG -aG -aG -aG -aG -aG +ia +ia +aN +aN +aN +aN +aN +aN aL gN gN @@ -18648,44 +18635,44 @@ bj fp fS aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (117,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -18727,13 +18714,13 @@ aF aF aF ab -aa -aa -aG -aG -aG -aG -aG +ia +ia +aN +aN +aN +aN +aN aL aL gN @@ -18790,44 +18777,44 @@ fS fC fS aL -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (118,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -18869,13 +18856,13 @@ aF aF aF ab -aa -aG -aG -aG -aG -aG -aG +ia +aN +aN +aN +aN +aN +aN aL gN gN @@ -18932,44 +18919,44 @@ bj bj fS aL -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (119,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab au au @@ -19011,13 +18998,13 @@ aF aF aF ab -aa -aG -aG -aG -aG -aG -aG +ia +aN +aN +aN +aN +aN +aN aL gN gN @@ -19074,44 +19061,44 @@ bj bj fS aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (120,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab au au @@ -19153,13 +19140,13 @@ aF aF aF ab -aa -aG -aG -aG -aG -aG -aG +ia +aN +aN +aN +aN +aN +aN aL gN gN @@ -19216,44 +19203,44 @@ bj bj fS aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (121,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab ab au @@ -19295,12 +19282,12 @@ aF aF aF ab -aa -aG -aG -aG -aG -aG +ia +aN +aN +aN +aN +aN aL aL gN @@ -19358,45 +19345,45 @@ bj bj fS aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (122,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab au aA @@ -19437,12 +19424,12 @@ aF aF aF ab -aa -aa -aa -aG -aG -aG +ia +ia +ia +aN +aN +aN aL gN gN @@ -19500,45 +19487,45 @@ bj bj fS aL -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (123,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab au au @@ -19579,12 +19566,12 @@ aF aF aF ab -aa -aa -aa -aG -aG -aG +ia +ia +ia +aN +aN +aN aL gN gN @@ -19642,45 +19629,45 @@ Ep bj fS aL -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (124,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab ab au @@ -19721,12 +19708,12 @@ aF aF aF ab -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +aN +aN aL gN gN @@ -19784,46 +19771,46 @@ bj bj fS aL -aG -aG -aG -aG +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (125,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab au av @@ -19833,20 +19820,20 @@ au au ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab ab ab @@ -19864,11 +19851,11 @@ aF aF ab ab -aa -aa -aa -aG -aG +ia +ia +ia +aN +aN aL aL gN @@ -19926,46 +19913,46 @@ bj bj fS aL -aG -aG -aG -aG +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (126,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab au ab @@ -19974,24 +19961,24 @@ ab au ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -20006,11 +19993,11 @@ aF aF ab ab -aa -aa -aa -aG -aG +ia +ia +ia +aN +aN aN aL gN @@ -20068,46 +20055,46 @@ bj bj fS aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (127,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab ab av @@ -20115,25 +20102,25 @@ ca av ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -20147,12 +20134,12 @@ ab ab ab ab -aa -aa -aa -aa -aG -aG +ia +ia +ia +ia +aN +aN aL aL gN @@ -20210,45 +20197,45 @@ bj bj fS aL -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (128,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab ab av @@ -20257,25 +20244,25 @@ ab av cp ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aF aF @@ -20286,15 +20273,15 @@ ab ab ab ab -aa -aa -aa -aa -aa -aa -aG -aG -aG +ia +ia +ia +ia +ia +ia +aN +aN +aN aL gN gN @@ -20352,45 +20339,45 @@ bj bj fS aL -aG -aG -aG -aG +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (129,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab cp av @@ -20399,44 +20386,44 @@ av av av ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab ab ab ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN aL gN gN @@ -20494,45 +20481,45 @@ Ht fu fS aL -aG -aG -aG -aG +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (130,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab av av @@ -20541,44 +20528,44 @@ av av av ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN aL aL aL @@ -20636,44 +20623,44 @@ bj fp fS aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (131,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab ab av @@ -20684,45 +20671,45 @@ av av ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN aL gN gN @@ -20778,44 +20765,44 @@ bj bj fS aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (132,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aP av @@ -20826,45 +20813,45 @@ av av ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN aL gN gN @@ -20920,44 +20907,44 @@ bj bj fS aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (133,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aP dJ @@ -20968,45 +20955,45 @@ av av ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN aL gN gN @@ -21062,44 +21049,44 @@ bj bj fS aL -aG -aG -aG +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (134,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab aw aP @@ -21109,46 +21096,46 @@ ab ab ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN aL gN gN @@ -21204,93 +21191,93 @@ bj bj fS aL -aG -aG -aG -aG +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (135,1,1) = {" -aH -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia ab ab ab ab ab -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN aL aL aL @@ -21346,96 +21333,96 @@ fS fS fS aL -aG -aG -aG -aG +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (136,1,1) = {" -aH aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN +aN aL gN gN @@ -21488,96 +21475,96 @@ BQ fF fS aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (137,1,1) = {" -aH aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN aL gN gN @@ -21630,96 +21617,96 @@ eL fF fS aL -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (138,1,1) = {" -aH aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN aL aL aL @@ -21729,12 +21716,12 @@ aL aL aL aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN aL aL aL @@ -21772,122 +21759,122 @@ fF fF fS aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (139,1,1) = {" -aH aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aG -aG -aG -aG -aG -aG -aG -aG +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +aN +aN +aN +aN +aN +aN +aN +aN aL aL aL aL -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN +aN aL aL aL aL -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN aL aL fS @@ -21914,123 +21901,90 @@ fS fS fS aL -aG -aG -aG -aG -aG -aG +aN +aN +aN +aN +aN +aN +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia +ia aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aH "} (140,1,1) = {" -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX -gX +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +ae aL aL aL @@ -22056,27 +22010,60 @@ aL aL aL aL -gX -gX -gX -gX -gX -gX -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH -aH +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aL +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa "} diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm index c42104de1c..040ca78627 100644 --- a/maps/tether/tether-01-surface1.dmm +++ b/maps/tether/tether-01-surface1.dmm @@ -2486,9 +2486,6 @@ /turf/simulated/floor/plating, /area/engineering/atmos) "aed" = ( -/obj/machinery/vending/medical{ - dir = 1 - }, /obj/effect/floor_decal/corner/paleblue{ dir = 9 }, @@ -2498,6 +2495,8 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, +/obj/structure/table/standard, +/obj/random/maintenance/medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "aee" = ( @@ -3393,18 +3392,11 @@ /turf/simulated/floor/tiled, /area/rnd/hardstorage) "afv" = ( -/obj/structure/closet/firecloset, +/obj/machinery/vending/tool, /turf/simulated/floor/tiled, /area/storage/primary) "afw" = ( -/obj/structure/table/standard, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/machinery/alarm{ - pixel_y = 23 - }, +/obj/machinery/vending/assist, /turf/simulated/floor/tiled, /area/storage/primary) "afx" = ( @@ -3429,19 +3421,9 @@ /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) "afz" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/obj/machinery/camera/network/tether, +/obj/machinery/vending/hydronutrients/brig, /turf/simulated/floor/tiled, -/area/hallway/lower/first_west) +/area/tether/surfacebase/security/brig) "afA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -3704,9 +3686,9 @@ /turf/simulated/floor/tiled, /area/storage/primary) "afW" = ( -/obj/structure/table/standard, +/obj/machinery/seed_storage/brig, /turf/simulated/floor/tiled, -/area/storage/primary) +/area/tether/surfacebase/security/brig) "afX" = ( /obj/machinery/door/airlock/maintenance/rnd{ name = "Research Maintenance Access"; @@ -3725,8 +3707,25 @@ /turf/simulated/floor/tiled/steel_dirty, /area/rnd/hardstorage) "afY" = ( -/obj/machinery/camera/network/civilian, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/fitness, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/tram) "afZ" = ( /obj/effect/floor_decal/borderfloor{ @@ -3748,9 +3747,6 @@ /obj/machinery/camera/network/civilian{ dir = 9 }, -/obj/machinery/vending/coffee{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "agb" = ( @@ -3863,6 +3859,7 @@ pixel_x = 24 }, /obj/machinery/light/small, +/obj/structure/closet/crate/plastic, /turf/simulated/floor/tiled, /area/rnd/hardstorage) "ags" = ( @@ -3937,9 +3934,7 @@ /turf/simulated/floor/tiled, /area/storage/primary) "agB" = ( -/obj/machinery/vending/tool{ - dir = 8 - }, +/obj/structure/closet/firecloset, /turf/simulated/floor/tiled, /area/storage/primary) "agC" = ( @@ -4524,21 +4519,15 @@ /turf/simulated/floor/tiled/white, /area/rnd/chemistry_lab) "ahI" = ( -/obj/machinery/status_display{ - pixel_y = 30 +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 }, -/obj/effect/floor_decal/borderfloor{ - dir = 1 +/obj/effect/floor_decal/corner/paleblue{ + dir = 6 }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/hallway/lower/first_west) +/obj/machinery/vending/fitness, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lowerhall) "ahJ" = ( /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 2 @@ -5490,9 +5479,6 @@ /turf/simulated/wall/r_wall, /area/crew_quarters/sleep/Dorm_7) "ajm" = ( -/obj/machinery/vending/tool{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -7292,9 +7278,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 }, -/obj/machinery/vending/coffee{ - dir = 4 - }, +/obj/machinery/vending/coffee, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/public_garden) "amj" = ( @@ -7504,6 +7488,7 @@ /obj/effect/floor_decal/corner/lightgrey{ dir = 6 }, +<<<<<<< HEAD /obj/effect/floor_decal/steeldecal/steel_decals9, /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 @@ -7519,6 +7504,26 @@ }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/public_garden) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/snack{ + dir = 4 + }, +/turf/simulated/floor/tiled/monotile, +/area/hallway/lower/first_west) +======= +/turf/simulated/floor/tiled, +/area/hallway/lower/first_west) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "amD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -7705,13 +7710,11 @@ /turf/simulated/floor/tiled, /area/storage/primary) "amV" = ( -/obj/machinery/vending/assist{ - dir = 8 - }, /obj/machinery/status_display{ layer = 4; pixel_x = 32 }, +/obj/structure/table/standard, /turf/simulated/floor/tiled, /area/storage/primary) "amW" = ( @@ -8551,6 +8554,24 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +======= +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/status_display{ + pixel_x = 32; + pixel_y = -32 + }, +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "aoh" = ( @@ -8935,10 +8956,6 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) -"aoR" = ( -/obj/machinery/light/flamp/noshade, -/turf/simulated/floor/grass, -/area/tether/surfacebase/surface_one_hall) "aoS" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/grass, @@ -12987,12 +13004,12 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "avD" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) @@ -13091,6 +13108,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 10 }, +/obj/machinery/light{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/hallway/lower/first_west) "avK" = ( @@ -13393,49 +13413,31 @@ /turf/simulated/wall, /area/rnd/hallway) "awo" = ( -/obj/machinery/vending/snack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/lightgrey{ +/obj/effect/floor_decal/corner/paleblue{ dir = 9 }, -/obj/effect/floor_decal/corner/lightgrey{ +/obj/effect/floor_decal/corner/paleblue{ dir = 6 }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/hallway/lower/first_west) +/obj/machinery/vending/medical, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lowerhall) "awp" = ( -/obj/effect/floor_decal/corner/lightgrey{ - dir = 9 +/obj/effect/floor_decal/borderfloorwhite, +/obj/effect/floor_decal/corner/paleblue/border, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 6 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/steeldecal/steel_decals9{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/machinery/vending/cola{ - dir = 1 - }, -/turf/simulated/floor/tiled/monotile, -/area/hallway/lower/first_west) +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/lowerhall) "awq" = ( /obj/effect/floor_decal/corner/lightgrey{ dir = 9 @@ -13453,14 +13455,9 @@ /obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 }, -/obj/machinery/vending/fitness{ - dir = 1 - }, -/obj/machinery/light{ - dir = 4 - }, +/obj/machinery/vending/snack, /turf/simulated/floor/tiled/monotile, -/area/hallway/lower/first_west) +/area/tether/surfacebase/lowernorthhall) "awr" = ( /obj/structure/cable{ d1 = 4; @@ -13674,21 +13671,25 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) "awF" = ( -/obj/effect/floor_decal/borderfloorwhite, -/obj/effect/floor_decal/corner/paleblue/border, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/lowerhall) +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/coffee, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/lowernorthhall) "awG" = ( /obj/effect/floor_decal/borderfloorwhite, /obj/effect/floor_decal/corner/paleblue/border, @@ -13820,12 +13821,6 @@ /obj/item/weapon/folder/red, /turf/simulated/floor/tiled, /area/security/checkpoint) -"awR" = ( -/obj/machinery/vending/snack{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/tram) "awS" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -14389,12 +14384,6 @@ /obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/tram, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) -"axz" = ( -/obj/machinery/vending/cola{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/tram) "axA" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -14580,9 +14569,37 @@ /turf/simulated/wall, /area/tether/surfacebase/medical/lowerhall) "axM" = ( -/obj/machinery/vending/coffee{ +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/snack, +/turf/simulated/floor/tiled/monotile, +/area/hallway/lower/first_west) +"axN" = ( +/obj/structure/table/standard, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/machinery/alarm{ + pixel_y = 23 + }, +/turf/simulated/floor/tiled, +/area/storage/primary) +"axO" = ( /obj/effect/floor_decal/corner/paleblue{ dir = 9 }, @@ -14592,29 +14609,9 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/lowerhall) -"axN" = ( -/obj/machinery/vending/fitness{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/lowerhall) -"axO" = ( -/obj/machinery/vending/snack{ - dir = 1 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 - }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 +/obj/structure/table/standard, +/obj/structure/noticeboard{ + pixel_x = -32 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lowerhall) @@ -15425,6 +15422,10 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 5 }, +/obj/machinery/light_switch{ + dir = 8; + pixel_x = 26 + }, /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) "ayX" = ( @@ -16954,12 +16955,26 @@ /turf/simulated/floor/plating, /area/maintenance/lower/research) "aBs" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 10 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 }, -/obj/effect/floor_decal/steeldecal/steel_decals4, -/turf/simulated/floor/plating, -/area/vacant/vacant_site/east) +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/cigarette, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/surface_one_hall) "aBt" = ( /obj/structure/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -17246,35 +17261,49 @@ /turf/simulated/floor/plating, /area/crew_quarters/locker/laundry_arrival) "aBU" = ( -/obj/machinery/washing_machine, -/obj/effect/floor_decal/borderfloor{ - dir = 8 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 }, -/obj/effect/floor_decal/corner/lightgrey/border{ +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/machinery/light/small{ dir = 8 }, /turf/simulated/floor/tiled, -/area/crew_quarters/locker/laundry_arrival) +/area/hallway/lower/first_west) "aBV" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 4 - }, -/obj/effect/floor_decal/borderfloor/corner2{ +/obj/effect/floor_decal/corner/lightgrey{ dir = 6 }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 6 +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 }, +<<<<<<< HEAD /obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" +======= +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR }, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker/laundry_arrival) +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/snix, +/turf/simulated/floor/tiled/monotile, +/area/hallway/lower/first_west) "aBW" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 8 @@ -17696,33 +17725,55 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) "aCH" = ( -/obj/structure/table/standard, -/obj/effect/floor_decal/borderfloor{ +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/structure/sign/poster{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker/laundry_arrival) +/obj/machinery/vending/cola, +/turf/simulated/floor/tiled/monotile, +/area/hallway/lower/first_west) "aCI" = ( -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 }, +<<<<<<< HEAD /obj/structure/cable/green, /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/cable/orange, +/turf/simulated/floor/tiled, +/area/crew_quarters/locker/laundry_arrival) +======= +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/fitness, +/turf/simulated/floor/tiled/monotile, +/area/hallway/lower/first_west) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "aCJ" = ( /turf/simulated/floor/plating, /area/vacant/vacant_site/east) @@ -17804,7 +17855,7 @@ /turf/simulated/floor/lino, /area/crew_quarters/visitor_dining) "aCT" = ( -/obj/machinery/vending/fitness{ +/obj/structure/bed/chair{ dir = 4 }, /turf/simulated/floor/tiled, @@ -17958,6 +18009,7 @@ dir = 8 }, /obj/machinery/light_switch{ + dir = 1; pixel_y = -25 }, /turf/simulated/floor/tiled, @@ -17971,31 +18023,44 @@ /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) "aDp" = ( -/obj/machinery/washing_machine, /obj/effect/floor_decal/borderfloor{ - dir = 10 + dir = 8 }, /obj/effect/floor_decal/corner/lightgrey/border{ - dir = 10 + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/machinery/camera/network/tether{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/crew_quarters/locker/laundry_arrival) +/area/hallway/lower/first_west) "aDq" = ( -/obj/machinery/light_switch{ - pixel_y = -25 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 }, -/obj/structure/extinguisher_cabinet{ - dir = 8; - pixel_x = 30 - }, -/obj/effect/floor_decal/borderfloor{ +/obj/effect/floor_decal/corner/lightgrey{ dir = 6 }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 6 +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/crew_quarters/locker/laundry_arrival) +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/cola, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/tram) "aDr" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 @@ -18037,10 +18102,25 @@ /turf/simulated/floor/lino, /area/crew_quarters/visitor_dining) "aDw" = ( -/obj/machinery/vending/coffee{ +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/snack, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/tram) "aDx" = ( /obj/structure/closet/crate, @@ -18353,17 +18433,28 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_dining) "aEb" = ( -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_x = -30 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 }, -/obj/structure/flora/pottedplant/stoutbush, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/coffee, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/tram) "aEc" = ( -/obj/machinery/status_display{ - pixel_y = 30 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "aEd" = ( @@ -18646,6 +18737,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 10 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "aEI" = ( @@ -18678,35 +18770,35 @@ "aEM" = ( /turf/simulated/floor/tiled, /area/crew_quarters/visitor_dining) -"aEN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/bed/chair/wood, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/tram) "aEO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 4 }, -/obj/structure/bed/chair/wood, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "aEP" = ( +<<<<<<< HEAD /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, /obj/structure/cable/green{ +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/structure/cable/orange{ +======= +/obj/structure/cable/orange{ +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "aEQ" = ( @@ -19208,23 +19300,21 @@ /obj/machinery/light{ dir = 8 }, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "aFF" = ( -/obj/structure/bed/chair/wood{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "aFG" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/obj/structure/table/woodentable, +/obj/machinery/hologram/holopad, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "aFH" = ( <<<<<<< HEAD +<<<<<<< HEAD /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, @@ -19240,9 +19330,18 @@ d1 = 1; d2 = 2; icon_state = "1-2" +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" +======= +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR }, -/obj/structure/bed/chair/wood{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) @@ -19443,8 +19542,8 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/tether/surfacebase/tram) "aFW" = ( -/obj/structure/bed/chair/wood{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) @@ -20799,15 +20898,16 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "aIn" = ( -/obj/machinery/camera/network/tether, +/obj/machinery/vending/tool, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) +/area/rnd/hardstorage) "aIo" = ( -/obj/machinery/alarm{ - pixel_y = 22 +/obj/machinery/status_display{ + pixel_x = -32; + pixel_y = -1 }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/surface_one_hall) +/area/tether/surfacebase/tram) "aIp" = ( /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, @@ -21285,9 +21385,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "aJh" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -21297,6 +21394,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "aJi" = ( @@ -21717,7 +21815,6 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "aJR" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/floor_decal/borderfloor/shifted, /obj/effect/floor_decal/corner/lightgrey/border/shifted, @@ -22112,15 +22209,15 @@ /obj/effect/floor_decal/corner/lightgrey{ dir = 5 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/machinery/vending/coffee{ +/obj/machinery/camera/network/tether{ dir = 1 }, +/obj/structure/bed/chair/wood{ + dir = 4 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "aKE" = ( @@ -22130,12 +22227,12 @@ /obj/effect/floor_decal/corner/lightgrey{ dir = 5 }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/obj/machinery/lapvend{ - dir = 1 +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25 }, +/obj/machinery/light/small, +/obj/structure/table/standard, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) "aKF" = ( @@ -22145,8 +22242,8 @@ /obj/effect/floor_decal/corner/lightgrey{ dir = 5 }, -/obj/machinery/vending/cigarette{ - dir = 1 +/obj/structure/bed/chair/wood{ + dir = 8 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) @@ -27375,10 +27472,10 @@ /obj/effect/floor_decal/corner/grey/border{ dir = 9 }, -/obj/structure/closet/emcloset, /obj/machinery/light{ dir = 8 }, +/obj/machinery/vending/loadout/costume, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aUo" = ( @@ -27889,23 +27986,21 @@ /turf/simulated/floor/plating, /area/vacant/vacant_bar) "aVi" = ( -/obj/structure/bed/chair/comfy/black, -/obj/effect/floor_decal/borderfloor{ - dir = 5 - }, -/obj/effect/floor_decal/corner/grey/border{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/effect/floor_decal/industrial/outline, /turf/simulated/floor/tiled, -/area/crew_quarters/visitor_laundry) +/area/tether/surfacebase/tram) "aVj" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 4 +/obj/effect/floor_decal/borderfloor/corner{ + dir = 1 }, -/turf/simulated/floor/plating, +/obj/effect/floor_decal/corner/grey/bordercorner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aVk" = ( /obj/machinery/door/firedoor, @@ -28170,6 +28265,7 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aVC" = ( +<<<<<<< HEAD /obj/structure/cable/green{ d1 = 2; d2 = 8; @@ -28191,21 +28287,37 @@ icon_state = "bordercolor" }, ======= +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +======= +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /obj/effect/floor_decal/borderfloor{ dir = 8 }, /obj/effect/floor_decal/corner/grey/border{ dir = 8 }, +<<<<<<< HEAD >>>>>>> d6307e55b9... Merge pull request #9465 from KillianKirilenko/kk-misc2 +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +======= +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aVD" = ( -/obj/structure/table/standard, -/obj/effect/floor_decal/borderfloor{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/obj/effect/floor_decal/corner/grey/border{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /turf/simulated/floor/tiled, @@ -28425,17 +28537,14 @@ /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aVT" = ( -/obj/structure/bed/chair/comfy/black{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/effect/floor_decal/borderfloor{ - dir = 6 - }, -/obj/effect/floor_decal/corner/grey/border{ - dir = 6 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/tiled, -/area/crew_quarters/visitor_laundry) +/area/tether/surfacebase/tram) "aVU" = ( /obj/machinery/atmospherics/unary/outlet_injector{ dir = 4; @@ -28608,6 +28717,7 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plating, /area/crew_quarters/visitor_laundry) +<<<<<<< HEAD "aWo" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -28631,6 +28741,21 @@ /area/crew_quarters/visitor_laundry) ||||||| parent of f19bc87ece... Merge pull request #10230 from TheFurryFeline/TFF-Brig_Flashes ======= +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"aWo" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 8 + }, +/obj/machinery/vending/loadout/costume{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) +======= +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "aWp" = ( /obj/effect/floor_decal/steeldecal/steel_decals4, /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -28792,6 +28917,7 @@ /obj/effect/floor_decal/corner/blue/border{ dir = 6 }, +/obj/structure/closet/emcloset, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_lodging) "aWM" = ( @@ -28801,23 +28927,17 @@ /obj/effect/floor_decal/corner/grey/border{ dir = 8 }, -/obj/machinery/vending/fitness{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aWN" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/obj/effect/floor_decal/corner/grey/border{ - dir = 4 - }, -/obj/machinery/vending/cola{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, /turf/simulated/floor/tiled, -/area/crew_quarters/visitor_laundry) +/area/tether/surfacebase/tram) "aWO" = ( /obj/machinery/camera/network/engineering{ dir = 8 @@ -28875,9 +28995,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/machinery/vending/cigarette{ - dir = 4 - }, +/obj/structure/table/standard, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) "aWW" = ( @@ -32910,6 +33028,22 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"gjn" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/borderfloor/shifted{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border/shifted{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "gjD" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -32941,6 +33075,18 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"glu" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "glH" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 5 @@ -32999,6 +33145,30 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"grD" = ( +/obj/effect/floor_decal/corner/grey/diagonal{ + dir = 1 + }, +/obj/effect/floor_decal/corner/grey/diagonal{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/machinery/vending/coffee, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "gud" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -33275,18 +33445,31 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/floor_decal/borderfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 9 + }, +/obj/machinery/power/apc{ + pixel_y = -25 + }, +/obj/structure/cable/orange{ + d2 = 4; + icon_state = "0-4" + }, /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) +"hzr" = ( +/obj/machinery/light/bigfloorlamp, +/turf/simulated/floor/grass, +/area/tether/surfacebase/surface_one_hall) "hAe" = ( /turf/simulated/floor/looking_glass{ dir = 5 @@ -33372,6 +33555,15 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) +"hOH" = ( +/obj/structure/bed/chair/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) "hPU" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -33387,18 +33579,9 @@ /turf/simulated/floor/plating, /area/maintenance/lower/mining_eva) "hQg" = ( -/obj/machinery/vending/hydronutrients/brig{ - dir = 8 - }, /obj/machinery/light{ dir = 4 }, -/obj/effect/floor_decal/corner/lightorange{ - dir = 6 - }, -/obj/effect/floor_decal/corner/lightorange{ - dir = 9 - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) "hQw" = ( @@ -33589,6 +33772,26 @@ /obj/random/trash_pile, /turf/simulated/floor/tiled/techfloor, /area/maintenance/lower/xenoflora) +"ips" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/lapvend, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/surface_one_hall) "iqO" = ( /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -33598,6 +33801,10 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) +"ird" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) "iti" = ( /obj/effect/floor_decal/steeldecal/steel_decals4, /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -33823,6 +34030,19 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/brig) +"jAq" = ( +/obj/structure/table/standard, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "jCv" = ( /obj/structure/bed/chair/wood, /turf/simulated/floor/lino, @@ -33988,6 +34208,15 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"kcv" = ( +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/crew_quarters/visitor_laundry) "kdi" = ( /obj/structure/cable/green{ d1 = 1; @@ -34424,6 +34653,30 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"lei" = ( +/obj/effect/floor_decal/corner/grey/diagonal{ + dir = 1 + }, +/obj/effect/floor_decal/corner/grey/diagonal{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/machinery/vending/cigarette, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "lhM" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/blast/regular{ @@ -34472,10 +34725,8 @@ /turf/simulated/wall, /area/tether/surfacebase/funny/mimeoffice) "lsh" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/obj/structure/table/woodentable, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) "lwL" = ( @@ -34880,6 +35131,19 @@ /obj/structure/sign/poster, /turf/simulated/floor/lino, /area/crew_quarters/visitor_dining) +"mvl" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/table/bench/standard, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "mvM" = ( /obj/structure/cable/green{ d1 = 4; @@ -35121,6 +35385,13 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"mZQ" = ( +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) "naC" = ( /turf/simulated/wall/r_wall, /area/medical/virologyisolation) @@ -35186,15 +35457,29 @@ /obj/effect/floor_decal/steeldecal/steel_decals6{ dir = 5 }, +<<<<<<< HEAD /obj/structure/cable/green{ d1 = 2; d2 = 4; icon_state = "2-4" }, +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/cable/orange{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +======= +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) "njE" = ( @@ -35317,18 +35602,12 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) "nvD" = ( -/obj/machinery/seed_storage/brig{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightorange{ - dir = 6 - }, -/obj/effect/floor_decal/corner/lightorange{ - dir = 9 - }, /obj/machinery/camera/network/security{ dir = 8 }, +/obj/effect/floor_decal/corner/lightorange{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/brig) "nwH" = ( @@ -35438,6 +35717,49 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"nTC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, +/obj/effect/floor_decal/corner/grey{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) +======= +"nRK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) +"nTC" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/corner/grey{ + dir = 5 + }, +/obj/effect/floor_decal/corner/grey{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "nUG" = ( /obj/structure/table/rack, /obj/item/weapon/tool/prybar/red{ @@ -35646,6 +35968,13 @@ /obj/item/pizzavoucher, /turf/simulated/floor/plating, /area/maintenance/lowmedbaymaint) +"ovr" = ( +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) "ovG" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -35799,6 +36128,12 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"paJ" = ( +/obj/machinery/camera/network/civilian{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) "paY" = ( /obj/structure/cable/green{ d1 = 4; @@ -35895,10 +36230,18 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/crew_quarters/visitor_laundry) +"pvL" = ( +/obj/structure/bed/chair/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) "pxk" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/grey/border, /obj/structure/sign/poster, +/obj/structure/table/standard, /turf/simulated/floor/tiled, /area/crew_quarters/visitor_laundry) >>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff @@ -36103,6 +36446,18 @@ "qwV" = ( /turf/simulated/wall, /area/tether/surfacebase/security/brig) +"qBb" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "qDR" = ( /obj/machinery/firealarm{ dir = 8; @@ -36142,6 +36497,19 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/weaponsrange) +"qKk" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/table/bench/standard, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "qKn" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central1{ dir = 8 @@ -36264,13 +36632,13 @@ dir = 4 }, /obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lightgrey/border, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/effect/floor_decal/corner/lightgrey/border, /turf/simulated/floor/tiled, /area/crew_quarters/locker/laundry_arrival) "qWW" = ( @@ -36330,6 +36698,32 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/tram) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"rhc" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) +======= +"rhc" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/maintenance/lower/vacant_site) +"rnt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "rse" = ( /obj/structure/bed/double/padded, /obj/item/weapon/bedsheet/mimedouble, @@ -36610,9 +37004,15 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_one) "scf" = ( -/obj/effect/floor_decal/corner/lightorange, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, -/area/tether/surfacebase/security/brig) +/area/tether/surfacebase/tram) +"sch" = ( +/obj/structure/table/bench/standard, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/grey/border, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "svZ" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -36843,6 +37243,16 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lowerhall) +"tAT" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "tCV" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -36932,6 +37342,12 @@ "tOe" = ( /turf/simulated/floor/plating, /area/tether/surfacebase/funny/clownoffice) +"tPC" = ( +/obj/structure/bed/chair/wood{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/tether/surfacebase/tram) "tQH" = ( /obj/machinery/camera/network/security{ dir = 10 @@ -37095,6 +37511,17 @@ "uiK" = ( /turf/simulated/wall, /area/tether/surfacebase/security/weaponsrange) +"uke" = ( +/obj/structure/bed/chair/comfy/black, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "uqH" = ( /obj/structure/railing{ dir = 4 @@ -37378,6 +37805,21 @@ }, /turf/simulated/floor/tiled, /area/rnd/hallway) +"vrS" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor/shifted{ + dir = 1 + }, +/obj/effect/floor_decal/corner/lightgrey/border/shifted{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_one_hall) "vuO" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -37526,6 +37968,36 @@ "waR" = ( /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/weaponsrange) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"whV" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'HIGH VOLTAGE'"; + icon_state = "shock"; + name = "HIGH VOLTAGE" + }, +/turf/simulated/wall, +/area/maintenance/substation/surfaceservicesubstation) +======= +"wek" = ( +/obj/structure/bed/chair/wood{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/tram) +"whV" = ( +/obj/structure/sign/securearea{ + desc = "A warning sign which reads 'HIGH VOLTAGE'"; + icon_state = "shock"; + name = "HIGH VOLTAGE" + }, +/turf/simulated/wall, +/area/maintenance/substation/surfaceservicesubstation) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "wjq" = ( /obj/structure/bed/chair{ dir = 4 @@ -37712,6 +38184,16 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_one_hall) +"wVm" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/grey/border{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "wVB" = ( /obj/machinery/door/window/brigdoor/southleft{ dir = 8; @@ -37843,6 +38325,26 @@ }, /turf/simulated/floor/carpet/gaycarpet, /area/tether/surfacebase/funny/clownoffice) +"xtO" = ( +/obj/effect/floor_decal/corner/grey/diagonal{ + dir = 1 + }, +/obj/effect/floor_decal/corner/grey/diagonal{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/machinery/vending/cola/soft, +/turf/simulated/floor/tiled, +/area/crew_quarters/visitor_laundry) "xtS" = ( /obj/machinery/power/apc{ dir = 4; @@ -37956,6 +38458,26 @@ }, /turf/simulated/floor/plating, /area/tether/surfacebase/funny/hideyhole) +"yaA" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/coffee, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/surface_one_hall) "yaU" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -43467,7 +43989,7 @@ amB ajS aah aah -aah +ahl ahl ahl ahl @@ -43609,10 +44131,10 @@ ajS ajS aah aah -aah ahl +aBV ahG -aiD +aDp ajp aoC aph @@ -43630,8 +44152,8 @@ aui auF avb avI -awo -auK +ahl +rJv avh abN aeR @@ -43751,9 +44273,9 @@ ajS aah aah aah -aah ahl -afz +aCH +ahL aiE ajq anx @@ -43772,8 +44294,8 @@ anx anx anx acJ -awp -auK +ahl +rJv avh abN aeR @@ -43893,9 +44415,9 @@ aah aah aah aah -aah ahl -ahI +aCI +ahL anN aog aoD @@ -43914,8 +44436,8 @@ auj auG avc avJ -awq -auK +ahl +rJv avh abN aeR @@ -44057,7 +44579,7 @@ atH auK auK auK -auK +rJv axD abN aeR @@ -44171,6 +44693,7 @@ ajS alc aln ajS +<<<<<<< HEAD aah aah aah @@ -44179,6 +44702,25 @@ aah aah aah ahl +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aah +aah +aah +atH +xoT +sBl +aun +atG +======= +ahl +ahl +ahl +atH +xoT +sBl +aun +atG +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR ahK anP ajt @@ -44321,8 +44863,32 @@ aah aah aah ahl +<<<<<<< HEAD ahL anP +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +ahl +ahl +ahl +atH +xuM +dQn +jGM +fiP +hDQ +tGh +======= +ahl +axM +aBU +atH +xuM +dQn +jGM +fiP +hDQ +tGh +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR ajt ahl apk @@ -45765,7 +46331,7 @@ abw abw adM afU -abv +abI abm ajW aDf @@ -45902,12 +46468,12 @@ apj auK avh abm -abv +abI abv abv adM afU -abv +abI abm ajX aDf @@ -46045,11 +46611,11 @@ auK avh abm abI -abI -abI +abv +abv adM afU -abv +abI abm aka aFf @@ -46186,9 +46752,9 @@ apj auK avh abm -abI -abI -abI +aIn +abv +abv adN afU agr @@ -47139,7 +47705,7 @@ aad aad aah pCj -tdh +afz tdh ccA jDI @@ -47281,7 +47847,7 @@ aad aad aah pCj -tdh +afW tdh pKE jDI @@ -47438,8 +48004,8 @@ iUF fqa anp aeW +axN afr -afW amV agB agK @@ -47568,8 +48134,8 @@ mYf rQe tak lEg -scf -mYO +tdh +tdh mYO mYO fqa @@ -49868,21 +50434,21 @@ aKd aie anW aoj -aoR +hzr apA apA apA -aoR +hzr ary ary ary ary ary -aoR +hzr apA apA apA -aoR +hzr aoj awH axk @@ -50585,7 +51151,7 @@ aqf arg arA arz -aoR +hzr arz asO apC @@ -50836,14 +51402,14 @@ aad aad aah aah -aah aeU +ahI atc awx aeU aAI -aAI aef +awq yaU afO aBB @@ -50978,14 +51544,14 @@ aad aad aah aah -aah aeU +awo atq aww aeU aAI -aAI aef +awF afl agj aBG @@ -51026,10 +51592,10 @@ ayi ayV fyp huE -aBU -aCH -aDp ayh +aCJ +aCJ +aGt aBO aFp aBO @@ -51168,11 +51734,11 @@ ayh ayW eQT niz -aBV -aCI -aDq ayh aCJ +aCJ +aCJ +aCJ aFq aCJ aBk @@ -51288,21 +51854,21 @@ aef bbq anW aoj -aoR +hzr apA apA apA -aoR +hzr ary ary ary ary ary -aoR +hzr apA apA apA -aoR +hzr aoj awH axm @@ -51311,9 +51877,9 @@ ayh aAf cpp ayh -ayh -ayh -ayh +aCJ +aCJ +aCJ aCJ aFr aCJ @@ -51601,8 +52167,8 @@ aCJ aCJ aCJ aCJ -aCJ -aCJ +agM +agM agM aIm aJf @@ -51743,11 +52309,11 @@ aCJ aCJ aCJ aCJ -aCJ -aCJ agM -aIn -aJg +yaA +vrS +ayG +qBb aJR aKD aLg @@ -51833,8 +52399,8 @@ acY adE aan uHS -awF -axM +awC +aeU aeU bbI fKm @@ -51893,10 +52459,10 @@ aCJ aCJ aCJ aCJ -aCJ -aCJ agM -aIo +ips +vrS +ayG aJf aJQ aKE @@ -51984,7 +52550,7 @@ adT afb atO awC -axN +aeU aeU <<<<<<< HEAD aah @@ -52053,9 +52619,9 @@ aCJ aCJ aCJ aCJ -aCJ -aBs agM +aBs +gjn aEH aJh aJQ @@ -52143,7 +52709,7 @@ abL aea afb atO -awC +awp axO aeU bbZ @@ -53086,7 +53652,7 @@ aUp aVd aVz aUt -aWo +aWM aWM aWV aVn @@ -54146,9 +54712,9 @@ aCa axy atx aEb -auB +aVi aFE -auB +scf aLK act aDu @@ -54176,10 +54742,10 @@ aSo aUo aUQ bHR -aUP +aVD aVS aga -aWN +bcJ aXc aUm aUm @@ -54288,10 +54854,10 @@ aCa axy atx afY -auB -aFF +aVT auB auB +paJ aCO aHH aIu @@ -54314,12 +54880,12 @@ aPK aSo aSo aSo -aSo aUm aUm -aVi +aUm +cwS aVD -aVT +bcT aUm aUm aUm @@ -54429,10 +54995,10 @@ mOz atx atx atx -aEc -aEN -aFG -aFW +atx +aEO +auB +auB aGA aCO aHI @@ -54456,18 +55022,18 @@ aah aah aah aah -aah -aah aUm +grD +tAT aVj -aVj -aVj +nRK +bcm +aWM +qKk aUm -aah -aah -aah -aah -aah +baU +baU +baU aah aah aah @@ -54562,19 +55128,19 @@ auB auV avC auB -awR -axz +aCT +aCT ayp azp mRF rYL ayp aCT -aDw -auB +avA +aIo aEO -lsh -aFW +auB +auB lZU aCO jCv @@ -54598,19 +55164,19 @@ aah aah aah aah -aah -aad -aad -aad -aad -aad -aad -aah -aah -aah -aah -aah -aah +aUm +xtO +cwS +aUP +rnt +aUP +aUP +sch +aWn +baU +baU +baU +baU aah aah aah @@ -54697,7 +55263,7 @@ apF aah aah aah -aah +adK atx atZ auC @@ -54715,7 +55281,7 @@ aCU aCU aCU aEP -aFH +aFX aFX aGB aCO @@ -54740,20 +55306,20 @@ aad aad aad aad +aUm +lei +wVm +uke +jAq +glu +bcJ +mvl +aUm aad -aad -aad -aad -aad -aad -aad -aad -aah -aah -aah -aah -aah -aah +baU +baU +baU +baU aah aah aad @@ -54839,30 +55405,30 @@ aah aah aah aah -aah -atx -auB -auB -auU -auB -auB -auB -auB -auB -auB -auB -auB -auB -auB -auB -auB -auB -auU +adK +aDq +aEc +aEc +aFG +aFH +aCT +aCT +aCT auB auB auB auB auB +aCT +aCT +aCT +aWN +lsh +lsh +lsh +wek +pvL +hOH atW atx aad @@ -54882,15 +55448,15 @@ aad aad aad aad -aad -aad -aad -aad -aad -aad -aad -aad -aad +aUm +aUm +kcv +kcv +kcv +kcv +kcv +aUm +aUm aad aad aad @@ -55046,21 +55612,18 @@ aah aah aah aah -aah -atx -auB -auB -auB -auB -auB -auB -auB -auB -auB -auB -auB -auB -auB +adK +aDw +aFF +aFF +aFF +aFW +auB +auB +auB +auB +auB +auU auB auB auB @@ -55070,6 +55633,9 @@ auB auB auB auB +ovr +ird +mZQ auB atx aad @@ -55275,9 +55841,9 @@ oeA oeA oeA oeA -oeA -oeA -oeA +tPC +tPC +tPC aGC aty aad @@ -55518,15 +56084,15 @@ atA atA atA atA -atA aJp aub +aub +aub wXW atA atA atA atA -atA mtl auc auc diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 9b4148072f..b37dc0614f 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -1450,15 +1450,9 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/resleeving) "acb" = ( -/obj/structure/table/glass, -/obj/item/weapon/book/manual/resleeving, /obj/structure/sign/nosmoking_1{ pixel_x = -32 }, -/obj/item/device/sleevemate, -/obj/machinery/alarm{ - pixel_y = 28 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -1468,6 +1462,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 9 }, +/obj/machinery/vending/loadout/uniform, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acc" = ( @@ -1480,6 +1475,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, +/obj/machinery/clonepod/transhuman, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acd" = ( @@ -1495,6 +1491,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, +/obj/machinery/transhuman/resleever, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "ace" = ( @@ -1507,11 +1504,12 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 1 }, -/obj/machinery/transhuman/resleever, +/obj/structure/table/glass, +/obj/item/weapon/book/manual/resleeving, +/obj/item/device/sleevemate, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acf" = ( -/obj/machinery/clonepod/transhuman, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, @@ -1521,6 +1519,7 @@ /obj/effect/floor_decal/corner/paleblue/border{ dir = 5 }, +/obj/machinery/computer/transhuman/resleeving, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acg" = ( @@ -1633,9 +1632,6 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/medical/resleeving) "acr" = ( -/obj/machinery/computer/transhuman/resleeving{ - dir = 4 - }, /obj/machinery/light{ dir = 8 }, @@ -1648,11 +1644,15 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acs" = ( -/obj/structure/bed/chair/office/light{ - dir = 8 +/obj/effect/floor_decal/corner/paleblue{ + dir = 6 }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/resleeving) +/area/tether/surfacebase/medical/uppersouthstairwell) "act" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -1671,6 +1671,9 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 5 }, +/obj/structure/bed/chair/office/light{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acv" = ( @@ -1791,6 +1794,10 @@ dir = 10 }, /obj/structure/flora/pottedplant/decorative, +/obj/machinery/alarm{ + dir = 4; + pixel_x = -23 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "acI" = ( @@ -2643,7 +2650,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 8 }, -/obj/machinery/vending/loadout/uniform, +/obj/machinery/organ_printer/flesh, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "adZ" = ( @@ -2659,15 +2666,7 @@ /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 9 }, -/obj/machinery/organ_printer/flesh, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/resleeving) -"aea" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/bottle/biomass{ - pixel_x = 4; - pixel_y = 6 - }, /obj/item/weapon/reagent_containers/glass/bottle/biomass{ pixel_x = -4; pixel_y = 8 @@ -2680,10 +2679,17 @@ pixel_x = 6; pixel_y = 8 }, +/obj/item/weapon/reagent_containers/glass/bottle/biomass{ + pixel_x = 4; + pixel_y = 6 + }, /obj/item/device/flashlight/pen{ pixel_x = -3; pixel_y = -3 }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/resleeving) +"aea" = ( /obj/item/device/radio/intercom{ pixel_y = -28 }, @@ -2694,6 +2700,9 @@ /obj/effect/floor_decal/corner/paleblue/border, /obj/effect/floor_decal/borderfloorwhite/corner2, /obj/effect/floor_decal/corner/paleblue/bordercorner2, +/obj/structure/bed/chair{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "aeb" = ( @@ -2807,7 +2816,6 @@ /turf/simulated/wall, /area/tether/surfacebase/medical/patient_a) "aen" = ( -/obj/machinery/vending/loadout/uniform, /obj/machinery/camera/network/medbay{ dir = 10 }, @@ -2822,6 +2830,9 @@ pixel_y = -28 }, /obj/structure/cable/green, +/obj/structure/bed/chair{ + dir = 1 + }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/resleeving) "aeo" = ( @@ -3853,17 +3864,8 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting/storage) "afP" = ( -/obj/structure/table/rack/shelf/steel, -/obj/item/clothing/mask/gas{ - pixel_x = 3; - pixel_y = 3 - }, -/obj/item/clothing/mask/gas, -/obj/item/clothing/mask/gas{ - pixel_x = -3; - pixel_y = -3 - }, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/vending/security, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting/storage) "afQ" = ( @@ -4780,11 +4782,20 @@ /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting/storage) "ahw" = ( -/obj/machinery/vending/security, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/light{ dir = 4 }, +/obj/structure/table/rack/shelf/steel, +/obj/item/clothing/mask/gas{ + pixel_x = 3; + pixel_y = 3 + }, +/obj/item/clothing/mask/gas, +/obj/item/clothing/mask/gas{ + pixel_x = -3; + pixel_y = -3 + }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/outfitting/storage) "ahx" = ( @@ -6257,39 +6268,47 @@ /turf/simulated/floor/tiled/techfloor, /area/tether/surfacebase/medical/morgue) "ajK" = ( -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 }, -/obj/machinery/vending/snack, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 - }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/uppersouthstairwell) +/obj/machinery/vending/cigarette, +/turf/simulated/floor/tiled/monotile, +/area/rnd/research) "ajL" = ( -/obj/machinery/vending/cola/soft, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/effect/floor_decal/corner/paleblue{ - dir = 6 +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 }, -/obj/effect/floor_decal/corner/paleblue{ - dir = 9 - }, -/obj/structure/window/reinforced{ +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 1 }, -/turf/simulated/floor/tiled/white, -/area/tether/surfacebase/medical/uppersouthstairwell) +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/coffee, +/turf/simulated/floor/tiled/monotile, +/area/rnd/research) "ajM" = ( -/obj/machinery/door/firedoor/glass, -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/turf/simulated/floor/plating, -/area/tether/surfacebase/medical/uppersouthstairwell) +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/weeb, +/turf/simulated/floor/tiled/monotile, +/area/rnd/research) "ajN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -6690,7 +6709,7 @@ pixel_y = 32 }, /obj/effect/floor_decal/corner/paleblue/diagonal, -/obj/machinery/vending/cola, +/obj/machinery/vending/cola/soft, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "akx" = ( @@ -6709,18 +6728,32 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/breakroom) "akA" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/effect/floor_decal/corner/paleblue{ + dir = 6 }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/obj/machinery/vending/coffee, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "akB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 +/obj/effect/floor_decal/corner/paleblue{ + dir = 6 }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/vending/sol, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "akC" = ( @@ -6826,11 +6859,11 @@ /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "akI" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ +/obj/effect/floor_decal/corner/paleblue{ dir = 6 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) @@ -6977,15 +7010,17 @@ >>>>>>> bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff "akS" = ( /obj/structure/window/reinforced, -/obj/machinery/vending/fitness{ - dir = 1 - }, /obj/effect/floor_decal/corner/paleblue{ dir = 9 }, /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/obj/structure/table/standard, +/obj/random/medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "akT" = ( @@ -6996,9 +7031,11 @@ /obj/effect/floor_decal/corner/paleblue{ dir = 6 }, -/obj/machinery/vending/coffee{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, +/obj/structure/table/standard, +/obj/random/tetheraid, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/uppersouthstairwell) "akU" = ( @@ -7764,7 +7801,6 @@ "ama" = ( /obj/structure/table/glass, /obj/random/mre, -/obj/random/coin, /obj/random/maintenance/medical, /obj/random/medical, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -15262,8 +15298,8 @@ /turf/simulated/wall, /area/tether/surfacebase/fish_farm) "azt" = ( -/obj/structure/closet/hydrant, -/turf/simulated/wall, +/obj/machinery/vending/fishing, +/turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) "azu" = ( /obj/item/clothing/gloves/boxing/blue, @@ -15569,7 +15605,9 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) "aAd" = ( -/obj/machinery/vending/fishing, +/obj/structure/closet/hydrant{ + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/fish_farm) "aAe" = ( @@ -22945,8 +22983,19 @@ /turf/simulated/floor/tiled/dark, /area/rnd/lockers) "aOs" = ( -/turf/simulated/mineral, -/area/tether/surfacebase/emergency_storage/atmos) +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/effect/landmark/start{ + name = "Scientist" + }, +/obj/machinery/computer/security/telescreen/entertainment{ + desc = "Looks like it's set to Free-Anur-Entertanment, I wonder what else is on?"; + icon_state = "frame"; + pixel_x = 32 + }, +/turf/simulated/floor/wood, +/area/rnd/breakroom) "aOt" = ( /obj/machinery/portable_atmospherics/powered/pump/filled, /turf/simulated/floor/plating, @@ -23585,35 +23634,11 @@ /turf/simulated/floor/wood, /area/rnd/breakroom) "aPP" = ( -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /obj/machinery/light{ dir = 1 }, /turf/simulated/floor/wood, /area/rnd/breakroom) -"aPQ" = ( -/obj/machinery/power/apc{ - dir = 1; - name = "north bump"; - pixel_y = 24 - }, -/obj/structure/cable/green{ - icon_state = "0-8" - }, -/turf/simulated/floor/wood, -/area/rnd/breakroom) -"aPR" = ( -/obj/machinery/computer/security/telescreen/entertainment{ - desc = "Looks like it's set to Free-Anur-Entertanment, I wonder what else is on?"; - icon_state = "frame"; - pixel_y = 32 - }, -/turf/simulated/floor/wood, -/area/rnd/breakroom) "aPS" = ( /obj/machinery/alarm{ dir = 8; @@ -23882,39 +23907,10 @@ }, /turf/simulated/floor/wood, /area/rnd/breakroom) -"aQC" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/rnd/breakroom) -"aQD" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/wood, -/area/rnd/breakroom) "aQE" = ( /obj/structure/bed/chair{ dir = 4 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, /obj/effect/landmark/start{ name = "Roboticist" }, @@ -24770,6 +24766,46 @@ /obj/random/maintenance/clean, /turf/simulated/floor, /area/maintenance/lower/south) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"aSr" = ( +/obj/machinery/door/airlock{ + id_tag = "bathroomlock7"; + name = "Restroom" + }, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/medical/uppersouthstairwell) +"aSs" = ( +/obj/structure/toilet, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/button/remote/airlock{ + id = "bathroomlock9"; + name = "Surface Security Toilet Lock"; + pixel_x = -20; + pixel_y = -10; + specialfunctions = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/security/brig/bathroom) +======= +"aSs" = ( +/obj/structure/toilet, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/machinery/button/remote/airlock{ + id = "bathroomlock9"; + name = "Surface Security Toilet Lock"; + pixel_x = -20; + pixel_y = -10; + specialfunctions = 4 + }, +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/security/brig/bathroom) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "aSt" = ( /obj/structure/cable/green{ icon_state = "0-4" @@ -25244,6 +25280,15 @@ /obj/machinery/camera/network/research{ dir = 1 }, +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -28 + }, +/obj/structure/cable/green{ + d2 = 4; + icon_state = "0-4" + }, /turf/simulated/floor/wood, /area/rnd/breakroom) "aTx" = ( @@ -25254,6 +25299,11 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, /turf/simulated/floor/wood, /area/rnd/breakroom) "aTy" = ( @@ -25634,53 +25684,11 @@ /obj/structure/bookcase/manuals/research_and_development, /turf/simulated/floor/wood, /area/rnd/breakroom) -"aUp" = ( -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/machinery/vending/cigarette{ - dir = 1 - }, -/turf/simulated/floor/tiled/monotile, -/area/rnd/breakroom) "aUq" = ( -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ +/obj/machinery/camera/network/research{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/machinery/vending/coffee{ - dir = 1 - }, -/turf/simulated/floor/tiled/monotile, -/area/rnd/breakroom) -"aUr" = ( -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/obj/machinery/vending/weeb{ - dir = 1 - }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/wood, /area/rnd/breakroom) "aUs" = ( /obj/effect/floor_decal/borderfloor{ @@ -43969,9 +43977,9 @@ ann aux ahn ajE -awD -awD -awD +aAA +aAA +aAA awD awY awY @@ -44002,7 +44010,7 @@ aNz aOp aPb aPM -aQC +aRn aRn aRO aSC @@ -44112,9 +44120,9 @@ auy auA ajE aAA -awD aAA -awD +aAA +aAA awD awY aAa @@ -44144,7 +44152,7 @@ aNA aOq aMo aPN -aQD +aRm aRm aPN aSD @@ -44257,7 +44265,7 @@ aAA axe aAA aAA -awD +ajE azs aAb aAx @@ -44286,7 +44294,7 @@ aNB aOr aMo aPO -aQD +aRm aRm aPN aSE @@ -44399,7 +44407,7 @@ aAA aAA aAA aod -aAA +ajE azt aAc aAy @@ -44541,7 +44549,7 @@ anV aAA aAA aAA -awD +ajE azs aAd aAz @@ -44567,15 +44575,15 @@ aJO aJO aJO aNC -aOs -aPc -aPQ +aND +ajK +aRm aQF aQF aQF aQF aRm -aUp +aRm aPJ aYd aWH @@ -44709,9 +44717,9 @@ aKo aKo aJO aNC -aOs -aPc -aPR +aND +ajL +aRm aQF aQF aQF @@ -44851,15 +44859,15 @@ aKo aKo aJO aNC -aOs -aPc +aND +ajM aPS aQG aRp -aQG +aOs aQG aTC -aUr +aRm aQH aVQ aWJ @@ -45134,7 +45142,7 @@ aKo aKo aKo aJO -aND +aNC aOt asQ aPT @@ -45276,7 +45284,7 @@ aKo aKo aMr aJO -aND +aNC aso asR atc @@ -47070,7 +47078,7 @@ aab aab abN acc -acs +aiV aiV adr adZ @@ -50072,11 +50080,25 @@ aar aar aiK aiK +<<<<<<< HEAD akH akR akR akR akR +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aSr +aiK +aiK +aiK +aiK +======= +aiK +aiK +aiK +aiK +aiK +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR aiK auX asV @@ -50212,7 +50234,7 @@ ajR aar abF aer -ajK +aiK akA akI akS @@ -50354,9 +50376,9 @@ ajS aar abF aer -ajL +aiK akB -akJ +acs akT akW akJ @@ -50496,7 +50518,7 @@ akE aar abH agP -ajM +aiK akC akK akJ @@ -51908,7 +51930,7 @@ abn adt adt abn -aab +abn abn abn bgU @@ -52045,12 +52067,12 @@ adt aab aab aab -aab -aab -aab -aab -aab -aab +abn +abn +abn +abn +abn +abn abn abn bgU @@ -52188,12 +52210,12 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab +aeG +aeG +aeG +abn +abn +abn abn bgU bhI diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index 5f8f2020ec..66c825f51a 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -127785,21 +127785,19 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "aak" = ( -/obj/machinery/vending/snack{ - dir = 1 - }, /obj/effect/floor_decal/borderfloor{ dir = 10 }, /obj/effect/floor_decal/corner/red/border{ dir = 10 }, +/obj/machinery/alarm{ + dir = 1; + pixel_y = -22 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "aal" = ( -/obj/machinery/vending/cola{ - dir = 1 - }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, /obj/machinery/camera/network/security{ @@ -127808,9 +127806,6 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "aam" = ( -/obj/machinery/vending/coffee{ - dir = 1 - }, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/red/border, /obj/machinery/light, @@ -130040,9 +130035,7 @@ aaa /obj/effect/floor_decal/corner/paleblue/bordercorner2{ dir = 10 }, -/obj/machinery/vending/medical{ - dir = 4 - }, +/obj/machinery/vending/medical, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) "adx" = ( @@ -131702,16 +131695,16 @@ aaa /turf/simulated/wall/r_wall, /area/rnd/xenobiology/xenoflora_storage) "afT" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/grass, /area/hydroponics) "afU" = ( @@ -132336,11 +132329,23 @@ aaa /obj/machinery/light{ dir = 8 }, -/turf/simulated/floor/carpet/blue, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 9 + }, +/turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "agS" = ( -/obj/structure/bed/chair, -/turf/simulated/floor/carpet/blue, +/obj/machinery/vending/snack, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "agT" = ( /obj/structure/table/reinforced, @@ -133346,27 +133351,14 @@ aaa /turf/simulated/wall/r_wall, /area/crew_quarters/panic_shelter) "aip" = ( -/obj/machinery/vending/snack{ +/obj/structure/bed/chair{ dir = 4 }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 10 +/obj/effect/landmark/start{ + name = "Security Officer" }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, -/area/tether/surfacebase/surface_three_hall) +/turf/simulated/floor/carpet/blue, +/area/tether/surfacebase/security/breakroom) "aiq" = ( /obj/machinery/portable_atmospherics/hydroponics/soil, /obj/machinery/camera/network/civilian, @@ -134538,26 +134530,16 @@ aaa /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "akl" = ( -/obj/machinery/vending/cola{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey{ +/obj/effect/floor_decal/borderfloor{ dir = 10 }, -/obj/effect/floor_decal/corner/lightgrey{ +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 10 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, -/obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals9{ - dir = 8 - }, -/turf/simulated/floor/tiled/monotile, +/turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "akm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -135991,13 +135973,11 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "amY" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/smartfridge{ - req_access = list(28) +/obj/structure/bed/chair{ + dir = 8 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/turf/simulated/floor/carpet/blue, +/area/tether/surfacebase/security/breakroom) "amZ" = ( /obj/machinery/atmospherics/portables_connector{ dir = 1 @@ -136406,10 +136386,13 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "anN" = ( +/obj/structure/bed/chair/wood{ + dir = 1 + }, /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/structure/bed/chair/wood{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 1 }, /turf/simulated/floor/grass, @@ -136964,6 +136947,7 @@ aaa /turf/simulated/floor/tiled, /area/rnd/research/testingrange) "aoM" = ( +<<<<<<< HEAD /obj/machinery/power/apc{ dir = 1; name = "north bump"; @@ -136973,6 +136957,21 @@ aaa d2 = 2; icon_state = "0-2" }, +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + nightshift_setting = 2; + pixel_y = 24 + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +======= +/obj/machinery/seed_extractor, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /turf/simulated/floor/grass, /area/hydroponics) "aoN" = ( @@ -137227,9 +137226,12 @@ aaa /turf/simulated/floor/tiled/techfloor, /area/vacant/vacant_shop) "aph" = ( +/obj/machinery/requests_console{ + pixel_x = 32; + pixel_y = -32 + }, /obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" + dir = 8 }, /obj/structure/cable/green{ d1 = 4; @@ -137242,19 +137244,21 @@ aaa /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/light_switch{ - dir = 4; - pixel_x = -28; - pixel_y = 26 +/obj/machinery/button/remote/blast_door{ + id = "bar"; + name = "Bar Shutter Control"; + pixel_x = 24; + pixel_y = 24 }, -/turf/simulated/floor/wood, -/area/tether/surfacebase/bar_backroom) +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "api" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/button/remote/blast_door{ + dir = 4; id = "kitchen2"; name = "Kitchen shutters"; pixel_x = -24 @@ -137264,6 +137268,9 @@ aaa pixel_x = -23; pixel_y = 9 }, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "apj" = ( @@ -137874,9 +137881,16 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aqe" = ( -/obj/machinery/portable_atmospherics/hydroponics/soil, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) "aqf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -138003,15 +138017,16 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "aqo" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/machinery/light{ + dir = 8 }, -/turf/simulated/floor/tiled/eris/cafe, -/area/hydroponics) -"aqp" = ( -/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/grass, /area/hydroponics) +"aqp" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) "aqq" = ( /obj/structure/flora/ausbushes/fullgrass, /turf/simulated/floor/grass, @@ -138763,7 +138778,7 @@ aaa dir = 4 }, /obj/effect/floor_decal/steeldecal/steel_decals9, -/obj/machinery/vending/bepis, +/obj/machinery/vending/cola, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/surface_three_hall) "arF" = ( @@ -138877,11 +138892,25 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "arN" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 6 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 }, -/turf/simulated/floor/tiled/techfloor, -/area/hydroponics) +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/snack, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/surface_three_hall) "arO" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -138924,17 +138953,12 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "arQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, +/obj/machinery/biogenerator, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/grass, /area/hydroponics) "arR" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/grass, /area/hydroponics) "arS" = ( @@ -139090,30 +139114,9 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "asi" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/hydroponics) -"asj" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor, -/obj/structure/sign/botany, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/structure/window/reinforced, -/turf/simulated/floor/plating, +/obj/machinery/vending/hydronutrients, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/grass, /area/hydroponics) "ask" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -139179,14 +139182,9 @@ aaa /turf/simulated/floor/grass, /area/hydroponics) "asq" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/alarm{ dir = 4; - icon_state = "pipe-c" + pixel_x = -22 }, /turf/simulated/floor/grass, /area/hydroponics) @@ -139257,19 +139255,6 @@ aaa }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"asx" = ( -/obj/machinery/power/apc{ - cell_type = /obj/item/weapon/cell/super; - dir = 1; - name = "north bump"; - pixel_y = 24 - }, -/obj/structure/cable/green{ - icon_state = "0-2" - }, -/obj/structure/flora/ausbushes/ppflowers, -/turf/simulated/floor/grass, -/area/hydroponics/cafegarden) "asy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -139309,8 +139294,16 @@ aaa /area/tether/surfacebase/medical/uppersouthstairwell) "asB" = ( /obj/effect/floor_decal/spline/plain{ - dir = 1 + dir = 9 }, +/obj/structure/sign/securearea{ + desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'"; + icon_state = "monkey_painting"; + name = "Mr. Deempisi portrait"; + pixel_x = 4; + pixel_y = 28 + }, +/obj/machinery/camera/network/civilian, /turf/simulated/floor/lino, /area/crew_quarters/bar) "asC" = ( @@ -139400,11 +139393,25 @@ aaa /turf/simulated/floor/grass, /area/hydroponics) "asI" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/flora/ausbushes/ppflowers, -/turf/simulated/floor/grass, -/area/hydroponics/cafegarden) +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/cola, +/turf/simulated/floor/tiled/monotile, +/area/tether/surfacebase/surface_three_hall) "asJ" = ( /obj/structure/closet/firecloset, /obj/effect/floor_decal/borderfloor, @@ -139412,16 +139419,9 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "asK" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/cafe, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/grass, /area/hydroponics) "asL" = ( /obj/effect/floor_decal/corner/grey/diagonal, @@ -139429,6 +139429,7 @@ aaa dir = 1 }, /obj/structure/closet/secure_closet/freezer/fridge, +/obj/machinery/camera/network/outside, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "asM" = ( @@ -139450,12 +139451,9 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "asN" = ( -/obj/machinery/alarm{ - pixel_y = 25 - }, /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/grass, -/area/hydroponics/cafegarden) +/area/hydroponics) "asO" = ( /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/ppflowers, @@ -139468,13 +139466,13 @@ aaa /turf/simulated/floor/grass, /area/hydroponics) "asP" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 4 +/obj/effect/floor_decal/borderfloor/corner{ + dir = 8 }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 +/obj/effect/floor_decal/corner/lime/bordercorner{ + dir = 8 }, -/turf/simulated/floor/tiled/eris/cafe, +/turf/simulated/floor/grass, /area/hydroponics) "asQ" = ( /obj/structure/disposalpipe/segment{ @@ -139521,7 +139519,8 @@ aaa /area/bridge) "asU" = ( /obj/machinery/door/airlock/maintenance/int{ - name = "Fire/Phoron Shelter" + name = "Fire/Phoron Shelter"; + req_one_access = list(35,28) }, /obj/machinery/door/firedoor, /turf/simulated/floor/tiled/techfloor/grid, @@ -139551,15 +139550,13 @@ aaa dir = 4 }, /turf/simulated/floor/grass, -/area/hydroponics/cafegarden) +/area/hydroponics) "asZ" = ( /obj/machinery/light{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/grass, /area/hydroponics) "ata" = ( @@ -139595,16 +139592,20 @@ aaa /turf/simulated/floor/tiled/steel_dirty/virgo3b, /area/tether/surfacebase/outside/outside3) "ate" = ( -/turf/simulated/floor/tiled/eris/cafe, +/obj/machinery/firealarm{ + dir = 4; + pixel_x = -30 + }, +/obj/structure/sink{ + dir = 8; + pixel_x = -12 + }, +/turf/simulated/floor/grass, /area/hydroponics) "atf" = ( -/obj/structure/table/standard, -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/grass, +/area/hydroponics) "atg" = ( /obj/structure/sink{ dir = 8; @@ -139614,15 +139615,20 @@ aaa /turf/simulated/floor/grass, /area/hydroponics) "ath" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/vending/hydronutrients{ +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ dir = 8 }, /turf/simulated/floor/grass, /area/hydroponics) "ati" = ( /obj/structure/flora/ausbushes/pointybush, +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "atj" = ( @@ -139635,23 +139641,24 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "atk" = ( -/obj/machinery/light{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" }, -/obj/machinery/biogenerator, /turf/simulated/floor/grass, /area/hydroponics) "atl" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, /obj/machinery/door/firedoor, -/turf/simulated/floor/plating, +/obj/structure/table/reinforced, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/door/blast/gate/thin{ + dir = 8; + id = "kitchenhallway"; + layer = 3.3 + }, +/turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atm" = ( /obj/effect/floor_decal/borderfloor/corner{ @@ -139663,22 +139670,17 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "atn" = ( -/obj/structure/extinguisher_cabinet{ - dir = 8; - pixel_x = 30 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/smartfridge/drying_rack{ +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +"ato" = ( +/obj/structure/disposalpipe/segment{ dir = 8 }, -/turf/simulated/floor/grass, -/area/hydroponics) -"ato" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/obj/machinery/smartfridge/drinks, /turf/simulated/floor/lino, /area/crew_quarters/bar) "atp" = ( @@ -139740,13 +139742,10 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "atw" = ( -/obj/machinery/camera/network/outside{ - dir = 5 - }, -/obj/structure/table/standard, -/obj/effect/floor_decal/corner/grey/diagonal, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/obj/structure/closet/crate/plastic, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/hydroponics) "atx" = ( /obj/effect/floor_decal/corner/mauve{ dir = 6 @@ -139757,10 +139756,8 @@ aaa /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/window/reinforced{ + dir = 1 }, /turf/simulated/floor/grass, /area/hydroponics/cafegarden) @@ -139892,10 +139889,11 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atN" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 6 +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/vending/boozeomat, /turf/simulated/floor/lino, /area/crew_quarters/bar) "atO" = ( @@ -139914,16 +139912,9 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "atP" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/closet/secure_closet/freezer/kitchen, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/obj/machinery/portable_atmospherics/hydroponics/soil, +/turf/simulated/floor/grass, +/area/hydroponics) "atQ" = ( /obj/structure/cable/green{ d1 = 1; @@ -140162,6 +140153,13 @@ aaa /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, +/obj/machinery/door/window/westright{ + dir = 1; + req_one_access = list(35,28) + }, +/obj/machinery/door/firedoor/glass/hidden/steel{ + dir = 1 + }, /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "aun" = ( @@ -140504,14 +140502,15 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "auO" = ( -/obj/structure/bed/chair/wood, -/obj/effect/floor_decal/borderfloor{ +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/light{ dir = 4 }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/cafe, +/turf/simulated/floor/grass, /area/hydroponics) "auP" = ( /obj/structure/bed/chair/office/light, @@ -140521,14 +140520,14 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "auQ" = ( -/obj/structure/table/woodentable, -/obj/effect/floor_decal/borderfloor{ - dir = 4 +/obj/structure/bed/chair/wood{ + dir = 1 }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/turf/simulated/floor/tiled/eris/cafe, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/grass, /area/hydroponics) "auR" = ( /obj/structure/grille, @@ -140566,8 +140565,7 @@ aaa /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/grass, /area/hydroponics) "auV" = ( @@ -140669,10 +140667,8 @@ aaa icon_state = "frame"; pixel_y = 32 }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/grass, /area/hydroponics) "avh" = ( @@ -140794,12 +140790,8 @@ aaa /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/grass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled, /area/hydroponics) "avr" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -140869,12 +140861,20 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "avA" = ( -/obj/item/weapon/stool/padded, -/obj/effect/floor_decal/corner/beige{ - dir = 6 +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" }, +<<<<<<< HEAD /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/turf/simulated/floor/tiled/white, +/area/crew_quarters/bar) +======= +/turf/simulated/floor/tiled, +/area/hydroponics) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "avB" = ( /obj/structure/table/glass, /obj/machinery/reagentgrinder, @@ -140893,9 +140893,21 @@ aaa /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, /obj/machinery/button/remote/blast_door{ + dir = 4; id = "kitchen"; name = "Kitchen shutters"; - pixel_x = -24 + pixel_x = -24; + pixel_y = -3 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "kitchenhallway"; + name = "Kitchen shutters"; + pixel_x = -24; + pixel_y = 8 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -140951,19 +140963,18 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "avJ" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" }, -/obj/machinery/door/window/brigdoor/northleft{ - dir = 8; - name = "Bar"; - req_access = list(25) +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, -/obj/structure/extinguisher_cabinet{ - pixel_y = 32 +/obj/effect/floor_decal/corner/lime/border{ + dir = 8 }, -/turf/simulated/floor/lino, -/area/crew_quarters/bar) +/turf/simulated/floor/grass, +/area/hydroponics) "avK" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -140993,11 +141004,9 @@ aaa /turf/simulated/floor/grass, /area/hydroponics) "avO" = ( -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 - }, -/turf/simulated/floor/tiled/eris/cafe, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/grass, /area/hydroponics) "avP" = ( /obj/structure/disposalpipe/segment{ @@ -141244,15 +141253,14 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/captain) "awm" = ( -/obj/machinery/button/remote/airlock{ - id = "barbackdoor"; - name = "Back Door Locks"; - pixel_x = -29; - pixel_y = 30; - specialfunctions = 4 +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/turf/simulated/floor/wood, -/area/tether/surfacebase/bar_backroom) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/eris/cafe, +/area/hydroponics) "awn" = ( /turf/simulated/wall/r_wall, /area/bridge_hallway) @@ -141285,29 +141293,31 @@ aaa /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "awr" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 +/obj/structure/disposalpipe/segment{ + dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "aws" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/structure/closet/secure_closet/bar, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "awt" = ( -/obj/structure/closet/gmcloset{ - name = "formal wardrobe" +/obj/machinery/button/remote/airlock{ + id = "barbackdoor"; + name = "Back Door Locks"; + pixel_x = -29; + pixel_y = 30; + specialfunctions = 4 }, -/obj/item/glass_jar, -/obj/item/device/retail_scanner/civilian, -/obj/item/device/retail_scanner/civilian, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "awu" = ( @@ -141642,19 +141652,22 @@ aaa /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 }, +/obj/machinery/requests_console{ + dir = 1; + pixel_y = -22 + }, /turf/simulated/floor/grass, /area/hydroponics) "awR" = ( -/obj/structure/bed/chair/wood{ - dir = 1 +/obj/structure/table/glass, +/obj/machinery/door/window/westright{ + req_one_access = list(35,28) }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/cafe, +/turf/simulated/floor/tiled, /area/hydroponics) "awS" = ( /obj/structure/cable/green{ @@ -141676,10 +141689,21 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "awT" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk, -/turf/simulated/floor/wood, -/area/tether/surfacebase/bar_backroom) +/obj/effect/floor_decal/spline/plain{ + dir = 5 + }, +/obj/structure/table/marble, +/obj/machinery/chemical_dispenser/bar_alc/full{ + dir = 8 + }, +/obj/structure/sign/poster{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "awU" = ( /obj/structure/cable/green{ d1 = 1; @@ -141702,15 +141726,6 @@ aaa /obj/machinery/door/airlock/glass, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) -"awV" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/shaker, -/obj/machinery/alarm{ - dir = 8; - pixel_x = 24 - }, -/turf/simulated/floor/wood, -/area/tether/surfacebase/bar_backroom) "awW" = ( /obj/structure/disposalpipe/segment, /obj/machinery/alarm{ @@ -141896,25 +141911,17 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/security/lobby) "axo" = ( -/obj/structure/bed/chair/comfy, -/obj/effect/landmark/start{ - name = "Bartender" +/obj/effect/floor_decal/spline/plain{ + dir = 4 }, -/obj/structure/disposalpipe/segment, -/obj/machinery/firealarm{ - dir = 8; - pixel_x = -24 +/obj/structure/table/marble, +/obj/machinery/chemical_dispenser/bar_soft/full{ + dir = 8 }, -/turf/simulated/floor/wood, -/area/tether/surfacebase/bar_backroom) +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "axp" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/storage/box/beanbags, -/obj/item/weapon/gun/projectile/shotgun/doublebarrel, -/obj/item/weapon/paper{ - info = "This permit signifies that the Bartender is permitted to posess this firearm in the bar, and ONLY the bar. Failure to adhere to this permit will result in confiscation of the weapon and possibly arrest."; - name = "Shotgun permit" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "axq" = ( @@ -141969,12 +141976,17 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "axu" = ( -/obj/structure/table/woodentable, -/obj/machinery/reagentgrinder, +/obj/structure/sink{ + dir = 8; + pixel_x = -12 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "axv" = ( /mob/living/simple_mob/animal/passive/cow, +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "axw" = ( @@ -141999,20 +142011,20 @@ aaa /area/hallway/lower/third_south) "axx" = ( /obj/structure/table/woodentable, -/obj/item/weapon/flame/lighter/zippo, -/obj/item/clothing/head/that{ +/obj/item/weapon/packageWrap, +/obj/item/device/destTagger{ pixel_x = 4; - pixel_y = 6 + pixel_y = 3 }, -/obj/item/weapon/tool/screwdriver, -/obj/item/clothing/mask/smokable/cigarette/cigar/havana, -/obj/item/clothing/mask/smokable/cigarette/cigar/cohiba, +/obj/machinery/light/small, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "axy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/tether/surfacebase/bar_backroom) +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled, +/area/hydroponics) "axz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -142365,22 +142377,31 @@ aaa /turf/simulated/wall/r_wall, /area/vacant/vacant_shop) "axY" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/table/woodentable, +/obj/structure/disposalpipe/segment, +/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask, +/obj/machinery/camera/network/civilian{ + dir = 4 + }, +/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/weapon/book/manual/bar_guide, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "axZ" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 8 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/item/weapon/stool/padded, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 +/obj/machinery/light/floortube{ + dir = 4; + pixel_x = 6 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/lino, -/area/crew_quarters/bar) +/turf/simulated/floor/tiled/dark, +/area/bridge_hallway) "aya" = ( /obj/machinery/space_heater, /turf/simulated/floor/tiled/techmaint, @@ -142420,6 +142441,7 @@ aaa /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "ayf" = ( +<<<<<<< HEAD /obj/structure/table/marble, /obj/machinery/door/blast/shutters{ dir = 8; @@ -142429,12 +142451,37 @@ aaa }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/table/marble, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 +======= +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +<<<<<<< HEAD +/turf/simulated/floor/lino, +/area/crew_quarters/bar) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/machinery/door/blast/gate/thin{ + dir = 8; + id = "bar"; + layer = 3.3 }, /turf/simulated/floor/lino, /area/crew_quarters/bar) +======= +/obj/effect/floor_decal/corner/lime/border{ + dir = 8 + }, +/turf/simulated/floor/grass, +/area/hydroponics) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "ayg" = ( /turf/simulated/wall/r_wall, /area/tether/surfacebase/botanystorage) @@ -142680,6 +142727,10 @@ aaa /area/tether/surfacebase/barbackmaintenance) "ayE" = ( /obj/structure/closet/firecloset, +/obj/machinery/light/floortube{ + dir = 8; + pixel_x = -6 + }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/barbackmaintenance) "ayF" = ( @@ -142739,18 +142790,18 @@ aaa /turf/simulated/floor/carpet, /area/library) "ayJ" = ( -/obj/structure/sink{ - pixel_y = 20 +/obj/effect/floor_decal/spline/plain{ + dir = 6 }, -/obj/structure/mirror{ - dir = 4; - pixel_y = 32 +/obj/item/weapon/stool/padded, +/obj/structure/cable/green{ + icon_state = "0-8" }, -/obj/machinery/light/small{ - dir = 8 +/obj/machinery/light{ + dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "ayK" = ( /obj/machinery/door/airlock/glass_research{ name = "Xenoflora Research"; @@ -142760,8 +142811,11 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora) "ayL" = ( -/obj/structure/bed/chair/wood, -/turf/simulated/floor/tiled/eris/cafe, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled, /area/hydroponics) "ayM" = ( /turf/simulated/wall, @@ -143229,24 +143283,25 @@ aaa /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) "azs" = ( -/obj/structure/cable/green{ - icon_state = "2-4" +/obj/effect/floor_decal/spline/plain{ + dir = 8 }, +/obj/item/weapon/stool/padded, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 6 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 6 }, /turf/simulated/floor/lino, /area/crew_quarters/bar) "azt" = ( -/obj/structure/sink{ - dir = 8; - pixel_x = -12 +/obj/effect/floor_decal/spline/plain{ + dir = 6 }, -/turf/simulated/floor/wood, -/area/tether/surfacebase/bar_backroom) +/obj/machinery/vending/boozeomat, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "azu" = ( /obj/structure/medical_stand, /obj/effect/floor_decal/borderfloorwhite{ @@ -143293,21 +143348,18 @@ aaa /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "azx" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, +/obj/structure/table/marble, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/door/blast/gate/thin{ + dir = 8; + id = "bar"; + layer = 3.3 + }, /turf/simulated/floor/lino, /area/crew_quarters/bar) "azy" = ( @@ -143725,20 +143777,15 @@ aaa /turf/simulated/floor/plating, /area/tether/surfacebase/servicebackroom) "aAc" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 10 - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, -/turf/simulated/floor/lino, +/turf/simulated/floor/wood, /area/crew_quarters/bar) "aAd" = ( /obj/structure/cable/green{ @@ -143755,19 +143802,12 @@ aaa /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aAe" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/obj/machinery/hologram/holopad, +/turf/simulated/floor/tiled, +/area/hydroponics) "aAf" = ( /obj/structure/cable/green{ d1 = 2; @@ -143826,16 +143866,8 @@ aaa /turf/simulated/floor/wood, /area/library) "aAj" = ( -/obj/machinery/vending/wallmed1/public{ - pixel_x = -28 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 +/obj/machinery/light/small{ + dir = 8 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) @@ -143855,9 +143887,6 @@ aaa /obj/random/maintenance/clean, /obj/random/maintenance/clean, /obj/structure/table/rack/steel, -/obj/machinery/light/small{ - dir = 8 - }, /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/barbackmaintenance) "aAm" = ( @@ -144534,9 +144563,10 @@ aaa /turf/simulated/floor/wood, /area/crew_quarters/captain) "aBp" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/corner/lime/border, -/turf/simulated/floor/grass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "aBq" = ( /obj/item/device/radio/intercom{ @@ -144703,9 +144733,6 @@ aaa /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "aBF" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/effect/floor_decal/borderfloor{ dir = 4 }, @@ -144715,6 +144742,9 @@ aaa /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aBG" = ( @@ -145086,42 +145116,38 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aCh" = ( -/obj/machinery/door/airlock{ - name = "Service"; - req_one_access = list(35,28) - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/eris/cafe, +/area/hydroponics) "aCi" = ( -/obj/effect/floor_decal/corner/beige{ - dir = 10 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/obj/effect/floor_decal/corner/beige{ - dir = 4 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 6 - }, -/obj/machinery/light{ +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +<<<<<<< HEAD /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"aCj" = ( -/obj/effect/floor_decal/borderfloor/corner{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 8 - }, -/turf/simulated/floor/grass, +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/turf/simulated/floor/tiled/white, +/area/crew_quarters/bar) +======= +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"aCj" = ( +/obj/machinery/power/apc{ + name = "south bump"; + nightshift_setting = 2; + pixel_y = -32 + }, +/obj/structure/cable/green, +/turf/simulated/floor/grass, +/area/hydroponics/cafegarden) "aCk" = ( /obj/structure/table/woodentable, /obj/item/weapon/storage/box/sinpockets, @@ -145129,10 +145155,6 @@ aaa /obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) -"aCl" = ( -/obj/structure/table/rack/steel, -/turf/simulated/floor/tiled, -/area/hydroponics) "aCm" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -145529,7 +145551,6 @@ aaa /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) "aCW" = ( -/obj/machinery/vending/hydronutrients, /obj/effect/floor_decal/borderfloor{ dir = 9 }, @@ -145545,15 +145566,12 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aCX" = ( -/obj/machinery/seed_storage/garden, -/obj/effect/floor_decal/borderfloor{ - dir = 1 +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 1 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/turf/simulated/floor/grass, +/area/hydroponics) "aCY" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -145816,14 +145834,38 @@ aaa /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/public_garden_three) "aDz" = ( +<<<<<<< HEAD /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/machinery/door/firedoor, /obj/structure/window/reinforced{ dir = 4 +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/bed/chair/wood{ + dir = 1 +======= +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR }, +<<<<<<< HEAD /turf/simulated/floor/plating, /area/tether/surfacebase/public_garden_three) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +======= +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 8 + }, +/obj/effect/floor_decal/corner/beige/border, +/obj/machinery/camera/network/tether{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/surface_three_hall) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "aDA" = ( /obj/effect/floor_decal/borderfloor{ dir = 10 @@ -145938,7 +145980,9 @@ aaa /turf/simulated/open, /area/tether/surfacebase/public_garden_three) "aDI" = ( -/obj/machinery/camera/network/civilian, +/obj/structure/sink{ + pixel_y = 24 + }, /turf/simulated/floor/grass, /area/hydroponics) "aDJ" = ( @@ -145971,21 +146015,37 @@ aaa /turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "aDM" = ( -/obj/machinery/seed_extractor, /obj/effect/floor_decal/borderfloor{ dir = 1 }, /obj/effect/floor_decal/corner/lime/border{ dir = 1 }, +/obj/machinery/vending/hydronutrients, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) +<<<<<<< HEAD "aDN" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"aDN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) +======= +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "aDO" = ( +<<<<<<< HEAD /obj/machinery/alarm{ dir = 8; pixel_x = 25 @@ -145995,11 +146055,48 @@ aaa }, /obj/effect/floor_decal/corner/lime/border{ dir = 6 +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) +"aDP" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 6 }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 6 +======= +/obj/structure/bed/chair/wood, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +"aDP" = ( +/obj/structure/flora/ausbushes/ywflowers{ + pixel_x = -5; + pixel_y = -10 +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR + }, +<<<<<<< HEAD /obj/machinery/camera/network/civilian{ dir = 1 }, /turf/simulated/floor/tiled, +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/machinery/light{ + dir = 4 + }, +/obj/item/device/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = 24 + }, +/turf/simulated/floor/tiled, +======= +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/grass, +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /area/tether/surfacebase/public_garden_three) "aDP" = ( /obj/structure/grille, @@ -146028,6 +146125,7 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aDS" = ( +<<<<<<< HEAD /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/machinery/door/firedoor, @@ -146036,6 +146134,13 @@ aaa }, /obj/structure/window/reinforced, /turf/simulated/floor/plating, +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/bed/chair/wood, +/turf/simulated/floor/grass, +======= +/obj/structure/table/woodentable, +/turf/simulated/floor/grass, +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /area/tether/surfacebase/public_garden_three) "aDT" = ( /obj/machinery/light, @@ -146243,19 +146348,19 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aEl" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ dir = 8 }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/obj/structure/table/reinforced, +/obj/machinery/door/blast/gate/thin{ + dir = 8; + id = "kitchenhallway"; + layer = 3.3 + }, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "aEm" = ( /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) @@ -146420,8 +146525,9 @@ aaa /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/surface_three_hall) "aEB" = ( -/obj/structure/sink{ - pixel_y = 24 +/obj/machinery/smartfridge/drying_rack, +/obj/machinery/light{ + dir = 1 }, /turf/simulated/floor/grass, /area/hydroponics) @@ -146608,11 +146714,10 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aET" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/obj/item/weapon/stool/padded, -/turf/simulated/floor/lino, +/turf/simulated/floor/wood, /area/crew_quarters/bar) "aEU" = ( /turf/simulated/floor/carpet, @@ -146626,26 +146731,8 @@ aaa }, /turf/simulated/floor/carpet, /area/library) -"aEW" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/obj/structure/table/marble, -/obj/machinery/chemical_dispenser/bar_soft/full{ - dir = 8 - }, -/obj/machinery/light{ - dir = 4 - }, -/turf/simulated/floor/lino, -/area/crew_quarters/bar) "aEX" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/grass, /area/hydroponics) "aEY" = ( @@ -146654,6 +146741,12 @@ aaa d2 = 2; icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "aEZ" = ( @@ -146966,12 +147059,12 @@ aaa /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) "aFz" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/flora/ausbushes/pointybush, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, /turf/simulated/floor/grass, /area/hydroponics/cafegarden) "aFA" = ( @@ -147097,14 +147190,13 @@ aaa /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_north_airlock) "aFK" = ( -/obj/structure/bed/chair/wood, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 + dir = 8 }, -/turf/simulated/floor/tiled/eris/cafe, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, /area/hydroponics) "aFL" = ( /obj/structure/window/reinforced/full, @@ -147143,10 +147235,6 @@ aaa /turf/simulated/floor/tiled, /area/rnd/research/testingrange) "aFO" = ( -/obj/machinery/door/airlock{ - name = "Service"; - req_one_access = list(35,28) - }, /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -147156,24 +147244,23 @@ aaa /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/grass, +/area/hydroponics) "aFP" = ( /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/light{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/turf/simulated/floor/grass, +/area/hydroponics) "aFQ" = ( /obj/structure/cable/green{ d1 = 4; @@ -147224,14 +147311,17 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aFS" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 8 +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "aFT" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/mauve/border, @@ -147330,10 +147420,12 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aGb" = ( -/obj/machinery/camera/network/civilian{ - dir = 4 +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/obj/machinery/light{ + dir = 8 }, -/turf/simulated/floor/tiled/eris/cafe, +/turf/simulated/floor/grass, /area/hydroponics) "aGc" = ( /obj/effect/floor_decal/borderfloor/corner{ @@ -147354,21 +147446,21 @@ aaa /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/turf/simulated/floor/grass, +/area/hydroponics) +"aGe" = ( /obj/machinery/requests_console{ - pixel_y = 30 + pixel_x = -30 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/closet/crate, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) -"aGe" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) "aGf" = ( /obj/machinery/status_display{ pixel_x = 32 @@ -147399,12 +147491,11 @@ aaa /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/machinery/camera/network/civilian, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/turf/simulated/floor/grass, +/area/hydroponics) "aGh" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/freezer{ @@ -147435,7 +147526,6 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aGj" = ( -/obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -147531,19 +147621,9 @@ aaa /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_north_airlock) "aGq" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /obj/machinery/light{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aGr" = ( @@ -147578,13 +147658,15 @@ aaa /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_south_airlock) "aGt" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 8; - icon_state = "1-8" +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/structure/table/reinforced, +/obj/machinery/door/blast/gate/thin{ + dir = 2; + id = "kitchen"; + layer = 3.3 }, -/turf/simulated/floor/grass, -/area/hydroponics/cafegarden) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "aGu" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/steeldecal/steel_decals7{ @@ -147632,15 +147714,26 @@ aaa /turf/simulated/floor/wood, /area/library) "aGx" = ( -/obj/structure/sink{ - pixel_y = 20 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 }, -/obj/structure/mirror{ - dir = 4; - pixel_y = 32 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/snack, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled/monotile, +/area/crew_quarters/bar) "aGy" = ( /obj/structure/railing, /obj/structure/grille, @@ -147749,35 +147842,29 @@ aaa /area/hallway/lower/third_south) "aGG" = ( /obj/machinery/vending/cigarette, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) -"aGH" = ( -/obj/structure/table/woodentable, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/simulated/floor/grass, -/area/hydroponics) "aGI" = ( /obj/machinery/vending/cola/soft, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aGJ" = ( -/obj/machinery/portable_atmospherics/hydroponics, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/area/tether/surfacebase/servicebackroom) "aGK" = ( /turf/simulated/wall, /area/crew_quarters/barrestroom) @@ -147990,6 +148077,9 @@ aaa /area/library) "aHe" = ( /obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "aHf" = ( @@ -148085,6 +148175,9 @@ aaa "aHl" = ( /obj/structure/table/woodentable, /obj/item/weapon/flame/candle, +/obj/machinery/light/floortube{ + pixel_y = -6 + }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "aHm" = ( @@ -148101,16 +148194,15 @@ aaa dir = 8 }, /obj/effect/floor_decal/borderfloor{ - dir = 4 + dir = 8 }, /obj/effect/floor_decal/corner/lime/border{ - dir = 4 + dir = 8 }, -/turf/simulated/floor/tiled/eris/cafe, +/turf/simulated/floor/grass, /area/hydroponics) "aHo" = ( /obj/machinery/light, -/obj/machinery/portable_atmospherics/hydroponics, /obj/machinery/camera/network/civilian{ dir = 1 }, @@ -148119,16 +148211,12 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aHp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 +/obj/item/weapon/stool/padded, +/obj/effect/floor_decal/corner/beige{ + dir = 6 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/bar) "aHq" = ( /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) @@ -148170,34 +148258,69 @@ aaa }, /area/crew_quarters/bar) "aHv" = ( +/obj/machinery/door/airlock{ + name = "Bar Backroom"; + req_access = list(25) + }, +/obj/effect/floor_decal/spline/plain{ + dir = 5 + }, +/obj/effect/floor_decal/spline/plain, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/wood, +/obj/machinery/door/firedoor, +/turf/simulated/floor/lino, /area/tether/surfacebase/bar_backroom) "aHw" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) -"aHx" = ( -/obj/structure/disposalpipe/segment, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/door/airlock{ + name = "Service"; + req_one_access = list(35,28) + }, +/turf/simulated/floor/tiled, +/area/hydroponics) +"aHx" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aHy" = ( @@ -148230,6 +148353,12 @@ aaa d2 = 8; 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, /area/tether/surfacebase/servicebackroom) "aHB" = ( @@ -148644,6 +148773,7 @@ aaa /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/crew_quarters/bar) "aIi" = ( @@ -148661,25 +148791,40 @@ aaa d2 = 8; icon_state = "2-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aIk" = ( -/obj/machinery/portable_atmospherics/hydroponics, -/obj/effect/floor_decal/borderfloor/corner{ +/obj/structure/table/reinforced, +/obj/machinery/door/blast/shutters{ + dir = 8; + id = "kitchen"; + layer = 3.3; + name = "Kitchen Shutters" + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/chemical_dispenser/bar_soft/full{ dir = 8 }, -/obj/effect/floor_decal/corner/lime/bordercorner{ - dir = 8 +/obj/effect/floor_decal/spline/plain{ + dir = 4 }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/botanystorage) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "aIl" = ( /obj/item/weapon/stool/padded, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aIm" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/item/weapon/stool/padded, /turf/simulated/floor/lino, /area/crew_quarters/bar) "aIn" = ( @@ -148689,14 +148834,11 @@ aaa /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aIo" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/obj/item/weapon/stool/padded, /obj/structure/disposalpipe/segment{ dir = 8 }, -/turf/simulated/floor/lino, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/wood, /area/crew_quarters/bar) "aIp" = ( /obj/structure/flora/pottedplant/unusual, @@ -148935,6 +149077,7 @@ aaa /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aIJ" = ( +<<<<<<< HEAD /obj/structure/table/marble, /obj/machinery/door/blast/shutters{ dir = 8; @@ -148946,8 +149089,29 @@ aaa dir = 8 }, /turf/simulated/floor/lino, +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/table/marble, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/door/blast/gate/thin{ + dir = 8; + id = "bar"; + layer = 3.3 + }, +/turf/simulated/floor/lino, +======= +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/wood, +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /area/crew_quarters/bar) "aIK" = ( +/obj/effect/floor_decal/spline/plain{ + dir = 8 + }, +/obj/item/weapon/stool/padded, /obj/structure/disposalpipe/segment{ dir = 8 }, @@ -148974,15 +149138,36 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) "aIM" = ( +<<<<<<< HEAD /obj/structure/table/marble, /obj/machinery/door/blast/shutters{ +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/table/marble, +/obj/machinery/door/blast/gate/thin{ +======= +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 8 + }, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/effect/floor_decal/steeldecal/steel_decals4{ + dir = 5 + }, +/obj/machinery/computer/guestpass{ +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR dir = 8; +<<<<<<< HEAD id = "bar"; layer = 3.3; name = "Bar Shutters" +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR + id = "bar"; + layer = 3.3 +======= + pixel_x = 21 +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR }, -/turf/simulated/floor/lino, -/area/crew_quarters/bar) +/turf/simulated/floor/tiled/white, +/area/tether/surfacebase/servicebackroom) "aIN" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ @@ -149002,22 +149187,24 @@ aaa /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aIP" = ( +/obj/structure/table/marble, /obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" + dir = 8 + }, +/obj/machinery/door/blast/gate/thin{ + dir = 8; + id = "bar"; + layer = 3.3 }, /turf/simulated/floor/lino, /area/crew_quarters/bar) "aIQ" = ( -/obj/structure/bed/chair/comfy{ - dir = 1 +/obj/effect/floor_decal/spline/plain{ + dir = 4 }, -/obj/effect/landmark/start{ - name = "Bartender" - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/wood, -/area/tether/surfacebase/bar_backroom) +/obj/machinery/smartfridge/drinks, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "aIR" = ( /obj/structure/railing{ dir = 1 @@ -149025,8 +149212,8 @@ aaa /turf/simulated/open, /area/tether/surfacebase/medical/uppersouthstairwell) "aIS" = ( -/obj/machinery/vending/cigarette{ - dir = 1 +/obj/machinery/newscaster{ + pixel_y = -28 }, /turf/simulated/floor/wood, /area/crew_quarters/bar) @@ -149037,10 +149224,12 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aIU" = ( -/obj/machinery/vending/snack{ - dir = 1 +/obj/effect/floor_decal/spline/plain, +/obj/effect/floor_decal/corner/beige{ + dir = 10 }, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/spline/plain, +/turf/simulated/floor/tiled/white, /area/crew_quarters/bar) "aIV" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -149337,20 +149526,10 @@ aaa /obj/structure/disposalpipe/segment{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/grass, +/area/hydroponics) "aJv" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -149475,20 +149654,26 @@ aaa /turf/simulated/floor/tiled, /area/rnd/research/testingrange) "aJJ" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 10 }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 2 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/obj/machinery/camera/network/civilian{ + dir = 9 + }, +/turf/simulated/floor/grass, +/area/hydroponics) "aJK" = ( /obj/effect/floor_decal/spline/plain{ dir = 4 @@ -149599,6 +149784,7 @@ aaa icon_state = "frame"; pixel_x = -64 }, +/obj/machinery/computer/arcade/battle, /turf/simulated/floor/wood, /area/crew_quarters/bar) "aJT" = ( @@ -149618,21 +149804,20 @@ aaa /turf/simulated/floor/bluegrid, /area/rnd/robotics/mechbay) "aJV" = ( -/obj/structure/table/glass, -/obj/structure/window/reinforced{ - dir = 8 +/obj/effect/floor_decal/corner/beige{ + dir = 10 }, -/obj/item/weapon/packageWrap, -/obj/item/device/destTagger{ - pixel_x = 4; - pixel_y = 3 +/obj/effect/floor_decal/corner/beige{ + dir = 4 }, -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/effect/floor_decal/spline/plain{ + dir = 6 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/hydroponics) +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/bar) "aJW" = ( /turf/simulated/wall, /area/rnd/robotics/surgeryroom2) @@ -149708,6 +149893,24 @@ aaa d2 = 2; icon_state = "1-2" }, +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/machinery/door/blast/gate/thin{ + id = "kitchen2"; + layer = 3.3 + }, +======= +/obj/item/weapon/reagent_containers/food/condiment/small/saltshaker{ + pixel_x = -3 + }, +/obj/item/weapon/reagent_containers/food/condiment/small/peppermill{ + pixel_x = 3 + }, +/obj/machinery/door/blast/gate/thin{ + id = "kitchen2"; + layer = 3.3 + }, +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "aKd" = ( @@ -149765,28 +149968,21 @@ aaa /turf/simulated/floor/tiled/dark, /area/rnd/robotics/surgeryroom1) "aKl" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/structure/table/marble, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/window/brigdoor/northleft{ + dir = 2; + name = "Bar"; + req_access = list(25) }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/machinery/door/window/westright{ + dir = 1; + name = "Kitchen"; + req_access = list(28) }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 4 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 9 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "aKm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -149811,7 +150007,6 @@ aaa /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "aKp" = ( -/obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -149832,13 +150027,25 @@ aaa /turf/simulated/floor/wood, /area/crew_quarters/bar) "aKs" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 4 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -28; + pixel_y = 26 }, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) @@ -150185,13 +150392,13 @@ aaa /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/shuttle_pad) "aLb" = ( -/obj/structure/closet/crate, -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/smartfridge{ + req_access = list(28) }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "aLc" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/effect/landmark/start{ @@ -150227,16 +150434,8 @@ aaa /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aLg" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/obj/machinery/camera/network/civilian{ - dir = 1 - }, -/turf/simulated/floor/grass, -/area/hydroponics) +/turf/simulated/wall, +/area/space) "aLh" = ( /obj/machinery/light, /obj/effect/floor_decal/borderfloor, @@ -150482,20 +150681,14 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aLG" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/door/airlock{ + id_tag = "barbackdoor"; + name = "Service"; + req_access = list(25) }, -/obj/machinery/requests_console{ - pixel_x = 32; - pixel_y = -32 - }, -/obj/item/device/radio/intercom{ - pixel_y = -24 - }, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/bar_backroom) "aLH" = ( /obj/structure/disposalpipe/trunk{ dir = 1 @@ -150806,7 +150999,9 @@ aaa dir = 4; pixel_x = 24 }, -/obj/structure/flora/pottedplant/unusual, +/obj/structure/table/wooden_reinforced, +/obj/item/weapon/folder/white, +/obj/item/weapon/folder/red, /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) "aMn" = ( @@ -151709,14 +151904,28 @@ aaa /turf/simulated/wall/r_wall, /area/rnd/outpost/xenobiology/outpost_south_airlock) "aOg" = ( -/obj/structure/extinguisher_cabinet{ - pixel_y = -30 +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/grass, +/area/hydroponics) "aOh" = ( /obj/structure/cable/green, /obj/machinery/power/apc{ @@ -152238,22 +152447,19 @@ aaa /turf/simulated/floor/tiled/dark, /area/bridge) "aPl" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/storage/box/donkpockets, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/vending/bepis, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) "aPm" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/storage/box/donkpockets, +/obj/machinery/vending/fitness, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) "aPn" = ( -/obj/structure/table/woodentable, -/obj/machinery/microwave, /obj/machinery/light{ dir = 1 }, +/obj/machinery/vending/weeb, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) "aPo" = ( @@ -152391,9 +152597,8 @@ aaa /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_autopsy) "aPB" = ( -/obj/machinery/vending/weeb{ - dir = 4 - }, +/obj/structure/table/woodentable, +/obj/machinery/microwave, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) "aPC" = ( @@ -152530,12 +152735,6 @@ aaa /obj/structure/sign/department/xenolab, /turf/simulated/wall, /area/rnd/outpost/xenobiology/outpost_breakroom) -"aPU" = ( -/obj/machinery/vending/fitness{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/rnd/outpost/xenobiology/outpost_breakroom) "aPV" = ( /obj/machinery/light{ dir = 4 @@ -152618,22 +152817,28 @@ aaa /turf/simulated/floor/tiled/dark, /area/rnd/outpost/xenobiology/outpost_main) "aQf" = ( -/obj/structure/sink{ - pixel_y = 20 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 }, -/obj/structure/mirror{ - dir = 4; - pixel_y = 32 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 }, -/obj/machinery/light/small{ +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/cola, +/turf/simulated/floor/tiled/monotile, +/area/crew_quarters/bar) "aQg" = ( -/obj/machinery/vending/bepis{ - dir = 4 - }, +/obj/structure/table/woodentable, +/obj/item/weapon/storage/box/donkpockets, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_breakroom) "aQh" = ( @@ -152929,9 +153134,6 @@ aaa /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) "aQL" = ( -/obj/machinery/vending/coffee{ - dir = 8 - }, /obj/structure/cable/green{ icon_state = "1-2" }, @@ -152940,6 +153142,7 @@ aaa pixel_x = 24 }, /obj/structure/disposalpipe/segment, +/obj/structure/flora/pottedplant/unusual, /turf/simulated/floor/wood, /area/rnd/outpost/xenobiology/outpost_office) "aQM" = ( @@ -153391,13 +153594,14 @@ aaa /turf/simulated/floor/tiled/white, /area/rnd/outpost/xenobiology/outpost_autopsy) "aRJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/green{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/turf/simulated/floor/tiled, +/obj/structure/table/glass, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "aRK" = ( /obj/effect/floor_decal/borderfloorwhite, @@ -153604,6 +153808,9 @@ aaa /area/rnd/outpost/xenobiology/outpost_main) "aSh" = ( /obj/effect/floor_decal/industrial/outline/blue, +/obj/machinery/light{ + dir = 8 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aSi" = ( @@ -153781,17 +153988,25 @@ aaa /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_main) "aSx" = ( -/obj/machinery/light{ - dir = 1 - }, +/obj/machinery/camera/network/civilian, +/obj/machinery/seed_storage/garden, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/grass, /area/hydroponics) "aSy" = ( -/obj/machinery/light{ - dir = 8 +/obj/effect/floor_decal/spline/plain{ + dir = 1 }, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/machinery/door/window/brigdoor/northleft{ + dir = 8; + name = "Bar"; + req_access = list(25) + }, +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 + }, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "aSz" = ( /obj/structure/window/basic/full, /obj/structure/window/basic{ @@ -154381,12 +154596,12 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "aTF" = ( -/obj/structure/closet/crate/plastic, -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/machinery/light/small{ + dir = 1 }, -/turf/simulated/floor/tiled, -/area/hydroponics) +/obj/structure/closet/secure_closet/bar, +/turf/simulated/floor/wood, +/area/tether/surfacebase/bar_backroom) "aTG" = ( /obj/structure/table/woodentable, /obj/item/weapon/packageWrap, @@ -154409,12 +154624,11 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "aTI" = ( -/obj/structure/closet/crate, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/turf/simulated/floor/grass, +/area/hydroponics) "aTJ" = ( /obj/machinery/conveyor{ dir = 1; @@ -154553,6 +154767,19 @@ aaa }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/storage) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"aTW" = ( +/obj/machinery/light, +/turf/simulated/floor/tiled/freezer/cold, +/area/crew_quarters/freezer) +======= +"aTW" = ( +/obj/machinery/light, +/obj/structure/foodcart, +/turf/simulated/floor/tiled/freezer/cold, +/area/crew_quarters/freezer) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "aTX" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -154592,11 +154819,14 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa/officecommon) "aUb" = ( -/obj/structure/bed/chair, -/obj/machinery/alarm{ - pixel_y = 22 +/obj/machinery/vending/cola, +/obj/effect/floor_decal/borderfloor{ + dir = 1 }, -/turf/simulated/floor/carpet/blue, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "aUc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -154624,7 +154854,14 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aUe" = ( -/turf/simulated/floor/carpet/blue, +/obj/machinery/vending/coffee, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/red/border{ + dir = 1 + }, +/turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "aUf" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -154830,6 +155067,14 @@ aaa /obj/structure/window/reinforced{ dir = 1 }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lime/bordercorner, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "aUA" = ( @@ -155364,11 +155609,16 @@ aaa /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/surgery2) "aVw" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 +/obj/structure/cable/green{ + dir = 1; + icon_state = "1-2" }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "aVx" = ( /obj/machinery/firealarm{ dir = 8; @@ -155401,29 +155651,30 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aVB" = ( -/obj/structure/bed/chair/wood{ - dir = 1 +/obj/structure/table/glass, +/obj/machinery/door/window/westright{ + req_one_access = list(35,28) }, +/obj/machinery/door/firedoor, +/obj/item/device/destTagger{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/weapon/packageWrap, /obj/structure/disposalpipe/segment{ dir = 8 }, -/turf/simulated/floor/grass, +/turf/simulated/floor/tiled, /area/hydroponics) "aVC" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -22 +/obj/structure/closet/gmcloset{ + name = "formal wardrobe" }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/barrestroom) +/obj/item/glass_jar, +/obj/item/device/retail_scanner/civilian, +/obj/item/device/retail_scanner/civilian, +/turf/simulated/floor/wood, +/area/tether/surfacebase/bar_backroom) "aVD" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -155493,14 +155744,23 @@ aaa /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/upperhall) "aVK" = ( -/obj/effect/floor_decal/corner/lightgrey{ - dir = 10 +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, -/obj/effect/floor_decal/corner/lightgrey{ +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 5 }, -/obj/structure/flora/pottedplant/stoutbush, -/turf/simulated/floor/tiled/monotile, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/structure/flora/pottedplant/minitree, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aVL" = ( /obj/machinery/photocopier, @@ -155528,45 +155788,35 @@ aaa /area/tether/surfacebase/medical/surgery2) "aVO" = ( /obj/structure/disposalpipe/segment{ - dir = 8 + dir = 4; + icon_state = "pipe-c" }, -/turf/simulated/floor/tiled/eris/cafe, +/turf/simulated/floor/tiled, /area/hydroponics) "aVP" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/structure/table/marble, +/obj/machinery/door/blast/gate/thin{ + dir = 8; + id = "bar"; + layer = 3.3 }, -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 8 - }, -/turf/simulated/floor/grass, -/area/hydroponics) +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "aVQ" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 10 - }, /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 8 }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lightgrey/border, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 1 + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aVR" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/cafe, -/area/hydroponics) +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/wood, +/area/tether/surfacebase/bar_backroom) "aVS" = ( /obj/item/device/radio/intercom{ pixel_y = -24 @@ -155964,17 +156214,6 @@ aaa }, /turf/simulated/wall, /area/tether/surfacebase/entertainment/backstage) -"aWE" = ( -/obj/structure/table/glass, -/obj/machinery/door/window/westright{ - req_one_access = list(35,28) - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/hydroponics) "aWF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -156253,23 +156492,19 @@ aaa /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aXh" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -25 - }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/turf/simulated/floor/grass, +/area/hydroponics) "aXi" = ( -/obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/borderfloor{ dir = 10 }, /obj/effect/floor_decal/corner/lime/border{ dir = 10 }, +/obj/structure/closet/secure_closet/hydroponics, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aXj" = ( @@ -156430,15 +156665,8 @@ aaa /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "aXv" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/grass, /area/hydroponics) @@ -156669,12 +156897,93 @@ aaa }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"aXN" = ( +/obj/machinery/door/airlock{ + id_tag = "bathroomlock17"; + name = "Bar Toilet 1" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) +"aXO" = ( +/obj/structure/toilet{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/button/remote/airlock{ + id = "bathroomlock18"; + name = "Bar Toilet 2 Lock"; + pixel_x = -10; + pixel_y = 22; + specialfunctions = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) +======= +"aXN" = ( +/obj/structure/reagent_dispensers/beerkeg, +/obj/item/device/radio/intercom{ + dir = 4; + pixel_x = 24 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/bar_backroom) +"aXO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "aXP" = ( /obj/structure/disposalpipe/up{ dir = 8 }, /turf/simulated/floor/plating, /area/rnd/research_storage) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"aXQ" = ( +/obj/structure/toilet{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/button/remote/airlock{ + id = "bathroomlock17"; + name = "Bar Toilet 1 Lock"; + pixel_x = -10; + pixel_y = 22; + specialfunctions = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) +"aXR" = ( +/obj/machinery/door/airlock{ + id_tag = "bathroomlock18"; + name = "Bar Toilet 2" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) +======= +"aXQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, +/area/tether/surfacebase/bar_backroom) +"aXR" = ( +/obj/structure/table/woodentable, +/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 + }, +/turf/simulated/floor/wood, +/area/tether/surfacebase/bar_backroom) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "aXS" = ( /obj/structure/bed/chair/comfy, /obj/machinery/camera/network/civilian, @@ -156715,9 +157024,11 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "aXV" = ( -/obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, +/obj/structure/table/standard{ + name = "plastic table frame" + }, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aXW" = ( @@ -157132,13 +157443,13 @@ aaa /turf/simulated/floor/tiled/dark, /area/bridge) "aYN" = ( -/obj/machinery/portable_atmospherics/hydroponics, /obj/effect/floor_decal/borderfloor{ dir = 6 }, /obj/effect/floor_decal/corner/lime/border{ dir = 6 }, +/obj/structure/closet/secure_closet/hydroponics, /turf/simulated/floor/tiled, /area/tether/surfacebase/botanystorage) "aYO" = ( @@ -157230,9 +157541,6 @@ aaa /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light{ - dir = 4 - }, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -157264,6 +157572,10 @@ aaa d2 = 2; icon_state = "1-2" }, +/obj/machinery/light/floortube{ + dir = 4; + pixel_x = 6 + }, /turf/simulated/floor/tiled/dark, /area/bridge_hallway) "aZd" = ( @@ -157652,10 +157964,10 @@ aaa icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 + dir = 9 }, /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) @@ -157705,14 +158017,15 @@ aaa /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop) "aZQ" = ( -/obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/structure/table/glass, +/obj/structure/window/reinforced{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 8 }, -/turf/simulated/floor/tiled/eris/cafe, +/turf/simulated/floor/tiled, /area/hydroponics) "aZR" = ( /obj/effect/floor_decal/industrial/outline/yellow, @@ -158152,10 +158465,10 @@ aaa /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/item/weapon/stool/padded, /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/stool/padded, /turf/simulated/floor/carpet/turcarpet, /area/crew_quarters/bar) "baB" = ( @@ -158164,19 +158477,18 @@ aaa d2 = 8; icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled/eris/cafe, /area/hydroponics) "baC" = ( -/obj/machinery/vending/cola{ - dir = 1 +/obj/structure/table/woodentable, +/obj/machinery/light/floortube{ + dir = 1; + pixel_y = 6 }, -/obj/machinery/light, /turf/simulated/floor/wood, /area/crew_quarters/bar) "baD" = ( @@ -158220,21 +158532,13 @@ aaa /area/crew_quarters/kitchen) "baF" = ( /obj/structure/disposalpipe/segment{ - dir = 4 + dir = 8 }, -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/door/airlock/freezer{ - name = "Service"; - req_access = list(28) +/obj/structure/bed/chair/wood{ + dir = 1 }, -/obj/machinery/door/firedoor/glass, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "baG" = ( /obj/structure/bed/chair/comfy/brown{ dir = 8 @@ -158371,14 +158675,10 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "baP" = ( -/obj/structure/table/woodentable, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/cafe, +/turf/simulated/floor/tiled, /area/hydroponics) "baQ" = ( /obj/effect/floor_decal/borderfloor{ @@ -158415,7 +158715,6 @@ aaa dir = 1; pixel_y = -22 }, -/obj/machinery/media/jukebox, /turf/simulated/floor/wood, /area/crew_quarters/bar) "baU" = ( @@ -158432,19 +158731,15 @@ aaa dir = 1; pixel_y = -25 }, -/obj/machinery/computer/guestpass{ - dir = 8; - pixel_x = 25 - }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "baX" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/light{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "baY" = ( /obj/structure/window/reinforced/full, /obj/structure/grille, @@ -158455,7 +158750,7 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "baZ" = ( -/obj/random/cutout, +/obj/machinery/vending/entertainer, /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/backstage) "bba" = ( @@ -158580,14 +158875,11 @@ aaa /turf/simulated/wall, /area/tether/surfacebase/entertainment) "bbo" = ( -/obj/machinery/door/window/westright{ - req_one_access = list(35,28) - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 8 +/obj/structure/extinguisher_cabinet{ + pixel_y = -32 }, /turf/simulated/floor/grass, -/area/hydroponics/cafegarden) +/area/hydroponics) "bbp" = ( /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/tiled, @@ -158663,6 +158955,7 @@ aaa /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, +/obj/structure/closet/crate, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "bbw" = ( @@ -158826,18 +159119,11 @@ aaa /turf/simulated/floor/wood, /area/crew_quarters/captain) "bbI" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/flame/candle, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/structure/sink{ + dir = 4; + pixel_x = 11 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/camera/network/civilian{ - dir = 9 - }, -/turf/simulated/floor/tiled/eris/cafe, +/turf/simulated/floor/tiled, /area/hydroponics) "bbJ" = ( /obj/machinery/firealarm{ @@ -158851,18 +159137,14 @@ aaa /turf/simulated/floor/wood, /area/crew_quarters/bar) "bbL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/mob/living/carbon/human/monkey/punpun, +/turf/simulated/floor/wood, +/area/tether/surfacebase/bar_backroom) +"bbM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/crew_quarters/bar) -"bbM" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 8 - }, -/obj/item/weapon/stool/padded, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/lino, -/area/crew_quarters/bar) "bbN" = ( /obj/structure/cable/green{ d1 = 4; @@ -158895,67 +159177,35 @@ aaa "bbP" = ( /obj/structure/table/woodentable, /obj/item/weapon/flame/candle, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bbQ" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/item/weapon/reagent_containers/food/drinks/metaglass, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, /obj/structure/cable/green{ - icon_state = "0-8" + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "bbR" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" +/obj/effect/floor_decal/spline/plain{ + dir = 8 }, +/obj/item/weapon/stool/padded, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/lino, /area/crew_quarters/bar) "bbS" = ( -/obj/structure/table/marble, -/obj/machinery/door/blast/shutters{ - dir = 2; - id = "bar"; - layer = 3.3; - name = "Bar Shutters" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/lino, -/area/crew_quarters/bar) -"bbT" = ( -/obj/structure/table/woodentable, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"bbU" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"bbV" = ( /obj/effect/floor_decal/spline/plain{ dir = 8 }, @@ -158968,6 +159218,24 @@ aaa }, /turf/simulated/floor/lino, /area/crew_quarters/bar) +"bbT" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"bbU" = ( +/obj/structure/table/woodentable, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"bbV" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +<<<<<<< HEAD "bbW" = ( /obj/structure/cable/green{ d1 = 2; @@ -158987,28 +159255,65 @@ aaa }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"bbW" = ( +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -28; + pixel_y = -25 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) +"bbX" = ( +/obj/machinery/atmospherics/unary/engine{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/tourbus/general) +======= +"bbX" = ( +/obj/machinery/atmospherics/unary/engine{ + dir = 1 + }, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/tourbus/general) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "bbY" = ( -/obj/effect/floor_decal/spline/plain, -/obj/item/weapon/stool/padded, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/lino, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/wood, /area/crew_quarters/bar) "bbZ" = ( -/obj/effect/floor_decal/spline/plain, -/obj/item/weapon/stool/padded, +/obj/effect/floor_decal/spline/plain{ + dir = 10 + }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, /obj/structure/cable/green{ - d1 = 1; + d1 = 2; d2 = 8; - icon_state = "1-8" + icon_state = "2-8" }, /turf/simulated/floor/lino, /area/crew_quarters/bar) @@ -159130,7 +159435,6 @@ aaa /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/vending/entertainer, /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/backstage) "bck" = ( @@ -159218,17 +159522,8 @@ aaa /turf/simulated/floor/plating, /area/tether/surfacebase/entertainment) "bcp" = ( -/obj/machinery/requests_console{ - pixel_x = 32; - pixel_y = -32 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" + icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -159236,12 +159531,6 @@ aaa /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/button/remote/blast_door{ - id = "bar"; - name = "Bar Shutter Control"; - pixel_x = 24; - pixel_y = 24 - }, /turf/simulated/floor/lino, /area/crew_quarters/bar) "bcq" = ( @@ -159299,21 +159588,15 @@ aaa /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "bcu" = ( -/obj/structure/table/marble, -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/window/brigdoor/northleft{ - dir = 2; - name = "Bar"; - req_access = list(25) +/obj/structure/table/woodentable, +/obj/item/weapon/storage/box/beanbags, +/obj/item/weapon/gun/projectile/shotgun/doublebarrel, +/obj/item/weapon/paper{ + info = "This permit signifies that the Bartender is permitted to posess this firearm in the bar, and ONLY the bar. Failure to adhere to this permit will result in confiscation of the weapon and possibly arrest."; + name = "Shotgun permit" }, -/obj/machinery/door/window/westright{ - dir = 1; - name = "Kitchen"; - req_access = list(28) - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/turf/simulated/floor/wood, +/area/tether/surfacebase/bar_backroom) "bcv" = ( /obj/machinery/power/apc{ cell_type = /obj/item/weapon/cell/super; @@ -159328,10 +159611,8 @@ aaa /area/crew_quarters/freezer) "bcw" = ( /obj/machinery/light, -/obj/structure/bed/chair/comfy{ - dir = 4 - }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) "bcx" = ( /obj/effect/floor_decal/borderfloor{ @@ -159420,15 +159701,19 @@ aaa /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "bcB" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) "bcC" = ( /obj/structure/disposalpipe/segment{ @@ -159448,7 +159733,6 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "bcD" = ( -/obj/structure/closet/crate, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" @@ -159461,7 +159745,6 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) "bcE" = ( -/obj/structure/closet/crate, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -159528,7 +159811,7 @@ aaa dir = 8 }, /mob/living/simple_mob/vore/rabbit/white/lennie, -/turf/simulated/floor/tiled, +/turf/simulated/floor/grass, /area/hydroponics) "bcO" = ( /obj/effect/floor_decal/borderfloor{ @@ -159623,6 +159906,7 @@ aaa icon_state = "1-2" }, /obj/item/device/megaphone, +/obj/random/cutout, /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/backstage) "bcV" = ( @@ -159800,8 +160084,8 @@ aaa /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "bdi" = ( -/obj/machinery/alarm{ - pixel_y = 25 +/obj/machinery/light{ + dir = 1 }, /turf/simulated/floor/grass, /area/hydroponics) @@ -159818,15 +160102,7 @@ aaa /turf/simulated/floor/grass, /area/hydroponics) "bdl" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, +/obj/machinery/light, /turf/simulated/floor/grass, /area/hydroponics) "bdm" = ( @@ -159840,11 +160116,17 @@ aaa pixel_x = -24 }, /obj/item/weapon/stool/padded, +/obj/random/cutout, /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) "bdn" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/mob/living/carbon/human/monkey/punpun, +/obj/structure/bed/chair/comfy{ + dir = 1 + }, +/obj/effect/landmark/start{ + name = "Bartender" + }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "bdo" = ( @@ -159908,21 +160190,51 @@ aaa /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "bdt" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "bdu" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/bed/chair/comfy, +/obj/effect/landmark/start{ + name = "Bartender" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/firealarm{ + dir = 8; + pixel_x = -24 + }, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "bdv" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/table/woodentable, +/obj/item/weapon/reagent_containers/food/drinks/metaglass, +/obj/item/weapon/reagent_containers/food/drinks/metaglass, +/obj/item/weapon/reagent_containers/food/drinks/metaglass, +/obj/item/weapon/reagent_containers/food/drinks/metaglass, +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + pixel_x = 28 + }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, /turf/simulated/floor/wood, -/area/crew_quarters/bar) +/area/tether/surfacebase/bar_backroom) "bdw" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/grass, +/area/hydroponics) "bdx" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/cable/green{ @@ -159951,21 +160263,23 @@ aaa /turf/simulated/open, /area/tether/surfacebase/barbackmaintenance) "bdB" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/tiled/eris/cafe, -/area/hydroponics) -"bdC" = ( -/obj/structure/table/bench/standard, /obj/structure/disposalpipe/segment{ dir = 8 }, +/obj/structure/table/bench/standard, /obj/effect/landmark/start{ name = "Botanist" }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled, /area/hydroponics) +"bdC" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/grass, +/area/hydroponics) "bdD" = ( /obj/effect/floor_decal/corner/lightgrey{ dir = 9 @@ -159988,21 +160302,16 @@ aaa /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "bdG" = ( -/obj/machinery/hologram/holopad, -/turf/simulated/floor/wood, -/area/crew_quarters/bar) -"bdH" = ( -/obj/machinery/firealarm{ - dir = 1; - pixel_y = -24 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/grass, /area/hydroponics) +"bdH" = ( +/obj/structure/table/woodentable, +/obj/machinery/reagentgrinder, +/turf/simulated/floor/wood, +/area/tether/surfacebase/bar_backroom) "bdI" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/ywflowers, @@ -160019,8 +160328,11 @@ aaa d2 = 8; icon_state = "4-8" }, +/obj/structure/bed/chair/wood{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + dir = 4 }, /turf/simulated/floor/wood, /area/crew_quarters/bar) @@ -160048,12 +160360,14 @@ aaa /area/crew_quarters/bar) "bdO" = ( /obj/structure/table/woodentable, -/obj/item/weapon/packageWrap, -/obj/item/device/destTagger{ +/obj/item/weapon/flame/lighter/zippo, +/obj/item/clothing/head/that{ pixel_x = 4; - pixel_y = 3 + pixel_y = 6 }, -/obj/machinery/light/small, +/obj/item/weapon/tool/screwdriver, +/obj/item/clothing/mask/smokable/cigarette/cigar/havana, +/obj/item/clothing/mask/smokable/cigarette/cigar/cohiba, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "bdP" = ( @@ -160189,15 +160503,21 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "beg" = ( -/obj/machinery/light/small{ - dir = 4 +/obj/structure/cable/green{ + dir = 1; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/light_switch{ + pixel_x = -28; + pixel_y = 29 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "beh" = ( -/obj/machinery/newscaster{ - pixel_y = -28 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -160208,17 +160528,25 @@ aaa dir = 8; icon_state = "pipe-c" }, +/obj/machinery/light, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bei" = ( -/obj/machinery/power/apc{ - dir = 8; - name = "west bump"; - pixel_x = -28 +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -28; + pixel_y = -25 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 }, -/obj/structure/cable/green, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 1 + dir = 6 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) @@ -160242,6 +160570,7 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bek" = ( +<<<<<<< HEAD /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/requests_console{ pixel_x = 32; @@ -160259,9 +160588,52 @@ aaa "bel" = ( /obj/machinery/door/airlock{ name = "Unit 2" +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/requests_console{ + pixel_x = 32; + pixel_y = -32 + }, +/obj/machinery/light, +/obj/item/device/radio/intercom{ + pixel_y = -25 + }, +/obj/machinery/vending/dinnerware{ + dir = 1 }, /turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) +"bel" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/techfloor{ + dir = 8 +======= +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/grass, +/area/hydroponics) +"bel" = ( +/obj/effect/floor_decal/techfloor{ + dir = 8 +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR + }, +<<<<<<< HEAD +/turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) +======= +/obj/machinery/light/floortube{ + dir = 8; + pixel_x = -3 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "bem" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -160328,15 +160700,23 @@ aaa /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "bes" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 9 }, /obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 4 }, -/turf/simulated/floor/tiled, +/obj/machinery/camera/network/civilian{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) "bet" = ( /obj/effect/floor_decal/industrial/warning{ @@ -160366,9 +160746,7 @@ aaa /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/effect/landmark/start{ - name = "Chef" - }, +/obj/structure/closet/secure_closet/freezer/kitchen, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bew" = ( @@ -160385,10 +160763,18 @@ aaa /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/machinery/computer/guestpass{ - pixel_y = 23 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/floor/tiled, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/vending/dinnerware, +/obj/machinery/camera/network/civilian, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) "bey" = ( /obj/machinery/firealarm{ @@ -160424,9 +160810,6 @@ aaa /obj/structure/disposalpipe/trunk{ dir = 1 }, -/obj/machinery/light{ - dir = 4 - }, /turf/simulated/floor/wood, /area/crew_quarters/bar) "beB" = ( @@ -160448,30 +160831,49 @@ aaa /turf/simulated/floor/tiled, /area/hallway/lower/third_south) "beC" = ( -/obj/structure/table/bench/standard, -/obj/effect/landmark/start{ - name = "Botanist" +/obj/structure/table/marble, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/machinery/door/blast/gate/thin{ + dir = 2; + id = "bar"; + layer = 3.3 }, -/turf/simulated/floor/tiled, -/area/hydroponics) +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "beD" = ( -/obj/machinery/camera/network/civilian, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/turf/simulated/floor/tiled, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/requests_console{ + pixel_y = 26 + }, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) "beE" = ( -/obj/structure/table/glass, -/obj/structure/window/reinforced{ - dir = 8 +/obj/effect/floor_decal/spline/plain{ + dir = 4 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/hydroponics) +/obj/structure/table/marble, +/obj/machinery/door/blast/gate/thin{ + dir = 2; + id = "bar"; + layer = 3.3 + }, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "beF" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -160531,48 +160933,22 @@ aaa /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) "beK" = ( -/obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled, -/area/hydroponics) +/obj/effect/floor_decal/spline/plain, +/obj/item/weapon/stool/padded, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) "beL" = ( /obj/machinery/light, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lime/border{ - dir = 4 - }, -/turf/simulated/floor/tiled/eris/cafe, -/area/hydroponics) -"beM" = ( -/obj/machinery/door/window/westright{ - req_one_access = list(35,28) - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/hydroponics) -"beN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/turf/simulated/floor/tiled/techfloor, -/area/tether/surfacebase/shuttle_pad) -"beO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, @@ -160587,13 +160963,72 @@ aaa }, /turf/simulated/floor/grass, /area/hydroponics) +"beM" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/cigarette, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/monotile, +/area/crew_quarters/bar) +"beN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/techfloor, +/area/tether/surfacebase/shuttle_pad) +"beO" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "beP" = ( +<<<<<<< HEAD /obj/machinery/gibber, /obj/machinery/light{ dir = 1 +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/machinery/light{ + dir = 4 }, +/obj/effect/floor_decal/techfloor{ + dir = 4 +======= +/obj/effect/floor_decal/techfloor{ + dir = 4 +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR + }, +<<<<<<< HEAD /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) +======= +/obj/machinery/light/floortube{ + dir = 4; + pixel_x = 2 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "beQ" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -160655,17 +161090,9 @@ aaa /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "beZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 2 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) +/obj/structure/bed/chair/comfy/black, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "bfa" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -160678,15 +161105,17 @@ aaa /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) "bfb" = ( -/obj/machinery/door/airlock/freezer{ - name = "Service"; - req_one_access = list(35,28) +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/firedoor, +/obj/structure/window/reinforced{ + dir = 4 }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled, -/area/hydroponics/cafegarden) +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/crew_quarters/bar) "bfc" = ( /obj/structure/table/woodentable, /obj/item/weapon/flame/candle, @@ -160758,48 +161187,28 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) "bfk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/servicebackroom) -"bfl" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ dir = 10 }, -/obj/effect/floor_decal/steeldecal/steel_decals4, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) -"bfm" = ( /obj/structure/disposalpipe/segment{ - dir = 8 + dir = 4 }, /obj/structure/cable/green{ - d1 = 4; + d1 = 2; d2 = 8; - icon_state = "4-8" + icon_state = "2-8" }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 1 - }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 6 - }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) +"bfl" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "bfn" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/table/standard, @@ -160815,14 +161224,14 @@ aaa /area/tether/surfacebase/barbackmaintenance) "bfp" = ( /obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /obj/structure/cable/green{ d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/camera/network/civilian{ - dir = 9 + d2 = 4; + icon_state = "1-4" }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) @@ -160835,8 +161244,16 @@ aaa d2 = 8; icon_state = "4-8" }, -/obj/machinery/door/firedoor/glass/hidden/steel{ - dir = 1 +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/door/airlock/freezer{ + name = "Service"; + req_access = list(28) }, /turf/simulated/floor/tiled, /area/tether/surfacebase/servicebackroom) @@ -160869,29 +161286,28 @@ aaa /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) "bft" = ( -/obj/machinery/light, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/grass, -/area/hydroponics) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "bfu" = ( /obj/structure/cable/green{ d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/green{ - d1 = 2; d2 = 8; - icon_state = "2-8" + icon_state = "1-8" }, /turf/simulated/floor/grass, /area/hydroponics) "bfv" = ( -/obj/structure/closet/crate, /obj/structure/cable/green{ d1 = 1; d2 = 8; @@ -160926,13 +161342,21 @@ aaa /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) "bfA" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "bfB" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ +/obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, /turf/simulated/floor/tiled/white, @@ -161000,7 +161424,6 @@ aaa /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, -/obj/random/cutout, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -161039,15 +161462,25 @@ aaa /area/tether/surfacebase/servicebackroom) "bfM" = ( /obj/machinery/door/airlock{ - name = "Unit 3" + id_tag = "bathroomlock17"; + name = "Bar Toilet 1" }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "bfN" = ( -/obj/machinery/recharge_station, +/obj/structure/toilet{ + dir = 8 + }, /obj/machinery/light/small{ dir = 1 }, +/obj/machinery/button/remote/airlock{ + id = "bathroomlock17"; + name = "Bar Toilet 1 Lock"; + pixel_x = -10; + pixel_y = 22; + specialfunctions = 4 + }, /turf/simulated/floor/tiled/white, /area/crew_quarters/barrestroom) "bfO" = ( @@ -161076,7 +161509,15 @@ aaa /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) "bfR" = ( +<<<<<<< HEAD /obj/machinery/computer/arcade/battle, +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/machinery/computer/arcade/battle{ + dir = 1 + }, +======= +/obj/machinery/media/jukebox, +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /turf/simulated/floor/wood, /area/crew_quarters/bar) "bfS" = ( @@ -161098,32 +161539,18 @@ aaa /turf/simulated/floor/tiled, /area/rnd/xenobiology/xenoflora_storage) "bfU" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) "bfV" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) "bfW" = ( /obj/machinery/light, @@ -161131,30 +161558,34 @@ aaa /area/rnd/xenobiology/xenoflora_storage) "bfX" = ( /obj/effect/floor_decal/spline/plain{ - dir = 5 - }, -/obj/structure/table/marble, -/obj/machinery/chemical_dispenser/bar_alc/full{ - dir = 8 - }, -/obj/machinery/light{ dir = 1 }, -/obj/structure/sign/poster{ - dir = 4 - }, /turf/simulated/floor/lino, /area/crew_quarters/bar) "bfY" = ( +<<<<<<< HEAD /obj/structure/table/marble, /obj/machinery/door/blast/shutters{ dir = 8; id = "bar"; layer = 3.3; name = "Bar Shutters" +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/table/marble, +/obj/machinery/door/blast/shutters{ + dir = 2; + id = "bar"; + layer = 3.3; + name = "Bar Shutters" +======= +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR }, -/obj/item/weapon/material/ashtray/glass, -/turf/simulated/floor/lino, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/wood, /area/crew_quarters/bar) "bfZ" = ( /obj/effect/floor_decal/corner/beige{ @@ -161175,9 +161606,17 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "bga" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/tiled/eris/cafe, +/obj/machinery/door/window/westright{ + req_one_access = list(35,28) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, /area/hydroponics) "bgb" = ( /obj/machinery/button/remote/blast_door{ @@ -161188,21 +161627,30 @@ aaa /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) "bgc" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/turf/simulated/floor/tiled/eris/cafe, +/obj/machinery/door/firedoor, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/structure/sign/botany, +/turf/simulated/floor/plating, /area/hydroponics) "bgd" = ( /obj/effect/landmark{ name = "Observer-Start" }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/wood, /area/crew_quarters/bar) "bge" = ( -/obj/machinery/requests_console{ - pixel_x = -30 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/simulated/floor/tiled, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) "bgf" = ( /obj/structure/noticeboard{ @@ -161225,41 +161673,51 @@ aaa /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/backstage) "bgh" = ( -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 5 +/obj/machinery/alarm{ + dir = 1; + pixel_y = -25; + target_temperature = 270 }, -/obj/effect/floor_decal/steeldecal/steel_decals4{ - dir = 8 - }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) "bgi" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 + dir = 4 }, -/turf/simulated/floor/tiled, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) "bgj" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 9 +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 }, -/obj/structure/sign/securearea{ - desc = "Under the painting a plaque reads: 'While the meat grinder may not have spared you, fear not. Not one part of you has gone to waste... You were delicious.'"; - icon_state = "monkey_painting"; - name = "Mr. Deempisi portrait"; - pixel_x = 4; - pixel_y = 28 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 }, -/obj/machinery/camera/network/civilian, -/turf/simulated/floor/lino, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24 + }, +/turf/simulated/floor/wood, /area/crew_quarters/bar) "bgk" = ( /obj/effect/floor_decal/spline/plain, @@ -161422,6 +161880,7 @@ aaa /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/barbackmaintenance) "bgz" = ( +<<<<<<< HEAD /obj/effect/floor_decal/spline/plain{ dir = 4 }, @@ -161432,19 +161891,24 @@ aaa dir = 9 }, /obj/item/weapon/book/manual/bar_guide, +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/effect/floor_decal/spline/plain{ + dir = 4 + }, +/obj/structure/table/marble, +/obj/machinery/camera/network/civilian{ + dir = 9 + }, +/obj/machinery/chemical_dispenser/bar_coffee/full{ + dir = 8 + }, +======= +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /turf/simulated/floor/lino, /area/crew_quarters/bar) "bgA" = ( -/obj/structure/extinguisher_cabinet{ - dir = 4; - pixel_x = -30 - }, -/obj/machinery/alarm{ - dir = 1; - pixel_y = -25; - target_temperature = 270 - }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) "bgB" = ( /obj/structure/bed/chair/wood{ @@ -161461,15 +161925,12 @@ aaa /turf/simulated/floor/wood, /area/tether/surfacebase/entertainment) "bgC" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, /obj/structure/table/marble, -/obj/machinery/door/blast/shutters{ +/obj/item/weapon/material/ashtray/glass, +/obj/machinery/door/blast/gate/thin{ dir = 2; id = "bar"; - layer = 3.3; - name = "Bar Shutters" + layer = 3.3 }, /turf/simulated/floor/lino, /area/crew_quarters/bar) @@ -161480,20 +161941,12 @@ aaa /turf/simulated/floor/wood, /area/crew_quarters/bar) "bgE" = ( -/obj/effect/floor_decal/spline/plain{ - dir = 6 - }, +/obj/effect/floor_decal/spline/plain, /obj/item/weapon/stool/padded, -/obj/machinery/power/apc{ - dir = 4; - name = "east bump"; - pixel_x = 28 - }, /obj/structure/cable/green{ - icon_state = "0-8" - }, -/obj/machinery/light{ - dir = 4 + d1 = 4; + d2 = 8; + icon_state = "4-8" }, /turf/simulated/floor/lino, /area/crew_quarters/bar) @@ -161512,19 +161965,14 @@ aaa /turf/simulated/floor/tiled/eris/steel/bar_dance, /area/tether/surfacebase/barbackmaintenance) "bgH" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "secreet"; - name = "Tintable Window" +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "secreet"; - name = "Tintable Window" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/plating, -/area/tether/surfacebase/barbackmaintenance) +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "bgI" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -161533,17 +161981,15 @@ aaa dir = 1; pixel_y = -24 }, -/turf/simulated/floor/tiled, +/obj/effect/floor_decal/corner/grey/diagonal, +/turf/simulated/floor/tiled/white, /area/tether/surfacebase/servicebackroom) "bgJ" = ( -/obj/machinery/door/airlock{ - id_tag = "barbackdoor"; - name = "Service"; - req_access = list(25) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/bar_backroom) +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "bgK" = ( /obj/structure/cable/green{ d1 = 4; @@ -161576,11 +162022,7 @@ aaa /turf/simulated/floor/lino, /area/tether/surfacebase/entertainment/stage) "bgM" = ( -/obj/structure/reagent_dispensers/beerkeg, -/obj/item/device/radio/intercom{ - dir = 4; - pixel_x = 24 - }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) "bgN" = ( @@ -161591,13 +162033,39 @@ aaa /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/entertainment) "bgO" = ( +<<<<<<< HEAD /obj/structure/table/woodentable, /obj/structure/disposalpipe/segment, /obj/machinery/camera/network/civilian{ +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/table/woodentable, +/obj/structure/disposalpipe/segment, +/obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask, +/obj/machinery/camera/network/civilian{ +======= +/obj/effect/floor_decal/spline/plain{ +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR dir = 4 }, +<<<<<<< HEAD /turf/simulated/floor/wood, /area/tether/surfacebase/bar_backroom) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/weapon/book/manual/bar_guide, +/turf/simulated/floor/wood, +/area/tether/surfacebase/bar_backroom) +======= +/obj/structure/table/marble, +/obj/machinery/camera/network/civilian{ + dir = 9 + }, +/obj/machinery/chemical_dispenser/bar_coffee/full{ + dir = 8 + }, +/turf/simulated/floor/lino, +/area/crew_quarters/bar) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "bgP" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -161614,16 +162082,9 @@ aaa name = "\improper Surface Civilian Substation" }) "bgQ" = ( -/obj/machinery/door/airlock{ - name = "Bar Backroom"; - req_access = list(25) - }, -/obj/effect/floor_decal/spline/plain{ - dir = 5 - }, -/obj/effect/floor_decal/spline/plain, /obj/structure/disposalpipe/segment{ - dir = 8 + dir = 1; + icon_state = "pipe-c" }, /obj/structure/cable/green{ d1 = 4; @@ -161636,27 +162097,22 @@ aaa /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/machinery/door/firedoor, /turf/simulated/floor/lino, -/area/tether/surfacebase/bar_backroom) +/area/crew_quarters/bar) "bgR" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 }, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - name = "Unisex Restrooms" +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" }, -/turf/simulated/floor/tiled/techmaint, -/area/crew_quarters/barrestroom) +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "bgS" = ( /obj/structure/cable/green{ d1 = 1; @@ -161670,23 +162126,61 @@ aaa /turf/simulated/floor/tiled/techmaint, /area/tether/surfacebase/barbackmaintenance) "bgT" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/polarized/full{ - id = "secreet"; - name = "Tintable Window" - }, -/obj/structure/window/reinforced/polarized{ - id = "secreet"; - name = "Tintable Window" - }, -/obj/structure/window/reinforced/polarized{ - dir = 4; - id = "secreet"; - name = "Tintable Window" +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, +<<<<<<< HEAD /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/tether/surfacebase/barbackmaintenance) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/plating, +/area/tether/surfacebase/barbackmaintenance) +"bgU" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/crew_quarters/sleep/cryo) +"bgV" = ( +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/effect/landmark{ + name = "JoinLateCyborg" + }, +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) +"bgW" = ( +/turf/simulated/wall/r_wall, +/area/tether/surfacebase/shuttle_pad) +======= +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"bgU" = ( +/obj/machinery/door/firedoor, +/turf/simulated/floor/tiled, +/area/crew_quarters/sleep/cryo) +"bgV" = ( +/obj/machinery/firealarm{ + dir = 1; + pixel_y = -24 + }, +/obj/effect/landmark{ + name = "JoinLateCyborg" + }, +/obj/effect/floor_decal/techfloor{ + dir = 10 + }, +/turf/simulated/floor/tiled/techfloor, +/area/crew_quarters/sleep/cryo) +"bgW" = ( +/turf/simulated/wall/r_wall, +/area/tether/surfacebase/shuttle_pad) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "bgX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -162655,6 +163149,7 @@ aaa icon_state = "frame"; pixel_y = 32 }, +/obj/machinery/vending/coffee, /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "biP" = ( @@ -162673,6 +163168,7 @@ aaa /obj/machinery/alarm{ pixel_y = 28 }, +/obj/machinery/vending/sol, /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "biR" = ( @@ -162694,17 +163190,12 @@ aaa /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/topairlock) "biU" = ( -/obj/effect/floor_decal/corner/lightgrey{ - dir = 5 +/obj/machinery/computer/guestpass{ + dir = 1; + pixel_y = -28 }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 10 - }, -/obj/machinery/vending/sol{ - dir = 4 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/cafeteria) +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "biV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -162823,17 +163314,9 @@ aaa /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/topairlock) "bjh" = ( -/obj/machinery/vending/fitness{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/cafeteria) +/obj/machinery/light/small, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "bji" = ( /obj/structure/table/bench/sifwooden/padded, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -162880,17 +163363,9 @@ aaa /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/topairlock) "bjo" = ( -/obj/machinery/vending/coffee{ - dir = 4 - }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 5 - }, -/obj/effect/floor_decal/corner/lightgrey{ - dir = 10 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/cafeteria) +/obj/structure/sign/poster, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "bjp" = ( /obj/structure/table/wooden_reinforced, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -164447,6 +164922,20 @@ aaa /obj/machinery/smartfridge/chemistry, /turf/simulated/floor/plating, /area/tether/surfacebase/medical/chemistry) +"bnD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "bnF" = ( /obj/machinery/button/remote/airlock{ desc = "A remote control switch for the medbay foyer."; @@ -164960,6 +165449,13 @@ aaa /obj/item/weapon/storage/box/donut, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) +"bpC" = ( +/obj/effect/floor_decal/corner/grey/diagonal, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/kitchen) "bqs" = ( /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment{ @@ -164982,22 +165478,11 @@ aaa /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) "bsa" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/blast/shutters{ - dir = 8; - id = "kitchen"; - layer = 3.3; - name = "Kitchen Shutters" +/obj/structure/bed/chair/comfy/black{ + dir = 1 }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/chemical_dispenser/bar_soft/full{ - dir = 8 - }, -/obj/effect/floor_decal/spline/plain{ - dir = 4 - }, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/turf/simulated/floor/wood, +/area/crew_quarters/bar) "bsb" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -165059,6 +165544,22 @@ aaa }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"bJF" = ( +/obj/structure/toilet{ + dir = 8 + }, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/machinery/button/remote/airlock{ + id = "bathroomlock18"; + name = "Bar Toilet 2 Lock"; + pixel_x = -10; + pixel_y = 22; + specialfunctions = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "bJV" = ( /obj/structure/cable/green{ d1 = 1; @@ -165079,6 +165580,12 @@ aaa }, /turf/simulated/floor/tiled, /area/rnd/outpost/xenobiology/outpost_main) +"bLZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/turf/simulated/floor/grass, +/area/hydroponics) "bMK" = ( /obj/machinery/atmospherics/portables_connector{ dir = 8 @@ -165228,7 +165735,10 @@ aaa d2 = 4; icon_state = "1-4" }, -/turf/simulated/floor/tiled, +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "cnZ" = ( /obj/structure/bed/chair/bay/chair{ @@ -165264,6 +165774,7 @@ aaa }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) +<<<<<<< HEAD "csd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -165278,8 +165789,29 @@ aaa /obj/effect/floor_decal/corner/lime/border, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"cwI" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 +======= +"cun" = ( +/obj/machinery/atm{ + pixel_x = -32 +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR }, /turf/simulated/floor/tiled, +/area/tether/surfacebase/cafeteria) +"cwI" = ( +/obj/structure/flora/ausbushes/ppflowers{ + pixel_x = 5; + pixel_y = -7 + }, +/turf/simulated/floor/grass, /area/tether/surfacebase/public_garden_three) "cAG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -165288,6 +165820,24 @@ aaa /obj/machinery/light, /turf/simulated/floor/wood, /area/library) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"cAZ" = ( +/obj/structure/bed/chair/wood{ + dir = 8 + }, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +======= +"cAZ" = ( +/obj/item/device/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = 24 + }, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "cEx" = ( /obj/structure/table/reinforced, /obj/item/weapon/stamp/internalaffairs, @@ -165530,11 +166080,12 @@ aaa }, /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) -"dlX" = ( -/obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/turf/simulated/floor/carpet/blue, -/area/tether/surfacebase/security/breakroom) +"djy" = ( +/obj/machinery/door/airlock{ + name = "Unit 3" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "dmH" = ( /obj/structure/cable/green{ d1 = 1; @@ -165592,6 +166143,21 @@ aaa }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"dsT" = ( +/obj/machinery/alarm{ + dir = 4; + pixel_x = -22 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "dyV" = ( /obj/machinery/light{ dir = 1 @@ -228930,15 +229496,6 @@ aaa }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) -"dMk" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/security/breakroom) "dSQ" = ( /obj/structure/cable/green{ d1 = 4; @@ -229189,6 +229746,27 @@ aaa }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"eLp" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/grass, +/area/hydroponics) +"eMY" = ( +/obj/structure/sink{ + pixel_y = 20 + }, +/obj/structure/mirror{ + dir = 4; + pixel_y = 32 + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "eQN" = ( /obj/effect/floor_decal/borderfloor{ dir = 4 @@ -229208,6 +229786,20 @@ aaa }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"eWS" = ( +/obj/structure/sign/poster{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/cafeteria) +======= +"eWS" = ( +/obj/machinery/vending/sovietsoda, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/cafeteria) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "faL" = ( /obj/structure/lattice, /obj/structure/cable/orange{ @@ -229267,6 +229859,18 @@ aaa }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"fjX" = ( +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -28 + }, +/obj/structure/cable/green, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "fkn" = ( /obj/effect/floor_decal/borderfloor/corner{ dir = 1 @@ -229392,6 +229996,7 @@ aaa /obj/machinery/atmospherics/pipe/simple/hidden/yellow{ dir = 4 }, +<<<<<<< HEAD /obj/structure/cable{ d2 = 4; icon_state = "0-4" @@ -229418,6 +230023,21 @@ aaa }, /turf/simulated/floor/tiled, /area/teleporter/departing) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/tether/surfacebase/public_garden_three) +"gae" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/simulated/floor/carpet/blue, +/area/tether/surfacebase/security/breakroom) +======= +/obj/structure/window/reinforced, +/turf/simulated/floor/plating, +/area/tether/surfacebase/public_garden_three) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "gfg" = ( /obj/machinery/light{ dir = 8 @@ -229470,6 +230090,12 @@ aaa /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) +"gsP" = ( +/obj/structure/closet/hydrant{ + pixel_x = -32 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/cafeteria) "gtn" = ( /obj/structure/disposalpipe/segment, /obj/structure/disposalpipe/segment{ @@ -229641,7 +230267,9 @@ aaa /area/tether/surfacebase/cafeteria) "gZn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/tiled, +/obj/structure/table/glass, +/obj/item/weapon/storage/box/donut, +/turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "gZR" = ( /obj/effect/floor_decal/borderfloor{ @@ -229728,10 +230356,45 @@ aaa /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) "hxc" = ( +<<<<<<< HEAD /obj/effect/floor_decal/borderfloor/corner, /obj/effect/floor_decal/corner/lime/bordercorner, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner, +/obj/effect/floor_decal/corner/lime/bordercorner, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) +"hxr" = ( +/obj/structure/flora/ausbushes/ywflowers{ + pixel_x = -5; + pixel_y = -10 +======= +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/lime/border{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) +"hxr" = ( +/obj/structure/bed/chair/wood{ + dir = 8 +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -229792,12 +230455,6 @@ aaa /turf/simulated/floor/tiled/eris/dark/golden, /area/shuttle/tourbus/general) "hEt" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/obj/effect/landmark/start{ - name = "Security Officer" - }, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "hEN" = ( @@ -229902,6 +230559,12 @@ aaa /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/tether/surfacebase/shuttle_pad) +"ieF" = ( +/obj/structure/sign/poster{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/southhall) "ifI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/yellow, /obj/machinery/computer/atmos_alert{ @@ -229909,6 +230572,12 @@ aaa }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/shuttle_pad) +"ige" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "iiv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -229919,11 +230588,20 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/public_garden_three) "ikh" = ( -/obj/machinery/vending/sovietsoda{ - dir = 8 +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + dir = 1; + icon_state = "1-2" }, -/turf/simulated/floor/tiled, -/area/tether/surfacebase/cafeteria) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/door/airlock{ + name = "Unisex Restrooms" + }, +/turf/simulated/floor/tiled/techmaint, +/area/crew_quarters/barrestroom) "ioG" = ( /obj/effect/floor_decal/techfloor, /obj/structure/cable/green{ @@ -230049,10 +230727,8 @@ aaa /turf/simulated/floor, /area/tether/surfacebase/security/briefingroom) "iLR" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/table/glass, +/obj/item/weapon/paper_bin, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "iOL" = ( @@ -230403,6 +231079,26 @@ aaa }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/triage) +"jTY" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) +"jXY" = ( +/obj/machinery/vending/wallmed1/public{ + pixel_x = -28 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "jYd" = ( /obj/structure/cable/orange{ d1 = 4; @@ -230674,6 +231370,28 @@ aaa }, /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officea) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"kKV" = ( +/obj/machinery/light/flamp/noshade{ + pixel_y = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +======= +"kKV" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/light/bigfloorlamp, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "kQb" = ( /obj/effect/floor_decal/borderfloor{ dir = 5 @@ -230832,6 +231550,14 @@ aaa }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +"lpI" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/grass, +/area/hydroponics) "lqE" = ( /obj/effect/floor_decal/spline/plain, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -231022,8 +231748,9 @@ aaa /turf/simulated/floor/plating, /area/tether/surfacebase/security/hos) "lWN" = ( -/obj/machinery/vending/cigarette{ - dir = 8 +/obj/machinery/alarm{ + dir = 8; + pixel_x = 24 }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) @@ -231105,7 +231832,10 @@ aaa d2 = 8; icon_state = "4-8" }, -/turf/simulated/floor/tiled, +/obj/structure/bed/chair{ + dir = 1 + }, +/turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "mwz" = ( /obj/effect/floor_decal/corner/red{ @@ -231204,6 +231934,13 @@ aaa }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) +"mUC" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/grass, +/area/hydroponics) "mUE" = ( /obj/structure/cable/green{ d1 = 4; @@ -231321,6 +232058,41 @@ aaa }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"noU" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/tether/surfacebase/public_garden_three) +"ntl" = ( +/obj/structure/table/bench/wooden, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) +======= +"noU" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/tether/surfacebase/public_garden_three) +"nrN" = ( +/obj/machinery/recharge_station, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) +"ntl" = ( +/obj/structure/table/bench/wooden, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "nue" = ( /obj/structure/cable/green{ icon_state = "0-2" @@ -231432,8 +232204,13 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/security/briefingroom) "nSq" = ( -/obj/machinery/hologram/holopad, -/turf/simulated/floor/tiled, +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/effect/landmark/start{ + name = "Security Officer" + }, +/turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "nXZ" = ( /obj/structure/disposalpipe/segment{ @@ -231478,6 +232255,14 @@ aaa }, /turf/simulated/floor/tiled, /area/rnd/research/researchdivision) +"ocF" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/grass, +/area/hydroponics) "olG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -231520,18 +232305,6 @@ aaa /turf/simulated/floor/tiled/techfloor/grid, /area/maintenance/lower/medsec_maintenance) "orP" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ - dir = 8 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -231618,11 +232391,6 @@ aaa }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"oIJ" = ( -/obj/structure/table/glass, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/turf/simulated/floor/carpet/blue, -/area/tether/surfacebase/security/breakroom) "oJw" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -231785,9 +232553,7 @@ aaa /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) "oZC" = ( -/obj/structure/table/glass, -/obj/item/weapon/storage/box/donut, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/bed/chair, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "pcs" = ( @@ -231890,6 +232656,13 @@ aaa }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/iaa) +"psh" = ( +/obj/machinery/door/airlock{ + id_tag = "bathroomlock18"; + name = "Bar Toilet 2" + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) "psO" = ( /obj/machinery/status_display{ pixel_x = 32 @@ -231978,13 +232751,13 @@ aaa /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/iaa/officeb) "pJL" = ( -/obj/structure/bed/chair{ - dir = 4 +/obj/effect/floor_decal/borderfloor{ + dir = 8 }, -/obj/effect/landmark/start{ - name = "Security Officer" +/obj/effect/floor_decal/corner/red/border{ + dir = 8 }, -/turf/simulated/floor/carpet/blue, +/turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "pNk" = ( /obj/machinery/computer/shuttle_control/explore/tourbus, @@ -232039,6 +232812,15 @@ aaa /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, /area/tether/surfacebase/southhall) +"pXX" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/portable_atmospherics/hydroponics, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/grass, +/area/hydroponics) "qbo" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 @@ -232137,12 +232919,30 @@ aaa /turf/simulated/floor/plating, /area/crew_quarters/recreation_area) "qtt" = ( -/obj/structure/bed/chair{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/table/glass, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"qum" = ( +/obj/structure/bed/chair/wood{ + dir = 4 + }, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +======= +"qum" = ( +/obj/structure/sink{ + pixel_y = 20 + }, +/obj/structure/mirror{ + dir = 4; + pixel_y = 32 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "qvp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -232205,6 +233005,18 @@ aaa }, /turf/simulated/floor/tiled/monotile, /area/tether/surfacebase/southhall) +"qFD" = ( +/obj/machinery/light, +/turf/simulated/floor/wood, +/area/crew_quarters/bar) +"qFL" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/grass, +/area/hydroponics) "qGK" = ( /obj/structure/table/reinforced, /obj/item/device/radio{ @@ -232241,6 +233053,15 @@ aaa }, /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) +"qOy" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/portable_atmospherics/hydroponics, +/turf/simulated/floor/grass, +/area/hydroponics) "qQZ" = ( /obj/effect/floor_decal/techfloor, /obj/machinery/firealarm{ @@ -232357,9 +233178,7 @@ aaa /turf/simulated/floor/tiled, /area/tether/surfacebase/security/processing) "ruh" = ( -/obj/machinery/atm{ - pixel_y = 30 - }, +/obj/machinery/vending/fitness, /turf/simulated/floor/tiled, /area/tether/surfacebase/cafeteria) "rxh" = ( @@ -232455,6 +233274,7 @@ aaa }, /turf/simulated/floor/tiled, /area/hallway/lower/third_south) +<<<<<<< HEAD "rPu" = ( /obj/structure/closet/wardrobe/xenos, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -232462,6 +233282,15 @@ aaa }, /turf/simulated/floor/tiled, /area/teleporter/departing) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +======= +"rPs" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/crew_quarters/barrestroom) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "rQp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -232529,6 +233358,15 @@ aaa }, /turf/simulated/floor/plating, /area/rnd/outpost/xenobiology/outpost_storage) +"scL" = ( +/obj/machinery/computer/security/telescreen/entertainment{ + desc = "Looks like it's set to Free-Anur-Entertanment, I wonder what else is on?"; + icon_state = "frame"; + pixel_y = 32 + }, +/obj/machinery/vending/cigarette, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/cafeteria) "shx" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -232581,10 +233419,12 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "sts" = ( -/obj/effect/floor_decal/corner/grey/diagonal, -/obj/structure/foodcart, -/turf/simulated/floor/tiled/white, -/area/crew_quarters/kitchen) +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/grass, +/area/hydroponics) "suT" = ( /obj/structure/cable/green{ d1 = 4; @@ -232774,6 +233614,28 @@ aaa }, /turf/simulated/floor/carpet, /area/tether/surfacebase/security/hos) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"sTZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) +======= +"sTZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/lime/border, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/turf/simulated/floor/tiled, +/area/tether/surfacebase/public_garden_three) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "sWs" = ( /obj/effect/floor_decal/borderfloorwhite{ dir = 8 @@ -232793,12 +233655,6 @@ aaa }, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) -"sWR" = ( -/obj/structure/bed/chair{ - dir = 8 - }, -/turf/simulated/floor/carpet/blue, -/area/tether/surfacebase/security/breakroom) "sXa" = ( /obj/machinery/holoposter{ pixel_x = -30; @@ -232966,6 +233822,13 @@ aaa }, /turf/simulated/floor/tiled, /area/tether/surfacebase/security/upperhall) +"tJZ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/grass, +/area/hydroponics) "tLk" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -233042,7 +233905,8 @@ aaa /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, -/turf/simulated/floor/tiled, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "tWn" = ( /obj/effect/floor_decal/steeldecal/steel_decals4{ @@ -233083,10 +233947,21 @@ aaa }, /turf/simulated/floor/tiled, /area/rnd/research/testingrange) +<<<<<<< HEAD "udd" = ( /obj/machinery/cryopod/robot/door/gateway, /turf/simulated/floor/tiled/techfloor, /area/teleporter/departing) +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +======= +"uee" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/turf/simulated/floor/grass, +/area/hydroponics) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "ueB" = ( /turf/simulated/wall, /area/tether/surfacebase/security/hos) @@ -233107,6 +233982,20 @@ aaa }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/pool) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"ufJ" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +======= +"ufJ" = ( +/obj/structure/bed/chair/wood{ + dir = 1 + }, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "uhm" = ( /obj/structure/bed/chair/bay/chair{ dir = 8 @@ -233142,12 +234031,6 @@ aaa /turf/simulated/floor/tiled/dark, /area/tether/surfacebase/security/upperhall) "upV" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/red/border{ - dir = 8 - }, /obj/machinery/power/apc{ dir = 8; name = "west bump"; @@ -233157,7 +234040,10 @@ aaa d2 = 4; icon_state = "0-4" }, -/turf/simulated/floor/tiled, +/obj/structure/bed/chair{ + dir = 4 + }, +/turf/simulated/floor/carpet/blue, /area/tether/surfacebase/security/breakroom) "uxT" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central5{ @@ -233192,6 +234078,23 @@ aaa /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/white, /area/tether/surfacebase/medical/lobby) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"uBR" = ( +/obj/structure/flora/ausbushes/ppflowers{ + pixel_x = 5; + pixel_y = -7 + }, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +======= +"uBR" = ( +/obj/structure/bed/chair/wood{ + dir = 4 + }, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "uFI" = ( /obj/effect/floor_decal/borderfloor{ dir = 1 @@ -233621,6 +234524,16 @@ aaa }, /turf/simulated/floor/wood, /area/crew_quarters/recreation_area) +"whm" = ( +/obj/machinery/power/apc{ + dir = 4; + name = "east bump"; + nightshift_setting = 2; + pixel_x = 28 + }, +/obj/structure/cable/green, +/turf/simulated/floor/grass, +/area/hydroponics) "whW" = ( /obj/machinery/door/firedoor/glass, /obj/structure/grille, @@ -233642,9 +234555,7 @@ aaa /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) "wlf" = ( -/obj/structure/table/glass, -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/carpet/blue, +/turf/simulated/floor/tiled, /area/tether/surfacebase/security/breakroom) "wng" = ( /obj/structure/cable/green{ @@ -233999,6 +234910,15 @@ aaa }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"xrs" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/grass, +/area/hydroponics) "xsf" = ( /obj/structure/disposalpipe/segment, /obj/machinery/camera/network/security{ @@ -234041,6 +234961,26 @@ aaa }, /turf/simulated/floor/tiled/white, /area/crew_quarters/recreation_area_restroom) +<<<<<<< HEAD +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"xwQ" = ( +/obj/machinery/light/flamp/noshade, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +======= +"xwD" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/grass, +/area/hydroponics) +"xwQ" = ( +/obj/machinery/light/bigfloorlamp, +/turf/simulated/floor/grass, +/area/tether/surfacebase/public_garden_three) +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "xxe" = ( /obj/effect/floor_decal/steeldecal/steel_decals_central5{ dir = 4 @@ -239269,12 +240209,32 @@ aac aac aac aac +<<<<<<< HEAD aac aac arW arW aDd aDf +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aiF +aDe +aVr +sXa +pIJ +xwQ +aDe +fdB +======= +aiF +aDe +aVr +sXa +pIJ +xwQ +aDe +xwQ +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR aDj ajt aDu @@ -239427,7 +240387,7 @@ aVr aDe aVx aDc -aip +agp aVK akl alP @@ -239847,9 +240807,22 @@ aDm aDl aDt rEZ +<<<<<<< HEAD dgA +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aDg +======= +aqe +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR cwI +<<<<<<< HEAD aDf +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +uBR +qum +======= +uBR +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR aDT arW arW @@ -239989,11 +240962,25 @@ aDn aDg aDu aDD +<<<<<<< HEAD aDg aDN aDf aDc aDz +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +sTZ +aDN +aDS +ufJ +aDz +======= +sTZ +aDO +aDS +ufJ +arW +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR agw air aWF @@ -240131,12 +241118,28 @@ acm aDv aDg aDJ +<<<<<<< HEAD aUC +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aDg +======= +aqp +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR aDO aDc aDS +<<<<<<< HEAD aac agw +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +ufJ +aDz +agw +======= +ufJ +arW +arN +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR air aWF akn @@ -240273,12 +241276,30 @@ arW aDw aDg aDJ +<<<<<<< HEAD aUF arW +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aDg +aDO +======= +aqp +aDO +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR aDS +<<<<<<< HEAD aac aac agw +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +ufJ +aDz +agw +======= +ufJ +arW +asI +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR air aWF akn @@ -240342,7 +241363,7 @@ aOf aOf aOf aPB -aPU +aQg aQg aQt azr @@ -240417,9 +241438,19 @@ aDE aDK aUM aDP +<<<<<<< HEAD aac aac aac +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +hxr +cAZ +aDe +======= +hxr +cAZ +arW +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR agw aVG aWF @@ -242955,10 +243986,10 @@ adG abX agR pJL -gae -aUe +hEt +aip upV -dMk +hEt aak adq aaN @@ -243096,8 +244127,8 @@ aOm adG abX agS -dlX -oIJ +wlf +oZC iLR aRJ cnO @@ -243380,9 +244411,9 @@ aOm adG abX aUe -sWR +wlf hEt -aUe +amY nSq tRk aaj @@ -246819,7 +247850,7 @@ aZs aTt aEb aSE -aYS +axZ aYh aYS aYY @@ -246888,9 +247919,9 @@ bin bix biF biF -biU -bjh -bjo +biF +biF +biF biF biF adG @@ -247030,8 +248061,8 @@ laB beU biF bsr -biL -biL +cun +gsP biL bjs biF @@ -247973,7 +249004,7 @@ alZ auJ bbA ajR -aGA +aDz aYC bbn aGE @@ -248246,10 +249277,10 @@ xUo bqs xUo xUo +atn aCK aCK aCK -xUo fOj ahR arG @@ -248303,7 +249334,7 @@ aac aac aac aPs -beU +ieF bhx beU biH @@ -248388,10 +249419,10 @@ apC aqf aOT aFI -avP -avP -avP apS +avP +avP +avP apS ajX aZW @@ -248530,18 +249561,18 @@ agw aqg aqT apc -aBF -aBF -aBF aXT +aBF +aBF +aBF aXT bbN aru aGh aru -avp atl -avd +atl +aEl aru avd aru @@ -248674,16 +249705,16 @@ agw apc asZ anN -aVO -ate -ate +awm +awm +aBp baB asD baM api -atf -atw -atP +anj +anj +oII avD bej bfO @@ -248815,11 +249846,11 @@ aqi apc apc avg -anN -aVO -ate -ate -baB +auQ +awr +awr +aCh +aCi awv asw beF @@ -248875,7 +249906,7 @@ qDF bhy bhs biF -biO +scL bjc bjj bjq @@ -248956,10 +249987,10 @@ adt aqj aoH aww +atR asp -avq aBE -aVR +aBE aEY aZJ aKc @@ -249098,13 +250129,13 @@ aYl aqk apg apc -aGH +bgc aVB -aVO +awR aZQ bga bgc -asD +avp bev beG azZ @@ -249117,9 +250148,9 @@ avz avM asX asX -asX +aXO aIh -bdv +bbK bbK bbO bcl @@ -249240,9 +250271,9 @@ awP awP awP awP -aGH -aVB -aVO +atw +avq +bdB bdB ayL baP @@ -249261,7 +250292,7 @@ asX aLd aHe aIi -bdG +asX aLd bbP bcm @@ -249304,7 +250335,7 @@ biF gYa lWN qKO -ikh +biL bjv biF adG @@ -249376,16 +250407,16 @@ amK anp anS asU -arN +aop aqo -avO +asq ate -awr +aop aGb aVO -aVO -aVO -ate +avA +axy +aAe aFK bbI avp @@ -249405,7 +250436,7 @@ aHl aIi bgd aLd -bbT +baC bcm aAG bfR @@ -249518,16 +250549,16 @@ aio anq anT aok -asK -asP -auO -auQ -awR +bdi +aop +atf +aop +atf asP aHn +avJ +ayf aHn -aHn -asP beL aru aru @@ -249538,15 +250569,27 @@ baq bgp baE aLc +<<<<<<< HEAD axt avA aCi asX +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +wBv +avA +aCi asX +======= +wBv +avz +avM +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR asX -aIh -bdw -bbL +aLd +bbU +baF +asX +aLd bbU bdJ aAG @@ -249661,6 +250704,7 @@ anr anU aok asi +<<<<<<< HEAD asi asi asi @@ -249672,6 +250716,31 @@ aWE beE beM amY +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +asi +asi +asi +asi +asj +aJV +aWE +aWE +beE +beM +aZg +======= +aEX +avO +bdG +avO +aEX +eLp +bdC +qOy +xwD +tJZ +aZg +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR ani anj bgx @@ -249681,18 +250750,18 @@ nXZ bgx anj wju -bsa -aru -bgj -aET +avz +aIU +asX +asX aET aIo -axZ +bbM bbM bbV aAc -aEl -baC +aAG +asX ayM bdV beb @@ -249803,15 +250872,15 @@ aio anV aok aSx +arR +aCX +bek +atf aop +auU +aVy +auU aop -aop -aBp -aCl -aTF -bdC -beC -beK bcN bcg anj @@ -249822,19 +250891,19 @@ aGi bgq bgr anj -anj -anj -aru -avJ -aIM -aIM +aGt +aHp +aJV +asX +asX +asX aIJ -ayf -aIM +asX +asX bfY bbY -aIf -aIU +bfl +qFD ayM ayd ayb @@ -249945,16 +251014,16 @@ ans anU aok aDI -aqp aop -aqp -aCj -aFS -aVP -aVP -aVP -aFS -beO +aXv +bek +aop +aop +aVy +aVy +aVy +aop +aKm aru aES aIN @@ -249964,9 +251033,9 @@ bgx nXZ baq anj -anj -anj -bcu +aGt +aIk +aru asB aIm aIm @@ -249975,7 +251044,7 @@ azs bbR bbS bbZ -aIf +bft baT ayM bea @@ -250086,17 +251155,17 @@ amL ant anW aok -aop -aop -aop -aop -aUr -aWM -aXj -aVy -aVy -aop -aKm +arQ +arR +bdw +sts +pXX +asK +qFL +mUC +mUC +arR +uee avL atA aZX @@ -250106,15 +251175,15 @@ bgx rBz bew bfp -bfl -baX -amY -asB -aIm -aIm +anj +anj +aru +aSy +aVP +aVP aIP azx -aIm +aVP bgC bgE aIf @@ -250230,11 +251299,11 @@ anX aok aoM aEX -atR -aEX -asp -asq -aWM +avO +bLZ +auU +aop +aUr aXj aVy aop @@ -250245,21 +251314,25 @@ anj anj anj baq -bek -aru -aru -baF -aru -aru +anj +anj +aFS +anj +anj +aKl bfX -aEW +bgz bgz ato bcp atN -arJ -aGK +beC +beK bgR +biU +aGK +aGK +aGK aGK aGK aGK @@ -250267,10 +251340,6 @@ aGK aGK aGK aGK -bgH -bgH -bgT -aac aac aac aac @@ -250372,14 +251441,14 @@ anY aok bdi aop -bdj -arQ +atf +aop auU -aXv +aop ath afT atk -atn +auk awQ aru bgt @@ -250387,26 +251456,30 @@ bbm bcf bgs bch -sts -aru +anj +bpC bge -bfm bgA -aJt -aJt -aJt -aJt -aJt +bgA +aLb +bfX +bgz +bgz +baX bgQ -aJt -aJt +bgz +beE ayJ -bbW -aAe -aVC +bgR +asX +aGK aAj bei bfA +dsT +jXY +fjX +ige aTE aGK aac @@ -250435,10 +251508,6 @@ aac aac aac aac -aac -aac -aac -aac aaq adG aOi @@ -250514,14 +251583,14 @@ aok aok aEB aop -aeZ -arR +aop +aop aVy bdl -aFM +awP aFO -aFM -atb +aop +aop bbo atb aBy @@ -250534,27 +251603,27 @@ aoJ bex bfU bgI -aJt +aLg awT axo bgO aIQ aph azt -aJt -aGx -aTE +arJ +arJ +bgj aVw -aTE +ikh beg -aTE +bnD bfB aTE +jTY +aTE +rPs +aTE aGK -aaq -aaq -aac -aac aac aac aac @@ -250653,21 +251722,21 @@ axr ayK hfN atg -aSy aop aop -bdk -ask -aVy -aLg -aFM +aop +aop +xrs +lpI +auk +ocF aJu -aLb -atb -asu +aop +aop +aop ati aFz -asu +aCj aoJ aUq bdc @@ -250676,27 +251745,39 @@ aoJ beD bfV bgh -bgJ -awm -bdt -axy -axy +aJt +aJt +aJt +aJt +aJt aHv -bdO +aJt aJt aGx +bgH +asX +aGK +qum aTE aGK +<<<<<<< HEAD bdL -aGK -bel -aGK +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aXN +======= bfM +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aGK +<<<<<<< HEAD +bel +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aXR +======= +psh +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aGK +djy aGK -aaq -aaq -aac -aac aac aac aab @@ -250801,14 +251882,14 @@ aWM aWM asH aXj -bdH -aFM +aop +atP aFP aTI -atb -asx +aop +asN aty -aGt +asu aKw aoJ baI @@ -250827,18 +251908,30 @@ aKs axu aJt aQf +bgJ +bjh +aGK +eMY aTE aGK +<<<<<<< HEAD bef -aGK -bef -aGK +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aXQ +======= bfN +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aGK +<<<<<<< HEAD +bef +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aXO +======= +bJF +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +aGK +nrN aGK -adG -aOi -aab -aac aac aac aab @@ -250942,13 +252035,13 @@ aop aqq aBG asO -aqe -bft -aFM +aop +aop +atP aGd -aHp -bfb -asI +auk +auk +auk aum aJw asu @@ -250959,15 +252052,19 @@ bdT beq bes bcB -aLF -aJt +aIM +aLG awt bgM -awV +axp axp bbQ axx aJt +beM +bgT +asX +aGK aGK aGK aGK @@ -250990,10 +252087,6 @@ aab aab aab aab -aab -aab -aab -aab aac aac aac @@ -251084,12 +252177,12 @@ aop aqV aDY asV -aqe -aLG -aFM +aop +aop +atP aGg aXh -atb +aop asN awq aJw @@ -251099,17 +252192,21 @@ bcv bfs bgb aoJ -beZ +aFM bfq aFM aJt +aTF +aVR +aXQ +bbL +bdt +bdH aJt -aJt -aJt -aJt -aJt -aJt -aJt +beO +asX +bjo +arJ adG adG adG @@ -251166,10 +252263,6 @@ aab aab aab aab -aab -aab -aab -aab aaa "} (120,1,1) = {" @@ -251226,12 +252319,12 @@ ata aCI aCR aEh -aqe -aso -aFM +aop +arK +auO aJJ aOg -atb +whm asY axv bcF @@ -251241,18 +252334,21 @@ beP bdR aBJ aoJ -bbr -bcB +aGe +aGJ aAb -adG -adG -adG -adG -adG -adG -adG -adG -adG +aJt +aVC +aXN +aXR +bcu +bdv +bdO +aJt +beZ +bbT +bsa +arJ adG aNB aNM @@ -251262,10 +252358,7 @@ aNM aNM aNM aNM -aab -aab -aab -aab +aNM aab aab aab @@ -251370,11 +252463,11 @@ aop ask arK bfu -aCh -aKl +awP +awP aHw -atb -atb +awP +awP atb atb atb @@ -251386,20 +252479,20 @@ aoJ bbv bcC aAb +aJt +aJt +aJt +aJt +aJt +aJt +aJt +aJt +bfb +bfb +bfb +arJ adG -aOF -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aNM -aab -aab -aab -aab +aOi aab aab aab @@ -251529,6 +252622,18 @@ bbB bcD aAb adG +adG +adG +adG +adG +adG +adG +adG +adG +adG +adG +adG +adG aOi aab aab @@ -251584,18 +252689,6 @@ aab aab aab aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab aaa "} (123,1,1) = {" @@ -251671,18 +252764,18 @@ bbr bcE aAb adG -aOi -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab -aab +aOF +aNM +aNM +aNM +aNM +aNM +aNM +aNM +aNM +aNM +aNM +aNM aab aab aab @@ -251933,7 +253026,7 @@ aAH aBm aBM ayg -aCX +aAK aEm aEF aFg @@ -252364,7 +253457,7 @@ aEm aEN aFB aFH -aIk +aGc aKp aXi azY @@ -252506,8 +253599,8 @@ aEm aEm aEm aEm -aGJ -aGJ +aEm +aEm aXV azY adG @@ -252647,9 +253740,9 @@ aEk aEL aFl aFl -aGe -aGe -aGe +aFl +aFl +aFl aYN azY adG diff --git a/maps/tether/tether-04-transit.dmm b/maps/tether/tether-04-transit.dmm index 4dd52f7bce..f09da46a0c 100644 --- a/maps/tether/tether-04-transit.dmm +++ b/maps/tether/tether-04-transit.dmm @@ -176,6 +176,7 @@ /obj/machinery/door/firedoor/glass/hidden, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) +<<<<<<< HEAD "s" = ( /obj/machinery/atmospherics/pipe/simple/visible, /obj/structure/cable{ @@ -238,6 +239,33 @@ }, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"iK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/alarm{ + pixel_y = 26 + }, +/turf/simulated/floor/wood, +/area/tether/midpoint) +"jt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass/hidden, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +======= +"iK" = ( +/obj/structure/closet, +/obj/random/plushie, +/turf/simulated/floor/plating, +/area/maintenance/tether_midpoint) +"jt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass/hidden, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/dark, +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /area/tether/midpoint) "x" = ( /obj/machinery/atmospherics/pipe/zpipe/up/supply{ @@ -402,7 +430,7 @@ /turf/simulated/floor/plating, /area/maintenance/tether_midpoint) "oP" = ( -/obj/structure/grille, +/obj/random/junk, /turf/simulated/floor/plating, /area/maintenance/tether_midpoint) "pK" = ( @@ -437,14 +465,44 @@ "tn" = ( ======= "pO" = ( -/obj/machinery/media/jukebox, -/turf/simulated/floor/holofloor/tiled/dark, -/area/tether/midpoint) -"sw" = ( -/obj/machinery/vending/bepis{ +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 8 }, -/turf/simulated/floor/holofloor/tiled/dark, +/obj/machinery/media/jukebox, +/turf/simulated/floor/tiled/monotile, +/area/tether/midpoint) +"sw" = ( +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/snlvend, +/turf/simulated/floor/tiled/monotile, /area/tether/midpoint) "sR" = ( /obj/effect/floor_decal/borderfloorblack{ @@ -810,14 +868,24 @@ icon_state = "pipe-c" ======= "Kh" = ( -/obj/structure/disposalpipe/segment{ +/obj/effect/floor_decal/corner/lightgrey{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 }, -/obj/machinery/firealarm{ - layer = 3.3; - pixel_y = 26 +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 }, -/turf/simulated/floor/wood, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/bepis, +/turf/simulated/floor/tiled/monotile, /area/tether/midpoint) "KH" = ( /obj/structure/disposalpipe/segment{ @@ -974,18 +1042,52 @@ }, /turf/simulated/floor/tiled/dark, /area/tether/midpoint) +<<<<<<< HEAD "Z" = ( /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0 +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +"WY" = ( +/obj/random/junk, +/obj/random/junk, +/turf/simulated/floor/plating, +/area/maintenance/tether_midpoint) +"Xo" = ( +/obj/machinery/vending/snlvend{ + dir = 8 +======= +"WY" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 }, +/obj/machinery/alarm{ + pixel_y = 26 + }, +/turf/simulated/floor/wood, +/area/tether/midpoint) +"Xo" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR + }, +<<<<<<< HEAD <<<<<<< HEAD /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 ||||||| parent of bb3cfe95f0... Merge pull request #10765 from Very-Soft/messeswithstuff /turf/simulated/floor/holofloor/tiled/dark, +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +/turf/simulated/floor/holofloor/tiled/dark, +======= +/obj/machinery/firealarm{ + layer = 3.3; + pixel_y = 26 + }, +/turf/simulated/floor/wood, +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR /area/tether/midpoint) "YB" = ( /obj/structure/table/woodentable, @@ -9241,6 +9343,7 @@ a a "} (59,1,1) = {" +<<<<<<< HEAD a a a @@ -9381,8 +9484,292 @@ a a a a +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +NJ +gq +pK +pK +pK +pK +pK +pK +pK +pK +pK +pK +pK +Pz +pK +pK +Or +pK +pK +pK +nD +zP +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +======= +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +NJ +gq +pK +pK +pK +pK +pK +pK +Pz +pK +pK +pK +pK +Pz +pK +pK +Or +pK +pK +pK +nD +zP +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "} (60,1,1) = {" +<<<<<<< HEAD a a a @@ -9523,8 +9910,292 @@ a a a a +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +pK +pK +pK +pK +pK +PF +PF +pO +Xo +sw +PF +PF +PF +PF +PF +Or +pK +pK +pK +pK +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +======= +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +pK +pK +pK +pK +pK +PF +PF +PF +PF +PF +PF +PF +PF +PF +PF +Or +pK +pK +pK +pK +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "} (61,1,1) = {" +<<<<<<< HEAD a a a @@ -9665,8 +10336,292 @@ a a a a +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +tA +tA +tA +pK +pK +Dz +Dz +Dz +Dz +Dz +Dz +oN +yi +ML +Dz +uA +pK +tA +tA +tA +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +======= +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +tA +tA +tA +pK +pK +Dz +iK +pM +pM +pM +Dz +oN +yi +ML +PF +uA +pK +tA +tA +tA +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "} (62,1,1) = {" +<<<<<<< HEAD a a a @@ -9807,8 +10762,292 @@ a a a a +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +PF +uC +vh +dc +pK +Iq +Dz +Ui +HK +cB +Oq +mz +pM +pM +pM +Dz +wM +pK +dc +YB +vt +PF +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +======= +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +PF +uC +vh +dc +pK +Iq +Dz +Ui +HK +cB +Oq +mz +pM +oP +pM +PF +wM +pK +dc +YB +vt +PF +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "} (63,1,1) = {" +<<<<<<< HEAD a a a @@ -9949,8 +11188,292 @@ a a a a +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +tA +tA +tA +pK +pK +Dz +Qv +xl +no +jE +Ha +gV +Ls +pM +Dz +Or +pK +tA +tA +tA +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +======= +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +tA +tA +tA +pK +pK +Dz +Qv +xl +no +jE +Ha +gV +Ls +PF +PF +WY +pK +tA +tA +tA +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "} (64,1,1) = {" +<<<<<<< HEAD a a a @@ -10091,8 +11614,292 @@ a a a a +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +pK +pK +pK +pK +pK +Dz +Qv +Hs +Hs +Hs +Hs +Hs +Hs +WY +Dz +iK +pK +pK +pK +pK +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +======= +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +pK +pK +pK +pK +pK +Dz +Qv +Hs +Hs +Hs +Hs +Hs +Hs +PF +pO +Or +pK +pK +pK +pK +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "} (65,1,1) = {" +<<<<<<< HEAD a a a @@ -10233,8 +12040,292 @@ a a a a +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +pK +pK +pK +pK +pK +Dz +Qv +Hs +Gl +Gl +Gl +Gl +Hs +oP +Dz +Kh +pK +pK +pK +pK +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +======= +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +pK +pK +pK +pK +pK +Dz +Qv +Hs +Gl +Gl +Gl +Gl +Hs +PF +sw +Or +pK +pK +pK +pK +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "} (66,1,1) = {" +<<<<<<< HEAD a a a @@ -10375,8 +12466,292 @@ a a a a +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +tA +tA +tA +pK +pK +Dz +Qv +Hs +Gl +Gl +Gl +Gl +Hs +pM +Dz +hi +pK +tA +tA +tA +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +======= +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +tA +tA +tA +pK +pK +Dz +Qv +Hs +Gl +Gl +Gl +Gl +Hs +PF +Kh +hi +pK +tA +tA +tA +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "} (67,1,1) = {" +<<<<<<< HEAD a a a @@ -10517,8 +12892,292 @@ a a a a +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +PF +hp +YB +dc +pK +Iq +Dz +Qv +Hs +Gl +Gl +Gl +Gl +Hs +pM +Dz +wM +pK +dc +vh +zZ +PF +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +======= +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +PF +hp +YB +dc +pK +Iq +Dz +Qv +Hs +Gl +Gl +Gl +Gl +Hs +PF +PF +wM +pK +dc +vh +zZ +PF +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "} (68,1,1) = {" +<<<<<<< HEAD a a a @@ -10659,8 +13318,292 @@ a a a a +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +tA +tA +tA +pK +VB +Dz +Qv +Hs +Gl +Gl +Gl +Gl +Hs +Zd +Dz +Or +pK +tA +tA +tA +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +======= +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +tA +tA +tA +pK +VB +Dz +Qv +Hs +Gl +Gl +Gl +Gl +Hs +pM +PF +Xo +pK +tA +tA +tA +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "} (69,1,1) = {" +<<<<<<< HEAD a a a @@ -10801,6 +13744,289 @@ a a a a +||||||| parent of 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +pK +pK +pK +pK +pK +Dz +zG +Hs +Hs +Gl +Gl +Hs +Hs +Dz +Dz +Or +pK +pK +pK +pK +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +======= +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +Et +pK +pK +pK +pK +pK +Dz +zG +Hs +Hs +Gl +Gl +Hs +Hs +Dz +PF +Or +pK +pK +pK +pK +Et +kz +kz +kz +kz +kz +kz +lL +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +kz +>>>>>>> 660b7d0a0e... Merge pull request #10831 from Very-Soft/MESSESWITHTHEMAPMOAR "} (70,1,1) = {" a diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index 2929137feb..e8afb06324 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -2659,7 +2659,7 @@ /obj/effect/floor_decal/corner/lightgrey{ dir = 6 }, -/obj/structure/closet/emcloset, +/obj/machinery/vending/cigarette, /turf/simulated/floor/tiled, /area/hallway/station/docks) "afG" = ( @@ -3927,12 +3927,8 @@ /turf/simulated/floor/plating, /area/engineering/engine_airlock) "aiA" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, -/obj/structure/catwalk, -/turf/simulated/floor, +/obj/structure/sign/department/mail, +/turf/simulated/wall, /area/maintenance/cargo) "aiC" = ( /obj/effect/floor_decal/industrial/warning{ @@ -7117,9 +7113,7 @@ /turf/space, /area/space) "apX" = ( -/obj/machinery/vending/snack{ - dir = 8 - }, +/obj/machinery/vending/snack, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, /area/engineering/break_room) @@ -7407,9 +7401,6 @@ /turf/simulated/floor/carpet, /area/engineering/break_room) "aqH" = ( -/obj/machinery/vending/coffee{ - dir = 8 - }, /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, /area/engineering/break_room) @@ -7977,10 +7968,8 @@ d2 = 8; icon_state = "0-8" }, -/obj/machinery/vending/cigarette{ - dir = 8 - }, /obj/effect/floor_decal/corner/white/diagonal, +/obj/structure/table/reinforced, /turf/simulated/floor/tiled, /area/engineering/break_room) "asv" = ( @@ -8198,19 +8187,10 @@ /turf/simulated/floor/wood, /area/engineering/break_room) "ate" = ( -/obj/machinery/door/airlock/maintenance/cargo{ - req_access = list(50); - req_one_access = list(48) - }, -/obj/machinery/door/firedoor/glass, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor, -/area/quartermaster/delivery) +/obj/machinery/vending/cigarette, +/obj/effect/floor_decal/corner/white/diagonal, +/turf/simulated/floor/tiled, +/area/engineering/break_room) "atf" = ( /obj/machinery/atmospherics/binary/pump{ dir = 1 @@ -8278,17 +8258,12 @@ /turf/simulated/floor/tiled/monotile, /area/engineering/workshop) "atm" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" - }, /obj/effect/floor_decal/borderfloor{ dir = 9 }, /obj/effect/floor_decal/corner/brown/border{ dir = 9 }, -/obj/machinery/camera/network/cargo, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 }, @@ -8298,12 +8273,18 @@ /obj/structure/sign/poster{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/quartermaster/delivery) "atn" = ( -/obj/structure/disposalpipe/sortjunction/untagged/flipped{ - dir = 1 +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" }, +/obj/machinery/camera/network/cargo, /turf/simulated/floor/tiled, /area/quartermaster/delivery) "atr" = ( @@ -8855,7 +8836,11 @@ /turf/simulated/floor/tiled, /area/engineering/engine_eva) "avt" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/sortjunction/flipped{ + dir = 1; + name = "Sorting Office"; + sortType = "Sorting Office" + }, /turf/simulated/floor/tiled, /area/quartermaster/delivery) "avv" = ( @@ -10361,10 +10346,6 @@ /turf/simulated/wall, /area/quartermaster/delivery) "aAF" = ( -/obj/structure/disposalpipe/junction{ - dir = 2; - icon_state = "pipe-j2" - }, /obj/effect/floor_decal/borderfloor{ dir = 8 }, @@ -10375,13 +10356,15 @@ dir = 8; pixel_x = -24 }, +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, /turf/simulated/floor/tiled, /area/quartermaster/delivery) "aAG" = ( -/obj/structure/disposalpipe/sortjunction/flipped{ - dir = 1; - name = "Sorting Office"; - sortType = "Sorting Office" +/obj/structure/disposalpipe/sortjunction/untagged/flipped{ + dir = 1 }, /turf/simulated/floor/tiled, /area/quartermaster/delivery) @@ -18307,15 +18290,9 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "ejO" = ( -/obj/structure/table/standard, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/machinery/camera/network/civilian, +/obj/machinery/vending/tool, /turf/simulated/floor/tiled, /area/storage/tools) "ekh" = ( @@ -19327,6 +19304,24 @@ }, /turf/simulated/floor/tiled/techmaint, /area/shuttle/excursion/general) +"fmg" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 5 + }, +/obj/effect/floor_decal/steeldecal/steel_decals7{ + dir = 6 + }, +/obj/machinery/camera/network/tether{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/maintenance/cargo) "fpk" = ( /turf/simulated/floor/airless, /area/tether/outpost/solars_outside{ @@ -19526,20 +19521,24 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "fxR" = ( -/obj/machinery/alarm{ - dir = 4; - pixel_x = -23 +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 }, -/obj/machinery/vending/coffee{ +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 }, -/obj/effect/floor_decal/borderfloor{ - dir = 9 +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 9 +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 }, -/turf/simulated/floor/tiled, +/obj/machinery/vending/coffee, +/turf/simulated/floor/tiled/monotile, /area/quartermaster/foyer) "fyF" = ( /obj/machinery/power/apc{ @@ -20632,7 +20631,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/excursion/general) "gKa" = ( -/obj/structure/reagent_dispensers/foam, +/obj/machinery/lapvend, /turf/simulated/floor/tiled, /area/storage/tools) "gKH" = ( @@ -20884,10 +20883,10 @@ /area/tether/exploration) "gWp" = ( /obj/effect/floor_decal/borderfloor{ - dir = 1 + dir = 9 }, /obj/effect/floor_decal/corner/lightgrey/border{ - dir = 1 + dir = 9 }, /obj/effect/floor_decal/borderfloor/corner2{ dir = 1 @@ -20895,10 +20894,12 @@ /obj/effect/floor_decal/corner/lightgrey/bordercorner2{ dir = 1 }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 4 +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/bordercorner2{ + dir = 10 }, -/obj/effect/floor_decal/steeldecal/steel_decals7, /turf/simulated/floor/tiled, /area/quartermaster/foyer) "gWD" = ( @@ -23265,9 +23266,6 @@ /turf/simulated/floor/tiled, /area/quartermaster/storage) "iPR" = ( -/obj/machinery/lapvend{ - dir = 4 - }, /turf/simulated/floor/tiled, /area/storage/tools) "iRq" = ( @@ -25382,26 +25380,10 @@ /turf/simulated/floor/plating, /area/maintenance/substation/tcomms) "kSd" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 8 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 5 - }, -/obj/effect/floor_decal/steeldecal/steel_decals7{ - dir = 6 - }, -/obj/machinery/camera/network/tether{ - dir = 4 - }, -/obj/machinery/vending/fitness{ - dir = 4 - }, +/obj/machinery/vending/coffee, +/obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, -/area/quartermaster/foyer) +/area/engineering/break_room) "kSu" = ( /obj/structure/closet, /obj/random/tool, @@ -25810,6 +25792,7 @@ layer = 3.3; pixel_x = 26 }, +/obj/random/tech_supply, /turf/simulated/floor/tiled, /area/storage/tools) "ljB" = ( @@ -27194,9 +27177,18 @@ /turf/simulated/mineral/vacuum, /area/maintenance/station/cargo) "mtI" = ( -/obj/machinery/vending/tool{ - dir = 4 +/obj/structure/table/standard, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" }, +/obj/random/tech_supply, /turf/simulated/floor/tiled, /area/storage/tools) "mtR" = ( @@ -29505,6 +29497,15 @@ }, /turf/simulated/floor/tiled, /area/janitor) +"oFh" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/cargo{ + req_access = list(50); + req_one_access = list(48) + }, +/turf/simulated/floor, +/area/quartermaster/delivery) "oFl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -30564,8 +30565,14 @@ /turf/simulated/floor/tiled, /area/quartermaster/belterdock/gear) "qfK" = ( -/obj/structure/sign/department/mail, -/turf/simulated/wall, +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/lightgrey/border{ + dir = 10 + }, +/obj/structure/closet/emcloset, +/turf/simulated/floor/tiled, /area/maintenance/cargo) "qgB" = ( /obj/structure/cable/green{ @@ -33145,6 +33152,19 @@ /obj/effect/floor_decal/steeldecal/steel_decals4, /turf/simulated/floor/tiled, /area/engineering/hallway) +"sZb" = ( +/obj/effect/floor_decal/borderfloor{ + 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, +/area/quartermaster/delivery) "tal" = ( /turf/simulated/wall/r_wall, /area/ai_monitored/storage/eva) @@ -33468,17 +33488,12 @@ /turf/simulated/floor/tiled, /area/engineering/hallway) "tqt" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/obj/effect/floor_decal/corner/lightgrey/border{ - dir = 10 - }, -/obj/machinery/vending/cigarette{ +/obj/structure/reagent_dispensers/watertank, +/obj/machinery/light/small{ dir = 4 }, -/turf/simulated/floor/tiled, -/area/quartermaster/foyer) +/turf/simulated/floor, +/area/maintenance/cargo) "trn" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -33548,11 +33563,24 @@ /turf/simulated/floor/tiled, /area/hallway/station/atrium) "tvd" = ( -/obj/machinery/light/small{ +/obj/effect/floor_decal/corner/lightgrey{ + dir = 9 + }, +/obj/effect/floor_decal/corner/lightgrey{ + dir = 6 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ dir = 4 }, -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/machinery/vending/fitness, +/turf/simulated/floor/tiled/monotile, /area/maintenance/cargo) "txf" = ( /obj/effect/floor_decal/industrial/warning{ @@ -34325,6 +34353,7 @@ /obj/random/tech_supply, /obj/random/tech_supply, /obj/item/weapon/storage/box/lights/mixed, +/obj/random/tech_supply, /turf/simulated/floor/tiled, /area/storage/tools) "uuz" = ( @@ -35423,12 +35452,15 @@ /turf/simulated/floor/tiled/monotile, /area/tether/exploration) "vLU" = ( -/obj/machinery/vending/assist{ - dir = 4 - }, -/obj/machinery/light/small{ - dir = 8 - }, +/obj/structure/table/standard, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, +/obj/random/tech_supply, /turf/simulated/floor/tiled, /area/storage/tools) "vMe" = ( @@ -36325,6 +36357,7 @@ dir = 8; pixel_x = 25 }, +/obj/random/tech_supply, /turf/simulated/floor/tiled, /area/storage/tools) "xbp" = ( @@ -36406,23 +36439,17 @@ /turf/simulated/floor/tiled/dark, /area/ai_server_room) "xeo" = ( -/obj/structure/table/standard, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, /obj/machinery/power/apc{ dir = 1; name = "north bump"; pixel_y = 28 }, -/obj/random/tech_supply, -/obj/random/tech_supply, /obj/structure/cable/green{ d2 = 2; icon_state = "0-2" }, /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/vending/assist, /turf/simulated/floor/tiled, /area/storage/tools) "xeG" = ( @@ -36512,13 +36539,7 @@ /turf/simulated/floor/plating, /area/maintenance/station/cargo) "xjc" = ( -/obj/structure/table/standard, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, -/obj/random/tech_supply, +/obj/structure/reagent_dispensers/foam, /turf/simulated/floor/tiled, /area/storage/tools) "xjm" = ( @@ -45959,7 +45980,7 @@ aJs anZ any apg -apQ +ate ajF asp atJ @@ -46101,7 +46122,7 @@ aJs afq tpV apg -apQ +kSd apQ asx apQ @@ -47121,13 +47142,13 @@ lLv bVP ain tUh -wBw -wBw -axE -aAD +tqt +kLG +cFG +oFh atm aAF -avM +sZb mKD avM awj @@ -47263,10 +47284,10 @@ ago jjR aCq tUh -tvd -kLG +tUh +tUh aiA -ate +aAD atn aAG avt @@ -47405,8 +47426,8 @@ agw air aAw tUh -tUh -tUh +tvd +fmg qfK aAD oUP @@ -47548,8 +47569,8 @@ tmf ioz hLg fxR -kSd -tqt +wnV +aVY kUL atr atV