diff --git a/_maps/map_files/rift/rift-02-underground2.dmm b/_maps/map_files/rift/rift-02-underground2.dmm index 5145f3a98c3..6fa8ae99f60 100644 --- a/_maps/map_files/rift/rift-02-underground2.dmm +++ b/_maps/map_files/rift/rift-02-underground2.dmm @@ -9445,7 +9445,7 @@ /obj/effect/zone_divider, /obj/effect/zone_divider, /obj/effect/zone_divider, -/turf/simulated/open/lythios43c, +/turf/simulated/floor/sky/depths/lythios43c, /area/rift/surfacebase/underground/under2) "wy" = ( /obj/structure/table/rack, @@ -9770,11 +9770,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/structure/curtain/black{ - icon_state = "open"; - opacity = 0 - }, /obj/machinery/door/firedoor/glass, +/obj/structure/curtain/black, /turf/simulated/floor/tiled/dark, /area/chapel/main) "yp" = ( @@ -9811,7 +9808,7 @@ /obj/effect/map_effect/portal/line/side_a{ dir = 4 }, -/turf/simulated/open/lythios43c, +/turf/simulated/floor/sky/depths/lythios43c, /area/rift/surfacebase/underground/under2) "yG" = ( /obj/structure/railing{ @@ -9827,7 +9824,7 @@ /obj/effect/map_effect/portal/line/side_a{ dir = 4 }, -/turf/simulated/open/lythios43c, +/turf/simulated/floor/sky/depths/lythios43c, /area/rift/surfacebase/underground/under2) "za" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -9989,11 +9986,8 @@ /turf/simulated/floor/plating, /area/maintenance/chapel) "Av" = ( -/obj/structure/curtain/black{ - icon_state = "open"; - opacity = 0 - }, /obj/machinery/door/firedoor/glass, +/obj/structure/curtain/black, /turf/simulated/floor/tiled/dark, /area/chapel/main) "Aw" = ( @@ -10081,7 +10075,7 @@ /area/engineering/engine_room) "AW" = ( /obj/effect/blocker, -/turf/simulated/open/lythios43c, +/turf/simulated/floor/sky/depths/lythios43c, /area/rift/surfacebase/underground/under2) "AZ" = ( /obj/structure/disposalpipe/segment{ @@ -11371,7 +11365,7 @@ name = "center_to_westdeep"; portal_id = "westdeepstep" }, -/turf/simulated/open/lythios43c, +/turf/simulated/floor/sky/depths/lythios43c, /area/rift/surfacebase/underground/under2) "Lj" = ( /turf/simulated/wall, @@ -12068,7 +12062,7 @@ "Qs" = ( /obj/effect/zone_divider, /obj/effect/zone_divider, -/turf/simulated/open/lythios43c, +/turf/simulated/floor/sky/depths/lythios43c, /area/rift/surfacebase/underground/under2) "QD" = ( /obj/structure/table/woodentable, @@ -12345,6 +12339,7 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor/glass, +/obj/structure/curtain/black, /turf/simulated/floor/carpet/bcarpet, /area/chapel/main) "Tm" = ( @@ -12477,7 +12472,7 @@ /area/quartermaster/miningdock) "UC" = ( /obj/effect/zone_divider, -/turf/simulated/open/lythios43c, +/turf/simulated/floor/sky/depths/lythios43c, /area/rift/surfacebase/underground/under2) "UF" = ( /obj/machinery/door/airlock/maintenance/common{ @@ -12771,7 +12766,7 @@ /turf/simulated/floor/tiled/steel, /area/quartermaster/miningdock) "WA" = ( -/turf/simulated/open/lythios43c, +/turf/simulated/floor/sky/depths/lythios43c, /area/rift/surfacebase/underground/under2) "WD" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on{ @@ -12872,7 +12867,7 @@ /obj/effect/map_effect/portal/line/side_a{ dir = 4 }, -/turf/simulated/open/lythios43c, +/turf/simulated/floor/sky/depths/lythios43c, /area/rift/surfacebase/underground/under2) "Xx" = ( /obj/effect/floor_decal/chapel, diff --git a/_maps/map_files/rift/rift-03-underground1.dmm b/_maps/map_files/rift/rift-03-underground1.dmm index 38c43274213..a3ffed9f3bc 100644 --- a/_maps/map_files/rift/rift-03-underground1.dmm +++ b/_maps/map_files/rift/rift-03-underground1.dmm @@ -798,18 +798,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/underone) -"bQ" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/tiled/steel, -/area/hallway/primary/underone) "bR" = ( /obj/structure/railing{ dir = 8 @@ -1204,21 +1192,6 @@ }, /turf/simulated/open, /area/maintenance/substation/engineering) -"cF" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 1 - }, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled/steel, -/area/hallway/primary/underone) "cG" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -1250,25 +1223,6 @@ /obj/item/phone, /turf/simulated/floor/tiled/steel, /area/hallway/primary/underone) -"cK" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/tiled/steel, -/area/hallway/primary/underone) "cL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -1972,18 +1926,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/underone) -"dN" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/tiled/steel, -/area/hallway/primary/underone) "dO" = ( /obj/structure/cable/green{ d1 = 4; @@ -2662,18 +2604,6 @@ }, /turf/simulated/floor/tiled/monotile, /area/engineering/engineering_monitoring) -"eZ" = ( -/obj/effect/floor_decal/borderfloor, -/obj/machinery/computer/general_air_control/supermatter_core{ - dir = 1; - input_tag = "cooling_in"; - name = "Engine Cooling Control"; - output_tag = "cooling_out"; - sensors = list("engine_sensor"="Engine Core"); - throwpass = 1 - }, -/turf/simulated/floor/tiled/monotile, -/area/engineering/engineering_monitoring) "fa" = ( /obj/structure/table/steel_reinforced, /obj/effect/floor_decal/borderfloor{ @@ -3145,15 +3075,6 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/underone) -"fN" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/steel, -/area/hallway/primary/underone) "fO" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/borderfloor/corner2, @@ -9695,6 +9616,13 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/break_room) +"qC" = ( +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/underone) "qE" = ( /obj/effect/floor_decal/industrial/danger/corner, /turf/simulated/floor/tiled/dark, @@ -9936,12 +9864,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/engineering/break_room) -"rb" = ( -/obj/effect/floor_decal/borderfloor{ - dir = 10 - }, -/turf/simulated/floor/tiled/steel, -/area/hallway/primary/underone) "rc" = ( /obj/machinery/door/firedoor/glass, /obj/structure/lattice, @@ -10012,6 +9934,13 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/break_room) +"rj" = ( +/obj/machinery/mech_recharger, +/obj/mecha/combat/fighter/pinnace{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/rift/station/fighter_bay/hangar) "rr" = ( /obj/effect/floor_decal/borderfloorblack/corner, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -10030,6 +9959,18 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/break_room) +"ru" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/hallway/primary/underone) "rx" = ( /obj/machinery/light, /obj/effect/floor_decal/borderfloorblack, @@ -10455,6 +10396,20 @@ }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/underone) +"sf" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/crystal, +/area/rift/station/adherent_maintenance) "sg" = ( /obj/structure/extinguisher_cabinet{ dir = 8; @@ -10776,6 +10731,17 @@ /obj/structure/lattice, /turf/simulated/open/lythios43c, /area/rift/surfacebase/underground/under1) +"tc" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/catwalk, +/obj/machinery/light, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/hangar) "td" = ( /turf/simulated/open/lythios43c, /area/rift/surfacebase/underground/under1) @@ -10838,6 +10804,22 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/hallway) +"tk" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "hangar_lockdown"; + name = "Hangar Lockdown Blast Doors"; + opacity = 0 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) "tl" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -11164,20 +11146,6 @@ }, /turf/simulated/floor/plating, /area/engineering/engine_balcony) -"tK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/door/airlock/glass{ - desc = "A room dedicated for the repairs and recharging of adherent."; - name = "Adherent Maintenance" - }, -/obj/machinery/door/firedoor/glass, -/turf/simulated/floor/tiled/steel, -/area/hallway/primary/underone) "tL" = ( /obj/effect/floor_decal/industrial/danger{ dir = 4 @@ -11189,15 +11157,23 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/lower/atmos_lockers) -"tP" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 +"tO" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 + dir = 4 }, -/turf/simulated/floor/crystal, -/area/hallway/primary/underone) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/rift/station/fighter_bay/maintenance) "tX" = ( /obj/effect/floor_decal/rust, /obj/structure/bed/chair/bay{ @@ -11263,6 +11239,28 @@ }, /turf/simulated/floor/reinforced, /area/engineering/engine_core) +"uy" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/tiled/techfloor/grid, +/area/rift/station/fighter_bay/hangar) +"uz" = ( +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/tiled/techmaint, +/area/rift/station/fighter_bay/maintenance) +"uE" = ( +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal, +/obj/machinery/button/remote/blast_door{ + id = "hangar_maint"; + name = "Hangar Maintenance Shutter Control"; + pixel_y = 28; + req_one_access = list(29,47) + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay/maintenance) "uI" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -11277,6 +11275,14 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering/upper) +"uJ" = ( +/obj/effect/map_effect/portal/master/side_a{ + dir = 4; + name = "center_to_westcave"; + portal_id = "westcavestep" + }, +/turf/simulated/open/lythios43c, +/area/rift/surfacebase/underground/under1) "uL" = ( /obj/structure/bed/chair/office/dark, /obj/machinery/button/remote/blast_door{ @@ -11309,6 +11315,14 @@ /obj/item/flashlight/lantern, /turf/simulated/floor/tiled, /area/maintenance/elevator) +"uP" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/hangar) "uX" = ( /obj/structure/cable/yellow{ d1 = 4; @@ -11317,14 +11331,50 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering) -"vA" = ( -/obj/effect/zone_divider, -/obj/effect/zone_divider, -/obj/effect/map_effect/portal/line/side_a{ +"uY" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) +"va" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/rift/station/fighter_bay/maintenance) +"vl" = ( +/obj/structure/railing{ dir = 4 }, -/turf/simulated/sky/lythios43c/moving/east, -/area/rift/surfacebase/underground/under1) +/obj/structure/catwalk, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/hangar) +"vo" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/sign/electricshock, +/obj/structure/window/reinforced/full, +/turf/simulated/floor/plating, +/area/rift/station/adherent_maintenance) +"vz" = ( +/obj/machinery/door/blast/regular{ + dir = 2; + id = "hangar_pad"; + name = "Hangar Bay Blast Door" + }, +/obj/structure/fans/tiny, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/hangar) "vE" = ( /obj/item/storage/excavation, /obj/structure/table/bench/wooden, @@ -11333,6 +11383,15 @@ "vI" = ( /turf/simulated/wall/r_wall, /area/engineering/engine_balcony) +"vQ" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/marker_beacon/red, +/turf/simulated/floor/tiled/techfloor/grid, +/area/rift/station/fighter_bay/hangar) "vR" = ( /obj/structure/cable/green{ d1 = 4; @@ -11347,6 +11406,16 @@ /obj/item/cigbutt/cigarbutt, /turf/simulated/floor/tiled, /area/maintenance/elevator) +"vX" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) "wd" = ( /obj/effect/floor_decal/rust, /obj/structure/bed/chair/bay{ @@ -11354,6 +11423,13 @@ }, /turf/simulated/floor/tiled, /area/maintenance/elevator) +"wh" = ( +/obj/effect/zone_divider, +/obj/effect/map_effect/portal/line/side_a{ + dir = 4 + }, +/turf/simulated/open/lythios43c, +/area/rift/surfacebase/underground/under1) "wj" = ( /obj/structure/cable{ d1 = 4; @@ -11366,6 +11442,45 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/engineering/upper) +"wx" = ( +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "hangar_pad"; + name = "Hangar Bay Blast Door Control"; + pixel_x = -24; + pixel_y = 28; + req_one_access = list(19,29,38,43,47,63,67) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) +"wy" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) +"wA" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/sortjunction/flipped{ + dir = 1; + name = "Fighter Bay"; + sortType = "Fighter Bay" + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/underone) "wC" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/orange/border, @@ -11379,6 +11494,10 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/engineering_hallway) +"wD" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/techfloor/grid, +/area/rift/station/fighter_bay/hangar) "wE" = ( /obj/machinery/light/small{ dir = 1 @@ -11388,12 +11507,13 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/drone_fabrication) -"wS" = ( -/obj/effect/zone_divider, -/obj/effect/zone_divider, -/obj/effect/zone_divider, -/turf/simulated/sky/lythios43c/moving/east, -/area/rift/surfacebase/underground/under1) +"wL" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/structure/table/reinforced, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/underone) "wU" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/orange/border, @@ -11404,12 +11524,37 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/engineering_hallway) +"xa" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/hangar) "xf" = ( /turf/simulated/wall, /area/vacant/vacant_site) -"xm" = ( -/obj/machinery/atmospherics/component/unary/vent_scrubber/on, -/turf/simulated/floor/crystal, +"xj" = ( +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/monotile, /area/hallway/primary/underone) "xo" = ( /obj/structure/disposalpipe/trunk{ @@ -11419,9 +11564,25 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled, /area/maintenance/elevator) -"xv" = ( +"xt" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/catwalk, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/hangar) +"xy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, /turf/simulated/floor/crystal, -/area/hallway/primary/underone) +/area/rift/station/adherent_maintenance) "xA" = ( /obj/effect/floor_decal/rust, /obj/structure/closet, @@ -11449,10 +11610,34 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/engineering_hallway) +"xI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 6 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) "xL" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled, /area/maintenance/elevator) +"xS" = ( +/obj/machinery/mech_recharger, +/turf/simulated/floor/tiled/techmaint, +/area/rift/station/fighter_bay/hangar) "xU" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/door/firedoor/glass/hidden{ @@ -11465,6 +11650,36 @@ }, /turf/simulated/floor/tiled/steel, /area/hallway/primary/underone) +"xW" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "hangar_pad"; + name = "Hangar Bay Blast Door Control"; + pixel_x = -24; + pixel_y = 28; + req_one_access = list(19,29,38,43,47,63,67) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/marker_beacon/red, +/turf/simulated/floor/tiled/techfloor/grid, +/area/rift/station/fighter_bay/hangar) +"xX" = ( +/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" + }, +/turf/simulated/floor/tiled/techmaint, +/area/rift/station/fighter_bay/maintenance) "yf" = ( /obj/machinery/power/apc{ dir = 4; @@ -11488,13 +11703,48 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering/upper) -"ym" = ( -/obj/machinery/alarm{ - dir = 1; - pixel_y = -24 +"yx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 }, -/turf/simulated/floor/crystal, -/area/hallway/primary/underone) +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) +"yy" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/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/techmaint, +/area/rift/station/fighter_bay/maintenance) +"yA" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "hangar_lockdown"; + name = "Hangar Lockdown Blast Doors"; + opacity = 0 + }, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay) "yH" = ( /obj/machinery/atmospherics/component/unary/vent_scrubber/on, /turf/simulated/floor/plating, @@ -11509,6 +11759,33 @@ }, /turf/simulated/open, /area/engineering/atmos/hallway) +"zb" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/underone) +"zd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor/grid, +/area/rift/station/fighter_bay/hangar) +"ze" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/techmaint, +/area/rift/station/fighter_bay/maintenance) "zj" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -11518,6 +11795,42 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering) +"zm" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/hangar) +"zo" = ( +/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/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 6 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) "zr" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/transit/orange, @@ -11561,6 +11874,18 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) +"zy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/rift/station/fighter_bay/hangar) +"zz" = ( +/turf/simulated/wall, +/area/rift/station/adherent_maintenance) "zG" = ( /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -11568,6 +11893,16 @@ /obj/random/trash_pile, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) +"zI" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/maintenance) +"zM" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/crystal, +/area/rift/station/adherent_maintenance) "zO" = ( /obj/structure/closet/crate, /obj/structure/railing{ @@ -11578,6 +11913,15 @@ /obj/random/maintenance/clean, /turf/simulated/floor/plating, /area/maintenance/engineering) +"Af" = ( +/obj/structure/fans/tiny, +/obj/machinery/door/blast/regular{ + dir = 2; + id = "hangar_pad"; + name = "Hangar Bay Blast Door" + }, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/hangar) "Ag" = ( /obj/structure/cable/green{ d1 = 4; @@ -11586,19 +11930,28 @@ }, /turf/simulated/floor/tiled/techmaint, /area/maintenance/engineering) -"Aj" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/sign/signnew/danger, -/turf/simulated/floor/plating, -/area/hallway/primary/underone) -"Al" = ( -/obj/machinery/atmospherics/component/unary/vent_pump/on{ +"Am" = ( +/obj/structure/table/glass, +/obj/machinery/light{ dir = 1 }, /turf/simulated/floor/crystal, -/area/hallway/primary/underone) +/area/rift/station/adherent_maintenance) +"Ap" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) "Aq" = ( /obj/effect/zone_divider, /obj/effect/zone_divider, @@ -11625,6 +11978,15 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/engineering_hallway) +"AA" = ( +/obj/effect/floor_decal/industrial/warning, +/obj/machinery/door/blast/regular{ + dir = 4; + id = "hangar_maint"; + name = "Hangar Maintenance Shutter" + }, +/turf/simulated/floor/tiled/techmaint, +/area/rift/station/fighter_bay/maintenance) "AB" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -11645,6 +12007,31 @@ /obj/effect/zone_divider, /turf/simulated/wall, /area/maintenance/engineering) +"AG" = ( +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/maintenance/common, +/turf/simulated/floor/plating, +/area/maintenance/engineering/upper) +"AK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/underone) +"AO" = ( +/turf/simulated/floor/tiled/techmaint, +/area/rift/station/fighter_bay/hangar) "AP" = ( /obj/structure/cable{ d1 = 1; @@ -11688,10 +12075,6 @@ "Bj" = ( /turf/simulated/shuttle/wall/voidcraft, /area/turbolift/rmine/under1) -"Bn" = ( -/obj/effect/zone_divider, -/turf/simulated/sky/lythios43c/moving/east, -/area/rift/surfacebase/underground/under1) "Bq" = ( /obj/effect/floor_decal/rust, /obj/machinery/alarm{ @@ -11699,6 +12082,17 @@ }, /turf/simulated/floor/tiled, /area/maintenance/elevator) +"Bu" = ( +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "hangar_lockdown"; + name = "Hangar Lockdown Control"; + pixel_x = -24; + pixel_y = -32; + req_one_access = list(19,29,38,43,47,63,67) + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) "Bx" = ( /turf/simulated/floor/holofloor/tiled/dark, /area/turbolift/rmine/under1) @@ -11731,6 +12125,19 @@ "BP" = ( /turf/simulated/floor/tiled/steel, /area/security/prison) +"BS" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) +"BU" = ( +/turf/simulated/floor/tiled/techmaint, +/area/rift/station/fighter_bay/maintenance) "BV" = ( /obj/machinery/alarm{ desc = " "; @@ -11751,6 +12158,39 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/hallway) +"BX" = ( +/turf/simulated/wall, +/area/rift/station/fighter_bay) +"Ce" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/hangar) +"Cl" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/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 = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/underone) "Cq" = ( /obj/effect/floor_decal/industrial/warning, /obj/random/junk, @@ -11793,10 +12233,6 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) -"CB" = ( -/obj/structure/table/glass, -/turf/simulated/floor/crystal, -/area/hallway/primary/underone) "CC" = ( /obj/machinery/door/firedoor/glass/hidden{ dir = 8 @@ -11827,9 +12263,93 @@ }, /turf/simulated/floor/tiled/monotile, /area/engineering/engineering_monitoring) +"CQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) +"CV" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) "CY" = ( /turf/simulated/floor/tiled/techmaint, /area/engineering/drone_fabrication) +"CZ" = ( +/obj/effect/floor_decal/industrial/loading, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/maintenance) +"Db" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/door/airlock/glass_research{ + name = "Hangar Repair Bay"; + req_one_access = list(29,47) + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) +"Dc" = ( +/obj/machinery/door/firedoor/glass, +/obj/structure/grille, +/obj/structure/window/reinforced/full, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay) +"Dd" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/tiled/techfloor/grid, +/area/rift/station/fighter_bay/hangar) +"Dg" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/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 = 8 + }, +/obj/machinery/door/firedoor/glass/hidden{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/underone) +"Dn" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/marker_beacon/red, +/turf/simulated/floor/tiled/techfloor/grid, +/area/rift/station/fighter_bay/hangar) "Do" = ( /obj/effect/floor_decal/rust, /obj/random/cigarettes, @@ -11851,6 +12371,9 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/engineering_hallway) +"Dw" = ( +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/maintenance) "Dx" = ( /obj/effect/floor_decal/industrial/danger{ dir = 8 @@ -11895,6 +12418,26 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering/upper) +"Eu" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/underone) "EB" = ( /obj/structure/railing{ dir = 8 @@ -11905,6 +12448,13 @@ /obj/structure/loot_pile/maint/trash, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) +"ED" = ( +/obj/machinery/alarm{ + dir = 1; + pixel_y = -24 + }, +/turf/simulated/floor/crystal, +/area/rift/station/adherent_maintenance) "EF" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -11936,15 +12486,6 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering) -"EL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/crystal, -/area/hallway/primary/underone) "ES" = ( /obj/structure/bonfire/permanent, /obj/structure/catwalk, @@ -11976,6 +12517,17 @@ }, /turf/simulated/floor/plating, /area/engineering/engine_core) +"EX" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/marker_beacon/red, +/turf/simulated/floor/tiled/techfloor/grid, +/area/rift/station/fighter_bay/hangar) "Fc" = ( /obj/structure/cable/green{ d1 = 1; @@ -11995,6 +12547,44 @@ }, /turf/simulated/floor/plating, /area/vacant/vacant_site) +"Fo" = ( +/obj/machinery/vending/cigarette, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) +"Fv" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/obj/machinery/button/remote/blast_door{ + id = "hangar_ext"; + name = "Hangar Bay Service Shutter Control"; + pixel_x = 32; + pixel_y = 28; + req_one_access = list(19,29,38,43,47,63,67) + }, +/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 = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/underone) "FA" = ( /obj/effect/floor_decal/rust, /obj/structure/table/steel, @@ -12027,6 +12617,23 @@ /obj/machinery/power/rad_collector, /turf/simulated/floor/reinforced, /area/engineering/engine_core) +"FL" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass{ + desc = "A room dedicated for the repairs and recharging of adherent."; + name = "Adherent Maintenance" + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/adherent_maintenance) "FM" = ( /obj/item/pickaxe/hand, /obj/structure/table/bench/wooden, @@ -12085,6 +12692,33 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/engineering_hallway) +"Gi" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/hangar) +"Gn" = ( +/turf/simulated/floor/tiled/techfloor/grid, +/area/rift/station/fighter_bay/hangar) +"Gp" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/techmaint, +/area/rift/station/fighter_bay/maintenance) "Gq" = ( /obj/machinery/door/airlock/maintenance/common, /obj/machinery/door/firedoor/glass, @@ -12094,6 +12728,13 @@ /obj/structure/loot_pile/maint/trash, /turf/simulated/floor/plating, /area/maintenance/engineering) +"Gu" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/mecha_part_fabricator, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay/maintenance) "Gv" = ( /obj/structure/railing{ dir = 8 @@ -12180,6 +12821,19 @@ /obj/random/maintenance/engineering, /turf/simulated/floor/plating, /area/maintenance/engineering) +"Hd" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/maintenance) +"He" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/crystal, +/area/rift/station/adherent_maintenance) "Hf" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -12189,6 +12843,26 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/engineering) +"Hg" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/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 = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/underone) "Hh" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -12204,10 +12878,29 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/hallway) +"Hj" = ( +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/machinery/power/apc{ + dir = 4; + pixel_x = 24 + }, +/turf/simulated/floor/crystal, +/area/rift/station/adherent_maintenance) "Hk" = ( /obj/effect/zone_divider, /turf/simulated/wall/r_wall, /area/rift/surfacebase/underground/under1) +"Hm" = ( +/obj/effect/zone_divider, +/obj/effect/zone_divider, +/obj/effect/map_effect/portal/line/side_a{ + dir = 4 + }, +/turf/simulated/open/lythios43c, +/area/rift/surfacebase/underground/under1) "Hn" = ( /turf/simulated/wall, /area/engineering/engine_balcony) @@ -12235,6 +12928,18 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/engineering) +"Hx" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/rift/station/fighter_bay/hangar) "Hz" = ( /obj/structure/railing{ dir = 1 @@ -12255,28 +12960,6 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) -"HF" = ( -/obj/effect/map_effect/portal/master/side_a{ - dir = 4; - name = "center_to_westcave"; - portal_id = "westcavestep" - }, -/turf/simulated/sky/lythios43c/moving/east, -/area/rift/surfacebase/underground/under1) -"HG" = ( -/obj/structure/lattice, -/obj/effect/overlay/snow/floor/pointy, -/obj/effect/overlay/snow/floor/pointy{ - dir = 8 - }, -/obj/effect/overlay/snow/floor/pointy{ - dir = 4 - }, -/obj/effect/overlay/snow/floor/pointy{ - dir = 1 - }, -/turf/simulated/sky/lythios43c/moving/east, -/area/rift/surfacebase/underground/under1) "HH" = ( /obj/machinery/door/airlock/maintenance/common, /obj/structure/disposalpipe/segment, @@ -12337,6 +13020,21 @@ }, /turf/simulated/floor/tiled, /area/maintenance/elevator) +"Is" = ( +/obj/effect/floor_decal/industrial/warning/corner, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/marker_beacon/red, +/turf/simulated/floor/tiled/techfloor/grid, +/area/rift/station/fighter_bay/hangar) +"It" = ( +/obj/effect/map_effect/portal/line/side_a{ + dir = 4 + }, +/turf/simulated/open/lythios43c, +/area/rift/surfacebase/underground/under1) "Iz" = ( /obj/effect/floor_decal/rust, /turf/simulated/floor/plating, @@ -12354,6 +13052,15 @@ "IF" = ( /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/turbolift/rmine/under1) +"IG" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/structure/bed/chair/comfy/beige{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/underone) "IJ" = ( /obj/effect/zone_divider, /obj/effect/zone_divider, @@ -12361,6 +13068,25 @@ /obj/effect/zone_divider, /turf/simulated/mineral/icerock, /area/rift/surfacebase/underground/under1) +"IO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 5 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) "IZ" = ( /obj/effect/floor_decal/industrial/warning{ dir = 1 @@ -12376,6 +13102,17 @@ "Jb" = ( /turf/simulated/wall, /area/engineering/drone_fabrication) +"Jc" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/machinery/light, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/underone) "Jd" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, @@ -12398,6 +13135,13 @@ }, /turf/simulated/floor/tiled, /area/maintenance/elevator) +"Jk" = ( +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/underone) "Jr" = ( /obj/effect/floor_decal/rust, /obj/machinery/light{ @@ -12405,12 +13149,6 @@ }, /turf/simulated/floor/tiled, /area/maintenance/elevator) -"Jt" = ( -/obj/effect/map_effect/portal/line/side_a{ - dir = 4 - }, -/turf/simulated/sky/lythios43c/moving/east, -/area/rift/surfacebase/underground/under1) "Jw" = ( /obj/effect/zone_divider, /turf/simulated/mineral/icerock, @@ -12490,6 +13228,35 @@ }, /turf/simulated/floor/plating, /area/vacant/vacant_site) +"Ke" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/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 = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/underone) +"Kj" = ( +/obj/effect/zone_divider, +/obj/effect/zone_divider, +/obj/effect/zone_divider, +/turf/simulated/open/lythios43c, +/area/rift/surfacebase/underground/under1) "Kp" = ( /obj/effect/floor_decal/borderfloor, /obj/machinery/light, @@ -12517,6 +13284,24 @@ }, /turf/simulated/open, /area/engineering/atmos/hallway) +"KB" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "hangar_lockdown"; + name = "Hangar Lockdown Blast Doors"; + opacity = 0 + }, +/obj/machinery/door/firedoor/multi_tile{ + dir = 2 + }, +/obj/machinery/door/airlock/multi_tile/metal{ + dir = 1; + name = "Fighter Hangar"; + req_one_access = list(19,29,38,43,47,63,67) + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) "KC" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -12533,6 +13318,10 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/hallway) +"KJ" = ( +/obj/machinery/autolathe, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay/maintenance) "KK" = ( /obj/machinery/light/small, /obj/structure/railing{ @@ -12560,6 +13349,30 @@ /obj/structure/closet/firecloset/full, /turf/simulated/floor/plating, /area/maintenance/engineering) +"La" = ( +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/underone) "Li" = ( /obj/machinery/light/small, /obj/structure/railing{ @@ -12608,9 +13421,35 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/engineering_hallway) +"LJ" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/machinery/door/blast/regular{ + dir = 2; + id = "hangar_maint"; + name = "Hangar Maintenance Shutter" + }, +/turf/simulated/floor/tiled/techmaint, +/area/rift/station/fighter_bay) +"LL" = ( +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) "LN" = ( /turf/simulated/floor/plating, /area/security/prison) +"LS" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) "Mk" = ( /obj/effect/zone_divider, /turf/simulated/wall, @@ -12623,10 +13462,6 @@ }, /turf/simulated/floor/plating, /area/vacant/vacant_site) -"Mm" = ( -/obj/structure/adherent_bath, -/turf/simulated/floor/crystal, -/area/hallway/primary/underone) "Mt" = ( /obj/structure/cable/green{ d1 = 1; @@ -12658,6 +13493,11 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/hallway) +"MD" = ( +/obj/effect/zone_divider, +/obj/effect/zone_divider, +/turf/simulated/open/lythios43c, +/area/rift/surfacebase/underground/under1) "MF" = ( /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/techfloor/orange/corner, @@ -12674,6 +13514,24 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) +"MO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4; + icon_state = "pipe-c" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) "MQ" = ( /obj/machinery/drone_fabricator{ fabricator_tag = "Engineering" @@ -12683,12 +13541,24 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/drone_fabrication) -"MY" = ( -/obj/effect/floor_decal/borderfloor, -/obj/effect/floor_decal/borderfloor/corner2{ - dir = 9 +"Nb" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/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 = 8 }, -/obj/machinery/light, /turf/simulated/floor/tiled/steel, /area/hallway/primary/underone) "Nf" = ( @@ -12698,6 +13568,28 @@ /obj/structure/railing, /turf/simulated/floor/plating, /area/security/prison) +"Nn" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/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/effect/floor_decal/borderfloor/corner{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) "Nt" = ( /obj/structure/cable/green{ d1 = 4; @@ -12726,6 +13618,24 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering/upper) +"Nz" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 10 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 10 + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) "NF" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/monotile, @@ -12750,6 +13660,25 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) +"NN" = ( +/obj/machinery/button/remote/blast_door{ + dir = 1; + id = "hangar_ext"; + name = "Hangar Bay Service Shutter Control"; + pixel_x = 33; + pixel_y = -26; + req_one_access = list(19,29,38,43,47,63,67) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) "NO" = ( /turf/simulated/floor/tiled/steel, /area/vacant/vacant_site) @@ -12760,6 +13689,15 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/drone_fabrication) +"NQ" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/door/firedoor/glass/hidden{ + dir = 8 + }, +/turf/simulated/floor/tiled/monotile, +/area/hallway/primary/underone) "NT" = ( /obj/structure/railing{ dir = 8 @@ -12774,6 +13712,13 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/drone_fabrication) +"NW" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/catwalk, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/hangar) "NZ" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 1 @@ -12789,9 +13734,49 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/engineering_hallway) +"Oj" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/marker_beacon/red, +/turf/simulated/floor/tiled/techfloor/grid, +/area/rift/station/fighter_bay/hangar) "Ol" = ( /turf/simulated/wall, /area/maintenance/lower/trash_pit) +"Ov" = ( +/obj/structure/lattice, +/obj/effect/overlay/snow/floor/pointy, +/obj/effect/overlay/snow/floor/pointy{ + dir = 8 + }, +/obj/effect/overlay/snow/floor/pointy{ + dir = 4 + }, +/obj/effect/overlay/snow/floor/pointy{ + dir = 1 + }, +/turf/simulated/floor/plating/lythios43c, +/area/rift/surfacebase/underground/under1) +"Oz" = ( +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/marker_beacon/red, +/turf/simulated/floor/tiled/techfloor/grid, +/area/rift/station/fighter_bay/hangar) +"OA" = ( +/obj/effect/zone_divider, +/turf/simulated/open/lythios43c, +/area/rift/surfacebase/underground/under1) "OD" = ( /obj/effect/floor_decal/rust, /obj/machinery/door/airlock/maintenance/int{ @@ -12813,6 +13798,27 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/hallway) +"OI" = ( +/obj/effect/floor_decal/industrial/warning, +/turf/simulated/floor/tiled/techfloor/grid, +/area/rift/station/fighter_bay/hangar) +"OW" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 8 + }, +/obj/effect/floor_decal/industrial/warning/corner, +/obj/machinery/button/remote/blast_door{ + dir = 4; + id = "hangar_lockdown"; + name = "Hangar Lockdown Control"; + pixel_x = -24; + pixel_y = -32; + req_one_access = list(19,29,38,43,47,63,67) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/marker_beacon/red, +/turf/simulated/floor/tiled/techfloor/grid, +/area/rift/station/fighter_bay/hangar) "OZ" = ( /obj/structure/railing{ dir = 1 @@ -12838,6 +13844,10 @@ }, /turf/simulated/floor/tiled/monotile, /area/hallway/primary/underone) +"Pc" = ( +/obj/mecha/combat/fighter/pinnace, +/turf/simulated/floor/tiled/techmaint, +/area/rift/station/fighter_bay/hangar) "Ph" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -12893,11 +13903,63 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/hallway) -"PI" = ( -/obj/effect/zone_divider, -/obj/effect/zone_divider, -/turf/simulated/sky/lythios43c/moving/east, -/area/rift/surfacebase/underground/under1) +"PA" = ( +/obj/machinery/button/remote/blast_door{ + id = "hangar_maint"; + name = "Hangar Maintenance Shutter Control"; + pixel_y = 28; + req_one_access = list(29,47) + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 4 + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) +"PD" = ( +/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 = 10 + }, +/turf/simulated/floor/tiled/techmaint, +/area/rift/station/fighter_bay/maintenance) +"PH" = ( +/turf/simulated/floor/crystal, +/area/rift/station/adherent_maintenance) +"PJ" = ( +/obj/machinery/vending/cola, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 5 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 5 + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) "PZ" = ( /obj/structure/catwalk, /obj/structure/railing{ @@ -12905,9 +13967,6 @@ }, /turf/simulated/open, /area/engineering/engine_core) -"Qd" = ( -/turf/simulated/sky/lythios43c/moving/east, -/area/rift/surfacebase/underground/under1) "Ql" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -12925,6 +13984,12 @@ /obj/machinery/power/rad_collector, /turf/simulated/floor/reinforced, /area/engineering/engine_core) +"QJ" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/underone) "QX" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 8 @@ -12943,6 +14008,14 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) +"Rf" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/catwalk, +/obj/machinery/light, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/maintenance) "Rj" = ( /obj/machinery/firealarm{ dir = 3; @@ -12957,6 +14030,36 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/drone_fabrication) +"Rm" = ( +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24 + }, +/obj/structure/cable/green{ + d2 = 8; + icon_state = "0-8" + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 1 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) +"Rs" = ( +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/crystal, +/area/rift/station/adherent_maintenance) "Ru" = ( /obj/effect/floor_decal/borderfloorblack/corner{ dir = 8 @@ -12980,6 +14083,11 @@ /obj/effect/floor_decal/rust, /turf/simulated/floor/tiled, /area/maintenance/elevator) +"Rw" = ( +/obj/structure/table/rack/shelf, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay/maintenance) "Rx" = ( /obj/structure/railing, /obj/effect/floor_decal/rust, @@ -13006,6 +14114,9 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/drone_fabrication) +"RH" = ( +/turf/simulated/wall/r_wall, +/area/rift/station/fighter_bay/maintenance) "RM" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -13015,6 +14126,29 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering) +"RN" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/effect/floor_decal/industrial/warning/corner{ + dir = 4 + }, +/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 = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/underone) "RP" = ( /obj/structure/closet/crate/miningcar, /obj/effect/floor_decal/rust, @@ -13026,6 +14160,15 @@ /obj/item/ore/coal, /turf/simulated/floor/tiled, /area/maintenance/elevator) +"RQ" = ( +/obj/structure/adherent_pylon, +/obj/structure/cable/green{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/crystal, +/area/rift/station/adherent_maintenance) "RU" = ( /obj/structure/catwalk, /obj/structure/cable/green{ @@ -13067,6 +14210,19 @@ }, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) +"Sq" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/obj/effect/floor_decal/borderfloor/corner2, +/obj/effect/floor_decal/corner/mauve/bordercorner2, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) "St" = ( /obj/effect/floor_decal/borderfloor, /obj/structure/cable{ @@ -13092,6 +14248,9 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/engineering_hallway) +"SI" = ( +/turf/simulated/wall/r_wall, +/area/rift/station/fighter_bay) "SK" = ( /obj/effect/floor_decal/borderfloorblack/corner, /obj/effect/floor_decal/corner/orange/bordercorner, @@ -13144,10 +14303,42 @@ "SW" = ( /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/turbolift/runder/level1) +"SX" = ( +/obj/structure/bed/chair/office/dark{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/maintenance) "Td" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/hallway) +"Th" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 4 + }, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/underone) +"Ti" = ( +/obj/machinery/atmospherics/component/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled/techmaint, +/area/rift/station/fighter_bay/maintenance) "Tm" = ( /obj/effect/floor_decal/rust, /obj/structure/cable/green{ @@ -13161,6 +14352,44 @@ }, /turf/simulated/floor/tiled, /area/maintenance/elevator) +"Tn" = ( +/obj/effect/zone_divider, +/obj/structure/lattice, +/obj/effect/overlay/snow/floor/pointy, +/obj/effect/overlay/snow/floor/pointy{ + dir = 8 + }, +/obj/effect/overlay/snow/floor/pointy{ + dir = 4 + }, +/obj/effect/overlay/snow/floor/pointy{ + dir = 1 + }, +/turf/simulated/floor/plating/lythios43c, +/area/rift/surfacebase/underground/under1) +"Tr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/monotile, +/area/hallway/primary/underone) +"Tt" = ( +/obj/effect/floor_decal/borderfloor, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/underone) "Tz" = ( /obj/structure/bed/chair{ dir = 4 @@ -13281,13 +14510,6 @@ "Uu" = ( /turf/unsimulated/mineral/icerock/lythios43c, /area/security/prison) -"Uv" = ( -/obj/structure/grille, -/obj/structure/window/reinforced/full, -/obj/machinery/door/firedoor/glass, -/obj/structure/sign/electricshock, -/turf/simulated/floor/plating, -/area/hallway/primary/underone) "Uw" = ( /obj/random/cigarettes, /obj/random/junk, @@ -13349,6 +14571,17 @@ /obj/effect/floor_decal/industrial/danger/corner, /turf/simulated/floor/tiled/dark, /area/engineering/lower/atmos_lockers) +"UL" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/hangar) "UN" = ( /obj/effect/floor_decal/rust, /obj/structure/sink{ @@ -13424,6 +14657,27 @@ }, /turf/simulated/floor/plating, /area/security/prison) +"Vh" = ( +/obj/machinery/door/blast/regular{ + dir = 4; + id = "hangar_ext"; + name = "Hangar Bay Service Shutter" + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) +"Vk" = ( +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/obj/structure/sign/signnew/danger, +/obj/structure/window/reinforced/full, +/turf/simulated/floor/plating, +/area/rift/station/adherent_maintenance) +"Vr" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/rift/station/fighter_bay/hangar) "Vs" = ( /obj/structure/railing, /obj/machinery/light/small{ @@ -13446,10 +14700,29 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/hallway) -"Vx" = ( -/obj/effect/blocker, -/turf/simulated/sky/lythios43c/moving/east, -/area/rift/surfacebase/underground/under1) +"Vw" = ( +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "hangar_lockdown"; + name = "Hangar Lockdown Blast Doors"; + opacity = 0 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_research{ + name = "Fighter Bay"; + req_one_access = list(19,29,38,43,47,63,67) + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) "VG" = ( /obj/structure/catwalk, /obj/structure/cable{ @@ -13459,6 +14732,13 @@ }, /turf/simulated/floor/plating, /area/maintenance/engineering) +"VL" = ( +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/turf/simulated/floor/tiled/monotile, +/area/hallway/primary/underone) "VO" = ( /obj/effect/floor_decal/borderfloorblack{ dir = 4 @@ -13475,6 +14755,13 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/hallway) +"VT" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/tiled/techfloor/grid, +/area/rift/station/fighter_bay/hangar) "VU" = ( /obj/machinery/light_switch{ dir = 8; @@ -13486,6 +14773,15 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) +"Wd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/green{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/crystal, +/area/rift/station/adherent_maintenance) "We" = ( /obj/machinery/door/airlock/maintenance/engi{ name = "Power Shaft Access" @@ -13498,6 +14794,45 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/plating, /area/maintenance/engineering) +"Wg" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 10 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 10 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 9 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) +"Wj" = ( +/obj/effect/blocker, +/turf/simulated/open/lythios43c, +/area/rift/surfacebase/underground/under1) +"Wm" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 1 + }, +/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 = 8 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/underone) "Wn" = ( /obj/structure/lattice, /obj/machinery/door/firedoor/glass, @@ -13554,6 +14889,14 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/engineering_hallway) +"WA" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/catwalk, +/obj/machinery/light, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/hangar) "WB" = ( /obj/effect/floor_decal/rust, /obj/structure/closet/crate/freezer, @@ -13563,6 +14906,32 @@ /obj/item/storage/box/glasses/shot, /turf/simulated/floor/tiled, /area/maintenance/elevator) +"WM" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/vending/coffee, +/obj/machinery/atmospherics/component/unary/vent_pump/on, +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 9 + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) +"WO" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + d2 = 2; + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + dir = 4; + pixel_x = 24 + }, +/turf/simulated/floor/tiled/steel_grid, +/area/rift/station/fighter_bay/maintenance) "WQ" = ( /obj/structure/railing{ dir = 1 @@ -13572,10 +14941,6 @@ }, /turf/simulated/open, /area/engineering/engine_balcony) -"WV" = ( -/obj/structure/adherent_pylon, -/turf/simulated/floor/crystal, -/area/hallway/primary/underone) "WX" = ( /obj/effect/floor_decal/borderfloorblack, /obj/effect/floor_decal/corner/orange/border, @@ -13602,6 +14967,24 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/engineering_hallway) +"Xh" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/catwalk, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on, +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/hangar) +"Xj" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 9 + }, +/obj/structure/bed/chair/comfy/beige, +/turf/simulated/floor/tiled/steel, +/area/hallway/primary/underone) "Xq" = ( /obj/machinery/door/firedoor/glass/hidden, /obj/effect/floor_decal/borderfloorblack{ @@ -13698,11 +15081,6 @@ }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/engineering_hallway) -"XT" = ( -/obj/machinery/door/firedoor/glass, -/obj/machinery/door/airlock/maintenance/common, -/turf/simulated/floor/plating, -/area/hallway/primary/underone) "XV" = ( /obj/structure/railing{ dir = 8 @@ -13712,27 +15090,28 @@ }, /turf/simulated/floor/plating, /area/maintenance/elevator) -"XX" = ( -/obj/effect/zone_divider, -/obj/structure/lattice, -/obj/effect/overlay/snow/floor/pointy, -/obj/effect/overlay/snow/floor/pointy{ +"XW" = ( +/obj/structure/railing{ dir = 8 }, -/obj/effect/overlay/snow/floor/pointy{ - dir = 4 - }, -/obj/effect/overlay/snow/floor/pointy{ +/obj/structure/catwalk, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ dir = 1 }, -/turf/simulated/sky/lythios43c/moving/east, -/area/rift/surfacebase/underground/under1) +/turf/simulated/floor/plating, +/area/rift/station/fighter_bay/hangar) "Ya" = ( /obj/structure/symbol/sa, /turf/simulated/wall{ can_open = 1 }, /area/vacant/vacant_site) +"Yb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 1 + }, +/turf/simulated/floor/crystal, +/area/rift/station/adherent_maintenance) "Yi" = ( /obj/machinery/light/small{ dir = 1 @@ -13786,6 +15165,13 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/locker_room) +"Yt" = ( +/obj/structure/adherent_bath, +/turf/simulated/floor/crystal, +/area/rift/station/adherent_maintenance) +"Yu" = ( +/turf/simulated/wall/r_wall, +/area/rift/station/fighter_bay/hangar) "Yv" = ( /obj/structure/cable/green{ d1 = 4; @@ -13795,6 +15181,19 @@ /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled/techmaint, /area/engineering/drone_fabrication) +"YB" = ( +/obj/machinery/vending/snack, +/obj/machinery/atmospherics/component/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor{ + dir = 6 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 6 + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) "YD" = ( /obj/structure/stairs/spawner/north, /turf/simulated/floor/tiled/steel, @@ -13807,6 +15206,23 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) +"YX" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/turf/simulated/floor/tiled/monotile, +/area/hallway/primary/underone) +"YY" = ( +/obj/machinery/computer/rdconsole/robotics, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay/maintenance) "Zc" = ( /obj/machinery/alarm{ dir = 4; @@ -13815,6 +15231,14 @@ /obj/structure/catwalk, /turf/simulated/floor/plating, /area/maintenance/lower/trash_pit) +"Ze" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/floor_decal/borderfloor, +/obj/effect/floor_decal/corner/mauve/border, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) "Zf" = ( /obj/structure/disposalpipe/segment, /obj/effect/floor_decal/rust, @@ -13841,13 +15265,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/engineering/atmos/hallway) -"Zl" = ( -/obj/effect/zone_divider, -/obj/effect/map_effect/portal/line/side_a{ - dir = 4 - }, -/turf/simulated/sky/lythios43c/moving/east, -/area/rift/surfacebase/underground/under1) "Zs" = ( /obj/machinery/recharge_station, /turf/simulated/floor/tiled/techmaint, @@ -13855,6 +15272,18 @@ "Zu" = ( /turf/simulated/mineral/icerock, /area/security/prison) +"Zv" = ( +/obj/effect/floor_decal/borderfloor, +/obj/machinery/computer/general_air_control/supermatter_core{ + dir = 1; + input_tag = "cooling_in"; + name = "Engine Cooling Control"; + output_tag = "cooling_out"; + sensors = list("engine_sensor"="Engine Core"); + throwpass = 1 + }, +/turf/simulated/floor/tiled/monotile, +/area/engineering/engineering_monitoring) "Zx" = ( /obj/structure/catwalk, /obj/structure/railing{ @@ -13862,6 +15291,21 @@ }, /turf/simulated/open, /area/engineering/engine_core) +"ZE" = ( +/obj/effect/floor_decal/borderfloor{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/border{ + dir = 8 + }, +/obj/effect/floor_decal/borderfloor/corner2{ + dir = 8 + }, +/obj/effect/floor_decal/corner/mauve/bordercorner2{ + dir = 8 + }, +/turf/simulated/floor/tiled/steel, +/area/rift/station/fighter_bay) "ZG" = ( /obj/machinery/camera/network/mining{ dir = 6 @@ -13911,1935 +15355,1935 @@ /area/hallway/secondary/engineering_hallway) (1,1,1) = {" -Vx -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Zl -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Zl -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Zl -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Zl -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Zl -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Zl -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Zl -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Zl -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Zl -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Zl -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Zl -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Zl -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -vA -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -vA -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Zl -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -Jt -HF -Vx +Wj +It +It +It +It +It +It +It +It +It +It +It +wh +It +It +It +It +It +It +It +It +It +It +It +wh +It +It +It +It +It +It +It +It +It +It +It +wh +It +It +It +It +It +It +It +It +It +It +It +wh +It +It +It +It +It +It +It +It +It +It +It +wh +It +It +It +It +It +It +It +It +It +It +It +wh +It +It +It +It +It +It +It +It +It +It +It +wh +It +It +It +It +It +It +It +It +It +It +It +wh +It +It +It +It +It +It +It +It +It +It +It +wh +It +It +It +It +It +It +It +It +It +It +It +wh +It +It +It +It +It +It +It +It +It +It +It +wh +It +It +It +It +It +It +It +It +It +It +It +wh +It +It +It +It +It +It +It +It +It +It +It +Hm +It +It +It +It +It +It +It +It +It +It +It +Hm +It +It +It +It +It +It +It +It +It +It +It +wh +It +It +It +It +It +It +It +It +It +uJ +Wj "} (2,1,1) = {" -Vx -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -PI -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -PI -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Vx +Wj +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +MD +td +td +td +td +td +td +td +td +td +td +td +MD +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +Wj "} (3,1,1) = {" -Vx -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -PI -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -PI -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Vx +Wj +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +MD +td +td +td +td +td +td +td +td +td +td +td +MD +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +Wj "} (4,1,1) = {" -Vx -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -PI -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -PI -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Vx +Wj +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +MD +td +td +td +td +td +td +td +td +td +td +td +MD +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +Wj "} (5,1,1) = {" -Vx -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -PI -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -PI -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Vx +Wj +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +MD +td +td +td +td +td +td +td +td +td +td +td +MD +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +Wj "} (6,1,1) = {" -Vx -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -PI -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -PI -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Vx +Wj +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +MD +td +td +td +td +td +td +td +td +td +td +td +MD +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +Wj "} (7,1,1) = {" -Vx -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -PI -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -PI -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Vx +Wj +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +MD +td +td +td +td +td +td +td +td +td +td +td +MD +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +Wj "} (8,1,1) = {" -Vx -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd +Wj +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td es -HG +Ov es -HG +Ov Hk -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -PI -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -PI -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Vx +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +MD +td +td +td +td +td +td +td +td +td +td +td +MD +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +Wj "} (9,1,1) = {" -Vx -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -HG -Qd -Qd -Qd -XX -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -PI -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -PI -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd +Wj +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +Ov +td +td +td +Tn +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +MD +td +td +td +td +td +td +td +td +td +td +td +MD +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td aa aa aa ms "} (10,1,1) = {" -Vx -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -es +Wj +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +OA +OA +OA +OA +OA +OA +OA +OA +OA +OA +OA +Hk aa aa aa Hk -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -PI -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -PI -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +MD +td +td +td +td +td +td +td +td +td +td +td +MD +td +td +td +td +td +td +td +td +td +td +td +OA +td +td aa aa aa @@ -15851,111 +17295,111 @@ aa ms "} (11,1,1) = {" -Vx -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -aa +Wj +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +Jw +Yu +Yu +Yu +Af +Af +Af +vz +Yu +Yu +Yu Jw -aa -aa -aa -aa -aa -aa -aa -aa aa aa aa @@ -15966,68 +17410,68 @@ aa aa aa aa -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -PI -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -PI -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +MD +td +td +td +td +td +td +td +td +td +td +td +MD +td +td +td +td +td +td +td +td aa aa aa @@ -16045,92 +17489,92 @@ aa ms "} (12,1,1) = {" -Vx -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -PI -Bn -Bn -Bn -Bn -Bn -Bn -PI -PI -PI -Bn -Bn -PI -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -PI -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -PI -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -PI -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -PI -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -PI -Bn +Wj +OA +OA +OA +OA +OA +OA +OA +OA +OA +OA +OA +MD +OA +OA +OA +OA +OA +OA +MD +MD +MD +OA +OA +MD +OA +OA +OA +OA +OA +OA +OA +OA +OA +OA +OA +MD +OA +OA +OA +OA +OA +OA +OA +OA +OA +OA +OA +MD +OA +OA +OA +OA +OA +OA +OA +OA +OA +OA +OA +MD +OA +OA +OA +OA +OA +OA +OA +OA +OA +OA +OA +MD +OA +OA +OA +OA +OA +OA +OA +OA +OA +OA +OA +MD +OA Jw Jw Jw @@ -16139,16 +17583,16 @@ Jw Jw Jw Jw -Jw -Jw -Aq -Jw -Jw -Jw -Jw -Jw -Jw -Jw +Yu +vl +Gi +xW +Hx +Dd +OW +xa +WA +Yu Jw Jw Jw @@ -16164,58 +17608,58 @@ Jw Jw Jw Jw -Bn -PI -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -PI -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -PI -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -wS -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -Bn -wS -Bn -Bn +OA +MD +OA +OA +OA +OA +OA +OA +OA +OA +OA +OA +OA +MD +OA +OA +OA +OA +OA +OA +OA +OA +OA +OA +OA +MD +OA +OA +OA +OA +OA +OA +OA +OA +OA +OA +OA +Kj +OA +OA +OA +OA +OA +OA +OA +OA +OA +OA +OA +Kj +OA +OA Jw Jw Jw @@ -16255,73 +17699,73 @@ Jw aa aa aa -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -es -es -es -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td aa Jw aa @@ -16332,17 +17776,17 @@ aa aa aa aa -aa -aa -aa Jw -aa -aa -aa -aa -aa -aa -aa +Yu +xS +AO +Vr +zy +Gn +OI +AO +xS +Yu aa aa aa @@ -16362,48 +17806,48 @@ aa Jw aa aa -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -PI -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +MD +td +td +td +td +td +td +td +td aa aa aa @@ -16462,57 +17906,81 @@ aa aa aa aa -es -es -es -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +aa +aa +aa +aa +Jw +aa +aa +aa +aa +aa +aa +aa +aa +Jw +Yu +xS +AO +Vr +zy +Gn +OI +AO +xS +Yu aa aa aa @@ -16535,63 +18003,39 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -Jw -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -Jw -aa -aa -aa -aa -aa -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -PI -Qd -Qd +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +MD +td +td aa aa aa @@ -16660,49 +18104,49 @@ es es es aa -Qd -Qd -Qd -Bn -Qd -Qd -Qd -es -es -es -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -es -es -es -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td aa aa aa @@ -16720,17 +18164,17 @@ aa aa aa aa -aa -aa -aa Jw -aa -aa -aa -aa -aa -aa -aa +Yu +xt +UL +Dn +VT +wD +Is +Ce +tc +Yu aa aa aa @@ -16863,31 +18307,31 @@ aa aa es es -es -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Qd -Bn -Qd -Qd -Qd -es -es -es +td +td +td +td +td +td +OA +td +td +td +td +td +td +td +td +td +td +td +OA +td +td +td +td +td +td aa aa aa @@ -16914,17 +18358,17 @@ aa aa aa aa -aa -aa -aa Jw -aa -aa -aa -aa -aa -aa -aa +Yu +xS +Pc +Vr +zy +Gn +OI +AO +rj +Yu aa aa aa @@ -17108,17 +18552,17 @@ aa aa aa aa -aa -aa -aa Jw -aa -aa -aa -aa -aa -aa -aa +Yu +xS +AO +Vr +zy +Gn +OI +AO +xS +Yu aa aa aa @@ -17303,16 +18747,16 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Yu +xt +Xh +EX +uy +zd +vQ +zm +tc +Yu aa aa aa @@ -17497,16 +18941,16 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +Yu +xS +AO +Vr +zy +Gn +OI +AO +rj +Yu aa aa aa @@ -17691,22 +19135,22 @@ aa aa aa aa +Yu +xS +AO +Vr +zy +Gn +OI +AO +xS +Yu aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bA +bA +bA +bA +bA aa aa aa @@ -17885,22 +19329,22 @@ aa aa aa aa +Yu +NW +uP +Oj +VT +wD +Oz +XW +NW +Yu aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bA +Xj +wL +IG +bA aa aa aa @@ -18079,22 +19523,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +SI +SI +SI +SI +tk +KB +SI +SI +SI +SI +SI +BX +QJ +dP +rT +bA aa aa aa @@ -18273,22 +19717,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +SI +WM +BS +Nz +wx +Bu +ZE +CV +CV +LS +Wg +yA +zb +dP +rT +bA aa aa aa @@ -18467,22 +19911,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +SI +Fo +vX +IO +wy +CQ +xI +MO +zo +Nn +Ap +Vw +YX +VL +rY +bA aa aa aa @@ -18661,22 +20105,22 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +SI +SI +Dc +Dc +LJ +LJ +Dc +Db +SI +Rm +Sq +yA +RN +eg +rT +bA aa aa aa @@ -18856,21 +20300,21 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +RH +KJ +Dw +BU +BU +BU +tO +AA +LL +yx +Vh +Hg +eg +rT +bA aa aa aa @@ -19050,21 +20494,21 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +RH +Rw +zI +Gp +xX +xX +yy +AA +uY +NN +Vh +Fv +eg +rT +bA aa aa aa @@ -19244,21 +20688,21 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +RH +Gu +CZ +ze +BU +Hd +Rf +RH +PA +Ze +BX +Nb +eg +rT +bA aa aa aa @@ -19438,21 +20882,21 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +RH +YY +SX +PD +Ti +uz +uz +RH +PJ +YB +BX +Cl +eg +rT +bA aa aa aa @@ -19632,21 +21076,21 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +RH +uE +WO +va +BU +uz +uz +RH +SI +SI +BX +Wm +eg +rT +bA aa aa aa @@ -19826,21 +21270,21 @@ aa aa aa aa +RH +RH +RH +RH +RH +RH +RH +RH aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +bA +Cl +eg +rT +bA aa aa aa @@ -20030,11 +21474,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +bA +Cl +eg +rT +bA aa aa aa @@ -20224,11 +21668,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +bA +Cl +eg +rT +bA aa aa aa @@ -20418,11 +21862,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +bA +Cl +eg +rT +bA aa aa aa @@ -20612,11 +22056,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +bA +Dg +NQ +XF +bA aa aa aa @@ -20806,11 +22250,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +bA +Cl +eg +rY +bA aa aa aa @@ -21000,11 +22444,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +bA +Cl +eg +rT +bA aa aa aa @@ -21194,11 +22638,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +bA +Cl +eg +rT +bA aa aa aa @@ -21388,11 +22832,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +bA +Cl +eg +rT +bA aa aa aa @@ -21582,11 +23026,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +bA +Cl +eg +rT +bA aa aa aa @@ -21776,11 +23220,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +bA +Cl +eg +rT +bA aa aa aa @@ -21970,11 +23414,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +bA +Wm +eg +rT +bA aa aa aa @@ -22164,11 +23608,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +bA +Cl +eg +rT +bA aa aa aa @@ -22358,11 +23802,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +bA +Cl +eg +rT +bA aa aa aa @@ -22552,11 +23996,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +bA +Cl +eg +rT +bA aa aa aa @@ -22746,11 +24190,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +bA +Cl +eg +rT +bA aa aa aa @@ -22940,11 +24384,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +bA +Cl +eg +rT +bA aa aa aa @@ -23134,11 +24578,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +bA +Cl +eg +rY +bA aa aa aa @@ -23328,11 +24772,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +bA +Cl +eg +rT +bA aa aa aa @@ -23522,11 +24966,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +bA +Cl +eg +rT +bA aa aa aa @@ -23716,11 +25160,11 @@ aa aa aa aa -aa -aa -aa -aa -aa +bA +Cl +eg +rT +bA aa aa aa @@ -23909,17 +25353,17 @@ aa aa aa aa -bA -bA -bA -bA -bA -bA -bA -aa -aa -aa aa +bA +Dg +NQ +XF +zz +zz +zz +zz +zz +zz aa aa aa @@ -24103,17 +25547,17 @@ aa aa aG aG -bA -Mm -xv -xv -xv -Mm -bA -aa -aa -aa -aa +aG +aG +Cl +eg +rT +zz +Am +PH +PH +Yt +zz aa aa aa @@ -24297,17 +25741,17 @@ aa aa aG yh -bA -xv -xv -xv -xv -xv -bA -aa -aa -aa -aa +gi +aG +Ke +eg +Jk +Vk +He +Yb +Rs +PH +zz aa aa aa @@ -24491,17 +25935,17 @@ aa aa aG wu -XT -xv -xv -WV -xv -ym -bA -aa -aa -aa -aa +gi +AG +xj +Tr +ru +FL +sf +RQ +PH +ED +zz aa aa aa @@ -24685,17 +26129,17 @@ aa aa aG wu -bA -xv -xm -tP -Al -xv -bA -aa -aa -aa -aa +gi +aG +Th +eg +fO +vo +xy +Wd +zM +PH +zz aa aa aa @@ -24879,17 +26323,17 @@ aa aa aG wu -bA -CB -xv -EL -xv -CB -bA -aa -aa -aa -aa +gi +aG +AK +eg +rT +zz +Am +Hj +PH +Yt +zz aa aa aa @@ -25073,17 +26517,17 @@ aG aG aG wu -bA -bA -Aj -tK -Uv -bA -bA -aa -aa -aa -aa +gi +aG +AK +eg +rT +zz +zz +zz +zz +zz +zz pQ sL hO @@ -25268,10 +26712,10 @@ gi aG wu bw -bA -bQ -dN -rb +aG +AK +qC +Tt ju ju ju @@ -25463,9 +26907,9 @@ aG wu Li aG -cF +Eu et -MY +Jc ju kg kE @@ -25657,9 +27101,9 @@ aG aJ bf hU -cK +La ey -fN +wA gd gW fk @@ -29552,7 +30996,7 @@ dY el ev uL -eZ +Zv fn gB km diff --git a/_maps/map_files/rift/rift-08-west_deep.dmm b/_maps/map_files/rift/rift-08-west_deep.dmm index 27a5dc2e2ad..d8e1519b415 100644 --- a/_maps/map_files/rift/rift-08-west_deep.dmm +++ b/_maps/map_files/rift/rift-08-west_deep.dmm @@ -18,7 +18,7 @@ /turf/simulated/floor/tiled/dark, /area/rift/facility/interior/temple) "bh" = ( -/turf/simulated/open/lythios43c, +/turf/simulated/floor/sky/depths/west/lythios43c, /area/rift/surfacebase/outside/west_deep) "bY" = ( /obj/machinery/door/window/brigdoor/southleft, @@ -125,8 +125,8 @@ "hZ" = ( /obj/effect/decal/cleanable/blood/writing{ dir = 8; - name = "bloody message"; - message = "THEY KILLED US" + message = "THEY KILLED US"; + name = "bloody message" }, /turf/simulated/floor/tiled/steel_dirty, /area/rift/facility/interior/prison) @@ -136,7 +136,7 @@ name = "westdeep_to_center"; portal_id = "westdeepstep" }, -/turf/simulated/open/lythios43c, +/turf/simulated/floor/sky/depths/west/lythios43c, /area/rift/surfacebase/outside/west_deep) "iq" = ( /obj/effect/floor_decal/corner/white{ @@ -193,7 +193,7 @@ /turf/simulated/floor/tiled/steel_dirty, /area/rift/facility/interior/undergound2) "ju" = ( -/turf/simulated/open/lythios43c, +/turf/simulated/floor/sky/depths/west/lythios43c, /area/rift/facility/interior/undergound2) "jw" = ( /obj/structure/table/marble, @@ -310,9 +310,9 @@ dir = 4 }, /obj/machinery/power/apc/alarms_hidden{ - dir = 1; + cell_type = null; chargelevel = 0; - cell_type = null + dir = 1 }, /turf/simulated/floor/tiled/dark, /area/rift/facility/interior/temple) @@ -337,7 +337,7 @@ /area/rift/facility/interior/temple) "pT" = ( /obj/effect/blocker, -/turf/simulated/open/lythios43c, +/turf/simulated/floor/sky/depths/west/lythios43c, /area/rift/surfacebase/outside/west_deep) "pX" = ( /obj/structure/bed/chair/wood{ @@ -475,9 +475,9 @@ "yG" = ( /obj/structure/bed/chair, /obj/machinery/power/apc/alarms_hidden{ - dir = 1; + cell_type = null; chargelevel = 0; - cell_type = null + dir = 1 }, /turf/simulated/floor/tiled/steel_dirty, /area/rift/facility/interior/prison) @@ -612,9 +612,9 @@ /area/rift/facility/interior/elevator) "Mc" = ( /obj/machinery/power/apc/alarms_hidden{ - dir = 1; + cell_type = null; chargelevel = 0; - cell_type = null + dir = 1 }, /turf/simulated/floor/tiled/steel_dirty, /area/rift/facility/interior/undergound2) @@ -676,7 +676,7 @@ /area/rift/facility/interior/undergound2) "Sw" = ( /obj/effect/map_effect/radiation_emitter/chernobyl, -/turf/simulated/open/lythios43c, +/turf/simulated/floor/sky/depths/west/lythios43c, /area/rift/facility/interior/undergound2) "Sy" = ( /obj/effect/floor_decal/corner/black{ @@ -722,9 +722,9 @@ /area/rift/facility/interior/prison) "UD" = ( /obj/machinery/power/apc/alarms_hidden{ - dir = 1; + cell_type = null; chargelevel = 0; - cell_type = null + dir = 1 }, /turf/simulated/floor/tiled/steel_dirty, /area/rift/facility/interior/janitorial) @@ -780,7 +780,7 @@ /obj/effect/map_effect/portal/line/side_b{ dir = 8 }, -/turf/simulated/open/lythios43c, +/turf/simulated/floor/sky/depths/west/lythios43c, /area/rift/surfacebase/outside/west_deep) "YK" = ( /turf/simulated/floor/tiled/steel_dirty, @@ -33105,8 +33105,8 @@ so so lq lq -bh -bh +lq +lq lq lq kx @@ -33299,8 +33299,8 @@ so so lq lq -bh -bh +lq +lq lq lq kx diff --git a/_maps/map_files/rift/rift-09-west_caves.dmm b/_maps/map_files/rift/rift-09-west_caves.dmm index 29e55c58ea5..edf8e3c9570 100644 --- a/_maps/map_files/rift/rift-09-west_caves.dmm +++ b/_maps/map_files/rift/rift-09-west_caves.dmm @@ -57,7 +57,7 @@ /area/rift/facility/interior/command) "gk" = ( /obj/effect/blocker, -/turf/simulated/sky/lythios43c/moving/east, +/turf/simulated/open/lythios43c, /area/rift/surfacebase/outside/west_caves) "gK" = ( /obj/structure/mirror/long/left_broke{ @@ -266,7 +266,7 @@ name = "westcave_to_center"; portal_id = "westcavestep" }, -/turf/simulated/sky/lythios43c/moving/east, +/turf/simulated/open/lythios43c, /area/rift/surfacebase/outside/west_caves) "vh" = ( /obj/structure/stairs/spawner/south, @@ -424,7 +424,7 @@ /obj/effect/map_effect/portal/line/side_b{ dir = 8 }, -/turf/simulated/sky/lythios43c/moving/east, +/turf/simulated/open/lythios43c, /area/rift/surfacebase/outside/west_caves) "GR" = ( /obj/random/trash, @@ -613,9 +613,6 @@ }, /turf/simulated/floor/tiled/steel_dirty, /area/rift/facility/interior/medical) -"YA" = ( -/turf/simulated/sky/lythios43c/moving/east, -/area/rift/surfacebase/outside/west_caves) "YS" = ( /obj/structure/stairs/spawner/south, /turf/simulated/floor/outdoors/safeice/lythios43c/indoors, @@ -32304,22 +32301,22 @@ JD JD JD JD -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra JD JD JD @@ -32495,28 +32492,28 @@ JD JD JD JD -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra JD JD JD @@ -32686,33 +32683,33 @@ JD JD JD JD -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra JD JD JD @@ -32873,43 +32870,43 @@ JD JD JD JD -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra JD JD JD @@ -33057,57 +33054,57 @@ JD JD JD JD -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra JD JD JD @@ -33242,68 +33239,68 @@ JD JD JD JD -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra JD JD JD @@ -33434,71 +33431,71 @@ JD JD JD JD -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra JD JD JD @@ -33607,93 +33604,93 @@ JD JD JD JD -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra JD JD JD @@ -33797,98 +33794,98 @@ vv "} (172,1,1) = {" gk -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra JD JD JD @@ -33991,101 +33988,101 @@ vv "} (173,1,1) = {" gk -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra JD JD JD @@ -34185,106 +34182,106 @@ vv "} (174,1,1) = {" gk -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra JD JD JD @@ -34332,14 +34329,14 @@ JD JD JD JD -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra JD JD JD @@ -34379,119 +34376,119 @@ vv "} (175,1,1) = {" gk -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra JD JD JD @@ -34523,20 +34520,20 @@ JD JD JD JD -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra JD JD JD @@ -34561,132 +34558,132 @@ JD JD JD JD -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra gk "} (176,1,1) = {" gk -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra JD JD JD @@ -34714,26 +34711,26 @@ JD JD JD JD -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra JD JD JD @@ -34750,142 +34747,142 @@ JD JD JD JD -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra gk "} (177,1,1) = {" gk -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra JD JD JD @@ -34905,2774 +34902,2774 @@ JD JD JD JD -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra JD JD JD JD JD JD -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra gk "} (178,1,1) = {" gk -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra JD JD JD JD JD JD -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra gk "} (179,1,1) = {" gk -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra gk "} (180,1,1) = {" gk -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra gk "} (181,1,1) = {" gk -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra gk "} (182,1,1) = {" gk -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra gk "} (183,1,1) = {" gk -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra gk "} (184,1,1) = {" gk -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra gk "} (185,1,1) = {" gk -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra gk "} (186,1,1) = {" gk -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra gk "} (187,1,1) = {" gk -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra gk "} (188,1,1) = {" gk -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra gk "} (189,1,1) = {" gk -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra gk "} (190,1,1) = {" gk -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra gk "} (191,1,1) = {" gk -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA -YA +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra +Ra gk "} (192,1,1) = {" diff --git a/_maps/map_levels/192x192/lavaland.dmm b/_maps/map_levels/192x192/lavaland.dmm index 7849e4cf77a..e3dfad5873e 100644 --- a/_maps/map_levels/192x192/lavaland.dmm +++ b/_maps/map_levels/192x192/lavaland.dmm @@ -39,7 +39,7 @@ name = "\improper MEMETIC HAZARD"; pixel_x = 32 }, -/turf/simulated/mineral/triumph/lavaland, +/turf/simulated/floor/outdoors/lavaland, /area/lavaland/central/explored) "ci" = ( /obj/structure/grille, @@ -90,7 +90,7 @@ name = "to_east"; portal_id = "eaststep" }, -/turf/unsimulated/mineral/triumph/lavaland, +/turf/simulated/floor/tiled/dark/lavaland, /area/lavaland/central/transit) "dl" = ( /obj/machinery/atmospherics/pipe/tank/air{ @@ -140,7 +140,7 @@ /obj/effect/map_effect/portal/line/side_a{ dir = 8 }, -/turf/unsimulated/mineral/triumph/lavaland, +/turf/simulated/floor/tiled/dark/lavaland, /area/lavaland/central/transit) "ew" = ( /turf/simulated/floor/tiled, @@ -158,7 +158,7 @@ id = "ll_cent_shutter_east"; pixel_x = 25 }, -/turf/simulated/mineral/triumph/lavaland, +/turf/simulated/floor/outdoors/lavaland, /area/lavaland/central/explored) "eY" = ( /obj/structure/catwalk, @@ -38550,7 +38550,7 @@ RX RL MX RL -RL +gy gy gy gy @@ -38743,7 +38743,7 @@ RX MX MX RL -RL +gy gy gy gy @@ -38940,8 +38940,8 @@ gy gy gy gy -MX -MX +gy +gy RL RL xd @@ -39130,11 +39130,11 @@ RX MX MX ch -MX -MX -MX +gy +gy +gy eU -MX +gy MX MX RX diff --git a/code/game/objects/items/stacks/marker_beacons.dm b/code/game/objects/items/stacks/marker_beacons.dm index eb7ec5a2862..58044431e8d 100644 --- a/code/game/objects/items/stacks/marker_beacons.dm +++ b/code/game/objects/items/stacks/marker_beacons.dm @@ -137,3 +137,30 @@ var/list/marker_beacon_colors = list( if(input_color) picked_color = input_color update_icon() + +/obj/structure/marker_beacon/red + picked_color = "Burgundy" + +/obj/structure/marker_beacon/red/update_icon() + while(!picked_color || !marker_beacon_colors[picked_color]) + picked_color = "Burgundy" + icon_state = "[initial(icon_state)][lowertext(picked_color)]-on" + set_light(light_range, light_power, marker_beacon_colors[picked_color]) + +/obj/structure/marker_beacon/yellow + picked_color = "Yellow" + +/obj/structure/marker_beacon/yellow/update_icon() + while(!picked_color || !marker_beacon_colors[picked_color]) + picked_color = "Yellow" + icon_state = "[initial(icon_state)][lowertext(picked_color)]-on" + set_light(light_range, light_power, marker_beacon_colors[picked_color]) + +/obj/structure/marker_beacon/green + picked_color = "Green" + +/obj/structure/marker_beacon/green/update_icon() + while(!picked_color || !marker_beacon_colors[picked_color]) + picked_color = "Green" + icon_state = "[initial(icon_state)][lowertext(picked_color)]-on" + set_light(light_range, light_power, marker_beacon_colors[picked_color]) diff --git a/code/game/turfs/unsimulated/sky_vr.dm b/code/game/turfs/unsimulated/sky_vr.dm index ba83221e85a..45440dcb6af 100644 --- a/code/game/turfs/unsimulated/sky_vr.dm +++ b/code/game/turfs/unsimulated/sky_vr.dm @@ -2,7 +2,7 @@ // Generic skyfall turf // Really only works well if the map doesn't have 'indoor' areas otherwise they can fall into one. // TODO: Fix that. -/turf/unsimulated/floor/sky +/turf/simulated/floor/sky name = "the sky" desc = "It's the sky! Be careful!" icon = 'icons/turf/floors.dmi' @@ -11,14 +11,14 @@ var/does_skyfall = TRUE var/list/skyfall_levels -/turf/unsimulated/floor/sky/Initialize(mapload) +/turf/simulated/floor/sky/Initialize(mapload) . = ..() if(does_skyfall && !LAZYLEN(skyfall_levels)) log_world("[x],[y],[z], [get_area(src)] doesn't have skyfall_levels defined! Can't skyfall!") if(locate(/turf/simulated) in orange(src,1)) set_light(2, 2, color) -/turf/unsimulated/floor/sky/Entered(atom/movable/AM,atom/oldloc) +/turf/simulated/floor/sky/Entered(atom/movable/AM,atom/oldloc) ..() if(!does_skyfall) return //We don't do that @@ -41,7 +41,7 @@ do_fall(AM) -/turf/unsimulated/floor/sky/hitby(var/atom/movable/AM, var/speed) +/turf/simulated/floor/sky/hitby(var/atom/movable/AM, var/speed) . = ..() if(!does_skyfall) @@ -49,7 +49,7 @@ do_fall(AM) -/turf/unsimulated/floor/sky/proc/do_fall(atom/movable/AM) +/turf/simulated/floor/sky/proc/do_fall(atom/movable/AM) //Bye var/attempts = 100 var/turf/simulated/T @@ -71,26 +71,57 @@ message_admins("\The [AM] fell out of the sky.") L.fall_impact(T, 42, 90, FALSE, TRUE) //You will not be defibbed from this. -/turf/unsimulated/floor/sky/virgo2_sky +/turf/simulated/floor/sky/virgo2_sky name = "virgo 2 atmosphere" desc = "Be careful where you step!" color = "#eacd7c" VIRGO2_SET_ATMOS -/turf/unsimulated/floor/sky/virgo2_sky/Initialize(mapload) +/turf/simulated/floor/sky/virgo2_sky/Initialize(mapload) skyfall_levels = list(z+1) . = ..() -/turf/unsimulated/floor/sky/depths +/turf/simulated/floor/sky/depths name = "darkness" desc = "A straight drop down into the depths below." - skyfall_levels = "Western Caverns" + skyfall_levels = "Eastern Canyon" color ="#303030" -/turf/unsimulated/floor/sky/depths/Initialize(mapload) +/turf/simulated/floor/sky/depths/Initialize(mapload) . = ..() set_light(0, 0, "#FFFFFF") -/turf/unsimulated/floor/sky/depths/Initialize(mapload) - skyfall_levels = list(z + 1) +/turf/simulated/floor/sky/depths/Initialize(mapload) + skyfall_levels = list(z - 1) + . = ..() + +//This is a test adjustment to the do_fall proc to see if I can get it to land in the Lythios canyon turfs specifically. This is a RIFT ONLY edit until someone more skilled can find an elegant solution. +/turf/simulated/floor/sky/depths/do_fall(atom/movable/AM) + //Bye + var/attempts = 100 + var/turf/simulated/floor/outdoors/snow/lythios43c/T + while(attempts && !T) + var/turf/simulated/candidate = locate(rand(5,world.maxx-5),rand(5,world.maxy-5),pick(skyfall_levels)) + if(candidate.density) + attempts-- + continue + + T = candidate + break + + if(!T) + return + + AM.forceMove(T) + if(isliving(AM)) + var/mob/living/L = AM + message_admins("\The [AM] fell out of the sky.") + L.fall_impact(T, 42, 90, FALSE, TRUE) //You will not be defibbed from this. + + +/turf/simulated/floor/sky/depths/west + skyfall_levels = "Western Canyon" + +/turf/simulated/floor/sky/depths/west/Initialize(mapload) + skyfall_levels = list(z - 1) . = ..() diff --git a/code/modules/maps/rift/levels/_lythios43c.dm b/code/modules/maps/rift/levels/_lythios43c.dm index 68972bca330..00f085ffd57 100644 --- a/code/modules/maps/rift/levels/_lythios43c.dm +++ b/code/modules/maps/rift/levels/_lythios43c.dm @@ -26,3 +26,5 @@ LYTHIOS43C_TURF_CREATE(/turf/simulated/mineral) LYTHIOS43C_TURF_CREATE(/turf/simulated/mineral/floor) LYTHIOS43C_TURF_CREATE(/turf/simulated/mineral/icerock) LYTHIOS43C_TURF_CREATE(/turf/simulated/mineral/icerock/floor) +LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/sky/depths) +LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/sky/depths/west) diff --git a/code/modules/maps/tether/lateload.dm b/code/modules/maps/tether/lateload.dm index 8d9ddf27583..14d68e5772e 100644 --- a/code/modules/maps/tether/lateload.dm +++ b/code/modules/maps/tether/lateload.dm @@ -161,7 +161,7 @@ /datum/map_z_level/tether_lateload/away_aerostat name = "Away Mission - Aerostat" - base_turf = /turf/unsimulated/floor/sky/virgo2_sky + base_turf = /turf/simulated/floor/sky/virgo2_sky /datum/map_template/tether_lateload/away_aerostat_surface name = "Remmi Aerostat - Z2 Surface" diff --git a/code/modules/maps/tether/levels/virgo2.dm b/code/modules/maps/tether/levels/virgo2.dm index 38a574b2b63..758e403ed85 100644 --- a/code/modules/maps/tether/levels/virgo2.dm +++ b/code/modules/maps/tether/levels/virgo2.dm @@ -107,13 +107,13 @@ VIRGO2_TURF_CREATE(/turf/simulated/mineral/floor/ignore_mapgen) // -- Turfs -- // -/turf/unsimulated/floor/sky/virgo2_sky +/turf/simulated/floor/sky/virgo2_sky name = "virgo 2 atmosphere" desc = "Be careful where you step!" color = "#eacd7c" initial_gas_mix = ATMOSPHERE_ID_VIRGO2 -/turf/unsimulated/floor/sky/virgo2_sky/Initialize(mapload) +/turf/simulated/floor/sky/virgo2_sky/Initialize(mapload) skyfall_levels = list(z+1) . = ..() diff --git a/code/modules/mob/living/simple_mob/simple_mob_vr.dm b/code/modules/mob/living/simple_mob/simple_mob_vr.dm index a0516bfbb21..c8c7b4c8e92 100644 --- a/code/modules/mob/living/simple_mob/simple_mob_vr.dm +++ b/code/modules/mob/living/simple_mob/simple_mob_vr.dm @@ -246,7 +246,7 @@ // Checks to see if mob doesn't like this kind of turf /mob/living/simple_mob/IMove(turf/newloc, safety = TRUE) - if(istype(newloc,/turf/unsimulated/floor/sky)) + if(istype(newloc,/turf/simulated/floor/sky)) return MOVEMENT_FAILED //Mobs aren't that stupid, probably return ..() // Procede as normal. diff --git a/maps/rift/rift_areas2.dm b/maps/rift/rift_areas2.dm index 3fe44afcaa9..607fa493eb6 100644 --- a/maps/rift/rift_areas2.dm +++ b/maps/rift/rift_areas2.dm @@ -631,6 +631,23 @@ /area/shuttle/excursion/virgo3b_sky name = "\improper Excursion Shuttle - Lythios-43c Sky" + +//Adherent Maintenance +/area/rift/station/adherent_maintenance + icon_state = "yellow" + name = "\improper Adherent Maintenance" + +//Fighter Bay +/area/rift/station/fighter_bay + icon_state = "blue" + name = "\improper Fighter Bay" + +/area/rift/station/fighter_bay/hangar + name = "\improper Fighter Hangar" + +/area/rift/station/fighter_bay/maintenance + name = "\improper Fighter Bay Maintenance" + ////////////////////////////////// /* diff --git a/maps/rift/rift_turfs.dm b/maps/rift/rift_turfs.dm index f28bad5d9db..cf1a710f591 100644 --- a/maps/rift/rift_turfs.dm +++ b/maps/rift/rift_turfs.dm @@ -29,6 +29,11 @@ LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/outdoors/rocks) LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/outdoors/gravsnow) LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/outdoors/snow) + +LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/sky/depths) + +LYTHIOS43C_TURF_CREATE(/turf/simulated/floor/sky/depths/west) + /turf/simulated/floor/outdoors/snow/lythios43c baseturfs = /turf/simulated/floor/outdoors/safeice/lythios43c