diff --git a/maps/placeholder/placeholder-1_deck_1.dmm b/maps/placeholder/placeholder-1_deck_1.dmm index b62be68bf6a..31e4d6870d7 100644 --- a/maps/placeholder/placeholder-1_deck_1.dmm +++ b/maps/placeholder/placeholder-1_deck_1.dmm @@ -18379,8 +18379,8 @@ pg pg pg pg -oG -oG +pg +pg oG oG oG @@ -18581,8 +18581,8 @@ pg pg pg pg -Vh -Vh +pg +pg Vh Vh Vh @@ -18783,8 +18783,8 @@ pg pg pg pg -Vh -Vh +pg +pg Vh Vh Vh @@ -18985,8 +18985,8 @@ pg pg pg pg -Vh -Vh +pg +pg Vh Vh Vh diff --git a/maps/placeholder/placeholder-2_deck_2.dmm b/maps/placeholder/placeholder-2_deck_2.dmm index 9ac62415a6e..c5f711fef1a 100644 --- a/maps/placeholder/placeholder-2_deck_2.dmm +++ b/maps/placeholder/placeholder-2_deck_2.dmm @@ -52,6 +52,13 @@ /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/janitor) +"am" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/janitor) "an" = ( /obj/structure/table/standard, /turf/simulated/floor/reinforced, @@ -86,26 +93,12 @@ /obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/grass/alt, /area/template_noop) -"at" = ( -/obj/machinery/field_generator, -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, -/turf/simulated/floor/reinforced, -/area/janitor) "au" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 }, /turf/simulated/floor/reinforced, /area/janitor) -"av" = ( -/obj/machinery/field_generator, -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/turf/simulated/floor/reinforced, -/area/janitor) "ax" = ( /obj/structure/railing/mapped{ dir = 4 @@ -213,8 +206,11 @@ /turf/simulated/floor/tiled/dark, /area/janitor) "aQ" = ( -/obj/machinery/door/airlock/hatch, -/turf/simulated/floor/tiled/dark, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, /area/janitor) "aR" = ( /obj/machinery/pipedispenser, @@ -317,8 +313,14 @@ /turf/simulated/floor/tiled/dark, /area/janitor) "bf" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /obj/structure/lattice/catwalk/indoor/grate, -/turf/simulated/floor/tiled, +/turf/simulated/floor/plating, /area/janitor) "bg" = ( /obj/structure/railing/mapped{ @@ -374,10 +376,14 @@ /turf/simulated/floor/grass/alt, /area/janitor) "bn" = ( -/obj/machinery/telepad{ - pixel_y = 6 +/obj/machinery/power/tesla_coil, +/obj/structure/cable/yellow{ + icon_state = "0-8" }, -/turf/simulated/floor/reinforced, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/simulated/floor/greengrid/nitrogen, /area/janitor) "bo" = ( /obj/item/modular_computer/console/preset/security, @@ -499,12 +505,31 @@ }, /turf/simulated/floor/tiled/dark, /area/janitor) +"bK" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/janitor) "bN" = ( /obj/machinery/r_n_d/circuit_imprinter, /turf/simulated/floor/carpet/rubber, /area/janitor) +"bO" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/janitor) "bP" = ( -/obj/item/modular_computer/console/preset/engineering, +/obj/structure/cable/orange{ + icon_state = "2-4" + }, /turf/simulated/floor/tiled/dark, /area/janitor) "bQ" = ( @@ -535,6 +560,12 @@ }, /turf/simulated/open/airless, /area/janitor) +"bU" = ( +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) "bV" = ( /obj/structure/shuttle_part/dark{ icon_state = "d3-we-3_f" @@ -568,27 +599,29 @@ /turf/simulated/floor/tiled/dark, /area/janitor) "ca" = ( -/obj/machinery/field_generator, -/obj/effect/floor_decal/industrial/warning{ - dir = 10 +/obj/structure/cable/orange{ + icon_state = "4-8" }, -/turf/simulated/floor/reinforced, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, /area/janitor) "cc" = ( -/turf/simulated/floor/tiled/ramp{ - dir = 1 - }, -/area/janitor) -"cd" = ( -/obj/structure/table/standard, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 1 +/obj/effect/floor_decal/industrial/warning/corner, +/obj/structure/cable/orange{ + icon_state = "4-8" }, /turf/simulated/floor/tiled/dark, /area/janitor) +"cd" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/reinforced, +/area/janitor) "ce" = ( /obj/structure/flora/pottedplant/random, /turf/simulated/floor/carpet, @@ -610,8 +643,11 @@ /turf/simulated/floor/tiled, /area/janitor) "ci" = ( -/obj/machinery/computer/telescience{ - starting_crystals = 4 +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" }, /turf/simulated/floor/tiled/dark, /area/janitor) @@ -643,6 +679,12 @@ }, /turf/simulated/floor/tiled/dark, /area/janitor) +"co" = ( +/obj/structure/cable/orange{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) "cp" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/window/reinforced{ @@ -656,15 +698,14 @@ "cq" = ( /obj/structure/lattice/catwalk/indoor, /obj/machinery/door/airlock/external, -/turf/simulated/floor/tiled/dark, +/turf/simulated/floor/plating, /area/janitor) "cr" = ( -/obj/structure/table/standard, -/obj/structure/window/reinforced{ - dir = 4 +/obj/structure/cable/orange{ + icon_state = "1-2" }, -/obj/structure/window/reinforced{ - dir = 1 +/obj/structure/cable/orange{ + icon_state = "1-4" }, /turf/simulated/floor/tiled/dark, /area/janitor) @@ -717,8 +758,8 @@ /turf/simulated/floor/tiled, /area/janitor) "cz" = ( -/obj/structure/bed/chair/office/dark{ - dir = 1 +/obj/machinery/computer/telescience{ + starting_crystals = 4 }, /turf/simulated/floor/tiled/dark, /area/janitor) @@ -732,12 +773,34 @@ /obj/structure/sign/biohazard, /turf/simulated/wall, /area/janitor) +"cD" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/janitor) "cE" = ( /obj/structure/railing/mapped{ dir = 8 }, /turf/simulated/open, /area/janitor) +"cF" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/janitor) "cG" = ( /obj/machinery/portable_atmospherics/hydroponics, /turf/simulated/floor/tiled/dark, @@ -772,16 +835,6 @@ /obj/structure/lattice, /turf/simulated/open/airless, /area/janitor) -"cQ" = ( -/obj/machinery/power/emitter{ - dir = 4 - }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/janitor) "cS" = ( /obj/structure/table/standard, /obj/structure/window/reinforced, @@ -859,6 +912,22 @@ /obj/item/device/flashlight/lamp, /turf/simulated/floor/tiled, /area/janitor) +"di" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/obj/structure/cable/orange{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) +"dj" = ( +/obj/machinery/power/tesla_coil, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/simulated/floor/greengrid/nitrogen, +/area/janitor) "dk" = ( /obj/machinery/atmospherics/unary/freezer{ dir = 4; @@ -886,8 +955,12 @@ /turf/simulated/floor/tiled/dark, /area/janitor) "dp" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/turf/simulated/floor/plating, +/obj/machinery/power/tesla_coil, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/structure/cable/yellow, +/turf/simulated/floor/greengrid/nitrogen, /area/janitor) "dq" = ( /obj/structure/sink{ @@ -926,9 +999,7 @@ /turf/simulated/floor/tiled/dark, /area/janitor) "dw" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 9 - }, +/obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled/dark, /area/janitor) "dy" = ( @@ -1007,6 +1078,11 @@ /obj/machinery/seed_storage/xenobotany, /turf/simulated/floor/tiled/dark, /area/janitor) +"dQ" = ( +/obj/machinery/power/tesla_coil, +/obj/structure/cable/yellow, +/turf/simulated/floor/greengrid/nitrogen, +/area/janitor) "dR" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/valve/digital{ @@ -1061,11 +1137,23 @@ /obj/structure/lattice, /turf/simulated/open/airless, /area/janitor) +"ej" = ( +/obj/machinery/power/tesla_coil, +/obj/structure/cable/yellow, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/simulated/floor/greengrid/nitrogen, +/area/janitor) "ek" = ( /obj/effect/floor_decal/corner_wide/grey/diagonal, /obj/structure/table/standard, /turf/simulated/floor/tiled/white, /area/janitor) +"em" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/tiled, +/area/janitor) "er" = ( /obj/structure/closet/wardrobe/robotics_black, /turf/simulated/floor/tiled, @@ -1076,15 +1164,51 @@ }, /turf/simulated/floor/tiled, /area/janitor) +"et" = ( +/obj/structure/cable/orange{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) "eu" = ( /obj/structure/bed/chair/office/dark, /turf/simulated/floor/tiled, /area/janitor) +"ew" = ( +/obj/machinery/power/emitter{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/structure/cable/orange{ + icon_state = "0-8" + }, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/janitor) "eA" = ( /obj/effect/floor_decal/corner_wide/grey/diagonal, /obj/machinery/vending/snack, /turf/simulated/floor/tiled/white, /area/janitor) +"eC" = ( +/obj/machinery/power/apc{ + dir = 1; + pixel_y = 24 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) +"eE" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/janitor) "eH" = ( /obj/effect/floor_decal/industrial/warning{ dir = 9 @@ -1107,6 +1231,16 @@ }, /turf/simulated/floor/tiled/dark, /area/janitor) +"eN" = ( +/obj/structure/table/standard, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) "eO" = ( /obj/structure/table/standard, /turf/simulated/floor/carpet, @@ -1173,6 +1307,26 @@ }, /turf/simulated/floor/tiled/white, /area/janitor) +"fc" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) +"fd" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/janitor) +"fe" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/janitor) "fh" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, /turf/simulated/floor/tiled/dark, @@ -1191,6 +1345,12 @@ }, /turf/simulated/floor/tiled/dark, /area/janitor) +"fq" = ( +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) "fr" = ( /obj/structure/table/standard, /obj/item/reagent_containers/spray/cleaner, @@ -1231,6 +1391,12 @@ }, /turf/simulated/floor/tiled/white, /area/janitor) +"fF" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) "fH" = ( /obj/effect/floor_decal/corner/green{ dir = 9 @@ -1238,12 +1404,27 @@ /obj/machinery/vending/cigarette, /turf/simulated/floor/tiled, /area/janitor) +"fI" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) "fJ" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 6 }, /turf/simulated/open/airless, /area/janitor) +"fL" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) "fN" = ( /obj/structure/cryofeed{ dir = 4 @@ -1298,12 +1479,46 @@ }, /turf/simulated/floor/tiled/white, /area/janitor) +"gc" = ( +/obj/machinery/door/airlock/engineering, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) "gd" = ( /obj/structure/shuttle_part/dark{ icon_state = "d3-we-3" }, /turf/simulated/open/airless, /area/janitor) +"ge" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/door/airlock/hatch{ + icon_state = "door_locked"; + locked = 1 + }, +/turf/simulated/floor/plating, +/area/janitor) +"gf" = ( +/obj/structure/bed/chair/office/dark{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) +"gh" = ( +/obj/machinery/door/airlock/hatch{ + icon_state = "door_locked"; + locked = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/janitor) "gi" = ( /obj/structure/table/standard, /obj/structure/window/reinforced{ @@ -1331,6 +1546,23 @@ }, /turf/simulated/floor/tiled, /area/janitor) +"go" = ( +/obj/machinery/door/airlock/hatch{ + icon_state = "door_locked"; + locked = 1 + }, +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/janitor) +"gs" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/janitor) "gt" = ( /obj/machinery/smartfridge/secure/extract, /turf/simulated/wall, @@ -1347,6 +1579,10 @@ }, /turf/simulated/floor/tiled, /area/janitor) +"gw" = ( +/obj/machinery/power/breakerbox, +/turf/simulated/floor/tiled/dark, +/area/janitor) "gy" = ( /obj/structure/table/rack, /obj/item/towel, @@ -1359,6 +1595,16 @@ }, /turf/simulated/floor/tiled/freezer, /area/janitor) +"gz" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/janitor) "gF" = ( /obj/structure/railing/mapped, /obj/structure/window/reinforced, @@ -1375,12 +1621,24 @@ /obj/effect/floor_decal/industrial/warning/full, /turf/simulated/floor/plating, /area/janitor) +"gJ" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/janitor) "gK" = ( /obj/structure/shuttle_part/dark{ icon_state = "d3-we-6_f" }, /turf/simulated/floor/tiled, /area/janitor) +"gM" = ( +/obj/structure/cable/orange{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/janitor) "gN" = ( /obj/structure/table/standard, /obj/machinery/recharger, @@ -1390,6 +1648,27 @@ /obj/structure/weapon_rack/double, /turf/simulated/wall, /area/janitor) +"gP" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/janitor) +"gQ" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/janitor) +"gU" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/janitor) "gV" = ( /obj/structure/flora/pottedplant/random, /obj/effect/floor_decal/corner_wide/green{ @@ -1403,9 +1682,7 @@ /turf/simulated/floor/tiled, /area/janitor) "gZ" = ( -/obj/structure/particle_accelerator/end_cap{ - dir = 1 - }, +/obj/machinery/power/smes/magical, /turf/simulated/floor/tiled/dark, /area/janitor) "ha" = ( @@ -1429,6 +1706,15 @@ }, /turf/simulated/floor/tiled, /area/janitor) +"hb" = ( +/obj/structure/cable/yellow, +/obj/machinery/power/terminal{ + dir = 8; + layer = 5 + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/janitor) "hd" = ( /obj/structure/ladder{ pixel_y = 16 @@ -1458,8 +1744,8 @@ /turf/simulated/floor/lino/grey, /area/janitor) "hm" = ( -/obj/structure/particle_accelerator/fuel_chamber{ - dir = 1 +/obj/structure/cable{ + icon_state = "1-4" }, /turf/simulated/floor/tiled/dark, /area/janitor) @@ -1483,12 +1769,6 @@ /obj/effect/floor_decal/industrial/outline/red, /turf/simulated/floor/tiled/white, /area/janitor) -"hx" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, -/turf/simulated/floor/tiled/dark, -/area/janitor) "hy" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/item/storage/firstaid/toxin{ @@ -1517,6 +1797,17 @@ }, /turf/simulated/floor/tiled/white, /area/janitor) +"hG" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/door/airlock/hatch{ + icon_state = "door_locked"; + locked = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) "hH" = ( /obj/structure/bed, /obj/machinery/light{ @@ -1525,6 +1816,13 @@ /obj/item/bedsheet/medical, /turf/simulated/floor/tiled/white, /area/janitor) +"hI" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/turf/simulated/floor/plating, +/area/janitor) "hJ" = ( /obj/machinery/power/breakerbox, /turf/simulated/floor/plating, @@ -1533,6 +1831,32 @@ /obj/machinery/r_n_d/protolathe, /turf/simulated/floor/tiled/dark, /area/janitor) +"hX" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/door/airlock/hatch{ + icon_state = "door_locked"; + locked = 1 + }, +/turf/simulated/floor/plating, +/area/janitor) +"hY" = ( +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) +"ia" = ( +/obj/structure/cable, +/obj/machinery/power/apc{ + dir = 8; + name = "west bump"; + pixel_x = -24 + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) "id" = ( /obj/machinery/door/blast/shutters{ dir = 4 @@ -1546,10 +1870,11 @@ /turf/simulated/floor/tiled/dark, /area/janitor) "in" = ( -/obj/structure/bed/chair/office/dark{ - dir = 8 +/obj/machinery/power/terminal{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, +/obj/structure/cable/yellow, +/turf/simulated/floor/plating, /area/janitor) "io" = ( /obj/structure/table/rack, @@ -1705,6 +2030,19 @@ }, /turf/simulated/floor/tiled/dark, /area/janitor) +"jk" = ( +/obj/machinery/power/emitter{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 8 + }, +/obj/structure/cable/orange{ + icon_state = "0-8" + }, +/turf/simulated/floor/plating, +/area/janitor) "jp" = ( /obj/structure/table/standard, /obj/item/device/camera, @@ -1887,6 +2225,12 @@ /area/janitor) "ld" = ( /obj/machinery/power/tesla_coil, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, /turf/simulated/floor/greengrid/nitrogen, /area/janitor) "lf" = ( @@ -1922,10 +2266,6 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/simulated/floor/grass/alt, /area/janitor) -"lB" = ( -/obj/machinery/particle_accelerator/control_box, -/turf/simulated/floor/tiled/dark, -/area/janitor) "lH" = ( /obj/structure/shuttle_part/dark{ icon_state = "d3-we-1_f" @@ -1963,14 +2303,6 @@ }, /turf/simulated/open/airless, /area/template_noop) -"mi" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/plating, -/area/janitor) "mj" = ( /obj/structure/table/standard, /obj/item/device/flashlight/lamp, @@ -2044,6 +2376,11 @@ }, /turf/simulated/floor/tiled/dark, /area/janitor) +"mL" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/plating, +/area/janitor) "mM" = ( /obj/machinery/vending/hydroseeds, /turf/simulated/floor/wood, @@ -2222,13 +2559,6 @@ /obj/machinery/iv_drip, /turf/simulated/floor/tiled/white, /area/janitor) -"ol" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/janitor) "oo" = ( /obj/machinery/light{ dir = 4 @@ -2508,12 +2838,6 @@ }, /turf/simulated/floor/reinforced, /area/janitor) -"qG" = ( -/obj/effect/floor_decal/industrial/warning{ - dir = 5 - }, -/turf/simulated/floor/tiled/dark, -/area/janitor) "qK" = ( /obj/structure/table/rack, /turf/simulated/floor/tiled/white, @@ -2654,12 +2978,6 @@ /obj/item/storage/bag/slimes, /turf/simulated/floor/tiled/dark, /area/janitor) -"sf" = ( -/obj/structure/bed/chair/office/dark{ - dir = 4 - }, -/turf/simulated/floor/tiled/dark, -/area/janitor) "sj" = ( /obj/effect/map_effect/wingrille_spawn/reinforced_phoron, /turf/simulated/floor/reinforced, @@ -2715,6 +3033,12 @@ /obj/structure/closet/crate, /turf/simulated/floor/tiled, /area/janitor) +"sI" = ( +/obj/machinery/telepad{ + pixel_y = 6 + }, +/turf/simulated/floor/reinforced, +/area/janitor) "sJ" = ( /obj/structure/flora/pottedplant/random, /turf/simulated/floor/tiled, @@ -2774,12 +3098,6 @@ }, /turf/simulated/open, /area/janitor) -"tj" = ( -/obj/structure/particle_accelerator/particle_emitter/center{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/janitor) "tp" = ( /obj/effect/floor_decal/corner/white/diagonal, /turf/simulated/floor/tiled, @@ -2891,11 +3209,6 @@ /obj/structure/closet/coffin, /turf/simulated/floor/tiled, /area/janitor) -"tT" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/floor_decal/industrial/warning, -/turf/simulated/floor/plating, -/area/janitor) "tU" = ( /obj/structure/table/steel, /obj/item/device/assembly/prox_sensor{ @@ -2914,6 +3227,10 @@ /obj/machinery/cryopod, /turf/simulated/floor/tiled/white, /area/janitor) +"tZ" = ( +/obj/machinery/the_singularitygen/tesla, +/turf/simulated/floor/reinforced, +/area/janitor) "ub" = ( /obj/structure/table/standard, /obj/item/device/radio/off, @@ -2926,6 +3243,10 @@ /obj/effect/floor_decal/sign/first_responder, /turf/simulated/floor/tiled/white, /area/janitor) +"ud" = ( +/obj/machinery/particle_accelerator/control_box, +/turf/simulated/floor/tiled/dark, +/area/janitor) "ug" = ( /obj/structure/bed/chair/office/dark{ dir = 8 @@ -2942,6 +3263,13 @@ }, /turf/simulated/floor/grass/alt, /area/janitor) +"um" = ( +/obj/machinery/field_generator, +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/turf/simulated/floor/reinforced, +/area/janitor) "up" = ( /obj/effect/floor_decal/corner/green{ dir = 9 @@ -3094,6 +3422,12 @@ /obj/structure/plasticflaps/mining, /turf/simulated/floor/tiled, /area/janitor) +"vE" = ( +/obj/structure/particle_accelerator/particle_emitter/center{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) "vG" = ( /obj/machinery/bodyscanner{ dir = 4 @@ -3173,10 +3507,6 @@ /obj/machinery/vending/cigarette, /turf/simulated/floor/tiled/white, /area/janitor) -"wv" = ( -/obj/machinery/the_singularitygen/tesla, -/turf/simulated/floor/reinforced, -/area/janitor) "wz" = ( /obj/structure/table/standard, /obj/structure/closet/crate/hydroponics, @@ -3366,6 +3696,12 @@ }, /turf/simulated/floor/tiled/white, /area/janitor) +"yo" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) "yr" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -3447,7 +3783,7 @@ /turf/simulated/floor/tiled/dark, /area/janitor) "za" = ( -/turf/simulated/wall, +/turf/simulated/floor/plating, /area/template_noop) "zd" = ( /obj/structure/table/standard, @@ -3597,13 +3933,6 @@ }, /turf/simulated/floor/tiled/dark, /area/janitor) -"Ar" = ( -/obj/machinery/door/blast/shutters{ - dir = 2; - layer = 5 - }, -/turf/simulated/floor/tiled, -/area/janitor) "As" = ( /obj/effect/floor_decal/corner/white/diagonal, /obj/item/reagent_containers/hypospray{ @@ -3662,6 +3991,14 @@ }, /turf/simulated/floor/tiled/dark, /area/janitor) +"AK" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/janitor) "AN" = ( /obj/machinery/atmospherics/unary/vent_pump/engine{ dir = 8 @@ -3716,6 +4053,10 @@ }, /turf/simulated/floor/tiled/dark, /area/janitor) +"Bf" = ( +/obj/item/modular_computer/console/preset/engineering, +/turf/simulated/floor/tiled/dark, +/area/janitor) "Bg" = ( /obj/machinery/atmospherics/binary/pump{ dir = 1 @@ -3767,6 +4108,10 @@ }, /turf/simulated/floor/tiled/white, /area/janitor) +"BN" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/plating, +/area/janitor) "BO" = ( /obj/effect/floor_decal/corner_wide/green{ dir = 9 @@ -3889,12 +4234,14 @@ /obj/item/cell/high, /turf/simulated/floor/tiled, /area/janitor) -"Dc" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 4 +"Da" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 10 }, -/turf/simulated/floor/plating, +/obj/structure/cable/orange{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/dark, /area/janitor) "De" = ( /obj/structure/closet/wardrobe/chaplain_black, @@ -3910,13 +4257,6 @@ /obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/white, /area/janitor) -"Dk" = ( -/obj/machinery/field_generator, -/obj/effect/floor_decal/industrial/warning{ - dir = 6 - }, -/turf/simulated/floor/reinforced, -/area/janitor) "Dm" = ( /obj/structure/window/reinforced, /obj/structure/window/reinforced{ @@ -3984,13 +4324,6 @@ /obj/machinery/computer/shuttle_control/lift, /turf/simulated/floor/tiled/dark, /area/janitor) -"DF" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/janitor) "DH" = ( /obj/machinery/r_n_d/destructive_analyzer, /turf/simulated/floor/tiled/dark, @@ -4042,14 +4375,6 @@ }, /turf/simulated/floor/tiled/white, /area/janitor) -"DW" = ( -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/floor_decal/industrial/warning, -/obj/effect/floor_decal/industrial/warning{ - dir = 1 - }, -/turf/simulated/floor/plating, -/area/janitor) "DY" = ( /obj/structure/shuttle_part/dark{ icon_state = "d2-we-2" @@ -4260,6 +4585,12 @@ }, /turf/simulated/floor/wood, /area/janitor) +"FO" = ( +/obj/structure/particle_accelerator/fuel_chamber{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) "FP" = ( /obj/machinery/power/apc{ is_critical = 1; @@ -4306,6 +4637,12 @@ }, /turf/simulated/floor/tiled/white, /area/janitor) +"FY" = ( +/obj/structure/bed/chair/office/dark{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) "Gb" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 4 @@ -4338,6 +4675,12 @@ }, /turf/simulated/floor/plating, /area/janitor) +"Gl" = ( +/obj/structure/particle_accelerator/end_cap{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) "Gt" = ( /obj/machinery/door/window/northright, /turf/simulated/floor/tiled/dark, @@ -4577,6 +4920,13 @@ /obj/structure/lattice/catwalk/indoor/grate, /turf/simulated/floor/plating, /area/janitor) +"IG" = ( +/obj/machinery/field_generator, +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/reinforced, +/area/janitor) "II" = ( /obj/machinery/power/apc{ dir = 8; @@ -4665,6 +5015,13 @@ /obj/structure/window/reinforced, /turf/simulated/floor/tiled, /area/janitor) +"Jo" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/janitor) "Jq" = ( /obj/machinery/slime_extractor, /obj/effect/floor_decal/industrial/warning/full, @@ -4734,6 +5091,12 @@ }, /turf/simulated/floor/tiled/dark, /area/janitor) +"JI" = ( +/obj/structure/particle_accelerator/power_box{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) "JJ" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/bed/chair/office/light{ @@ -4868,7 +5231,10 @@ /area/janitor) "KS" = ( /obj/effect/floor_decal/industrial/warning{ - dir = 10 + dir = 6 + }, +/obj/structure/cable/orange{ + icon_state = "4-8" }, /turf/simulated/floor/tiled/dark, /area/janitor) @@ -4989,6 +5355,12 @@ }, /turf/simulated/floor/tiled, /area/janitor) +"LV" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 9 + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) "Md" = ( /obj/structure/table/standard, /obj/item/storage/box/fancy/crayons/chalkbox, @@ -5133,6 +5505,13 @@ /obj/item/modular_computer/console/preset/engineering, /turf/simulated/floor/carpet/rubber, /area/janitor) +"Nt" = ( +/obj/machinery/door/airlock/hatch{ + icon_state = "door_locked"; + locked = 1 + }, +/turf/simulated/floor/plating, +/area/janitor) "Nx" = ( /obj/structure/table/wood, /obj/item/clipboard, @@ -5164,12 +5543,6 @@ /obj/structure/reagent_dispensers/watertank, /turf/simulated/floor/tiled, /area/janitor) -"NO" = ( -/obj/structure/particle_accelerator/power_box{ - dir = 1 - }, -/turf/simulated/floor/tiled/dark, -/area/janitor) "NR" = ( /obj/machinery/door/firedoor, /obj/structure/grille, @@ -5298,6 +5671,11 @@ dir = 8 }, /area/janitor) +"Pp" = ( +/turf/simulated/floor/tiled/ramp{ + dir = 1 + }, +/area/janitor) "Pq" = ( /obj/machinery/seed_extractor, /turf/simulated/floor/wood, @@ -5335,16 +5713,6 @@ /obj/structure/window/reinforced, /turf/simulated/floor/grass/alt, /area/janitor) -"PC" = ( -/obj/machinery/power/emitter{ - dir = 8 - }, -/obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/floor_decal/industrial/warning/cee{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/janitor) "PF" = ( /obj/structure/table/stone/marble, /obj/effect/floor_decal/corner/grey/diagonal, @@ -5571,6 +5939,13 @@ /obj/machinery/door/window/westright, /turf/simulated/floor/tiled/dark, /area/janitor) +"Rw" = ( +/obj/machinery/field_generator, +/obj/effect/floor_decal/industrial/warning{ + dir = 10 + }, +/turf/simulated/floor/reinforced, +/area/janitor) "Rx" = ( /obj/structure/bed/chair/comfy/black, /turf/simulated/floor/carpet, @@ -5806,6 +6181,16 @@ /obj/structure/table/standard, /turf/simulated/floor/tiled, /area/janitor) +"Tu" = ( +/obj/structure/table/standard, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) "Tv" = ( /obj/structure/closet/secure_closet/atmos_personal, /turf/simulated/floor/tiled/dark, @@ -5941,6 +6326,19 @@ }, /turf/simulated/floor/tiled, /area/janitor) +"Ud" = ( +/obj/machinery/power/emitter{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 4 + }, +/obj/structure/cable/orange{ + icon_state = "0-4" + }, +/turf/simulated/floor/plating, +/area/janitor) "Uf" = ( /obj/machinery/door/airlock/external, /turf/simulated/floor/plating, @@ -6081,6 +6479,13 @@ /obj/effect/floor_decal/industrial/warning/corner, /turf/simulated/floor/tiled/dark, /area/janitor) +"Vg" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning/cee{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/janitor) "Vk" = ( /obj/structure/window/reinforced{ dir = 8 @@ -6531,6 +6936,14 @@ }, /turf/simulated/floor/tiled/dark, /area/janitor) +"Zh" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/plating, +/area/janitor) "Zl" = ( /turf/simulated/floor/wood, /area/janitor) @@ -6541,6 +6954,13 @@ /obj/item/pen, /turf/simulated/floor/tiled/white, /area/janitor) +"Zv" = ( +/obj/machinery/field_generator, +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/turf/simulated/floor/reinforced, +/area/janitor) "Zw" = ( /obj/structure/table/standard, /obj/item/paper_bin, @@ -6574,6 +6994,20 @@ }, /turf/simulated/floor/tiled/white, /area/janitor) +"ZI" = ( +/obj/structure/table/standard, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/machinery/door/blast/shutters{ + dir = 2; + layer = 5 + }, +/turf/simulated/floor/tiled, +/area/janitor) "ZJ" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/portable_atmospherics/canister/phoron, @@ -26920,7 +27354,7 @@ ai ao XX ac -ab +ac ac ac ac @@ -27494,7 +27928,7 @@ bt ee Zd Op -NZ +gP Kv ab aP @@ -27696,7 +28130,7 @@ NG hd az qN -NZ +gP tN ab aP @@ -27898,7 +28332,7 @@ eL IQ Zd qN -NZ +gP tN nz WO @@ -28100,7 +28534,7 @@ Zd Zd Zd qN -NZ +gP tN ab aR @@ -28293,16 +28727,16 @@ aa bb Zd Zd -WO -WO -WO -WO -WO +ad +ad +XX +ad +XX WO WO XX qN -NZ +gP tN ab ab @@ -28494,21 +28928,21 @@ aa aa Zd Zd -Zd +ad +ad +ad +XX +ad +Uf WO -WO -WO -WO -WO -WO -WO -op -qN -NZ +fq +gc +gs +gU tN ab Mv -WO +Tv pa Tz Nz @@ -28696,19 +29130,19 @@ aa bb Zd Zd -WO -WO -WO -WO -WO -WO -WO -WO +ad +ad +ad XX -qN -NZ -tN XX +XX +WO +fF +XX +Hv +GX +zr +ab Tv WO pT @@ -28897,21 +29331,21 @@ aa aa Zd Zd -WO -WO -WO -WO -WO -WO -WO -WO -WO +ad +ad +ad +ad XX -Hv -NZ -zr +WO +WO +WO +fF XX -Tv +XX +XX +XX +XX +WO WO zC wB @@ -29099,18 +29533,19 @@ aa aa Zd Zd +ad +ad +ad +ad +bD WO WO WO -WO -WO -WO -WO -WO -WO -XX -XX -op +fI +gc +fc +fc +hm XX XX XX @@ -29118,7 +29553,6 @@ ab ab ab ab -ab ad ad ad @@ -29301,25 +29735,25 @@ aa aa Zd Zd -WO -WO -WO -WO -WO -WO -WO -WO -WO +ad +ad +ad +ad +XX +eC +fc +fc +fL XX WO WO +fF WO -WO -XX -ac -ac -ac -ac +bD +ad +ad +ad +ad ab ad ad @@ -29509,19 +29943,19 @@ XX XX XX XX +Rq +Rq XX XX XX XX -WO -WO -WO -WO +hG XX -ac -ac -ac -ac +XX +ad +ad +ad +ad jE ad ad @@ -29704,26 +30138,26 @@ aa bb Zd Zd -WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -XX +bP +cr +Aq +Aq +Aq +et WO WO WO WO XX -ac -ac -ac -ac +gw +gZ +hI +Mv +XX +ad +ad +ad +ad ab ab ab @@ -29906,26 +30340,26 @@ bb Zd Zd Zd -WO -cQ -WO -WO -WO -cQ +bU +jk WO WO WO +ew WO +am +eE +eE +ge +gz +hb +hI +Mv XX -WO -WO -WO -WO -XX -ac -ac -ac -ac +ad +ad +ad +ad ab ac ac @@ -30108,26 +30542,26 @@ Zd Zd Zd WO -WO -mi +bU +Zh Tz Tz Tz -mi -WO +Zh WO +aQ WO WO XX XX XX -op +hX XX XX -ac -ac -ac -ac +ad +ad +ad +ad ab ac ac @@ -30309,27 +30743,27 @@ aa Zd Zd WO -WO -WO -mi -ld -ld -ld -mi -WO -WO +am +ca +cD +dj +dp +dQ +cD +eE +fd WO Rq Rq -bP -bP -WO -WO +Bf +Bf +hY +ia XX -ac -ac -ac -ac +ad +ad +ad +ad ab ac ac @@ -30511,27 +30945,27 @@ aa Zd Zd WO -WO -pa -Dc +aQ +cc +Jo aA aA aA -Dc +Jo Nz WO Rq Rq WO -in -in +FY +FY WO WO XX -ac -ac -ac -ac +ad +ad +ad +ad ab ac ac @@ -30713,14 +31147,14 @@ aa Zd Zd pa -Tz -hx -at +bf +KS +IG aH aH aH -ca -qG +Rw +yo Tz Rq Tz @@ -30730,10 +31164,10 @@ WO WO WO XX -ac -ac -ac -ac +ad +ad +ad +ad ab ac ac @@ -30916,30 +31350,30 @@ bA Zd pT ld -bt +cd au ai ai ai bt -ol -dp +gQ +BN Rq -tT -tj +mL +vE WO -lB +ud WO WO XX -ac -ac -ab -ab +ad +ad +ad ab ab ab ab +WO ab ab ab @@ -31118,31 +31552,31 @@ Zd Zd pT ld -bt +cd au ai -wv +tZ ai bt -ol -dp +gQ +BN Rq -tT -tj -NO -hm -gZ +mL +vE +JI +FO +Gl WO XX -ac -ac +ad +ad +ad ab WO WO WO WO -cc -WO +Pp ab HN HN @@ -31319,32 +31753,32 @@ aa Zd Zd pT -ld -bt +bn +cd au ai ai ai bt -ol -dp +gQ +BN Rq -tT -tj +mL +vE WO WO WO WO XX -ac -ac +ad +ad +ad ab -bf +em ai -bf -WO -cd +em WO +Tu ab HN ac @@ -31521,14 +31955,14 @@ aa Zd Zd zC -wB -KS -av +bK +Da +Zv aA aA aA -Dk -dw +um +LV wB Rq wB @@ -31538,14 +31972,14 @@ WO WO WO XX -ac -ac +ad +ad +ad ab ai -bn +sI ai WO -ci cz GG ac @@ -31723,32 +32157,32 @@ aa Zd Zd WO -WO -zC -DF +aQ +ci +Vg aH aH aH -DF +Vg Wm WO Rq Rq WO -sf -sf +gf +gf WO WO XX -ac -ac +ad +ad +ad ab -bf +em ai -bf -WO -cr +em WO +eN ab HN ac @@ -31925,32 +32359,32 @@ aa Zd Zd WO -WO -WO -DW -ld -ld -ld -DW -WO -WO +bO +ca +cF +dj +dp +ej +cF +eE +fe WO Rq Rq -bP -bP +Bf +Bf WO WO XX -ac -ac +ad +ad +ad ab WO WO WO WO -cc -WO +Pp ab HN HN @@ -32128,30 +32562,30 @@ bA Zd Zd WO -WO -DW +bU +AK wB wB wB -DW +AK WO -WO -WO -WO -XX -XX -XX -aQ aQ +WO +WO XX -ac -ac -ab -ab +XX +XX +Nt +XX +XX +ad +ad +ad ab ab ab ab +WO ab ab ab @@ -32330,26 +32764,26 @@ aa bA Zd Zd -WO -PC -WO -WO -WO -PC -WO -WO -WO -WO -aQ +bU +Ud WO WO WO +Ud WO +bO +eE +eE +gh +gJ +gJ +gJ +in XX -ac -ac -ac -ac +ad +ad +ad +ad ab ac ac @@ -32532,26 +32966,26 @@ aa aa bA Zd -WO -WO -WO -WO -WO -WO -WO -WO -WO -WO -aQ -WO -WO -WO -WO +co +di +Aq +Aq +Aq +di +Aq +Aq +Aq +Aq +go +gM +gM +gM +dy XX -ac -ac -ac -ac +ad +ad +ad +ad ab ac ac @@ -32732,28 +33166,28 @@ aa aa aa aa -bA +aa Zd Zd +WO +WO +WO +WO +WO +WO +WO +WO +WO XX XX XX XX XX XX -XX -XX -XX -XX -XX -XX -XX -XX -XX -ac -ac -ac -ac +ad +ad +ad +ad ab ac ac @@ -32938,24 +33372,24 @@ aa bA Zd Zd -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ac -ac -ac -ac +WO +dw +dw +dw +WO +dw +dw +dw +XX +ad +ad +ad +ad +ad +ad +ad +ad +ad ab ac ac @@ -33140,24 +33574,24 @@ aa aa Zd Zd -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ac -ab -ac -ac -ac -ac +Zd +dw +dw +dw +WO +dw +dw +dw +XX +ad +ad +ad +ad +ad +ad +ad +ad +ad ab ac ac @@ -33353,13 +33787,13 @@ Zd Zd Zd Zd -ac -ac -ab -ac -ac -ac -ac +ad +ad +ad +ad +ad +ad +ad ab ac ac @@ -33559,9 +33993,9 @@ za za za za -ab -ab -ab +ad +ad +ad ab ab ab @@ -33757,13 +34191,13 @@ aa aa aa bA -Hf -Hf -Hf -Hf -Hf -ac -ac +za +za +za +za +za +ad +ad ac ac ac @@ -33959,13 +34393,13 @@ aa aa aa bA -Hf -Hf -Hf -Hf -Hf -ac -ac +za +za +za +za +za +ad +ad ac ac ac @@ -36605,7 +37039,7 @@ cG WO ab ab -Wx +ZI ab ab cT @@ -36807,7 +37241,7 @@ cG WO ab Tt -ac +Am Zw TV ac @@ -37010,7 +37444,7 @@ WO ab Vm ac -eu +ac cS ac ac @@ -37211,7 +37645,7 @@ cG WO ab Wg -Ar +ac HN TV MM diff --git a/maps/placeholder/placeholder-3_deck_3.dmm b/maps/placeholder/placeholder-3_deck_3.dmm index bd80a241b3e..1fef029e06d 100644 --- a/maps/placeholder/placeholder-3_deck_3.dmm +++ b/maps/placeholder/placeholder-3_deck_3.dmm @@ -29,6 +29,12 @@ /obj/structure/undies_wardrobe{ pixel_y = 1 }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/janitor) "aj" = ( @@ -56,6 +62,9 @@ /area/janitor) "an" = ( /obj/structure/table/rack, +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/janitor) "ao" = ( @@ -101,14 +110,9 @@ /turf/simulated/floor/tiled/white, /area/janitor) "ar" = ( -/obj/structure/table/rack, -/obj/item/towel, -/obj/item/towel, -/obj/item/towel{ - pixel_y = 6 - }, -/obj/item/towel{ - pixel_y = 6 +/obj/structure/curtain/open, +/obj/structure/window/reinforced{ + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/janitor) @@ -257,25 +261,34 @@ /obj/item/clothing/shoes/workboots/toeless, /obj/item/clothing/shoes/jackboots/toeless, /obj/item/clothing/shoes/jackboots/toeless, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/janitor) "aV" = ( /obj/structure/closet/wardrobe/mixed, +/obj/structure/window/reinforced, /turf/simulated/floor/tiled/dark, /area/janitor) "aW" = ( /obj/structure/closet/wardrobe/grey, +/obj/structure/window/reinforced, /turf/simulated/floor/tiled/dark, /area/janitor) "aX" = ( /obj/structure/closet/wardrobe/black, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/janitor) "aY" = ( /obj/effect/floor_decal/corner/grey/diagonal{ dir = 8 }, -/obj/structure/table/standard, /obj/item/reagent_containers/toothpaste{ pixel_x = -3 }, @@ -306,6 +319,7 @@ name = "disposable toothbrush"; pixel_y = 8 }, +/obj/structure/table/rack, /turf/simulated/floor/tiled/white, /area/janitor) "aZ" = ( @@ -1253,7 +1267,6 @@ desc = "This is how you get Wendy's whistle wet."; name = "lifeguard whistle" }, -/obj/structure/railing/mapped, /turf/simulated/floor/wood, /area/janitor) "gF" = ( @@ -1275,9 +1288,6 @@ /obj/effect/floor_decal/spline/fancy/wood{ dir = 1 }, -/obj/structure/railing/mapped{ - dir = 1 - }, /turf/simulated/floor/tiled/dark, /area/janitor) "gY" = ( @@ -1342,6 +1352,15 @@ }, /turf/simulated/floor/tiled, /area/janitor) +"hC" = ( +/obj/structure/bed/chair{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) "hG" = ( /obj/effect/floor_decal/corner_wide/blue{ dir = 4 @@ -1357,12 +1376,6 @@ /obj/effect/floor_decal/corner_wide/blue{ dir = 9 }, -/obj/effect/decal/fake_object{ - color = "#545c68"; - icon = 'icons/obj/railing.dmi'; - icon_state = "mcorneroverlay1"; - name = "railing" - }, /turf/simulated/floor/tiled/dark, /area/janitor) "hZ" = ( @@ -1658,6 +1671,10 @@ icon_state = "wood_light" }, /area/janitor) +"pm" = ( +/obj/machinery/door/airlock, +/turf/simulated/floor, +/area/janitor) "pt" = ( /obj/structure/closet, /turf/simulated/floor/tiled/dark, @@ -1795,9 +1812,6 @@ /obj/effect/floor_decal/corner_wide/blue{ dir = 9 }, -/obj/structure/railing/mapped{ - dir = 4 - }, /turf/simulated/floor/tiled/dark, /area/janitor) "sB" = ( @@ -2087,6 +2101,10 @@ /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/tiled/dark, /area/janitor) +"Bj" = ( +/obj/structure/closet/jcloset, +/turf/simulated/floor, +/area/janitor) "Bp" = ( /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/wood, @@ -2294,12 +2312,15 @@ "FH" = ( /obj/structure/sink{ dir = 8; - pixel_x = -12; - pixel_y = 5 + pixel_x = -12 }, /obj/effect/floor_decal/corner/grey/diagonal{ dir = 8 }, +/obj/structure/mirror{ + pixel_x = -26; + pixel_y = 3 + }, /turf/simulated/floor/tiled/white, /area/janitor) "FJ" = ( @@ -2455,11 +2476,6 @@ /obj/structure/bed/chair/office/bridge{ dir = 4 }, -/obj/machinery/button/windowtint{ - id = "conference"; - pixel_x = 28; - pixel_y = -16 - }, /obj/machinery/light{ dir = 8 }, @@ -2599,6 +2615,13 @@ dir = 4 }, /area/janitor) +"No" = ( +/obj/structure/closet/secure_closet/personal, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) "Nr" = ( /obj/structure/railing/mapped{ dir = 4 @@ -2618,6 +2641,15 @@ }, /turf/simulated/floor/beach/water/pool, /area/janitor) +"Oj" = ( +/obj/structure/bed/chair{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/simulated/floor/tiled/dark, +/area/janitor) "Om" = ( /obj/machinery/door/airlock/multi_tile/glass, /turf/simulated/floor/tiled, @@ -2675,12 +2707,6 @@ pixel_y = -38; req_access = list(40) }, -/obj/machinery/button/windowtint{ - id = "CMO"; - pixel_x = 16; - pixel_y = -28; - req_access = list(40) - }, /turf/simulated/floor/tiled/white, /area/janitor) "PH" = ( @@ -2701,6 +2727,9 @@ /area/janitor) "QX" = ( /obj/structure/closet/athletic_mixed, +/obj/structure/window/reinforced{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/janitor) "Rn" = ( @@ -2895,6 +2924,9 @@ /area/janitor) "Xt" = ( /obj/structure/closet/secure_closet/personal, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/janitor) "Xw" = ( @@ -6968,41 +7000,41 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -7169,43 +7201,43 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aa aa @@ -7371,8 +7403,8 @@ aa aa aa aa -at -at +aa +aa at at at @@ -7573,44 +7605,44 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -7775,44 +7807,44 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -7977,44 +8009,44 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -8215,8 +8247,8 @@ at at at at -aa -aa +at +at aa aa aa @@ -8382,10 +8414,6 @@ aa aa aa aa -aa -aa -aa -aa at at at @@ -8406,19 +8434,23 @@ at at at at -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -8585,9 +8617,6 @@ aa aa aa aa -aa -aa -aa at at at @@ -8608,18 +8637,21 @@ at at at at -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -8789,30 +8821,30 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +aa aa aa aa @@ -8991,30 +9023,30 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +aa aa aa aa @@ -9193,30 +9225,30 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -9394,32 +9426,32 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +aa aa aa aa @@ -9596,33 +9628,33 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +aa aa aa aa @@ -9798,32 +9830,32 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -10000,33 +10032,33 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -10201,35 +10233,35 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +aa aa aa aa @@ -10403,35 +10435,35 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -10605,35 +10637,35 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -10806,38 +10838,38 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +aa aa aa aa @@ -11008,37 +11040,37 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -11210,38 +11242,38 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -11411,40 +11443,40 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +aa aa aa aa @@ -11613,40 +11645,40 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -11815,40 +11847,40 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -12016,43 +12048,43 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +aa aa aa aa @@ -12218,42 +12250,42 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -12420,43 +12452,43 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -12622,43 +12654,43 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -12823,45 +12855,45 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -13025,45 +13057,45 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -13227,46 +13259,46 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -13428,47 +13460,47 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -13630,48 +13662,48 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -13832,48 +13864,48 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -14033,50 +14065,50 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -14235,50 +14267,50 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -14437,51 +14469,51 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -14638,52 +14670,52 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -14840,53 +14872,53 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -15042,53 +15074,53 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -15291,7 +15323,7 @@ at at at at -aa +at aa aa aa @@ -15445,55 +15477,55 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -15647,57 +15679,57 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -15843,12 +15875,12 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa +at +at +at +at +at +at at at at @@ -15898,8 +15930,8 @@ at at at at -aa -aa +at +at aa aa aa @@ -16101,7 +16133,7 @@ at at at at -aa +at aa aa aa @@ -17515,7 +17547,7 @@ at at at at -aa +at aa aa aa @@ -17717,7 +17749,7 @@ at at at at -aa +at aa aa aa @@ -17919,7 +17951,7 @@ at at at at -aa +at aa aa aa @@ -20302,7 +20334,7 @@ df Xt Xt Xt -lN +hC aU aE ah @@ -20903,7 +20935,7 @@ gI yB ED aE -al +ar df df df @@ -21107,10 +21139,10 @@ ED aE QX df -Xt -Xt -Xt -gw +No +No +No +Oj aX aE ah @@ -21509,7 +21541,7 @@ eY yB ED aE -ar +df df cz qX @@ -22327,10 +22359,10 @@ aE aE ah ah -aE -ah -ah -ah +pm +ae +ae +ae aE Ga bL @@ -22530,9 +22562,9 @@ aE ah ah aE -ah -ah -ah +Bj +ae +ae wx bt bL @@ -24316,15 +24348,15 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at +aa +aa +aa +aa +aa +aa +aa +aa +aa at at at @@ -24517,7 +24549,7 @@ aa aa aa aa -at +aa at at at @@ -24719,7 +24751,7 @@ aa aa aa aa -at +aa at at at @@ -24920,7 +24952,7 @@ aa aa aa aa -at +aa at at at @@ -25122,7 +25154,7 @@ aa aa aa aa -at +aa at at at @@ -25727,7 +25759,7 @@ aa aa aa aa -at +aa at at at @@ -25928,7 +25960,7 @@ aa aa aa aa -at +aa at at at @@ -26129,8 +26161,8 @@ aa aa aa aa -at -at +aa +aa at at at @@ -26331,7 +26363,7 @@ aa aa aa aa -at +aa at at at @@ -28351,7 +28383,7 @@ aa aa aa aa -aa +at at at at @@ -28553,8 +28585,8 @@ aa aa aa aa -aa -aa +at +at at at at @@ -28756,8 +28788,8 @@ aa aa aa aa -aa -aa +at +at at at at @@ -28959,7 +28991,7 @@ aa aa aa aa -aa +at at at at @@ -29162,7 +29194,7 @@ aa aa aa aa -aa +at at at at @@ -29364,7 +29396,7 @@ aa aa aa aa -aa +at at at at @@ -29567,7 +29599,7 @@ aa aa aa aa -aa +at at at at @@ -29769,18 +29801,18 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +at +at +at +at +at +at +at +at +at +at +at +at at at at @@ -29825,7 +29857,7 @@ aE aE aE aE -df +aE df df df @@ -29972,17 +30004,17 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +at +at +at +at +at +at +at +at +at +at +at at at at @@ -30185,12 +30217,12 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa +at +at +at +at +at +at at at at @@ -30240,7 +30272,7 @@ at at at at -aa +at aa aa aa @@ -30387,12 +30419,12 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa +at +at +at +at +at +at at at at @@ -30589,12 +30621,12 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa +at +at +at +at +at +at at at at @@ -30643,7 +30675,7 @@ at at at at -aa +at aa aa aa @@ -30845,7 +30877,7 @@ at at at at -aa +at aa aa aa @@ -31046,8 +31078,8 @@ at at at at -aa -aa +at +at aa aa aa @@ -31248,8 +31280,8 @@ at at at at -aa -aa +at +at aa aa aa @@ -31404,53 +31436,53 @@ aa aa aa aa -at -at -at -at -at -at -at -ac -UV -UV -UV -UV -ac -ah -ah -ah -ac -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -aa aa +at +at +at +at +at +at +ac +UV +UV +UV +UV +ac +ah +ah +ah +ac +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -31651,8 +31683,8 @@ at at at at -aa -aa +at +at aa aa aa @@ -31852,8 +31884,8 @@ at at at at -aa -aa +at +at aa aa aa @@ -32011,51 +32043,51 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -32255,8 +32287,8 @@ at at at at -aa -aa +at +at aa aa aa @@ -32457,8 +32489,8 @@ at at at at -aa -aa +at +at aa aa aa @@ -32618,48 +32650,48 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -32860,8 +32892,8 @@ at at at at -aa -aa +at +at aa aa aa @@ -33061,8 +33093,8 @@ at at at at -aa -aa +at +at aa aa aa @@ -33225,46 +33257,46 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -33464,8 +33496,8 @@ at at at at -aa -aa +at +at aa aa aa @@ -33666,8 +33698,8 @@ at at at at -aa -aa +at +at aa aa aa @@ -33832,43 +33864,43 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -34034,43 +34066,43 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -34270,8 +34302,8 @@ at at at at -aa -aa +at +at aa aa aa @@ -34439,41 +34471,41 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -34641,40 +34673,40 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -34875,8 +34907,8 @@ at at at at -aa -aa +at +at aa aa aa @@ -35046,38 +35078,38 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -35248,38 +35280,38 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -35479,8 +35511,8 @@ at at at at -aa -aa +at +at aa aa aa @@ -35653,36 +35685,36 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -35855,35 +35887,35 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -36084,8 +36116,8 @@ at at at at -aa -aa +at +at aa aa aa @@ -36260,33 +36292,33 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -36462,33 +36494,33 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -36664,32 +36696,32 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -36867,31 +36899,31 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -37069,30 +37101,30 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -37271,30 +37303,30 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -37474,28 +37506,28 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -37676,28 +37708,28 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -aa aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -37874,42 +37906,42 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -38075,44 +38107,44 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -38277,44 +38309,44 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -38479,44 +38511,44 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -38681,44 +38713,44 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -38883,44 +38915,44 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa @@ -39086,42 +39118,42 @@ aa aa aa aa -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at -at aa +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at +at aa aa aa