diff --git a/maps/tether/submaps/_tether_submaps.dm b/maps/tether/submaps/_tether_submaps.dm
index a61895f42f0..e40123a8cc7 100644
--- a/maps/tether/submaps/_tether_submaps.dm
+++ b/maps/tether/submaps/_tether_submaps.dm
@@ -440,3 +440,9 @@
mobs_to_pick_from = list(
/mob/living/simple_mob/shadekin
)
+
+//////////////////////////////////////////////////////////////////////////////
+//Overmap ship spawns
+
+#include "om_ships/hybridshuttle.dm"
+#include "om_ships/screebarge.dm"
diff --git a/maps/tether/submaps/aerostat/_aerostat.dm b/maps/tether/submaps/aerostat/_aerostat.dm
index bda7715de7d..0d2a5516c32 100644
--- a/maps/tether/submaps/aerostat/_aerostat.dm
+++ b/maps/tether/submaps/aerostat/_aerostat.dm
@@ -1,34 +1,20 @@
#include "submaps/virgo2.dm"
+/obj/effect/overmap/visitable/sector/virgo2
+ name = "Virgo 2"
+ desc = "Includes the Remmi Aerostat and associated ground mining complexes."
+ icon_state = "globe"
+ color = "#dfff3f" //Bright yellow
+ initial_generic_waypoints = list("aerostat_west","aerostat_east","aerostat_south","aerostat_northwest","aerostat_northeast")
+
// -- Datums -- //
-/datum/shuttle_destination/excursion/virgo2orbit
- name = "Virgo 2 Orbit"
- my_landmark = "tether_excursion_space"
- preferred_interim_tag = "tether_excursion_transit_space"
- skip_me = TRUE
-
- routes_to_make = list(
- /datum/shuttle_destination/excursion/bluespace = 30 SECONDS,
- /datum/shuttle_destination/excursion/virgo2orbit = 30 SECONDS
- )
-
-/datum/shuttle_destination/excursion/aerostat
- name = "Remmi Aerostat"
- my_landmark = "tether_excursion_aerostat"
- preferred_interim_tag = "tether_excursion_transit_space"
- skip_me = TRUE
-
- routes_to_make = list(
- /datum/shuttle_destination/excursion/virgo2orbit = 30 SECONDS
- )
-
/datum/shuttle/autodock/ferry/aerostat
name = "Aerostat Ferry"
shuttle_area = /area/shuttle/aerostat
warmup_time = 10 //want some warmup time so people can cancel.
- landmark_station = "aerostat_up"
- landmark_offsite = "aerostat_down"
+ landmark_station = "aerostat_east"
+ landmark_offsite = "aerostat_surface"
/datum/random_map/noise/ore/virgo2
descriptor = "virgo 2 ore distribution map"
@@ -44,19 +30,6 @@
name = "aerostat ferry control console"
shuttle_tag = "Aerostat Ferry"
-/obj/shuttle_connector/aerostat
- name = "shuttle connector - aerostat"
- shuttle_name = "Excursion Shuttle"
- destinations = list(/datum/shuttle_destination/excursion/virgo2orbit, /datum/shuttle_destination/excursion/aerostat)
-
-/obj/away_mission_init/aerostat/Initialize()
- /*seed_submaps(list(Z_LEVEL_AEROSTAT_SURFACE), 50, /area/tether_away/aerostat/surface/unexplored, /datum/map_template/virgo2)
- new /datum/random_map/automata/cave_system/no_cracks(null, 1, 1, Z_LEVEL_AEROSTAT_SURFACE, world.maxx, world.maxy)
- new /datum/random_map/noise/ore/virgo2(null, 1, 1, Z_LEVEL_AEROSTAT_SURFACE, 64, 64)*/
-
- initialized = TRUE
- return INITIALIZE_HINT_QDEL
-
/obj/tether_away_spawner/aerostat_inside
name = "Aerostat Indoors Spawner"
faction = "aerostat_inside"
diff --git a/maps/tether/submaps/aerostat/aerostat.dmm b/maps/tether/submaps/aerostat/aerostat.dmm
index 2275fe0c9d4..ce0b8010ab1 100644
--- a/maps/tether/submaps/aerostat/aerostat.dmm
+++ b/maps/tether/submaps/aerostat/aerostat.dmm
@@ -774,14 +774,6 @@
icon_state = "void-hc"
},
/area/tether_away/aerostat/inside)
-"cf" = (
-/obj/effect/floor_decal/industrial/warning/dust{
- dir = 1
- },
-/obj/shuttle_connector/aerostat,
-/obj/effect/floor_decal/rust,
-/turf/simulated/floor/plating/virgo2,
-/area/tether_away/aerostat/inside)
"cg" = (
/obj/machinery/door/airlock/multi_tile/metal{
icon_state = "door_closed";
@@ -880,8 +872,8 @@
/obj/effect/shuttle_landmark{
base_area = /area/tether_away/aerostat;
base_turf = /turf/unsimulated/floor/sky/virgo2_sky;
- landmark_tag = "tether_excursion_aerostat";
- name = "Excursion Aerostat"
+ landmark_tag = "aerostat_west";
+ name = "Virgo 2 Aerostat (W)"
},
/turf/unsimulated/floor/sky/virgo2_sky,
/area/tether_away/aerostat)
@@ -1632,6 +1624,10 @@
/obj/random/toolbox,
/turf/simulated/floor/plating/virgo2,
/area/tether_away/aerostat/inside)
+"eL" = (
+/obj/structure/railing,
+/turf/simulated/floor/plating/virgo2,
+/area/tether_away/aerostat)
"fl" = (
/obj/random/contraband,
/turf/simulated/floor/plating/virgo2,
@@ -1640,10 +1636,22 @@
/obj/structure/salvageable/implant_container,
/turf/simulated/floor/tiled/techfloor/virgo2,
/area/tether_away/aerostat/inside)
+"gt" = (
+/obj/structure/railing{
+ dir = 8
+ },
+/turf/simulated/floor/plating/virgo2,
+/area/tether_away/aerostat)
"gD" = (
/obj/tether_away_spawner/aerostat_inside,
/turf/simulated/floor/plating/virgo2,
/area/tether_away/aerostat/inside)
+"gT" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/simulated/floor/plating/virgo2,
+/area/tether_away/aerostat)
"gX" = (
/obj/structure/salvageable/data,
/turf/simulated/floor/tiled/techfloor/virgo2,
@@ -1652,6 +1660,15 @@
/obj/random/contraband,
/turf/simulated/floor/tiled/techfloor/virgo2,
/area/tether_away/aerostat/inside)
+"kD" = (
+/obj/effect/shuttle_landmark{
+ base_area = /area/tether_away/aerostat;
+ base_turf = /turf/unsimulated/floor/sky/virgo2_sky;
+ landmark_tag = "aerostat_northwest";
+ name = "Virgo 2 Aerostat (NW)"
+ },
+/turf/unsimulated/floor/sky/virgo2_sky,
+/area/tether_away/aerostat)
"kF" = (
/obj/random/action_figure,
/turf/simulated/floor/tiled/techfloor/virgo2,
@@ -1660,8 +1677,8 @@
/obj/effect/shuttle_landmark{
base_area = /area/tether_away/aerostat;
base_turf = /turf/unsimulated/floor/sky/virgo2_sky;
- landmark_tag = "aerostat_up";
- name = "Remmi Aerostat"
+ landmark_tag = "aerostat_east";
+ name = "Virgo 2 Aerostat (E)"
},
/turf/simulated/shuttle/floor/yellow,
/area/shuttle/aerostat)
@@ -1685,6 +1702,15 @@
/obj/structure/salvageable/autolathe,
/turf/simulated/floor/tiled/techfloor/virgo2,
/area/tether_away/aerostat/inside)
+"zX" = (
+/obj/effect/shuttle_landmark{
+ base_area = /area/tether_away/aerostat;
+ base_turf = /turf/unsimulated/floor/sky/virgo2_sky;
+ landmark_tag = "aerostat_south";
+ name = "Virgo 2 Aerostat (S)"
+ },
+/turf/unsimulated/floor/sky/virgo2_sky,
+/area/tether_away/aerostat)
"AS" = (
/obj/effect/floor_decal/industrial/warning/dust{
dir = 4
@@ -1692,6 +1718,15 @@
/obj/random/toolbox,
/turf/simulated/floor/tiled/techfloor/virgo2,
/area/tether_away/aerostat/inside)
+"Dt" = (
+/obj/effect/shuttle_landmark{
+ base_area = /area/tether_away/aerostat;
+ base_turf = /turf/unsimulated/floor/sky/virgo2_sky;
+ landmark_tag = "aerostat_northeast";
+ name = "Virgo 2 Aerostat (NE)"
+ },
+/turf/unsimulated/floor/sky/virgo2_sky,
+/area/tether_away/aerostat)
"Du" = (
/obj/effect/floor_decal/industrial/warning/dust{
dir = 1
@@ -1737,6 +1772,13 @@
/obj/random/contraband,
/turf/simulated/floor/bluegrid/virgo2,
/area/tether_away/aerostat/inside)
+"ON" = (
+/obj/structure/railing{
+ icon_state = "railing0";
+ dir = 1
+ },
+/turf/simulated/floor/plating/virgo2,
+/area/tether_away/aerostat)
"Qe" = (
/obj/structure/table/standard,
/obj/effect/decal/cleanable/cobweb2,
@@ -1747,6 +1789,10 @@
/obj/structure/salvageable/machine,
/turf/simulated/floor/tiled/techfloor/virgo2,
/area/tether_away/aerostat/inside)
+"Tq" = (
+/obj/effect/overmap/visitable/sector/virgo2,
+/turf/unsimulated/floor/sky/virgo2_sky,
+/area/tether_away/aerostat)
"TR" = (
/obj/structure/salvageable/computer,
/turf/simulated/floor/tiled/techfloor/virgo2,
@@ -1757,10 +1803,17 @@
/obj/random/toolbox,
/turf/simulated/floor/tiled/techfloor/virgo2,
/area/tether_away/aerostat/inside)
+"VR" = (
+/obj/machinery/door/airlock/external,
+/turf/simulated/floor/plating/virgo2,
+/area/tether_away/aerostat/inside)
"Wk" = (
/obj/random/drinkbottle,
/turf/simulated/floor/plating/virgo2,
/area/tether_away/aerostat/inside)
+"WS" = (
+/turf/simulated/floor/plating/virgo2,
+/area/tether_away/aerostat)
"Ym" = (
/obj/structure/table/standard,
/obj/item/weapon/gun/energy/taser/xeno,
@@ -2052,7 +2105,7 @@ aw
aw
aw
aw
-aw
+Tq
cZ
"}
(3,1,1) = {"
@@ -7095,7 +7148,7 @@ aw
aw
aw
aa
-cf
+cc
cY
aa
aw
@@ -10884,7 +10937,7 @@ aw
aw
aw
aw
-aw
+kD
aw
aw
aw
@@ -11168,8 +11221,8 @@ aw
aw
aw
aw
-aw
-aw
+ON
+eL
aw
aw
aw
@@ -11310,8 +11363,8 @@ aw
aw
aw
aw
-aw
-aw
+ON
+eL
aw
aw
aw
@@ -11452,19 +11505,19 @@ aw
aw
aw
aw
+ON
+eL
aw
aw
aw
aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
+ac
+bo
+bf
+ac
+ac
+bo
+bf
ac
be
be
@@ -11530,14 +11583,14 @@ aw
aw
bq
ac
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
+ac
+bo
+bf
+ac
+ac
+bo
+bf
+ac
aw
aw
aw
@@ -11594,20 +11647,20 @@ aw
aw
aw
aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-ac
+ON
+WS
+gt
+gt
+gt
+gt
+VR
+be
+be
+be
+be
+be
+be
+VR
be
gD
bj
@@ -11671,17 +11724,17 @@ aw
aw
aw
bq
-bf
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
+be
+VR
+be
+be
+be
+be
+be
+be
+VR
aw
+zX
aw
aw
aw
@@ -11736,20 +11789,20 @@ aw
aw
aw
aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-ac
+ON
+WS
+gT
+gT
+gT
+gT
+VR
+be
+be
+be
+be
+be
+be
+VR
be
be
bj
@@ -11813,15 +11866,15 @@ aw
aw
aw
bq
-bf
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
+be
+VR
+be
+be
+be
+be
+be
+be
+VR
aw
aw
aw
@@ -11878,19 +11931,19 @@ aw
aw
aw
aw
+ON
+eL
aw
aw
aw
aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
+ac
+bo
+bf
+ac
+ac
+bo
+bf
ac
be
be
@@ -11956,14 +12009,14 @@ aw
aw
bq
ac
-aw
-aw
-aw
-aw
-aw
-aw
-aw
-aw
+ac
+bo
+bf
+ac
+ac
+bo
+bf
+ac
aw
aw
aw
@@ -12020,8 +12073,8 @@ aw
aw
aw
aw
-aw
-aw
+ON
+eL
aw
aw
aw
@@ -12162,8 +12215,8 @@ aw
aw
aw
aw
-aw
-aw
+ON
+eL
aw
aw
aw
@@ -12446,7 +12499,7 @@ aw
aw
aw
aw
-aw
+Dt
aw
aw
aw
diff --git a/maps/tether/submaps/aerostat/surface.dmm b/maps/tether/submaps/aerostat/surface.dmm
index 5b78c81cc23..4f8cd9d6dde 100644
--- a/maps/tether/submaps/aerostat/surface.dmm
+++ b/maps/tether/submaps/aerostat/surface.dmm
@@ -47,7 +47,7 @@
/obj/effect/shuttle_landmark{
base_area = /area/tether_away/aerostat/surface/explored;
base_turf = /turf/simulated/floor/tiled/techfloor/virgo2;
- landmark_tag = "aerostat_down";
+ landmark_tag = "aerostat_surface";
name = "Virgo 2 Surface"
},
/turf/simulated/floor/tiled/techfloor/virgo2,
diff --git a/maps/tether/submaps/alienship/_alienship.dm b/maps/tether/submaps/alienship/_alienship.dm
index bcd57752430..7dad899974b 100644
--- a/maps/tether/submaps/alienship/_alienship.dm
+++ b/maps/tether/submaps/alienship/_alienship.dm
@@ -1,23 +1,16 @@
// -- Datums -- //
-/datum/shuttle_destination/excursion/alienship
- name = "Unknown Ship"
- my_landmark = "tether_excursion_alienship"
- preferred_interim_tag = "tether_excursion_transit_space"
- skip_me = TRUE
-
- routes_to_make = list(
- /datum/shuttle_destination/excursion/bluespace = 30 SECONDS
- )
+/obj/effect/overmap/visitable/sector/alienship
+ name = "Unknown Vessel"
+ desc = "An unknown vessel detected by sensors."
+ start_x = 12
+ start_y = 12
+ icon_state = "ship"
+ color = "#ff00ff" //Sandy
+ initial_generic_waypoints = list("tether_excursion_alienship")
// -- Objs -- //
-/obj/shuttle_connector/alienship
- name = "shuttle connector - alienship"
- shuttle_name = "Excursion Shuttle"
- destinations = list(/datum/shuttle_destination/excursion/alienship)
- initialized = TRUE //Just don't.
-
/obj/away_mission_init/alienship
name = "away mission initializer - alienship"
icon = 'alienship.dmi'
diff --git a/maps/tether/submaps/beach/_beach.dm b/maps/tether/submaps/beach/_beach.dm
index 2ef393b617d..a383d7c9c24 100644
--- a/maps/tether/submaps/beach/_beach.dm
+++ b/maps/tether/submaps/beach/_beach.dm
@@ -1,26 +1,11 @@
// -- Datums -- //
-//We're including two new shuttle destinations. One is in orbit of our 'desert planet'
-/datum/shuttle_destination/excursion/virgo4orbit //Must be a unique path
- name = "Virgo 4 Orbit" //The name of the destination
- my_landmark = "tether_excursion_space" //The area the shuttle goes when it's settled at this destination
- preferred_interim_tag = "tether_excursion_transit_space" //The area the shuttle goes while it's moving there
- skip_me = TRUE //Must be TRUE on all away-mission destinations for reasons
-
- routes_to_make = list( //These are routes the shuttle connects to,
- /datum/shuttle_destination/excursion/bluespace = 30 SECONDS //This is a normal destination that's part of Tether
- )
-
-//The other destination is landed on the surface
-/datum/shuttle_destination/excursion/beach
- name = "Remote Coastal Area"
- my_landmark = "tether_excursion_beach"
- preferred_interim_tag = "tether_excursion_transit_sand"
- skip_me = TRUE
-
- routes_to_make = list(
- /datum/shuttle_destination/excursion/virgo4orbit = 30 SECONDS //This is the above one
- )
+/obj/effect/overmap/visitable/sector/virgo4
+ name = "Virgo 4"
+ desc = "Home to sand, and things with big fluffy ears."
+ icon_state = "globe"
+ color = "#ffd300" //Sandy
+ initial_generic_waypoints = list("beach_e", "beach_c", "beach_nw")
//This is a special subtype of the thing that generates ores on a map
//It will generate more rich ores because of the lower numbers than the normal one
@@ -58,14 +43,6 @@
// -- Objs -- //
-//This is a special type of object which will build our shuttle paths, only if this map loads
-//You do need to place this object on the map somewhere.
-/obj/shuttle_connector/beach
- name = "shuttle connector - beach"
- shuttle_name = "Excursion Shuttle"
- //This list needs to be in the correct order, and start with the one that connects to the rest of the shuttle 'network'
- destinations = list(/datum/shuttle_destination/excursion/virgo4orbit, /datum/shuttle_destination/excursion/beach)
-
//This object simply performs any map setup that needs to happen on our map if it loads.
//As with the above, you do need to place this object on the map somewhere.
/obj/away_mission_init/beachcave
diff --git a/maps/tether/submaps/beach/beach.dmm b/maps/tether/submaps/beach/beach.dmm
index b5948df7a91..e46fb81c166 100644
--- a/maps/tether/submaps/beach/beach.dmm
+++ b/maps/tether/submaps/beach/beach.dmm
@@ -311,8 +311,8 @@
/obj/effect/shuttle_landmark{
base_area = /area/tether_away/beach/jungle;
base_turf = /turf/simulated/floor/beach/sand/desert;
- landmark_tag = "tether_excursion_beach";
- name = "Excursion Beach"
+ landmark_tag = "beach_c";
+ name = "Virgo 4 Beach (Center)"
},
/turf/simulated/floor/beach/sand/desert,
/area/tether_away/beach/jungle)
@@ -331,14 +331,35 @@
/turf/simulated/floor/beach/sand,
/area/tether_away/beach/jungle)
"bs" = (
-/obj/shuttle_connector/beach,
/obj/effect/step_trigger/zlevel_fall/beach,
/turf/simulated/floor/beach/sand/desert,
/area/tether_away/beach/jungle)
+"hx" = (
+/obj/effect/overmap/visitable/sector/virgo4,
+/turf/simulated/floor/water/deep/ocean,
+/area/tether_away/beach/water)
"xW" = (
/obj/tether_away_spawner/beach_outside_friendly,
/turf/simulated/floor/beach/sand/desert,
/area/tether_away/beach/jungle)
+"Ar" = (
+/obj/effect/shuttle_landmark{
+ base_area = /area/tether_away/beach/jungle;
+ base_turf = /turf/simulated/floor/beach/sand/desert;
+ landmark_tag = "beach_nw";
+ name = "Virgo 4 Beach (NW)"
+ },
+/turf/simulated/floor/beach/sand/desert,
+/area/tether_away/beach/jungle)
+"Dr" = (
+/obj/effect/shuttle_landmark{
+ base_area = /area/tether_away/beach/jungle;
+ base_turf = /turf/simulated/floor/beach/sand/desert;
+ landmark_tag = "beach_e";
+ name = "Virgo 4 Beach (E)"
+ },
+/turf/simulated/floor/beach/sand/desert,
+/area/tether_away/beach/jungle)
"TU" = (
/obj/tether_away_spawner/beach_outside,
/turf/simulated/floor/beach/sand/desert,
@@ -629,7 +650,7 @@ am
am
am
am
-am
+hx
bi
"}
(3,1,1) = {"
@@ -1206,7 +1227,7 @@ aa
aa
aa
aa
-aa
+ab
aa
aa
aa
@@ -1359,7 +1380,7 @@ aa
aa
aa
aa
-aa
+ab
aa
aa
aa
@@ -1810,6 +1831,7 @@ aa
aa
aa
aa
+ac
aa
aa
aa
@@ -1860,8 +1882,7 @@ aa
aa
aa
aa
-aa
-aa
+ab
aa
aa
aa
@@ -1978,7 +1999,7 @@ aa
aa
aa
aa
-aa
+ab
aa
aa
aa
@@ -2092,7 +2113,7 @@ aa
aa
aa
aa
-ac
+aa
aa
aa
aa
@@ -2222,7 +2243,7 @@ aa
aa
aa
aa
-ac
+aa
aa
aa
aa
@@ -2639,7 +2660,7 @@ aa
aa
aa
aa
-ac
+aa
aa
aa
aa
@@ -2794,7 +2815,7 @@ aa
aa
aa
aa
-ab
+aa
aa
aa
aa
@@ -3340,7 +3361,7 @@ aa
aa
aa
aa
-aa
+ab
aa
aa
aa
@@ -3509,7 +3530,7 @@ aa
aa
aa
aa
-ac
+aa
aa
aa
aa
@@ -3785,7 +3806,7 @@ aa
aa
aa
aa
-ac
+aa
aa
aa
aa
@@ -4207,7 +4228,7 @@ aa
aa
aa
aa
-ab
+aa
aa
aa
aa
@@ -4485,9 +4506,9 @@ aa
aa
aa
aa
-ac
aa
aa
+Ar
aa
aa
aa
@@ -4647,7 +4668,7 @@ aa
aa
aa
aa
-ab
+aa
aa
aa
aa
@@ -4793,7 +4814,7 @@ aa
aa
aa
aa
-aa
+ab
aa
aa
aa
@@ -5209,7 +5230,7 @@ aa
aa
aa
aa
-ac
+aa
aa
aa
aa
@@ -5361,7 +5382,7 @@ aa
aa
aa
aa
-ac
+aa
aa
aa
aa
@@ -5498,7 +5519,6 @@ aa
aa
aa
aa
-TU
aa
aa
aa
@@ -5508,6 +5528,7 @@ aa
aa
aa
aa
+ac
aa
aa
aa
@@ -5644,6 +5665,7 @@ aa
aa
aa
aa
+TU
aa
aa
aa
@@ -5653,8 +5675,7 @@ aa
aa
aa
aa
-aa
-aa
+ab
aa
aa
aa
@@ -5908,8 +5929,8 @@ aa
aa
aa
aa
-ac
-bh
+aa
+aa
aa
aa
aa
@@ -6034,7 +6055,7 @@ aa
aa
aa
aa
-aa
+ab
aa
aa
aa
@@ -6631,8 +6652,8 @@ aa
aa
aa
aa
-ab
-bh
+aa
+aa
aa
aa
aa
@@ -6754,7 +6775,7 @@ aa
aa
aa
aa
-ab
+aa
aa
aa
aa
@@ -7035,7 +7056,7 @@ aa
aa
aa
aa
-aa
+ab
aa
aa
aa
@@ -7190,7 +7211,7 @@ aa
aa
aa
aa
-ab
+aa
aa
aa
aa
@@ -7348,8 +7369,8 @@ aa
aa
aa
aa
-aa
-ac
+ab
+bh
aa
aa
aa
@@ -7483,7 +7504,7 @@ aa
aa
aa
aa
-ac
+aa
aa
aa
aa
@@ -8065,7 +8086,7 @@ aa
aa
aa
aa
-aa
+ac
aa
aa
aa
@@ -8170,6 +8191,8 @@ aa
aa
aa
aa
+ac
+bh
aa
aa
aa
@@ -8198,9 +8221,7 @@ aa
aa
aa
aa
-aa
-aa
-aa
+ac
aa
aa
aa
@@ -8468,7 +8489,7 @@ aa
aa
aa
aa
-aa
+ab
aa
aa
aa
@@ -18732,7 +18753,7 @@ aa
aa
aa
aa
-aa
+Dr
aa
aa
aa
diff --git a/maps/tether/submaps/gateway/carpfarm.dm b/maps/tether/submaps/gateway/carpfarm.dm
index b5f0524e2cc..34a919f7d2a 100644
--- a/maps/tether/submaps/gateway/carpfarm.dm
+++ b/maps/tether/submaps/gateway/carpfarm.dm
@@ -1,3 +1,10 @@
+/obj/effect/overmap/visitable/sector/carpfarm
+ name = "Unknown Facility"
+ desc = "Seems to be a carp farm of some sort."
+ icon_state = "object"
+ known = FALSE
+ initial_generic_waypoints = list("tether_excursion_carpfarm")
+
/area/awaymission/carpfarm
icon_state = "blank"
requires_power = 0
diff --git a/maps/tether/submaps/gateway/carpfarm.dmm b/maps/tether/submaps/gateway/carpfarm.dmm
index 0afbdefbf05..03fe34cee1a 100644
--- a/maps/tether/submaps/gateway/carpfarm.dmm
+++ b/maps/tether/submaps/gateway/carpfarm.dmm
@@ -763,6 +763,19 @@
},
/turf/simulated/floor/airless,
/area/space)
+"sI" = (
+/obj/effect/shuttle_landmark{
+ base_area = /area/space;
+ base_turf = /turf/space;
+ landmark_tag = "tether_excursion_carpfarm";
+ name = "Outside Facility (SW)"
+ },
+/turf/space,
+/area/space)
+"Fi" = (
+/obj/effect/overmap/visitable/sector/carpfarm,
+/turf/space,
+/area/space)
(1,1,1) = {"
aa
@@ -1045,7 +1058,7 @@ aa
aa
aa
aa
-aa
+Fi
aa
"}
(3,1,1) = {"
@@ -4579,7 +4592,7 @@ aa
aa
aa
aa
-aa
+sI
aa
aa
aa
diff --git a/maps/tether/submaps/gateway/listeningpost.dm b/maps/tether/submaps/gateway/listeningpost.dm
index 5f32d82147b..3df132e6c7c 100644
--- a/maps/tether/submaps/gateway/listeningpost.dm
+++ b/maps/tether/submaps/gateway/listeningpost.dm
@@ -1,3 +1,10 @@
+/obj/effect/overmap/visitable/sector/listeningpost
+ name = "Unknown Facility"
+ desc = "High levels of radio frequency emissions."
+ icon_state = "object"
+ known = FALSE
+ initial_generic_waypoints = list("tether_excursion_listeningpost")
+
/obj/item/weapon/paper/listneningpost/mission
name = "\improper Operation: Watchtower"
info = {"Mission Details: You have been assigned to a newly constructed listening post
diff --git a/maps/tether/submaps/gateway/listeningpost.dmm b/maps/tether/submaps/gateway/listeningpost.dmm
index b5d285c63ad..e980203d301 100644
--- a/maps/tether/submaps/gateway/listeningpost.dmm
+++ b/maps/tether/submaps/gateway/listeningpost.dmm
@@ -1,11 +1,11 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/space,
-/area)
+/area/space)
"b" = (
/obj/effect/blocker,
/turf/space,
-/area)
+/area/space)
"c" = (
/turf/simulated/wall/r_wall,
/area/awaymission/listeningpost)
@@ -309,6 +309,19 @@
},
/turf/simulated/floor/greengrid,
/area/mine/explored)
+"W" = (
+/obj/effect/overmap/visitable/sector/listeningpost,
+/turf/space,
+/area/space)
+"Y" = (
+/obj/effect/shuttle_landmark{
+ base_area = /area/space;
+ base_turf = /turf/space;
+ landmark_tag = "tether_excursion_listeningpost";
+ name = "Near Asteroid (SE)"
+ },
+/turf/space,
+/area/space)
(1,1,1) = {"
a
@@ -591,7 +604,7 @@ a
a
a
a
-a
+W
a
"}
(3,1,1) = {"
@@ -16323,7 +16336,7 @@ a
a
a
a
-a
+Y
a
a
a
diff --git a/maps/tether/submaps/gateway/snow_outpost.dm b/maps/tether/submaps/gateway/snow_outpost.dm
index de9d70dfb1b..0b319d8b52d 100644
--- a/maps/tether/submaps/gateway/snow_outpost.dm
+++ b/maps/tether/submaps/gateway/snow_outpost.dm
@@ -1,3 +1,10 @@
+/obj/effect/overmap/visitable/sector/snowoutpost
+ name = "Unknown Facility"
+ desc = "Low surface activity and temperature detected."
+ icon_state = "globe"
+ known = FALSE
+ initial_generic_waypoints = list("tether_excursion_snow_outpost")
+
// -- Areas -- //
/area/awaymission/snow_outpost
diff --git a/maps/tether/submaps/gateway/snowfield.dm b/maps/tether/submaps/gateway/snowfield.dm
index bf72d5b299b..dda508bfbc2 100644
--- a/maps/tether/submaps/gateway/snowfield.dm
+++ b/maps/tether/submaps/gateway/snowfield.dm
@@ -1,3 +1,11 @@
+/obj/effect/overmap/visitable/sector/snowfield
+ name = "Unknown Facility"
+ desc = "Wet, boring, and cold."
+ icon_state = "globe"
+ known = FALSE
+ initial_generic_waypoints = list("tether_excursion_snowfield")
+
+
// -- Areas -- //
/area/awaymission/snowfield
diff --git a/maps/tether/submaps/gateway/snowfield.dmm b/maps/tether/submaps/gateway/snowfield.dmm
index 01870183500..54832163964 100644
--- a/maps/tether/submaps/gateway/snowfield.dmm
+++ b/maps/tether/submaps/gateway/snowfield.dmm
@@ -107,7 +107,7 @@
input_attempt = 1;
input_level = 250000;
inputting = 1;
- output_level = 250000;
+ output_level = 250000
},
/obj/structure/cable{
icon_state = "0-2";
@@ -1683,6 +1683,26 @@
temperature = 243.15
},
/area/awaymission/snowfield/base)
+"tn" = (
+/obj/effect/shuttle_landmark{
+ base_area = /area/awaymission/snowfield/outside;
+ base_turf = /turf/simulated/floor/outdoors/snow;
+ landmark_tag = "tether_excursion_snowfield"
+ },
+/turf/simulated/floor/outdoors/snow{
+ nitrogen = 93.7835;
+ oxygen = 20.7263;
+ temperature = 243.15
+ },
+/area/awaymission/snowfield/outside)
+"Bw" = (
+/obj/effect/overmap/visitable/sector/snowfield,
+/turf/simulated/floor/outdoors/snow{
+ nitrogen = 93.7835;
+ oxygen = 20.7263;
+ temperature = 243.15
+ },
+/area/awaymission/snowfield/restricted)
(1,1,1) = {"
aa
@@ -1965,7 +1985,7 @@ ab
ab
ab
ab
-ab
+Bw
aa
"}
(3,1,1) = {"
@@ -7311,7 +7331,7 @@ ad
ad
ad
ad
-ad
+tn
ad
ad
ad
diff --git a/maps/tether/submaps/om_ships/hybridshuttle.dm b/maps/tether/submaps/om_ships/hybridshuttle.dm
new file mode 100644
index 00000000000..e85d2342230
--- /dev/null
+++ b/maps/tether/submaps/om_ships/hybridshuttle.dm
@@ -0,0 +1,49 @@
+// Compile in the map for CI testing if we're testing compileability of all the maps
+#if MAP_TEST
+#include "hybridshuttle.dmm"
+#endif
+
+// Map template for spawning the shuttle
+/datum/map_template/om_ships/hybrid
+ name = "OM Ship - Hybrid Shuttle"
+ desc = "A prototype human/alien tech hybrid shuttle."
+ mappath = 'hybridshuttle.dmm'
+ annihilate = TRUE
+
+// The shuttle's area(s)
+/area/shuttle/blue_fo
+ name = "\improper Hybrid Shuttle"
+ icon_state = "shuttle2"
+ requires_power = 1
+
+// The shuttle's 'shuttle' computer
+/obj/machinery/computer/shuttle_control/explore/hybridshuttle
+ name = "short jump console"
+ shuttle_tag = "XN-29 Prototype Shuttle"
+ req_one_access = list(access_pilot)
+
+// A shuttle lateloader landmark
+/obj/effect/shuttle_landmark/shuttle_initializer/hybridshuttle
+ name = "Origin - Hybrid Shuttle"
+ base_area = /area/space
+ base_turf = /turf/space
+ landmark_tag = "omship_spawn_hybridshuttle"
+ shuttle_type = /datum/shuttle/autodock/overmap/hybridshuttle
+
+// The 'shuttle'
+/datum/shuttle/autodock/overmap/hybridshuttle
+ name = "XN-29 Prototype Shuttle"
+ current_location = "omship_spawn_hybridshuttle"
+ docking_controller_tag = "hybrid_shuttle_docker"
+ shuttle_area = /area/shuttle/blue_fo
+ fuel_consumption = 0
+ defer_initialisation = TRUE //We're not loaded until an admin does it
+
+// The 'ship'
+/obj/effect/overmap/visitable/ship/landable/hybridshuttle
+ name = "XN-29 Prototype Shuttle"
+ desc = "A hybrid excursion shuttle, sporting different features. Less space for equipment, but no fuel or power requirements."
+ color = "#00aaff" //Bluey
+ vessel_mass = 3000
+ vessel_size = SHIP_SIZE_SMALL
+ shuttle = "XN-29 Prototype Shuttle"
\ No newline at end of file
diff --git a/maps/tether/submaps/om_ships/hybridshuttle.dmm b/maps/tether/submaps/om_ships/hybridshuttle.dmm
new file mode 100644
index 00000000000..da3c6fa8452
--- /dev/null
+++ b/maps/tether/submaps/om_ships/hybridshuttle.dmm
@@ -0,0 +1,1173 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/turf/template_noop,
+/area/template_noop)
+"ab" = (
+/turf/simulated/shuttle/wall/alien/blue,
+/area/shuttle/blue_fo)
+"ac" = (
+/obj/structure/railing{
+ icon_state = "railing0";
+ dir = 1
+ },
+/turf/simulated/shuttle/wall/alien/blue/hard_corner,
+/area/shuttle/blue_fo)
+"ad" = (
+/obj/machinery/ion_engine,
+/turf/simulated/shuttle/floor/alienplating/blue/half{
+ dir = 8
+ },
+/area/shuttle/blue_fo)
+"ae" = (
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/blue_fo)
+"af" = (
+/obj/machinery/ion_engine,
+/turf/simulated/shuttle/floor/alienplating/blue/half{
+ dir = 4
+ },
+/area/shuttle/blue_fo)
+"ag" = (
+/obj/structure/table/alien/blue,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/blue_fo)
+"ah" = (
+/obj/structure/prop/alien/pod/hybrid,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/blue_fo)
+"ai" = (
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/obj/item/clothing/mask/breath,
+/obj/item/weapon/tank/emergency/oxygen/engi,
+/obj/item/weapon/tank/emergency/oxygen/engi,
+/obj/item/weapon/tank/emergency/oxygen/engi,
+/obj/item/weapon/tank/emergency/oxygen/engi,
+/obj/item/clothing/suit/space/emergency,
+/obj/item/clothing/suit/space/emergency,
+/obj/item/clothing/suit/space/emergency,
+/obj/item/clothing/suit/space/emergency,
+/obj/item/clothing/head/helmet/space/emergency,
+/obj/item/clothing/head/helmet/space/emergency,
+/obj/item/clothing/head/helmet/space/emergency,
+/obj/item/clothing/head/helmet/space/emergency,
+/obj/structure/closet/emcloset/legacy,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/blue_fo)
+"aj" = (
+/obj/machinery/power/apc{
+ dir = 1;
+ name = "north bump";
+ pixel_x = 0;
+ pixel_y = 24
+ },
+/obj/structure/cable{
+ icon_state = "0-4";
+ d2 = 4
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/blue_fo)
+"ak" = (
+/obj/machinery/power/smes/buildable/hybrid,
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/blue_fo)
+"al" = (
+/obj/effect/map_effect/perma_light/brighter,
+/obj/structure/bed/chair/bay/shuttle{
+ icon_state = "shuttle_chair_preview";
+ dir = 1
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/blue_fo)
+"am" = (
+/obj/structure/bed/alien{
+ icon = 'icons/obj/abductor_vr.dmi'
+ },
+/obj/item/weapon/bedsheet/blue,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/blue_fo)
+"an" = (
+/obj/effect/map_effect/perma_light/brighter,
+/obj/structure/handrail{
+ icon_state = "handrail";
+ dir = 1
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/blue_fo)
+"ao" = (
+/obj/machinery/power/terminal{
+ icon_state = "term";
+ dir = 1
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/blue_fo)
+"ap" = (
+/turf/simulated/shuttle/wall/alien/blue/hard_corner,
+/area/shuttle/blue_fo)
+"aq" = (
+/obj/machinery/door/airlock/alien/blue,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"ar" = (
+/obj/structure/fans/hardlight,
+/obj/structure/window/reinforced/full,
+/turf/simulated/shuttle/floor/alienplating/blue/half{
+ dir = 8
+ },
+/area/shuttle/blue_fo)
+"as" = (
+/obj/machinery/sleeper{
+ dir = 8
+ },
+/obj/effect/floor_decal/techfloor/orange{
+ icon_state = "techfloororange_edges";
+ dir = 9
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"at" = (
+/obj/machinery/sleep_console,
+/obj/effect/floor_decal/techfloor/orange{
+ icon_state = "techfloororange_edges";
+ dir = 1
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"au" = (
+/obj/effect/floor_decal/techfloor/orange{
+ icon_state = "techfloororange_edges";
+ dir = 1
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"av" = (
+/obj/effect/floor_decal/techfloor/orange/corner{
+ icon_state = "techfloororange_corners";
+ dir = 1
+ },
+/obj/effect/floor_decal/techfloor/orange/corner{
+ icon_state = "techfloororange_corners";
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"aw" = (
+/obj/structure/railing{
+ icon_state = "railing0";
+ dir = 8
+ },
+/obj/structure/railing,
+/turf/simulated/shuttle/floor/alien,
+/area/shuttle/blue_fo)
+"ax" = (
+/obj/structure/railing{
+ icon_state = "railing0";
+ dir = 4
+ },
+/obj/structure/railing,
+/turf/simulated/shuttle/floor/alien,
+/area/shuttle/blue_fo)
+"ay" = (
+/obj/effect/floor_decal/techfloor/orange/corner{
+ icon_state = "techfloororange_corners";
+ dir = 4
+ },
+/obj/effect/floor_decal/techfloor/orange/corner{
+ icon_state = "techfloororange_corners";
+ dir = 1
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"az" = (
+/obj/structure/bed/chair/sofa/right{
+ sofa_material = "black"
+ },
+/obj/effect/floor_decal/techfloor/orange{
+ icon_state = "techfloororange_edges";
+ dir = 1
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"aA" = (
+/obj/structure/bed/chair/sofa/left{
+ sofa_material = "black"
+ },
+/obj/effect/floor_decal/techfloor/orange{
+ icon_state = "techfloororange_edges";
+ dir = 1
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"aB" = (
+/obj/effect/floor_decal/techfloor/orange{
+ icon_state = "techfloororange_edges";
+ dir = 5
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"aC" = (
+/obj/structure/fans/hardlight,
+/obj/structure/window/reinforced/full,
+/turf/simulated/shuttle/floor/alienplating/blue/half{
+ dir = 4
+ },
+/area/shuttle/blue_fo)
+"aD" = (
+/obj/effect/floor_decal/techfloor/orange{
+ icon_state = "techfloororange_edges";
+ dir = 8
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"aE" = (
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"aF" = (
+/obj/effect/map_effect/perma_light/brighter,
+/obj/item/device/perfect_tele_beacon/stationary{
+ icon_state = "beacon";
+ tele_name = "Hybrid Shuttle";
+ tele_network = "hybridshuttle"
+ },
+/obj/effect/floor_decal/industrial/outline/grey,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"aG" = (
+/obj/machinery/door/airlock/alien/blue,
+/turf/simulated/shuttle/floor/alien,
+/area/shuttle/blue_fo)
+"aH" = (
+/obj/effect/map_effect/perma_light/brighter,
+/obj/structure/table/alien/blue,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"aI" = (
+/obj/structure/table/alien/blue,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"aJ" = (
+/obj/effect/floor_decal/techfloor/orange{
+ icon_state = "techfloororange_edges";
+ dir = 4
+ },
+/obj/machinery/recharge_station,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"aK" = (
+/obj/machinery/sleeper{
+ dir = 8
+ },
+/obj/effect/floor_decal/techfloor/orange{
+ icon_state = "techfloororange_edges";
+ dir = 10
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"aL" = (
+/obj/machinery/sleep_console,
+/obj/effect/floor_decal/techfloor/orange,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"aM" = (
+/obj/effect/floor_decal/techfloor/orange,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"aN" = (
+/obj/effect/floor_decal/techfloor/orange/corner,
+/obj/effect/floor_decal/techfloor/orange/corner{
+ icon_state = "techfloororange_corners";
+ dir = 8
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"aO" = (
+/obj/structure/railing{
+ icon_state = "railing0";
+ dir = 8
+ },
+/obj/structure/railing{
+ icon_state = "railing0";
+ dir = 1
+ },
+/turf/simulated/shuttle/floor/alien,
+/area/shuttle/blue_fo)
+"aP" = (
+/obj/structure/railing{
+ icon_state = "railing0";
+ dir = 4
+ },
+/obj/structure/railing{
+ icon_state = "railing0";
+ dir = 1
+ },
+/turf/simulated/shuttle/floor/alien,
+/area/shuttle/blue_fo)
+"aQ" = (
+/obj/structure/bed/chair/sofa/left{
+ dir = 1;
+ icon_state = "sofaend_left";
+ sofa_material = "black"
+ },
+/obj/effect/floor_decal/techfloor/orange,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"aR" = (
+/obj/structure/bed/chair/sofa/right{
+ dir = 1;
+ icon_state = "sofaend_right";
+ sofa_material = "black"
+ },
+/obj/effect/floor_decal/techfloor/orange,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"aS" = (
+/obj/effect/floor_decal/techfloor/orange{
+ icon_state = "techfloororange_edges";
+ dir = 6
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"aT" = (
+/obj/machinery/door/airlock/alien/blue,
+/obj/effect/floor_decal/techfloor/orange{
+ icon_state = "techfloororange_edges";
+ dir = 4
+ },
+/obj/effect/floor_decal/techfloor/orange{
+ icon_state = "techfloororange_edges";
+ dir = 8
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"aU" = (
+/obj/machinery/door/airlock/alien/blue,
+/obj/effect/floor_decal/techfloor/orange{
+ icon_state = "techfloororange_edges";
+ dir = 8
+ },
+/obj/effect/floor_decal/techfloor/orange{
+ icon_state = "techfloororange_edges";
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"aV" = (
+/obj/effect/floor_decal/techfloor/orange{
+ icon_state = "techfloororange_edges";
+ dir = 9
+ },
+/obj/structure/closet/secure_closet/guncabinet/excursion,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"aW" = (
+/obj/effect/floor_decal/techfloor/orange{
+ icon_state = "techfloororange_edges";
+ dir = 1
+ },
+/obj/structure/table/alien/blue,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"aX" = (
+/obj/effect/floor_decal/techfloor/orange{
+ icon_state = "techfloororange_edges";
+ dir = 1
+ },
+/obj/machinery/recharger/wallcharger{
+ pixel_x = 4;
+ pixel_y = 30
+ },
+/obj/machinery/recharger/wallcharger{
+ pixel_x = 4;
+ pixel_y = 20
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"aY" = (
+/obj/effect/floor_decal/techfloor/orange{
+ icon_state = "techfloororange_edges";
+ dir = 1
+ },
+/obj/structure/bed/chair/bay/shuttle{
+ icon_state = "shuttle_chair_preview";
+ dir = 8
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"aZ" = (
+/obj/effect/floor_decal/techfloor/orange{
+ icon_state = "techfloororange_edges";
+ dir = 1
+ },
+/obj/structure/table/alien/blue,
+/obj/item/device/perfect_tele/alien/bluefo{
+ pixel_x = 6;
+ pixel_y = 3
+ },
+/obj/item/device/perfect_tele/alien/bluefo{
+ pixel_x = -6;
+ pixel_y = 3
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"ba" = (
+/obj/effect/floor_decal/techfloor/orange{
+ icon_state = "techfloororange_edges";
+ dir = 1
+ },
+/obj/structure/bed/chair/bay/shuttle{
+ icon_state = "shuttle_chair_preview";
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"bb" = (
+/obj/structure/prop/alien/computer/hybrid,
+/obj/effect/floor_decal/techfloor/orange{
+ icon_state = "techfloororange_edges";
+ dir = 1
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"bc" = (
+/obj/effect/floor_decal/techfloor/orange{
+ icon_state = "techfloororange_edges";
+ dir = 5
+ },
+/obj/structure/bed/chair/bay/shuttle,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"bd" = (
+/obj/effect/floor_decal/techfloor/orange{
+ icon_state = "techfloororange_edges";
+ dir = 8
+ },
+/obj/structure/bed/chair/bay/shuttle{
+ icon_state = "shuttle_chair_preview";
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"be" = (
+/obj/effect/map_effect/perma_light/brighter,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"bf" = (
+/obj/structure/bed/chair/bay/shuttle{
+ icon_state = "shuttle_chair_preview";
+ dir = 8
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"bg" = (
+/obj/structure/table/alien/blue,
+/obj/item/device/perfect_tele/alien/bluefo{
+ pixel_x = -6;
+ pixel_y = 3
+ },
+/obj/item/device/perfect_tele/alien/bluefo{
+ pixel_x = 6;
+ pixel_y = 3
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"bh" = (
+/obj/structure/bed/chair/bay/shuttle{
+ icon_state = "shuttle_chair_preview";
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"bi" = (
+/obj/effect/floor_decal/techfloor/orange{
+ icon_state = "techfloororange_edges";
+ dir = 4
+ },
+/obj/structure/table/alien/blue,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"bj" = (
+/obj/machinery/door/airlock/alien/blue{
+ frequency = 1380;
+ id_tag = "hybrid_shuttle_afts";
+ req_one_access = list(19,43,67)
+ },
+/obj/structure/fans/hardlight,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/blue_fo)
+"bk" = (
+/obj/effect/floor_decal/techfloor/orange/corner{
+ icon_state = "techfloororange_corners";
+ dir = 8
+ },
+/obj/effect/floor_decal/techfloor/orange/corner{
+ icon_state = "techfloororange_corners";
+ dir = 1
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/blue_fo)
+"bl" = (
+/obj/structure/table/alien/blue,
+/obj/machinery/button/remote/airlock{
+ id = "hybrid_shuttle_afts";
+ name = "Aft Door Bolts";
+ pixel_x = 6;
+ pixel_y = 2;
+ req_one_access = list(19,43,67);
+ specialfunctions = 4
+ },
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+ frequency = 1380;
+ id_tag = "hybrid_shuttle_docker";
+ pixel_x = -6;
+ pixel_y = 0;
+ req_one_access = list(19,43,67);
+ tag_door = "hybrid_shuttle_afts"
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"bm" = (
+/obj/effect/floor_decal/techfloor/orange/corner{
+ icon_state = "techfloororange_corners";
+ dir = 4
+ },
+/obj/effect/floor_decal/techfloor/orange/corner,
+/obj/effect/shuttle_landmark/shuttle_initializer/hybridshuttle,
+/obj/effect/overmap/visitable/ship/landable/hybridshuttle,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/blue_fo)
+"bn" = (
+/obj/machinery/mech_recharger{
+ icon = 'icons/turf/shuttle_alien_blue.dmi'
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"bo" = (
+/obj/effect/floor_decal/industrial/outline/blue,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"bp" = (
+/obj/effect/floor_decal/techfloor/orange{
+ icon_state = "techfloororange_edges";
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"bq" = (
+/obj/machinery/shipsensors,
+/turf/simulated/shuttle/floor/alienplating/blue/half{
+ dir = 8
+ },
+/area/shuttle/blue_fo)
+"br" = (
+/obj/structure/railing{
+ icon_state = "railing0";
+ dir = 1
+ },
+/turf/simulated/shuttle/floor/alien,
+/area/shuttle/blue_fo)
+"bs" = (
+/obj/structure/railing{
+ icon_state = "railing0";
+ dir = 1
+ },
+/obj/structure/railing{
+ icon_state = "railing0";
+ dir = 4
+ },
+/turf/simulated/shuttle/floor/alien,
+/area/shuttle/blue_fo)
+"bt" = (
+/obj/effect/floor_decal/techfloor/orange/corner{
+ icon_state = "techfloororange_corners";
+ dir = 8
+ },
+/obj/effect/floor_decal/techfloor/orange/corner,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/blue_fo)
+"bu" = (
+/obj/effect/floor_decal/techfloor/orange,
+/obj/structure/table/alien/blue,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
+"bv" = (
+/obj/effect/floor_decal/techfloor/orange/corner,
+/obj/effect/floor_decal/techfloor/orange/corner{
+ icon_state = "techfloororange_corners";
+ dir = 8
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/blue_fo)
+"bw" = (
+/obj/structure/railing{
+ icon_state = "railing0";
+ dir = 1
+ },
+/obj/structure/railing{
+ icon_state = "railing0";
+ dir = 8
+ },
+/turf/simulated/shuttle/floor/alien,
+/area/shuttle/blue_fo)
+"bx" = (
+/obj/structure/fans/hardlight,
+/obj/structure/window/reinforced/full,
+/turf/simulated/shuttle/floor/alienplating/blue/half,
+/area/shuttle/blue_fo)
+"by" = (
+/obj/machinery/computer/shuttle_control/explore/hybridshuttle,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/blue_fo)
+"bz" = (
+/obj/machinery/computer/ship/helm,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/blue_fo)
+"bA" = (
+/obj/machinery/computer/ship/sensors,
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/blue_fo)
+"bB" = (
+/obj/machinery/computer/ship/engines{
+ icon_state = "computer";
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techfloor,
+/area/shuttle/blue_fo)
+"bC" = (
+/turf/simulated/shuttle/floor/alienplating/blue/half{
+ dir = 4
+ },
+/area/shuttle/blue_fo)
+
+(1,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(2,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(3,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(4,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(5,1,1) = {"
+aa
+aa
+aa
+aa
+bq
+ap
+ab
+ap
+ar
+ar
+ar
+ap
+ab
+ab
+bj
+ab
+ap
+ad
+aa
+aa
+aa
+aa
+"}
+(6,1,1) = {"
+aa
+aa
+aa
+aa
+ap
+ap
+bB
+ab
+as
+aD
+aK
+ab
+aV
+bd
+bk
+aD
+ac
+ap
+aa
+aa
+aa
+aa
+"}
+(7,1,1) = {"
+aa
+aa
+aa
+aa
+ab
+by
+ae
+ab
+at
+aE
+aL
+ab
+aW
+aI
+aE
+bn
+br
+ab
+aa
+aa
+aa
+aa
+"}
+(8,1,1) = {"
+aa
+aa
+aa
+aa
+ab
+bz
+al
+ab
+au
+aF
+aM
+ab
+aX
+be
+aE
+bn
+bs
+ab
+aa
+aa
+aa
+aa
+"}
+(9,1,1) = {"
+aa
+aa
+aa
+aa
+ab
+bA
+ae
+aq
+av
+aE
+aN
+aT
+av
+aE
+aE
+aE
+bt
+bj
+aa
+aa
+aa
+aa
+"}
+(10,1,1) = {"
+aa
+aa
+aa
+aa
+ab
+ag
+ag
+ab
+aw
+aE
+aO
+ab
+aY
+bf
+bf
+aE
+bu
+bx
+aa
+aa
+aa
+aa
+"}
+(11,1,1) = {"
+aa
+aa
+aa
+aa
+ab
+ab
+ab
+ab
+ab
+aG
+ab
+ab
+aZ
+bg
+bl
+be
+bu
+bx
+aa
+aa
+aa
+aa
+"}
+(12,1,1) = {"
+aa
+aa
+aa
+aa
+ab
+ah
+am
+ab
+ax
+aE
+aP
+ab
+ba
+bh
+bh
+aE
+bu
+bx
+aa
+aa
+aa
+aa
+"}
+(13,1,1) = {"
+aa
+aa
+aa
+aa
+ab
+ai
+ae
+aq
+ay
+aE
+aN
+aU
+ay
+aE
+aE
+aE
+bv
+bj
+aa
+aa
+aa
+aa
+"}
+(14,1,1) = {"
+aa
+aa
+aa
+aa
+ab
+aj
+an
+ab
+az
+aH
+aQ
+ab
+bb
+be
+aE
+bo
+bw
+ab
+aa
+aa
+aa
+aa
+"}
+(15,1,1) = {"
+aa
+aa
+aa
+aa
+ab
+ak
+ao
+ab
+aA
+aI
+aR
+ab
+au
+aE
+aE
+bo
+br
+ab
+aa
+aa
+aa
+aa
+"}
+(16,1,1) = {"
+aa
+aa
+aa
+aa
+ap
+ap
+ag
+ab
+aB
+aJ
+aS
+ab
+bc
+bi
+bm
+bp
+ac
+ap
+aa
+aa
+aa
+aa
+"}
+(17,1,1) = {"
+aa
+aa
+aa
+aa
+bC
+ap
+ab
+ap
+aC
+aC
+aC
+ap
+ab
+ab
+bj
+ab
+ap
+af
+aa
+aa
+aa
+aa
+"}
+(18,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(19,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(20,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(21,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(22,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
diff --git a/maps/tether/submaps/om_ships/screebarge.dm b/maps/tether/submaps/om_ships/screebarge.dm
new file mode 100644
index 00000000000..317f34396bf
--- /dev/null
+++ b/maps/tether/submaps/om_ships/screebarge.dm
@@ -0,0 +1,54 @@
+// Compile in the map for CI testing if we're testing compileability of all the maps
+#if MAP_TEST
+#include "screebarge.dmm"
+#endif
+
+// Map template for spawning the shuttle
+/datum/map_template/om_ships/screebarge
+ name = "OM Ship - Battle Barge"
+ desc = "The BATTLE BARGE."
+ mappath = 'screebarge.dmm'
+ annihilate = TRUE
+
+// The shuttle's area(s)
+/area/shuttle/screebarge
+ icon_state = "shuttle2"
+ requires_power = 1
+/area/shuttle/screebarge/fore
+ name = "\improper Battle Barge - Fore"
+/area/shuttle/screebarge/mid
+ name = "\improper Battle Barge - Mid"
+/area/shuttle/screebarge/aft
+ name = "\improper Battle Barge - Aft"
+
+// The shuttle's 'shuttle' computer
+/obj/machinery/computer/shuttle_control/explore/screebarge
+ name = "short jump console"
+ shuttle_tag = "XN-29 Prototype Shuttle"
+ req_one_access = list(access_pilot)
+
+// A shuttle lateloader landmark
+/obj/effect/shuttle_landmark/shuttle_initializer/screebarge
+ name = "Origin - Battle Barge"
+ base_area = /area/space
+ base_turf = /turf/space
+ landmark_tag = "omship_spawn_battlebarge"
+ shuttle_type = /datum/shuttle/autodock/overmap/screebarge
+
+// The 'shuttle'
+/datum/shuttle/autodock/overmap/screebarge
+ name = "Battle Barge"
+ current_location = "omship_spawn_battlebarge"
+ docking_controller_tag = "battlebarge_docker"
+ shuttle_area = list(/area/shuttle/screebarge/fore,/area/shuttle/screebarge/mid,/area/shuttle/screebarge/aft)
+ fuel_consumption = 0
+ defer_initialisation = TRUE //We're not loaded until an admin does it
+
+// The 'ship'
+/obj/effect/overmap/visitable/ship/landable/screebarge
+ name = "Battle Barge"
+ desc = "Some sort of makeshift battle barge. Appears to be armed."
+ color = "#95c633" //Greenish
+ vessel_mass = 3000
+ vessel_size = SHIP_SIZE_SMALL
+ shuttle = "Battle Barge"
\ No newline at end of file
diff --git a/maps/tether/submaps/om_ships/screebarge.dmm b/maps/tether/submaps/om_ships/screebarge.dmm
new file mode 100644
index 00000000000..25330182e77
--- /dev/null
+++ b/maps/tether/submaps/om_ships/screebarge.dmm
@@ -0,0 +1,1120 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"aa" = (
+/turf/space,
+/area/space)
+"ab" = (
+/turf/simulated/wall/shull,
+/area/shuttle/screebarge/fore)
+"ac" = (
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"ad" = (
+/obj/machinery/door/airlock/external,
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"ae" = (
+/obj/structure/disposaloutlet{
+ icon_state = "outlet";
+ dir = 1
+ },
+/obj/structure/disposalpipe/trunk,
+/turf/simulated/floor/plating,
+/area/shuttle/screebarge/fore)
+"af" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced{
+ icon_state = "rwindow";
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/shuttle/screebarge/fore)
+"ag" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced{
+ icon_state = "rwindow";
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ icon_state = "pipe-s";
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/shuttle/screebarge/fore)
+"ah" = (
+/obj/machinery/power/emitter{
+ icon_state = "emitter";
+ dir = 1
+ },
+/obj/structure/cable/cyan{
+ icon_state = "0-2"
+ },
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"ai" = (
+/obj/machinery/computer/ship/helm,
+/obj/structure/disposalpipe/segment{
+ icon_state = "pipe-s";
+ dir = 1
+ },
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"aj" = (
+/obj/machinery/computer/ship/engines,
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"ak" = (
+/obj/machinery/computer/ship/sensors,
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"al" = (
+/obj/structure/disposalpipe/segment{
+ icon_state = "pipe-s";
+ dir = 1
+ },
+/obj/machinery/computer/shuttle_control/explore/screebarge,
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"am" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced{
+ icon_state = "rwindow";
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/shuttle/screebarge/fore)
+"an" = (
+/obj/structure/cable/cyan{
+ icon_state = "1-4"
+ },
+/obj/structure/cable/cyan{
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"ao" = (
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 1
+ },
+/obj/structure/disposalpipe/segment{
+ icon_state = "pipe-s";
+ dir = 1
+ },
+/obj/structure/cable/cyan{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"ap" = (
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 1
+ },
+/obj/structure/cable/cyan{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"aq" = (
+/obj/structure/cable/cyan{
+ icon_state = "2-4"
+ },
+/obj/structure/cable/cyan{
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"ar" = (
+/obj/structure/cable/cyan{
+ icon_state = "1-8"
+ },
+/obj/structure/cable/cyan{
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"as" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced{
+ icon_state = "rwindow";
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/shuttle/screebarge/fore)
+"at" = (
+/obj/structure/cable/cyan{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"au" = (
+/obj/structure/disposalpipe/segment{
+ icon_state = "pipe-s";
+ dir = 1
+ },
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"av" = (
+/obj/machinery/power/smes/buildable{
+ charge = 5e+006
+ },
+/obj/structure/cable/cyan,
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"aw" = (
+/obj/machinery/power/apc{
+ pixel_x = -28
+ },
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"ax" = (
+/obj/structure/disposalpipe/segment{
+ icon_state = "pipe-c";
+ dir = 1
+ },
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"ay" = (
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ icon_state = "pipe-t";
+ dir = 8
+ },
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"az" = (
+/obj/structure/table/standard,
+/obj/machinery/power/terminal{
+ icon_state = "term";
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "0-2"
+ },
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"aA" = (
+/obj/machinery/disposal,
+/obj/structure/disposalpipe/trunk{
+ icon_state = "pipe-t";
+ dir = 4
+ },
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"aB" = (
+/obj/structure/disposalpipe/segment{
+ icon_state = "conpipe-c";
+ dir = 8
+ },
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"aC" = (
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 8
+ },
+/obj/structure/cable/cyan{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"aD" = (
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 4
+ },
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+ frequency = 1380;
+ id_tag = "battlebarge_docker";
+ pixel_x = -26;
+ pixel_y = -7;
+ tag_door = "battlebarge_foredoor"
+ },
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"aE" = (
+/obj/machinery/autolathe,
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"aF" = (
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 1
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"aG" = (
+/obj/structure/table/standard,
+/obj/machinery/chemical_dispenser/full,
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"aH" = (
+/obj/machinery/door/airlock/external{
+ icon_state = "door_locked";
+ id_tag = "battlebarge_frontdoor";
+ locked = 1
+ },
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"aI" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"aJ" = (
+/obj/machinery/power/emitter{
+ icon_state = "emitter";
+ dir = 1
+ },
+/obj/structure/cable/cyan{
+ icon_state = "0-2"
+ },
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"aK" = (
+/turf/simulated/wall/shull,
+/area/shuttle/screebarge/mid)
+"aL" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/turf/simulated/floor/plating,
+/area/shuttle/screebarge/mid)
+"aM" = (
+/obj/machinery/door/airlock/maintenance/command,
+/turf/simulated/floor/tiled/steel_ridged,
+/area/shuttle/screebarge/mid)
+"aN" = (
+/obj/machinery/door/airlock/maintenance/command,
+/obj/structure/cable/cyan{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled/steel_ridged,
+/area/shuttle/screebarge/mid)
+"aO" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced{
+ icon_state = "rwindow";
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/shuttle/screebarge/mid)
+"aP" = (
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/screebarge/mid)
+"aQ" = (
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/screebarge/mid)
+"aR" = (
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/screebarge/mid)
+"aS" = (
+/obj/machinery/sleeper{
+ icon_state = "sleeper_0";
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/screebarge/mid)
+"aT" = (
+/obj/machinery/sleep_console,
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/screebarge/mid)
+"aU" = (
+/obj/structure/cable/cyan{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/screebarge/mid)
+"aV" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced{
+ icon_state = "rwindow";
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/shuttle/screebarge/mid)
+"aW" = (
+/obj/structure/bed/roller,
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/screebarge/mid)
+"aX" = (
+/obj/structure/cable/cyan{
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/screebarge/mid)
+"aY" = (
+/obj/structure/cable/cyan{
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/screebarge/mid)
+"aZ" = (
+/obj/structure/cable/cyan{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/screebarge/mid)
+"ba" = (
+/obj/machinery/door/airlock/maintenance/medical,
+/obj/structure/cable/cyan{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/steel_ridged,
+/area/shuttle/screebarge/mid)
+"bb" = (
+/obj/structure/cable/cyan{
+ icon_state = "1-8"
+ },
+/obj/structure/cable/cyan{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/screebarge/mid)
+"bc" = (
+/obj/structure/table/standard,
+/obj/item/weapon/storage/firstaid/o2{
+ step_x = 2;
+ step_y = 2
+ },
+/obj/item/weapon/storage/firstaid/regular{
+ step_x = -2;
+ step_y = -2
+ },
+/obj/item/bodybag/cryobag,
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/screebarge/mid)
+"bd" = (
+/obj/structure/closet/crate,
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/screebarge/mid)
+"be" = (
+/obj/structure/cable/cyan{
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/screebarge/mid)
+"bf" = (
+/obj/structure/cable/cyan{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc{
+ pixel_x = 28
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/screebarge/mid)
+"bg" = (
+/obj/machinery/door/airlock/external{
+ frequency = 1380;
+ icon_state = "door_locked";
+ id_tag = "battlebarge_foredoor";
+ locked = 1
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/steel_ridged,
+/area/shuttle/screebarge/fore)
+"bh" = (
+/turf/simulated/wall/shull,
+/area/shuttle/screebarge/aft)
+"bi" = (
+/obj/machinery/door/airlock/maintenance/engi,
+/obj/structure/cable/cyan{
+ icon_state = "1-2"
+ },
+/turf/simulated/floor/tiled/steel_ridged,
+/area/shuttle/screebarge/aft)
+"bj" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/turf/simulated/floor/plating,
+/area/shuttle/screebarge/aft)
+"bk" = (
+/obj/machinery/atmospherics/portables_connector{
+ icon_state = "map_connector";
+ dir = 4
+ },
+/obj/effect/floor_decal/industrial/outline/red,
+/obj/machinery/portable_atmospherics/canister/phoron,
+/turf/simulated/floor/plating,
+/area/shuttle/screebarge/aft)
+"bl" = (
+/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
+ icon_state = "map";
+ dir = 1
+ },
+/obj/structure/cable/cyan{
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/plating,
+/area/shuttle/screebarge/aft)
+"bm" = (
+/obj/machinery/atmospherics/binary/pump{
+ icon_state = "map_off";
+ dir = 4
+ },
+/obj/structure/cable/cyan{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/plating,
+/area/shuttle/screebarge/aft)
+"bn" = (
+/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
+ icon_state = "map";
+ dir = 1
+ },
+/obj/structure/cable/cyan{
+ icon_state = "0-8"
+ },
+/obj/machinery/power/apc{
+ pixel_x = 0;
+ pixel_y = 28
+ },
+/turf/simulated/floor/plating,
+/area/shuttle/screebarge/aft)
+"bo" = (
+/obj/machinery/atmospherics/binary/pump{
+ icon_state = "map_off";
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/shuttle/screebarge/aft)
+"bp" = (
+/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
+ icon_state = "map";
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/shuttle/screebarge/aft)
+"bq" = (
+/obj/machinery/atmospherics/portables_connector{
+ icon_state = "map_connector";
+ dir = 8
+ },
+/obj/effect/floor_decal/industrial/outline/red,
+/obj/machinery/portable_atmospherics/canister/phoron,
+/turf/simulated/floor/plating,
+/area/shuttle/screebarge/aft)
+"br" = (
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ icon_state = "intact";
+ dir = 9
+ },
+/turf/simulated/floor/plating,
+/area/shuttle/screebarge/aft)
+"bs" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/obj/machinery/light/small,
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"bt" = (
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ icon_state = "intact";
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/shuttle/screebarge/aft)
+"bu" = (
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ icon_state = "intact";
+ dir = 5
+ },
+/turf/simulated/floor/plating,
+/area/shuttle/screebarge/aft)
+"bv" = (
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ icon_state = "intact";
+ dir = 6
+ },
+/turf/simulated/wall/shull,
+/area/shuttle/screebarge/aft)
+"bw" = (
+/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
+ icon_state = "map";
+ dir = 1
+ },
+/turf/simulated/wall/shull,
+/area/shuttle/screebarge/aft)
+"bx" = (
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ icon_state = "intact";
+ dir = 4
+ },
+/turf/simulated/wall/shull,
+/area/shuttle/screebarge/aft)
+"by" = (
+/obj/machinery/atmospherics/pipe/manifold4w/visible/yellow,
+/turf/simulated/wall/shull,
+/area/shuttle/screebarge/aft)
+"bz" = (
+/obj/machinery/atmospherics/pipe/simple/visible/yellow{
+ icon_state = "intact";
+ dir = 10
+ },
+/turf/simulated/wall/shull,
+/area/shuttle/screebarge/aft)
+"bA" = (
+/obj/machinery/atmospherics/unary/engine{
+ dir = 1
+ },
+/turf/simulated/shuttle/plating/airless/carry,
+/area/shuttle/screebarge/aft)
+"bB" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/effect/shuttle_landmark/shuttle_initializer/screebarge,
+/obj/effect/overmap/visitable/ship/landable/screebarge,
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"bC" = (
+/obj/machinery/door/airlock/external{
+ icon_state = "door_locked";
+ id_tag = "battlebarge_aftdoor";
+ locked = 1
+ },
+/obj/machinery/button/remote/airlock{
+ desiredstate = 1;
+ id = "battlebarge_aftdoor";
+ pixel_y = 26;
+ specialfunctions = 4
+ },
+/turf/simulated/floor/tiled/steel_ridged,
+/area/shuttle/screebarge/mid)
+"bD" = (
+/obj/machinery/button/remote/airlock{
+ pixel_x = 26;
+ pixel_y = 5;
+ id = "battlebarge_frontdoor";
+ desiredstate = 1;
+ specialfunctions = 4
+ },
+/turf/simulated/floor/reinforced,
+/area/shuttle/screebarge/fore)
+"bE" = (
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 4
+ },
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/screebarge/mid)
+"bF" = (
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/screebarge/mid)
+"bG" = (
+/obj/machinery/light/small,
+/turf/simulated/floor/plating,
+/area/shuttle/screebarge/aft)
+
+(1,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(2,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(3,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(4,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ab
+ab
+am
+am
+ab
+ab
+bg
+aK
+aO
+aO
+aO
+aK
+bC
+bh
+bh
+bh
+bh
+bh
+aa
+aa
+aa
+"}
+(5,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+af
+ah
+an
+at
+aw
+aD
+bB
+aL
+aP
+aP
+aP
+bE
+aQ
+bh
+bk
+bk
+bv
+bA
+aa
+aa
+aa
+"}
+(6,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ae
+ag
+ai
+ao
+au
+ax
+ac
+aI
+aM
+aQ
+aQ
+aX
+aU
+aU
+bi
+bl
+br
+bw
+bA
+aa
+aa
+aa
+"}
+(7,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ab
+ab
+ab
+ab
+aj
+ap
+ac
+ay
+aE
+aI
+aL
+aR
+aR
+aZ
+bd
+bd
+bj
+bm
+bG
+bx
+bh
+aa
+aa
+aa
+"}
+(8,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ac
+aH
+bD
+ad
+ac
+aq
+av
+az
+aF
+bs
+aL
+aL
+aL
+ba
+aL
+aL
+bh
+bn
+bt
+by
+bA
+aa
+aa
+aa
+"}
+(9,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+ab
+ab
+ab
+ab
+ak
+ap
+ac
+aA
+aG
+ac
+aL
+aS
+aW
+aZ
+aW
+aS
+bj
+bo
+bG
+bx
+bh
+aa
+aa
+aa
+"}
+(10,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ae
+ag
+al
+ao
+au
+aB
+ac
+ac
+aL
+aT
+aX
+bb
+be
+aT
+bj
+bp
+bu
+bw
+bA
+aa
+aa
+aa
+"}
+(11,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+af
+aJ
+ar
+at
+aC
+aC
+at
+aN
+aU
+aY
+bc
+bf
+bF
+bh
+bq
+bq
+bz
+bA
+aa
+aa
+aa
+"}
+(12,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+ab
+ab
+as
+as
+ab
+ab
+ab
+aK
+aV
+aV
+aV
+aK
+aK
+bh
+bh
+bh
+bh
+bh
+aa
+aa
+aa
+"}
+(13,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(14,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
+(15,1,1) = {"
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+"}
diff --git a/maps/tether/submaps/space/_debrisfield.dm b/maps/tether/submaps/space/_debrisfield.dm
index ba141f49a0f..ab9d8cf41f1 100644
--- a/maps/tether/submaps/space/_debrisfield.dm
+++ b/maps/tether/submaps/space/_debrisfield.dm
@@ -1,21 +1,14 @@
// -- Datums -- //
-/datum/shuttle_destination/excursion/debrisfield
+/obj/effect/overmap/visitable/sector/debrisfield
name = "Debris Field"
- my_landmark = "tether_excursion_debrisfield"
- preferred_interim_tag = "tether_excursion_transit_space"
- skip_me = TRUE
-
- routes_to_make = list(
- /datum/shuttle_destination/excursion/virgo3b_orbit = 30 SECONDS
- )
+ desc = "Space junk galore."
+ icon_state = "dust1"
+ known = FALSE
+ initial_generic_waypoints = list("tether_excursion_debrisfield")
// -- Objs -- //
-/obj/shuttle_connector/debrisfield
- name = "shuttle connector - debrisfield"
- shuttle_name = "Excursion Shuttle"
- destinations = list(/datum/shuttle_destination/excursion/debrisfield)
/obj/effect/step_trigger/teleporter/debrisfield_loop/north/New()
..()
diff --git a/maps/tether/submaps/space/debrisfield.dmm b/maps/tether/submaps/space/debrisfield.dmm
index 458ca929bcf..76420efe1e6 100644
--- a/maps/tether/submaps/space/debrisfield.dmm
+++ b/maps/tether/submaps/space/debrisfield.dmm
@@ -6,7 +6,7 @@
/turf/space,
/area/tether_away/debrisfield/explored)
"c" = (
-/obj/shuttle_connector/debrisfield,
+/obj/effect/overmap/visitable/sector/debrisfield,
/turf/space,
/area/tether_away/debrisfield/explored)
"e" = (
diff --git a/maps/tether/submaps/tether_misc.dmm b/maps/tether/submaps/tether_misc.dmm
index dbef82d90c4..accb2ecaa72 100644
--- a/maps/tether/submaps/tether_misc.dmm
+++ b/maps/tether/submaps/tether_misc.dmm
@@ -3,14 +3,6 @@
/obj/machinery/vending/coffee,
/turf/unsimulated/beach/sand,
/area/beach)
-"ab" = (
-/obj/effect/floor_decal/techfloor/orange{
- icon_state = "techfloororange_edges";
- dir = 9
- },
-/obj/structure/closet/secure_closet/guncabinet/excursion,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"ag" = (
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
@@ -24,21 +16,6 @@
/obj/structure/closet/crate/secure,
/turf/simulated/shuttle/floor/black,
/area/shuttle/trade)
-"ai" = (
-/obj/effect/floor_decal/transit/orange{
- dir = 8
- },
-/obj/effect/step_trigger/lost_in_space/tram,
-/turf/unsimulated/floor/techfloor_grid{
- icon = 'icons/turf/transit_vr.dmi'
- },
-/area/centcom/ferry)
-"aj" = (
-/obj/effect/step_trigger/lost_in_space/tram,
-/turf/unsimulated/floor/techfloor_grid{
- icon = 'icons/turf/transit_vr.dmi'
- },
-/area/centcom/ferry)
"ak" = (
/obj/machinery/fitness/heavy/lifter,
/obj/effect/floor_decal/steeldecal/steel_decals10{
@@ -51,12 +28,6 @@
icon_state = "steel"
},
/area/antag/antag_base)
-"al" = (
-/obj/effect/step_trigger/lost_in_space/tram,
-/turf/unsimulated/floor/maglev{
- icon = 'icons/turf/transit_vr.dmi'
- },
-/area/centcom/ferry)
"am" = (
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
@@ -1442,16 +1413,6 @@
},
/turf/simulated/floor/holofloor/tiled,
/area/holodeck/source_emptycourt)
-"dy" = (
-/turf/simulated/shuttle/wall/dark/hard_corner,
-/area/shuttle/antag_ground{
- base_turf = /turf/unsimulated/floor/techfloor_grid
- })
-"dz" = (
-/turf/simulated/shuttle/wall/dark/hard_corner,
-/area/shuttle/antag_space{
- base_turf = /turf/unsimulated/floor/techfloor_grid
- })
"dA" = (
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
@@ -1471,12 +1432,6 @@
icon_state = "floor_dred"
},
/area/shuttle/mercenary)
-"dD" = (
-/obj/machinery/computer/shuttle_control/multi/tether_antag_ground,
-/turf/simulated/shuttle/floor/darkred,
-/area/shuttle/antag_ground{
- base_turf = /turf/unsimulated/floor/techfloor_grid
- })
"dE" = (
/obj/structure/shuttle/engine/heater,
/obj/structure/window/reinforced{
@@ -1591,15 +1546,6 @@
"dY" = (
/turf/simulated/floor/holofloor/tiled/dark,
/area/holodeck/source_boxingcourt)
-"dZ" = (
-/obj/effect/floor_decal/transit/orange{
- dir = 4
- },
-/obj/effect/step_trigger/lost_in_space/tram,
-/turf/unsimulated/floor/techfloor_grid{
- icon = 'icons/turf/transit_vr.dmi'
- },
-/area/centcom/ferry)
"ea" = (
/obj/machinery/power/emitter/gyrotron/anchored{
desc = "It is a heavy duty pulse laser emitter.";
@@ -2649,12 +2595,6 @@
/area/syndicate_mothership{
name = "\improper Trader Base"
})
-"gX" = (
-/turf/unsimulated/mineral{
- icon = 'icons/turf/transit_vr.dmi';
- icon_state = "rock"
- },
-/area/centcom/ferry)
"gY" = (
/obj/machinery/recharger,
/obj/structure/table/steel_reinforced,
@@ -2776,45 +2716,6 @@
/area/syndicate_mothership{
name = "\improper Trader Base"
})
-"hl" = (
-/turf/unsimulated/wall{
- icon = 'icons/turf/transit_vr.dmi'
- },
-/area/centcom/ferry)
-"hm" = (
-/obj/effect/floor_decal/transit/orange{
- dir = 8
- },
-/turf/unsimulated/floor/techfloor_grid{
- icon = 'icons/turf/transit_vr.dmi'
- },
-/area/centcom/ferry)
-"hn" = (
-/turf/unsimulated/floor/techfloor_grid{
- icon = 'icons/turf/transit_vr.dmi'
- },
-/area/centcom/ferry)
-"ho" = (
-/turf/unsimulated/floor/maglev{
- icon = 'icons/turf/transit_vr.dmi'
- },
-/area/centcom/ferry)
-"hp" = (
-/obj/effect/floor_decal/transit/orange{
- dir = 4
- },
-/turf/unsimulated/floor/techfloor_grid{
- icon = 'icons/turf/transit_vr.dmi'
- },
-/area/centcom/ferry)
-"hq" = (
-/obj/structure/bed/chair{
- dir = 8
- },
-/turf/simulated/shuttle/floor/darkred,
-/area/shuttle/antag_ground{
- base_turf = /turf/unsimulated/floor/techfloor_grid
- })
"hr" = (
/obj/machinery/door/blast/shutters{
dir = 8;
@@ -2863,17 +2764,6 @@
/area/syndicate_mothership{
name = "\improper Trader Base"
})
-"hv" = (
-/obj/effect/floor_decal/transit/orange{
- dir = 8
- },
-/obj/effect/transit/light{
- dir = 8
- },
-/turf/unsimulated/floor/techfloor_grid{
- icon = 'icons/turf/transit_vr.dmi'
- },
-/area/centcom/ferry)
"hw" = (
/obj/effect/floor_decal/rust,
/obj/structure/bed/chair{
@@ -2959,17 +2849,6 @@
/area/syndicate_mothership{
name = "\improper Trader Base"
})
-"hI" = (
-/obj/effect/floor_decal/transit/orange{
- dir = 4
- },
-/obj/effect/transit/light{
- dir = 4
- },
-/turf/unsimulated/floor/techfloor_grid{
- icon = 'icons/turf/transit_vr.dmi'
- },
-/area/centcom/ferry)
"hJ" = (
/obj/structure/bed/chair/holochair{
dir = 4
@@ -3100,97 +2979,13 @@
},
/area/shuttle/mercenary)
"hY" = (
-/obj/machinery/computer/shuttle_control/multi/syndicate{
+/obj/machinery/computer/shuttle_control/multi/mercenary{
dir = 4
},
/turf/simulated/shuttle/floor{
icon_state = "floor_red"
},
/area/shuttle/mercenary)
-"hZ" = (
-/turf/simulated/shuttle/floor/darkred,
-/area/shuttle/antag_ground{
- base_turf = /turf/unsimulated/floor/techfloor_grid
- })
-"ia" = (
-/obj/effect/floor_decal/transit/orange{
- dir = 8
- },
-/obj/effect/transit/light{
- dir = 8
- },
-/obj/effect/step_trigger/thrower{
- affect_ghosts = 1;
- direction = 2;
- name = "thrower_throwdownside";
- nostop = 1;
- stopper = 0;
- tiles = 0
- },
-/turf/unsimulated/floor/techfloor_grid{
- icon = 'icons/turf/transit_vr.dmi'
- },
-/area/centcom/ferry)
-"ib" = (
-/obj/effect/step_trigger/thrower{
- affect_ghosts = 1;
- direction = 8;
- name = "thrower_escapeshuttletop(left)";
- tiles = 0
- },
-/turf/unsimulated/floor/techfloor_grid{
- icon = 'icons/turf/transit_vr.dmi'
- },
-/area/centcom/ferry)
-"ic" = (
-/obj/effect/step_trigger/thrower{
- affect_ghosts = 1;
- direction = 8;
- name = "thrower_escapeshuttletop(left)";
- tiles = 0
- },
-/turf/unsimulated/floor/maglev{
- icon = 'icons/turf/transit_vr.dmi'
- },
-/area/centcom/ferry)
-"id" = (
-/obj/effect/step_trigger/thrower{
- affect_ghosts = 1;
- direction = 4;
- name = "thrower_escapeshuttletop(right)";
- tiles = 0
- },
-/turf/unsimulated/floor/techfloor_grid{
- icon = 'icons/turf/transit_vr.dmi'
- },
-/area/centcom/ferry)
-"ie" = (
-/obj/effect/step_trigger/thrower{
- affect_ghosts = 1;
- direction = 4;
- name = "thrower_escapeshuttletop(right)";
- tiles = 0
- },
-/turf/unsimulated/floor/maglev{
- icon = 'icons/turf/transit_vr.dmi'
- },
-/area/centcom/ferry)
-"if" = (
-/obj/effect/floor_decal/transit/orange{
- dir = 4
- },
-/obj/effect/step_trigger/thrower{
- affect_ghosts = 1;
- direction = 2;
- name = "thrower_throwdownside";
- nostop = 1;
- stopper = 0;
- tiles = 0
- },
-/turf/unsimulated/floor/techfloor_grid{
- icon = 'icons/turf/transit_vr.dmi'
- },
-/area/centcom/ferry)
"ig" = (
/turf/simulated/shuttle/floor{
icon_state = "floor_yellow"
@@ -3205,12 +3000,6 @@
icon_state = "floor_red"
},
/area/shuttle/mercenary)
-"ij" = (
-/obj/machinery/computer/shuttle_control/multi/tether_antag_space,
-/turf/simulated/shuttle/floor/darkred,
-/area/shuttle/antag_space{
- base_turf = /turf/unsimulated/floor/techfloor_grid
- })
"ik" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
@@ -3254,53 +3043,6 @@
/area/syndicate_mothership{
name = "\improper Trader Base"
})
-"in" = (
-/obj/effect/floor_decal/transit/orange{
- dir = 8
- },
-/obj/effect/step_trigger/thrower{
- affect_ghosts = 1;
- direction = 2;
- name = "thrower_throwdownside";
- nostop = 1;
- stopper = 0;
- tiles = 0
- },
-/turf/unsimulated/floor/techfloor_grid{
- icon = 'icons/turf/transit_vr.dmi'
- },
-/area/centcom/ferry)
-"ip" = (
-/obj/effect/shuttle_landmark{
- base_area = /area/centcom/ferry;
- base_turf = /turf/simulated/floor/tiled/techfloor/grid;
- docking_controller = null;
- landmark_tag = "escape_transit";
- name = "Escape Transit"
- },
-/turf/unsimulated/floor/techfloor_grid{
- icon = 'icons/turf/transit_vr.dmi'
- },
-/area/centcom/ferry)
-"iq" = (
-/obj/effect/floor_decal/transit/orange{
- dir = 4
- },
-/obj/effect/transit/light{
- dir = 4
- },
-/obj/effect/step_trigger/thrower{
- affect_ghosts = 1;
- direction = 2;
- name = "thrower_throwdownside";
- nostop = 1;
- stopper = 0;
- tiles = 0
- },
-/turf/unsimulated/floor/techfloor_grid{
- icon = 'icons/turf/transit_vr.dmi'
- },
-/area/centcom/ferry)
"ir" = (
/obj/structure/closet,
/obj/machinery/light{
@@ -3335,14 +3077,6 @@
icon_state = "floor_red"
},
/area/shuttle/mercenary)
-"iu" = (
-/obj/structure/bed/chair{
- dir = 8
- },
-/turf/simulated/shuttle/floor/darkred,
-/area/shuttle/antag_space{
- base_turf = /turf/unsimulated/floor/techfloor_grid
- })
"iv" = (
/obj/structure/table/glass,
/obj/item/device/radio/intercom{
@@ -3430,11 +3164,6 @@
icon_state = "floor_black"
},
/area/shuttle/mercenary)
-"iH" = (
-/turf/simulated/shuttle/floor/darkred,
-/area/shuttle/antag_space{
- base_turf = /turf/unsimulated/floor/techfloor_grid
- })
"iI" = (
/obj/structure/window/reinforced,
/obj/machinery/door/blast/shutters{
@@ -3778,19 +3507,6 @@
},
/turf/simulated/shuttle/floor/black,
/area/shuttle/trade)
-"jr" = (
-/obj/structure/bed/chair{
- dir = 1
- },
-/obj/machinery/light{
- dir = 8;
- icon_state = "tube1";
- pixel_y = 0
- },
-/turf/simulated/shuttle/floor/darkred,
-/area/shuttle/antag_ground{
- base_turf = /turf/unsimulated/floor/techfloor_grid
- })
"js" = (
/obj/item/weapon/tool/screwdriver,
/obj/effect/spawner/newbomb/timer/syndicate,
@@ -4194,10 +3910,12 @@
/turf/simulated/shuttle/floor/black,
/area/shuttle/trade)
"ko" = (
-/obj/structure/table/steel_reinforced,
/obj/machinery/newscaster{
pixel_x = 32
},
+/obj/machinery/computer/arcade/battle{
+ dir = 4
+ },
/turf/simulated/shuttle/floor/black,
/area/shuttle/trade)
"kp" = (
@@ -4413,10 +4131,8 @@
/turf/simulated/shuttle/plating,
/area/shuttle/trade)
"kN" = (
-/obj/machinery/computer/shuttle_control{
- name = "Beruang control console";
- req_access = list(160);
- shuttle_tag = "Trade"
+/obj/machinery/computer/shuttle_control/multi/trade{
+ dir = 4
},
/turf/simulated/shuttle/floor/black,
/area/shuttle/trade)
@@ -4497,7 +4213,7 @@
/turf/simulated/shuttle/floor/darkred,
/area/shuttle/trade)
"kZ" = (
-/obj/machinery/computer/arcade/battle,
+/obj/structure/table/steel_reinforced,
/turf/simulated/shuttle/floor/black,
/area/shuttle/trade)
"la" = (
@@ -4627,19 +4343,6 @@
/obj/item/weapon/storage/toolbox/mechanical,
/turf/simulated/shuttle/floor/black,
/area/shuttle/trade)
-"lo" = (
-/obj/effect/step_trigger/thrower{
- affect_ghosts = 1;
- direction = 2;
- name = "thrower_throwdownside";
- nostop = 1;
- stopper = 0;
- tiles = 0
- },
-/turf/unsimulated/floor/techfloor_grid{
- icon = 'icons/turf/transit_vr.dmi'
- },
-/area/centcom/ferry)
"lp" = (
/obj/structure/window/reinforced{
dir = 1
@@ -4718,19 +4421,6 @@
},
/turf/simulated/shuttle/floor/black,
/area/shuttle/trade)
-"lx" = (
-/obj/effect/step_trigger/thrower{
- affect_ghosts = 1;
- direction = 2;
- name = "thrower_throwdownside";
- nostop = 1;
- stopper = 0;
- tiles = 0
- },
-/turf/unsimulated/floor/maglev{
- icon = 'icons/turf/transit_vr.dmi'
- },
-/area/centcom/ferry)
"ly" = (
/obj/machinery/button/remote/blast_door{
id = "tradeportshutters";
@@ -5259,15 +4949,6 @@
},
/turf/simulated/shuttle/floor/black,
/area/shuttle/trade)
-"mu" = (
-/obj/effect/transit/light{
- dir = 8
- },
-/turf/unsimulated/mineral{
- icon = 'icons/turf/transit_vr.dmi';
- icon_state = "rock"
- },
-/area/centcom/ferry)
"mv" = (
/obj/effect/step_trigger/thrower{
affect_ghosts = 1;
@@ -6425,19 +6106,6 @@
tree_chance = 0
},
/area/antag/antag_base)
-"oZ" = (
-/obj/structure/bed/chair{
- dir = 1
- },
-/obj/machinery/light{
- dir = 8;
- icon_state = "tube1";
- pixel_y = 0
- },
-/turf/simulated/shuttle/floor/darkred,
-/area/shuttle/antag_space{
- base_turf = /turf/unsimulated/floor/techfloor_grid
- })
"pa" = (
/obj/structure/table/glass,
/obj/item/weapon/handcuffs/fuzzy,
@@ -6482,14 +6150,6 @@
icon_state = "dark"
},
/area/antag/antag_base)
-"pf" = (
-/obj/structure/bed/chair{
- dir = 4
- },
-/turf/simulated/shuttle/floor/darkred,
-/area/shuttle/antag_ground{
- base_turf = /turf/unsimulated/floor/techfloor_grid
- })
"pg" = (
/obj/structure/table/rack,
/obj/item/weapon/gun/energy/plasmastun,
@@ -6814,18 +6474,6 @@
icon_state = "lino"
},
/area/antag/antag_base)
-"pL" = (
-/obj/structure/bed/chair{
- dir = 8
- },
-/obj/machinery/recharger/wallcharger{
- pixel_x = 32;
- pixel_y = 0
- },
-/turf/simulated/shuttle/floor/darkred,
-/area/shuttle/antag_ground{
- base_turf = /turf/unsimulated/floor/techfloor_grid
- })
"pM" = (
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 9
@@ -7034,26 +6682,6 @@
icon_state = "lino"
},
/area/antag/antag_base)
-"qd" = (
-/obj/structure/bed/chair{
- dir = 4
- },
-/turf/simulated/shuttle/floor/darkred,
-/area/shuttle/antag_space{
- base_turf = /turf/unsimulated/floor/techfloor_grid
- })
-"qe" = (
-/obj/structure/bed/chair{
- dir = 8
- },
-/obj/machinery/recharger/wallcharger{
- pixel_x = 32;
- pixel_y = 0
- },
-/turf/simulated/shuttle/floor/darkred,
-/area/shuttle/antag_space{
- base_turf = /turf/unsimulated/floor/techfloor_grid
- })
"qf" = (
/obj/machinery/suit_cycler/syndicate{
locked = 0
@@ -7407,72 +7035,6 @@
icon_state = "cult"
},
/area/antag/antag_base)
-"qF" = (
-/obj/structure/table/steel,
-/obj/item/roller,
-/obj/item/roller{
- pixel_y = 8
- },
-/obj/item/roller{
- pixel_y = 16
- },
-/turf/simulated/shuttle/floor/darkred,
-/area/shuttle/antag_ground{
- base_turf = /turf/unsimulated/floor/techfloor_grid
- })
-"qG" = (
-/obj/machinery/embedded_controller/radio/simple_docking_controller{
- frequency = 1380;
- id_tag = "antag_ground_shuttle";
- pixel_x = -25;
- pixel_y = 0;
- req_one_access = list(13,31);
- tag_door = "antag_ground_shuttle_hatch"
- },
-/obj/machinery/portable_atmospherics/canister/air,
-/turf/simulated/shuttle/floor/darkred,
-/area/shuttle/antag_ground{
- base_turf = /turf/unsimulated/floor/techfloor_grid
- })
-"qH" = (
-/obj/machinery/portable_atmospherics/canister/air,
-/obj/machinery/light{
- dir = 4
- },
-/turf/simulated/shuttle/floor/darkred,
-/area/shuttle/antag_ground{
- base_turf = /turf/unsimulated/floor/techfloor_grid
- })
-"qI" = (
-/obj/machinery/embedded_controller/radio/simple_docking_controller{
- frequency = 1380;
- id_tag = "antag_space_shuttle";
- pixel_x = -25;
- pixel_y = 0;
- req_one_access = list(13,31);
- tag_door = "antag_space_shuttle_hatch"
- },
-/obj/structure/table/steel,
-/obj/item/roller,
-/obj/item/roller{
- pixel_y = 8
- },
-/obj/item/roller{
- pixel_y = 16
- },
-/turf/simulated/shuttle/floor/darkred,
-/area/shuttle/antag_space{
- base_turf = /turf/unsimulated/floor/techfloor_grid
- })
-"qJ" = (
-/obj/machinery/portable_atmospherics/canister/oxygen,
-/obj/machinery/light{
- dir = 4
- },
-/turf/simulated/shuttle/floor/darkred,
-/area/shuttle/antag_space{
- base_turf = /turf/unsimulated/floor/techfloor_grid
- })
"qK" = (
/obj/machinery/light/small{
dir = 4
@@ -7595,19 +7157,6 @@
icon_state = "dark"
},
/area/antag/antag_base)
-"qV" = (
-/obj/machinery/portable_atmospherics/powered/scrubber/huge/stationary/tram{
- name = "\improper Landcrawler Scrubber"
- },
-/turf/simulated/shuttle/floor/black,
-/area/shuttle/antag_ground{
- base_turf = /turf/unsimulated/floor/techfloor_grid
- })
-"qW" = (
-/turf/simulated/shuttle/floor/black,
-/area/shuttle/antag_ground{
- base_turf = /turf/unsimulated/floor/techfloor_grid
- })
"qX" = (
/obj/effect/floor_decal/corner/blue{
dir = 6
@@ -7815,55 +7364,6 @@
icon_state = "cult"
},
/area/antag/antag_base)
-"rm" = (
-/obj/machinery/portable_atmospherics/canister/air,
-/turf/simulated/shuttle/floor/black,
-/area/shuttle/antag_space{
- base_turf = /turf/unsimulated/floor/techfloor_grid
- })
-"rn" = (
-/turf/simulated/shuttle/floor/black,
-/area/shuttle/antag_space{
- base_turf = /turf/unsimulated/floor/techfloor_grid
- })
-"ro" = (
-/obj/machinery/door/airlock/glass_external{
- frequency = 1380;
- icon_state = "door_locked";
- id_tag = "antag_ground_shuttle_hatch";
- locked = 1;
- name = "Shuttle Hatch"
- },
-/obj/effect/shuttle_landmark{
- base_area = /area/antag/antag_base;
- base_turf = /turf/unsimulated/floor/steel;
- docking_controller = "antag_ground_dock";
- landmark_tag = "antag_ground_base";
- name = "Home Base"
- },
-/turf/simulated/shuttle/floor/black,
-/area/shuttle/antag_ground{
- base_turf = /turf/unsimulated/floor/techfloor_grid
- })
-"rp" = (
-/obj/machinery/door/airlock/glass_external{
- frequency = 1380;
- icon_state = "door_locked";
- id_tag = "antag_space_shuttle_hatch";
- locked = 1;
- name = "Shuttle Hatch"
- },
-/obj/effect/shuttle_landmark{
- base_area = /area/antag/antag_base;
- base_turf = /turf/unsimulated/floor/steel;
- docking_controller = "antag_space_dock";
- landmark_tag = "antag_space_base";
- name = "Home Base"
- },
-/turf/simulated/shuttle/floor/black,
-/area/shuttle/antag_space{
- base_turf = /turf/unsimulated/floor/techfloor_grid
- })
"rq" = (
/obj/structure/table/rack,
/obj/item/clothing/suit/storage/vest/heavy/merc,
@@ -8789,32 +8289,6 @@
icon_state = "dark"
},
/area/antag/antag_base)
-"sC" = (
-/obj/machinery/door/airlock/glass_external{
- frequency = 1380;
- icon_state = "door_locked";
- id_tag = "antag_ground_dock_hatch";
- locked = 1;
- name = "Land Crawler Hatch"
- },
-/turf/unsimulated/floor{
- dir = 2;
- icon_state = "dark"
- },
-/area/antag/antag_base)
-"sD" = (
-/obj/machinery/door/airlock/glass_external{
- frequency = 1380;
- icon_state = "door_locked";
- id_tag = "antag_space_dock_hatch";
- locked = 1;
- name = "Proto Shuttle Hatch"
- },
-/turf/unsimulated/floor{
- dir = 2;
- icon_state = "dark"
- },
-/area/antag/antag_base)
"sE" = (
/obj/item/weapon/reagent_containers/hypospray,
/obj/structure/table/steel,
@@ -8859,44 +8333,6 @@
icon_state = "dark"
},
/area/antag/antag_base)
-"sJ" = (
-/obj/effect/floor_decal/borderfloorblack{
- dir = 1
- },
-/obj/effect/floor_decal/borderfloorblack/corner2{
- dir = 1
- },
-/obj/machinery/embedded_controller/radio/simple_docking_controller{
- frequency = 1380;
- id_tag = "antag_ground_dock";
- pixel_x = 0;
- pixel_y = 28;
- tag_door = "antag_ground_dock_hatch"
- },
-/turf/unsimulated/floor{
- dir = 2;
- icon_state = "dark"
- },
-/area/antag/antag_base)
-"sK" = (
-/obj/effect/floor_decal/borderfloorblack{
- dir = 1
- },
-/obj/effect/floor_decal/borderfloorblack/corner2{
- dir = 1
- },
-/obj/machinery/embedded_controller/radio/simple_docking_controller{
- frequency = 1380;
- id_tag = "antag_space_dock";
- pixel_x = 0;
- pixel_y = 28;
- tag_door = "antag_space_dock_hatch"
- },
-/turf/unsimulated/floor{
- dir = 2;
- icon_state = "dark"
- },
-/area/antag/antag_base)
"sL" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 1
@@ -10067,7 +9503,7 @@
},
/area/ninja_dojo/dojo)
"vq" = (
-/obj/structure/flight_right{
+/obj/machinery/computer/station_alert{
dir = 1
},
/turf/simulated/shuttle/floor/voidcraft/light,
@@ -10100,24 +9536,12 @@
},
/turf/simulated/shuttle/floor/black,
/area/shuttle/skipjack)
-"vB" = (
-/obj/structure/railing{
- icon_state = "railing0";
- dir = 1
- },
-/obj/structure/railing{
- icon_state = "railing0";
- dir = 4
- },
-/turf/simulated/shuttle/floor/alien,
-/area/shuttle/blue_fo)
"vC" = (
/obj/machinery/light{
dir = 4;
icon_state = "tube1";
pixel_x = 0
},
-/obj/machinery/computer/security,
/turf/simulated/shuttle/floor/voidcraft/light,
/area/shuttle/ninja)
"vG" = (
@@ -10224,15 +9648,6 @@
dir = 2
},
/area/skipjack_station)
-"wn" = (
-/obj/structure/bed/chair/sofa/left{
- dir = 1;
- icon_state = "sofaend_left";
- sofa_material = "black"
- },
-/obj/effect/floor_decal/techfloor/orange,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"wq" = (
/obj/structure/undies_wardrobe,
/turf/unsimulated/floor{
@@ -10309,11 +9724,8 @@
"xt" = (
/turf/simulated/shuttle/plating,
/area/shuttle/skipjack)
-"xz" = (
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"xD" = (
-/obj/structure/flight_left{
+/obj/machinery/computer/security{
dir = 1
},
/turf/simulated/shuttle/floor/voidcraft/light,
@@ -10326,17 +9738,6 @@
icon_state = "steel"
},
/area/skipjack_station)
-"xJ" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
- icon_state = "techfloororange_corners";
- dir = 4
- },
-/obj/effect/floor_decal/techfloor/orange/corner{
- icon_state = "techfloororange_corners";
- dir = 1
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"xL" = (
/obj/structure/grille,
/obj/structure/window/reinforced,
@@ -10354,10 +9755,8 @@
/turf/simulated/shuttle/plating,
/area/shuttle/skipjack)
"xQ" = (
-/obj/machinery/computer/shuttle_control/web/ninja{
- dir = 1;
- icon = 'icons/obj/computer.dmi';
- icon_state = "flightcomp_center"
+/obj/machinery/computer/shuttle_control/multi/ninja{
+ dir = 1
},
/turf/simulated/shuttle/floor/voidcraft/light,
/area/shuttle/ninja)
@@ -10426,17 +9825,6 @@
icon_state = "wood"
},
/area/ninja_dojo/dojo)
-"yj" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
- icon_state = "techfloororange_corners";
- dir = 1
- },
-/obj/effect/floor_decal/techfloor/orange/corner{
- icon_state = "techfloororange_corners";
- dir = 4
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"yl" = (
/obj/machinery/teleport/station,
/turf/simulated/shuttle/plating,
@@ -10491,21 +9879,6 @@
name = "snow"
},
/area/ninja_dojo/dojo)
-"yS" = (
-/obj/structure/bed/chair/bay/shuttle{
- icon_state = "shuttle_chair_preview";
- dir = 4
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
-"yY" = (
-/obj/structure/railing{
- icon_state = "railing0";
- dir = 8
- },
-/obj/structure/railing,
-/turf/simulated/shuttle/floor/alien,
-/area/shuttle/blue_fo)
"zb" = (
/obj/structure/table/steel_reinforced,
/obj/machinery/recharger{
@@ -10513,20 +9886,11 @@
},
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/shuttle/ninja)
-"zc" = (
-/obj/machinery/mech_recharger{
- icon = 'icons/turf/shuttle_alien_blue.dmi'
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
-"zl" = (
-/obj/structure/prop/alien/computer/hybrid,
-/obj/effect/floor_decal/techfloor/orange{
- icon_state = "techfloororange_edges";
- dir = 1
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
+"zm" = (
+/obj/structure/shuttle/engine/propulsion,
+/turf/space,
+/turf/simulated/shuttle/plating/airless/carry,
+/area/shuttle/skipjack)
"zn" = (
/obj/structure/table/rack,
/obj/item/weapon/gun/launcher/crossbow,
@@ -10566,10 +9930,6 @@
/obj/structure/reagent_dispensers/fueltank,
/turf/simulated/shuttle/plating,
/area/shuttle/skipjack)
-"zS" = (
-/obj/machinery/door/airlock/alien/blue,
-/turf/simulated/shuttle/floor/alien,
-/area/shuttle/blue_fo)
"zT" = (
/obj/machinery/door/airlock{
icon = 'icons/obj/doors/Dooruranium.dmi'
@@ -10616,14 +9976,6 @@
},
/turf/space,
/area/space)
-"Ah" = (
-/obj/effect/floor_decal/techfloor/orange{
- icon_state = "techfloororange_edges";
- dir = 4
- },
-/obj/machinery/recharge_station,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"Ai" = (
/obj/machinery/light/small{
dir = 8
@@ -10755,16 +10107,6 @@
/obj/random/energy,
/turf/simulated/shuttle/plating,
/area/shuttle/skipjack)
-"Bb" = (
-/obj/machinery/sleeper{
- dir = 8
- },
-/obj/effect/floor_decal/techfloor/orange{
- icon_state = "techfloororange_edges";
- dir = 10
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"Bd" = (
/turf/unsimulated/floor{
icon_state = "steel_dirty"
@@ -10812,52 +10154,12 @@
name = "plating"
},
/area/skipjack_station)
-"Bm" = (
-/obj/structure/bed/chair/sofa/right{
- sofa_material = "black"
- },
-/obj/effect/floor_decal/techfloor/orange{
- icon_state = "techfloororange_edges";
- dir = 1
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"Bo" = (
/obj/machinery/bodyscanner{
dir = 8
},
/turf/simulated/shuttle/floor/white,
/area/shuttle/skipjack)
-"Bq" = (
-/obj/effect/floor_decal/techfloor/orange{
- icon_state = "techfloororange_edges";
- dir = 1
- },
-/obj/structure/table/alien/blue,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
-"Bs" = (
-/obj/effect/floor_decal/techfloor/orange{
- icon_state = "techfloororange_edges";
- dir = 1
- },
-/obj/structure/bed/chair/bay/shuttle{
- icon_state = "shuttle_chair_preview";
- dir = 4
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
-"Bv" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
- icon_state = "techfloororange_corners";
- dir = 8
- },
-/obj/effect/floor_decal/techfloor/orange/corner{
- icon_state = "techfloororange_corners";
- dir = 1
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/blue_fo)
"Bw" = (
/turf/unsimulated/beach/water,
/area/beach)
@@ -10880,9 +10182,6 @@
icon_state = "wood"
},
/area/ninja_dojo/dojo)
-"BF" = (
-/turf/simulated/shuttle/wall/alien/blue/hard_corner,
-/area/shuttle/blue_fo)
"BH" = (
/obj/machinery/embedded_controller/radio/airlock/airlock_controller{
frequency = 1331;
@@ -10917,23 +10216,6 @@
/turf/space,
/turf/simulated/shuttle/plating/airless/carry,
/area/shuttle/trade)
-"BR" = (
-/obj/effect/floor_decal/techfloor/orange{
- icon_state = "techfloororange_edges";
- dir = 1
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
-"BZ" = (
-/obj/effect/map_effect/perma_light/brighter,
-/obj/item/device/perfect_tele_beacon/stationary{
- icon_state = "beacon";
- tele_name = "Hybrid Shuttle";
- tele_network = "hybridshuttle"
- },
-/obj/effect/floor_decal/industrial/outline/grey,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"Cf" = (
/obj/structure/toilet{
dir = 4
@@ -10992,40 +10274,12 @@
dir = 2
},
/area/ninja_dojo/dojo)
-"Ct" = (
-/obj/machinery/sleep_console,
-/obj/effect/floor_decal/techfloor/orange{
- icon_state = "techfloororange_edges";
- dir = 1
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"Cu" = (
/obj/effect/floor_decal/industrial/warning/corner{
dir = 1
},
/turf/simulated/shuttle/floor/voidcraft/light,
/area/shuttle/ninja)
-"Cv" = (
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/item/clothing/mask/breath,
-/obj/item/weapon/tank/emergency/oxygen/engi,
-/obj/item/weapon/tank/emergency/oxygen/engi,
-/obj/item/weapon/tank/emergency/oxygen/engi,
-/obj/item/weapon/tank/emergency/oxygen/engi,
-/obj/item/clothing/suit/space/emergency,
-/obj/item/clothing/suit/space/emergency,
-/obj/item/clothing/suit/space/emergency,
-/obj/item/clothing/suit/space/emergency,
-/obj/item/clothing/head/helmet/space/emergency,
-/obj/item/clothing/head/helmet/space/emergency,
-/obj/item/clothing/head/helmet/space/emergency,
-/obj/item/clothing/head/helmet/space/emergency,
-/obj/structure/closet/emcloset/legacy,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/blue_fo)
"CE" = (
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/shuttle/plating,
@@ -11046,9 +10300,6 @@
icon_state = "cult"
},
/area/skipjack_station)
-"CL" = (
-/turf/simulated/shuttle/wall/alien/blue,
-/area/shuttle/blue_fo)
"Da" = (
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 4
@@ -11064,6 +10315,12 @@
pixel_x = 0;
pixel_y = 28
},
+/obj/effect/shuttle_landmark{
+ base_area = /area/ninja_dojo/dojo;
+ base_turf = /turf/unsimulated/floor;
+ landmark_tag = "ninja_base";
+ name = "The Dojo"
+ },
/turf/simulated/shuttle/floor/voidcraft/dark,
/area/shuttle/ninja)
"Dd" = (
@@ -11086,13 +10343,6 @@
dir = 2
},
/area/ninja_dojo/dojo)
-"Dh" = (
-/obj/structure/fans/hardlight,
-/obj/structure/window/reinforced/full,
-/turf/simulated/shuttle/floor/alienplating/blue/half{
- dir = 8
- },
-/area/shuttle/blue_fo)
"Dk" = (
/obj/structure/bed/padded,
/obj/item/weapon/bedsheet/hop,
@@ -11100,13 +10350,6 @@
icon_state = "wood"
},
/area/skipjack_station)
-"Do" = (
-/obj/structure/railing{
- icon_state = "railing0";
- dir = 1
- },
-/turf/simulated/shuttle/floor/alien,
-/area/shuttle/blue_fo)
"Dw" = (
/obj/structure/table/standard,
/obj/item/weapon/reagent_containers/food/snacks/chips,
@@ -11143,28 +10386,12 @@
name = "plating"
},
/area/skipjack_station)
-"DL" = (
-/obj/structure/table/alien/blue,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/blue_fo)
"DM" = (
/obj/structure/kitchenspike,
/turf/unsimulated/floor{
icon_state = "white"
},
/area/skipjack_station)
-"DO" = (
-/obj/structure/flight_left,
-/turf/simulated/shuttle/floor/darkred,
-/area/shuttle/skipjack)
-"DT" = (
-/obj/machinery/computer/shuttle_control/web/excursion/blue,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/blue_fo)
-"DW" = (
-/obj/structure/flight_right,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/blue_fo)
"DZ" = (
/obj/machinery/gibber,
/turf/unsimulated/floor{
@@ -11180,17 +10407,6 @@
},
/turf/simulated/shuttle/floor/black,
/area/shuttle/skipjack)
-"Ek" = (
-/obj/structure/railing{
- icon_state = "railing0";
- dir = 8
- },
-/obj/structure/railing{
- icon_state = "railing0";
- dir = 1
- },
-/turf/simulated/shuttle/floor/alien,
-/area/shuttle/blue_fo)
"Eo" = (
/obj/structure/closet/crate,
/obj/item/clothing/gloves/vox,
@@ -11242,14 +10458,6 @@
icon_state = "white"
},
/area/ninja_dojo/dojo)
-"Ez" = (
-/obj/effect/floor_decal/techfloor/orange{
- icon_state = "techfloororange_edges";
- dir = 4
- },
-/obj/structure/table/alien/blue,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"EA" = (
/turf/unsimulated/floor{
icon_state = "plating";
@@ -11269,14 +10477,6 @@
icon_state = "wood"
},
/area/skipjack_station)
-"EJ" = (
-/obj/effect/floor_decal/techfloor/orange{
- icon_state = "techfloororange_edges";
- dir = 5
- },
-/obj/structure/bed/chair/bay/shuttle,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"EN" = (
/obj/structure/bed/chair{
dir = 4
@@ -11295,10 +10495,6 @@
icon_state = "cult"
},
/area/skipjack_station)
-"EY" = (
-/obj/effect/floor_decal/techfloor/orange,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"EZ" = (
/turf/unsimulated/floor{
icon_state = "asteroid"
@@ -11337,10 +10533,6 @@
icon_state = "dark"
},
/area/ninja_dojo/dojo)
-"FE" = (
-/obj/structure/flight_right,
-/turf/simulated/shuttle/floor/darkred,
-/area/shuttle/skipjack)
"FF" = (
/obj/structure/sink{
icon_state = "sink";
@@ -11415,9 +10607,7 @@
},
/area/ninja_dojo/dojo)
"Ge" = (
-/obj/machinery/computer/shuttle_control/web/heist{
- icon = 'icons/obj/computer.dmi'
- },
+/obj/machinery/computer/shuttle_control/multi/skipjack,
/turf/simulated/shuttle/floor/darkred,
/area/shuttle/skipjack)
"Gi" = (
@@ -11447,22 +10637,6 @@
"Gq" = (
/turf/unsimulated/wall,
/area/beach)
-"Gv" = (
-/obj/effect/floor_decal/techfloor/orange{
- icon_state = "techfloororange_edges";
- dir = 1
- },
-/obj/structure/table/alien/blue,
-/obj/item/device/perfect_tele/alien/bluefo{
- pixel_x = 6;
- pixel_y = 3
- },
-/obj/item/device/perfect_tele/alien/bluefo{
- pixel_x = -6;
- pixel_y = 3
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"Gw" = (
/obj/effect/overlay/palmtree_l,
/turf/unsimulated/beach/sand,
@@ -11508,22 +10682,6 @@
/obj/random/rigsuit,
/turf/simulated/shuttle/floor/darkred,
/area/shuttle/skipjack)
-"Hi" = (
-/obj/structure/table/alien/blue,
-/obj/item/device/perfect_tele/alien/bluefo{
- pixel_x = -6;
- pixel_y = 3
- },
-/obj/item/device/perfect_tele/alien/bluefo{
- pixel_x = 6;
- pixel_y = 3
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
-"Hl" = (
-/obj/effect/floor_decal/industrial/outline/blue,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"Hm" = (
/obj/item/weapon/ore,
/turf/unsimulated/floor{
@@ -11538,17 +10696,6 @@
icon_state = "wood"
},
/area/ninja_dojo/dojo)
-"Hs" = (
-/obj/structure/railing{
- icon_state = "railing0";
- dir = 4
- },
-/obj/structure/railing{
- icon_state = "railing0";
- dir = 1
- },
-/turf/simulated/shuttle/floor/alien,
-/area/shuttle/blue_fo)
"HD" = (
/obj/structure/table/steel_reinforced,
/obj/machinery/cell_charger,
@@ -11588,19 +10735,6 @@
icon_state = "asteroid"
},
/area/skipjack_station)
-"HO" = (
-/obj/machinery/power/apc{
- dir = 1;
- name = "north bump";
- pixel_x = 0;
- pixel_y = 24
- },
-/obj/structure/cable{
- icon_state = "0-4";
- d2 = 4
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/blue_fo)
"HS" = (
/obj/item/robot_parts/head,
/turf/simulated/shuttle/plating,
@@ -11724,7 +10858,7 @@
base_area = /area/space;
base_turf = /turf/space;
docking_controller = "trade_shuttle_bay";
- landmark_tag = "trade_cc";
+ landmark_tag = "trade_dock";
name = "Trader Station"
},
/turf/simulated/shuttle/floor/black,
@@ -11753,6 +10887,13 @@
id_tag = "vox_east_sensor";
pixel_x = -25
},
+/obj/effect/shuttle_landmark{
+ base_area = /area/space;
+ base_turf = /turf/space;
+ docking_controller = null;
+ landmark_tag = "skipjack_base";
+ name = "The Hideaway"
+ },
/turf/simulated/shuttle/plating,
/area/shuttle/skipjack)
"IW" = (
@@ -11847,13 +10988,6 @@
icon_state = "dark"
},
/area/ninja_dojo/dojo)
-"JF" = (
-/obj/effect/floor_decal/techfloor/orange{
- icon_state = "techfloororange_edges";
- dir = 5
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"JJ" = (
/obj/machinery/door/airlock/hatch{
req_access = list(150)
@@ -11874,19 +11008,6 @@
},
/turf/simulated/shuttle/plating,
/area/shuttle/skipjack)
-"JN" = (
-/obj/effect/map_effect/perma_light/brighter,
-/obj/structure/handrail{
- icon_state = "handrail";
- dir = 1
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/blue_fo)
-"JR" = (
-/obj/structure/fans/hardlight,
-/obj/structure/window/reinforced/full,
-/turf/simulated/shuttle/floor/alienplating/blue/half,
-/area/shuttle/blue_fo)
"JW" = (
/turf/unsimulated/beach/water{
density = 1;
@@ -11907,89 +11028,19 @@
},
/turf/simulated/shuttle/plating,
/area/shuttle/skipjack)
-"Kb" = (
-/obj/structure/bed/chair/bay/shuttle{
- icon_state = "shuttle_chair_preview";
- dir = 8
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
-"Kc" = (
-/obj/machinery/door/airlock/alien/blue,
-/obj/effect/floor_decal/techfloor/orange{
- icon_state = "techfloororange_edges";
- dir = 8
- },
-/obj/effect/floor_decal/techfloor/orange{
- icon_state = "techfloororange_edges";
- dir = 4
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
-"Kd" = (
-/obj/effect/map_effect/perma_light/brighter,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
-"Ke" = (
-/obj/effect/floor_decal/techfloor/orange{
- icon_state = "techfloororange_edges";
- dir = 8
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
-"Kf" = (
-/obj/effect/floor_decal/techfloor/orange{
- icon_state = "techfloororange_edges";
- dir = 1
- },
-/obj/structure/bed/chair/bay/shuttle{
- icon_state = "shuttle_chair_preview";
- dir = 8
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"Kh" = (
/obj/item/weapon/bedsheet/orange,
/obj/structure/bed/padded,
/turf/simulated/shuttle/floor/red,
/area/shuttle/skipjack)
-"Kl" = (
-/obj/effect/map_effect/perma_light/brighter,
-/obj/structure/bed/chair/bay/shuttle{
- icon_state = "shuttle_chair_preview";
- dir = 1
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/blue_fo)
-"Kz" = (
-/turf/simulated/shuttle/wall/alien/blue{
- interior_corner = 1
- },
-/area/shuttle/blue_fo)
-"KD" = (
-/obj/machinery/door/airlock/alien/blue{
- frequency = 1380;
- id_tag = "hybrid_shuttle_afts"
- },
-/obj/structure/fans/hardlight,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/blue_fo)
"KH" = (
/obj/machinery/light{
dir = 8;
icon_state = "tube1";
pixel_y = 0
},
-/obj/machinery/computer/station_alert,
/turf/simulated/shuttle/floor/voidcraft/light,
/area/shuttle/ninja)
-"KK" = (
-/obj/structure/bed/alien{
- icon = 'icons/obj/abductor_vr.dmi'
- },
-/obj/item/weapon/bedsheet/blue,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/blue_fo)
"KL" = (
/obj/structure/table/rack,
/obj/item/weapon/melee/energy/sword/pirate,
@@ -12053,14 +11104,6 @@
/obj/machinery/floodlight,
/turf/simulated/shuttle/plating,
/area/shuttle/skipjack)
-"Lx" = (
-/obj/structure/railing{
- icon_state = "railing0";
- dir = 4
- },
-/obj/structure/railing,
-/turf/simulated/shuttle/floor/alien,
-/area/shuttle/blue_fo)
"Ly" = (
/obj/effect/floor_decal/carpet,
/obj/effect/floor_decal/carpet{
@@ -12162,19 +11205,6 @@
icon_state = "carpet"
},
/area/skipjack_station)
-"Mb" = (
-/obj/machinery/power/smes/buildable/hybrid,
-/obj/structure/cable{
- d2 = 8;
- icon_state = "0-8"
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/blue_fo)
-"Me" = (
-/obj/effect/floor_decal/techfloor/orange,
-/obj/structure/table/alien/blue,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"Mg" = (
/turf/unsimulated/wall{
desc = "That looks like it doesn't open easily.";
@@ -12184,12 +11214,6 @@
},
/area/skipjack_station)
"Ml" = (
-/obj/effect/shuttle_landmark{
- base_area = /area/ninja_dojo/dojo;
- base_turf = /turf/unsimulated/floor;
- landmark_tag = "ninja_base";
- name = "The Dojo"
- },
/turf/simulated/shuttle/wall/voidcraft/blue,
/area/shuttle/ninja)
"Mq" = (
@@ -12250,11 +11274,6 @@
},
/turf/simulated/shuttle/plating,
/area/shuttle/skipjack)
-"MU" = (
-/obj/effect/map_effect/perma_light/brighter,
-/obj/structure/table/alien/blue,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"Ng" = (
/turf/unsimulated/floor{
icon = 'icons/turf/flooring/wood.dmi';
@@ -12272,14 +11291,6 @@
icon_state = "wood"
},
/area/skipjack_station)
-"Nl" = (
-/obj/effect/floor_decal/techfloor/orange/corner,
-/obj/effect/floor_decal/techfloor/orange/corner{
- icon_state = "techfloororange_corners";
- dir = 8
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/blue_fo)
"No" = (
/obj/item/weapon/beach_ball,
/turf/unsimulated/beach/sand,
@@ -12355,14 +11366,6 @@
/obj/item/weapon/card/emag,
/turf/simulated/shuttle/plating,
/area/shuttle/skipjack)
-"Ob" = (
-/obj/effect/floor_decal/techfloor/orange/corner,
-/obj/effect/floor_decal/techfloor/orange/corner{
- icon_state = "techfloororange_corners";
- dir = 8
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"Od" = (
/obj/structure/sink{
dir = 4;
@@ -12372,45 +11375,6 @@
},
/turf/simulated/shuttle/floor/white,
/area/shuttle/skipjack)
-"Oj" = (
-/obj/structure/grille,
-/obj/structure/window/reinforced,
-/obj/structure/window/reinforced{
- dir = 1
- },
-/obj/machinery/door/blast/regular{
- id = "skipjackshutters";
- name = "Skipjack Blast Shielding"
- },
-/obj/structure/window/reinforced/full,
-/obj/effect/shuttle_landmark{
- base_area = /area/space;
- base_turf = /turf/space;
- docking_controller = null;
- landmark_tag = "skipjack_base";
- name = "The Hideaway"
- },
-/turf/simulated/shuttle/plating,
-/area/shuttle/skipjack)
-"On" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
- icon_state = "techfloororange_corners";
- dir = 4
- },
-/obj/effect/floor_decal/techfloor/orange/corner,
-/obj/effect/shuttle_landmark{
- base_area = /area/space;
- base_turf = /turf/space;
- landmark_tag = "bluefo_start";
- name = "Deepish Space"
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/blue_fo)
-"Oo" = (
-/obj/structure/shuttle/engine/propulsion,
-/turf/space,
-/turf/simulated/shuttle/plating/airless/carry,
-/area/shuttle/skipjack)
"Ow" = (
/obj/structure/table/steel_reinforced,
/obj/item/rig_module/mounted/energy_blade,
@@ -12451,6 +11415,9 @@
/obj/item/device/suit_cooling_unit,
/turf/simulated/shuttle/plating,
/area/shuttle/skipjack)
+"OY" = (
+/turf/unsimulated/map,
+/area/overmap)
"OZ" = (
/obj/machinery/portable_atmospherics/canister/oxygen,
/turf/simulated/shuttle/floor/darkred,
@@ -12565,25 +11532,6 @@
/obj/structure/window/reinforced/full,
/turf/simulated/shuttle/plating,
/area/shuttle/skipjack)
-"Ql" = (
-/obj/structure/bed/chair/sofa/right{
- dir = 1;
- icon_state = "sofaend_right";
- sofa_material = "black"
- },
-/obj/effect/floor_decal/techfloor/orange,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
-"Qo" = (
-/obj/effect/floor_decal/techfloor/orange{
- icon_state = "techfloororange_edges";
- dir = 4
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
-"Qs" = (
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/blue_fo)
"Qw" = (
/turf/unsimulated/wall{
icon = 'icons/obj/doors/Dooruranium.dmi';
@@ -12647,15 +11595,6 @@
icon_state = "cult"
},
/area/skipjack_station)
-"Rd" = (
-/obj/structure/prop/alien/pod/hybrid,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/blue_fo)
-"Ri" = (
-/obj/machinery/sleep_console,
-/obj/effect/floor_decal/techfloor/orange,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"Rn" = (
/obj/item/weapon/storage/box/syndie_kit/spy,
/turf/unsimulated/floor{
@@ -12683,10 +11622,6 @@
},
/turf/simulated/shuttle/plating,
/area/shuttle/skipjack)
-"RE" = (
-/obj/structure/table/alien/blue,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"RN" = (
/obj/structure/inflatable,
/turf/unsimulated/floor{
@@ -12773,34 +11708,6 @@
},
/turf/simulated/wall/skipjack,
/area/shuttle/skipjack)
-"SA" = (
-/obj/structure/flight_left{
- icon = 'icons/obj/flight_computer_vr.dmi'
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/blue_fo)
-"SB" = (
-/obj/machinery/power/terminal{
- icon_state = "term";
- dir = 1
- },
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/blue_fo)
-"SH" = (
-/obj/effect/floor_decal/techfloor/orange{
- icon_state = "techfloororange_edges";
- dir = 1
- },
-/obj/machinery/recharger/wallcharger{
- pixel_x = 4;
- pixel_y = 30
- },
-/obj/machinery/recharger/wallcharger{
- pixel_x = 4;
- pixel_y = 20
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"SI" = (
/obj/structure/table/standard,
/obj/item/weapon/storage/box/glasses/square{
@@ -12852,16 +11759,6 @@
},
/turf/simulated/shuttle/plating,
/area/shuttle/skipjack)
-"SV" = (
-/obj/structure/bed/chair/sofa/left{
- sofa_material = "black"
- },
-/obj/effect/floor_decal/techfloor/orange{
- icon_state = "techfloororange_edges";
- dir = 1
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"Te" = (
/obj/effect/floor_decal/carpet{
dir = 1
@@ -12889,13 +11786,6 @@
icon_state = "carpet"
},
/area/skipjack_station)
-"Tk" = (
-/obj/structure/fans/hardlight,
-/obj/structure/window/reinforced/full,
-/turf/simulated/shuttle/floor/alienplating/blue/half{
- dir = 4
- },
-/area/shuttle/blue_fo)
"Tn" = (
/obj/structure/table/standard,
/obj/item/clothing/under/color/rainbow,
@@ -12927,17 +11817,6 @@
icon_state = "steel"
},
/area/skipjack_station)
-"TA" = (
-/obj/effect/floor_decal/techfloor/orange{
- icon_state = "techfloororange_edges";
- dir = 8
- },
-/obj/structure/bed/chair/bay/shuttle{
- icon_state = "shuttle_chair_preview";
- dir = 4
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"TF" = (
/obj/structure/bed/chair,
/obj/effect/landmark{
@@ -12962,16 +11841,6 @@
icon_state = "wood"
},
/area/ninja_dojo/dojo)
-"Uc" = (
-/obj/machinery/sleeper{
- dir = 8
- },
-/obj/effect/floor_decal/techfloor/orange{
- icon_state = "techfloororange_edges";
- dir = 9
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"Ue" = (
/obj/item/weapon/ore,
/turf/unsimulated/floor{
@@ -13034,26 +11903,6 @@
/obj/item/stack/medical/advanced/bruise_pack,
/turf/simulated/shuttle/floor/white,
/area/shuttle/skipjack)
-"UZ" = (
-/obj/structure/railing{
- icon_state = "railing0";
- dir = 1
- },
-/obj/structure/railing{
- icon_state = "railing0";
- dir = 8
- },
-/turf/simulated/shuttle/floor/alien,
-/area/shuttle/blue_fo)
-"Vs" = (
-/obj/structure/railing{
- icon_state = "railing0";
- dir = 1
- },
-/turf/simulated/shuttle/wall/alien/blue{
- interior_corner = 1
- },
-/area/shuttle/blue_fo)
"Vx" = (
/turf/unsimulated/floor{
icon_state = "wood"
@@ -13080,13 +11929,6 @@
icon_state = "wood"
},
/area/ninja_dojo/dojo)
-"VK" = (
-/obj/effect/floor_decal/techfloor/orange{
- icon_state = "techfloororange_edges";
- dir = 6
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"VT" = (
/obj/machinery/door/airlock/hatch{
req_access = list(150)
@@ -13196,18 +12038,9 @@
icon_state = "wood_broken2"
},
/area/ninja_dojo/dojo)
-"Xf" = (
-/obj/machinery/door/airlock/alien/blue,
-/obj/effect/floor_decal/techfloor/orange{
- icon_state = "techfloororange_edges";
- dir = 4
- },
-/obj/effect/floor_decal/techfloor/orange{
- icon_state = "techfloororange_edges";
- dir = 8
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
+"Xl" = (
+/turf/unsimulated/map/edge,
+/area/overmap)
"Xo" = (
/obj/structure/table/steel,
/obj/item/clothing/glasses/regular,
@@ -13296,14 +12129,6 @@
/obj/structure/closet,
/turf/unsimulated/beach/sand,
/area/beach)
-"Yb" = (
-/obj/effect/floor_decal/techfloor/orange/corner{
- icon_state = "techfloororange_corners";
- dir = 8
- },
-/obj/effect/floor_decal/techfloor/orange/corner,
-/turf/simulated/floor/tiled/techfloor,
-/area/shuttle/blue_fo)
"Yd" = (
/obj/structure/bed/padded,
/obj/item/weapon/bedsheet/green,
@@ -13384,10 +12209,6 @@
},
/turf/simulated/shuttle/plating,
/area/shuttle/skipjack)
-"Yx" = (
-/obj/machinery/door/airlock/alien/blue,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"Yz" = (
/obj/structure/table/steel_reinforced,
/obj/item/weapon/storage/toolbox/syndicate{
@@ -13451,24 +12272,6 @@
icon_state = "white"
},
/area/skipjack_station)
-"Zy" = (
-/obj/structure/table/alien/blue,
-/obj/machinery/button/remote/airlock{
- name = "Aft Door Bolts";
- pixel_x = 6;
- pixel_y = 2;
- id = "hybrid_shuttle_afts";
- specialfunctions = 4
- },
-/obj/machinery/embedded_controller/radio/simple_docking_controller{
- pixel_x = -6;
- pixel_y = 0;
- id_tag = "hybrid_shuttle_docker";
- frequency = 1380;
- tag_door = "hybrid_shuttle_afts"
- },
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/blue_fo)
"ZA" = (
/turf/simulated/shuttle/floor/darkred,
/area/shuttle/skipjack)
@@ -13602,80 +12405,80 @@ ap
ap
ap
ap
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Qw
-Qw
-Nz
-Nz
-Nz
-Nz
-Nz
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-XL
-Af
-Af
-Af
-Af
-Af
-Af
-Af
-Af
-Af
-Af
-Af
-Af
-Af
-Af
-Af
-Af
-Af
-Af
-Af
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
"}
(2,1,1) = {"
aq
@@ -13744,60 +12547,6 @@ ap
ap
ap
ap
-Nz
-Wy
-JE
-xf
-Nz
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-Nz
-Bg
-Bg
-OK
-Fw
-Ac
-DC
-HD
-ar
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
ap
ap
ap
@@ -13817,7 +12566,61 @@ ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
"}
(3,1,1) = {"
aq
@@ -13886,59 +12689,6 @@ ap
ap
ap
ap
-Nz
-BC
-JE
-xf
-Nz
-yM
-yM
-yM
-CG
-yM
-yM
-vs
-yM
-yM
-yM
-yM
-yM
-yM
-Nz
-Bg
-Bg
-QC
-xf
-xf
-YA
-Ow
-ar
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
ap
ap
ap
@@ -13952,14 +12702,67 @@ ap
ap
ap
ap
-aB
ap
ap
ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
"}
(4,1,1) = {"
aq
@@ -14028,58 +12831,6 @@ ap
ap
ap
ap
-Nz
-QZ
-JE
-xf
-Nz
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-Nz
-Bg
-Bg
-OK
-Pi
-yv
-Yz
-Ji
-ar
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
ap
ap
ap
@@ -14094,14 +12845,66 @@ ap
ap
ap
ap
-aB
-aB
-aB
ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
"}
(5,1,1) = {"
aq
@@ -14170,53 +12973,6 @@ ap
ap
ap
ap
-Nz
-Nz
-QC
-Nz
-Nz
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-CG
-yM
-yM
-OK
-Bg
-Bg
-Nz
-Nz
-Nz
-Nz
-Nz
-ar
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
ap
ap
ap
@@ -14235,15 +12991,62 @@ ap
ap
ap
ap
-aB
-aB
-aB
-aB
ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
"}
(6,1,1) = {"
aq
@@ -14309,54 +13112,6 @@ ap
ap
ap
ap
-Nz
-Nz
-Nz
-Nz
-Bg
-Bg
-Bg
-Nz
-Nz
-Nz
-Nz
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-OK
-Bg
-Bg
-HX
-OK
-Ye
-Ye
-Ew
-ar
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
ap
ap
ap
@@ -14377,15 +13132,63 @@ ap
ap
ap
ap
-aB
-aB
-aB
-aB
-aB
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
"}
(7,1,1) = {"
aq
@@ -14451,53 +13254,6 @@ ap
ap
ap
ap
-Nz
-WY
-FM
-IL
-Bg
-Bg
-Bg
-Bg
-Bg
-wA
-Nz
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-OK
-Bg
-Bg
-Bg
-uZ
-Ye
-Ye
-At
-ar
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
ap
ap
ap
@@ -14519,15 +13275,62 @@ ap
ap
ap
ap
-aB
-aB
-aB
-aB
-aB
-aB
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
"}
(8,1,1) = {"
aq
@@ -14593,53 +13396,6 @@ ap
ap
ap
ap
-Nz
-Bg
-Bg
-Bg
-Bg
-Bg
-Bg
-Bg
-Bg
-wA
-Nz
-RU
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-OK
-Bg
-Bg
-Bg
-OK
-Ye
-Ye
-FX
-ar
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
ap
ap
ap
@@ -14662,14 +13418,61 @@ ap
ap
ap
ap
-aB
-aB
-aB
-aB
-aB
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
"}
(9,1,1) = {"
aq
@@ -14735,52 +13538,6 @@ ap
ap
ap
ap
-Nz
-Bg
-Bg
-Te
-He
-He
-He
-Ly
-Bg
-wA
-Nz
-xW
-xW
-xW
-xW
-xW
-xW
-xW
-xW
-xW
-xW
-Nz
-Bg
-Bg
-Bg
-Nz
-Nz
-Nz
-Nz
-ar
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
ap
ap
ap
@@ -14795,8 +13552,6 @@ ap
ap
ap
ap
-JX
-JX
ap
ap
ap
@@ -14805,13 +13560,61 @@ ap
ap
ap
ap
-aB
-aB
-aB
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
"}
(10,1,1) = {"
aq
@@ -14877,69 +13680,6 @@ ap
ap
ap
ap
-Nz
-TO
-Bg
-AF
-FV
-FV
-FV
-Dd
-Bg
-Bg
-OK
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-Ra
-OK
-Bg
-Bg
-Bg
-Bg
-Bg
-Bg
-Qw
-ar
-Id
-Id
-Id
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-Wf
-Wf
-Wf
-Wf
-Wf
-ZZ
-ZZ
-ZZ
-JX
-JX
-JX
-JX
-JX
-JX
-JX
-xV
-vG
-Aw
-JX
-JX
-JX
ap
ap
ap
@@ -14953,7 +13693,70 @@ ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
"}
(11,1,1) = {"
aq
@@ -15019,69 +13822,6 @@ ap
ap
ap
ap
-Nz
-FN
-Bg
-AF
-FV
-FV
-FV
-Dd
-Bg
-Bg
-AP
-Jk
-Jk
-Jk
-Jk
-Jk
-Jk
-Jk
-Jk
-Jk
-Jk
-AP
-Bg
-Bg
-Bg
-Bg
-Bg
-Bg
-Nz
-Wf
-Id
-EZ
-Id
-Id
-aB
-Wf
-Wf
-Wf
-Wf
-Wf
-Wf
-Wf
-Wf
-Tw
-Tw
-Bd
-Tw
-IM
-yw
-IM
-PQ
-WM
-Zo
-Wr
-JY
-CE
-CE
-CE
-Av
-Av
-YX
-Gz
-Oo
ap
ap
ap
@@ -15095,7 +13835,70 @@ ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
"}
(12,1,1) = {"
aq
@@ -15161,69 +13964,6 @@ ap
ap
ap
ap
-Nz
-TO
-Bg
-AF
-FV
-FV
-FV
-Dd
-Bg
-Bg
-OK
-KX
-KX
-KX
-KX
-KX
-KX
-KX
-KX
-Jk
-Jk
-OK
-IP
-Bg
-Bg
-Bg
-Bg
-Bg
-Qw
-Wf
-Id
-EZ
-EZ
-Id
-Id
-Wf
-Be
-vI
-Vx
-vI
-EH
-Wf
-ZY
-Tw
-Tw
-Tw
-Bd
-IM
-xG
-IM
-Wn
-Cg
-PY
-JX
-Yf
-xt
-xt
-xt
-xt
-xt
-Bi
-Gz
-Oo
ap
ap
ap
@@ -15237,7 +13977,70 @@ ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
"}
(13,1,1) = {"
aq
@@ -15303,69 +14106,6 @@ ap
ap
ap
ap
-Nz
-Bg
-Bg
-Fs
-SL
-SL
-SL
-Hf
-Bg
-wA
-Nz
-WX
-WX
-WX
-WX
-WX
-WX
-WX
-WX
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Bg
-Bg
-Nz
-Wf
-EZ
-EZ
-EZ
-EZ
-Id
-Wf
-Wx
-Vx
-yD
-Vx
-Wx
-Wf
-Tw
-Tw
-Tw
-Wf
-Wf
-Gx
-Gx
-Gx
-JX
-JX
-JX
-JX
-JX
-OF
-xt
-xt
-Lm
-xt
-Bi
-JX
-JX
ap
ap
ap
@@ -15379,7 +14119,70 @@ ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
"}
(14,1,1) = {"
aq
@@ -15445,73 +14248,6 @@ ap
ap
ap
ap
-Nz
-Bg
-Bg
-Bg
-Bg
-Bg
-Bg
-Bg
-Ng
-wA
-Nz
-RU
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-Nz
-Yp
-Bg
-Bg
-Bg
-BE
-OK
-Bg
-Bg
-Nz
-Wf
-Wf
-RN
-Ww
-Wf
-Wf
-Wf
-uX
-vI
-Vx
-vI
-AY
-Wf
-Tw
-Tw
-Tw
-zv
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-JX
-LJ
-xt
-xt
-DF
-JX
-JX
-JX
-JX
-JX
-JX
-JX
-JX
ap
ap
ap
@@ -15521,7 +14257,74 @@ ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
"}
(15,1,1) = {"
aq
@@ -15587,73 +14390,6 @@ ap
ap
ap
ap
-Nz
-Hq
-Bg
-Bg
-Bg
-Bg
-Bg
-Bg
-Bg
-wA
-Nz
-yM
-yM
-yM
-yM
-yM
-CG
-yM
-yM
-OK
-Bg
-Bg
-wA
-Bg
-Bg
-Nz
-Bg
-Bg
-Nz
-Wf
-uY
-Tw
-EZ
-vt
-Tw
-Wf
-Wx
-Vx
-Vx
-Vx
-Wx
-Wf
-Bd
-Tw
-Tw
-zv
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-JX
-KZ
-Wa
-xt
-xt
-WG
-Ak
-Ak
-IW
-Ak
-Ak
-JX
-JX
ap
ap
ap
@@ -15663,7 +14399,74 @@ ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
"}
(16,1,1) = {"
aq
@@ -15725,78 +14528,6 @@ ap
ap
ap
ap
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Bg
-Bg
-Bg
-Nz
-Nz
-Nz
-Nz
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-OK
-Bg
-wA
-VH
-yf
-Bg
-Bh
-Bg
-Bg
-Nz
-Wf
-uY
-Tw
-Tw
-Tw
-Tw
-Wf
-Yd
-vI
-Vx
-Po
-Dk
-Wf
-Bd
-Bd
-Tw
-zv
-ap
-ap
-ap
-ap
-ap
-ap
-JX
-JX
-JX
-JX
-JX
-ZR
-JX
-JX
-we
-Ak
-Mq
-XI
-Ak
-vu
-JX
-JX
ap
ap
ap
@@ -15805,7 +14536,79 @@ ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
"}
(17,1,1) = {"
gp
@@ -15867,79 +14670,6 @@ ap
ap
ap
ap
-Nz
-PI
-PI
-PI
-QU
-yM
-yM
-Nz
-Nz
-zT
-Nz
-Nz
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-OK
-Bg
-Bg
-wA
-Bg
-Bg
-Nz
-Bg
-Bg
-Nz
-Wf
-IC
-Tw
-Tw
-Tw
-Tw
-Wf
-Nk
-LY
-Tg
-AV
-Wx
-Wf
-Wf
-Wf
-vZ
-Wf
-Wf
-Wf
-ap
-ap
-JX
-JX
-JX
-JX
-Hg
-KL
-Yn
-ZA
-zn
-JX
-Ak
-Ak
-Ak
-Ak
-Ec
-Ak
-JX
-JX
-JX
ap
ap
ap
@@ -15947,7 +14677,80 @@ ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
"}
(18,1,1) = {"
gp
@@ -16009,79 +14812,6 @@ ap
ap
ap
ap
-Nz
-PI
-QU
-QU
-yM
-vs
-yM
-OK
-EA
-EA
-EA
-OK
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-Nz
-Jv
-Bg
-Bg
-Bg
-Jv
-OK
-Bg
-Bg
-Nz
-Wf
-Wf
-Wf
-Ig
-Wf
-Wf
-Wf
-Wf
-Wf
-ND
-Wf
-Wf
-Wf
-EX
-EX
-EX
-EX
-Rn
-Wf
-ap
-ap
-ap
-xL
-PX
-Ai
-ZA
-ZA
-pF
-ZA
-vK
-JX
-SU
-RB
-Yq
-JX
-JX
-JX
-JX
-Gz
-Oo
ap
ap
ap
@@ -16089,7 +14819,80 @@ ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
"}
(19,1,1) = {"
gp
@@ -16151,79 +14954,6 @@ ap
ap
ap
ap
-Nz
-PI
-QU
-yM
-yM
-yM
-yM
-OK
-EA
-EA
-EA
-OK
-yM
-vs
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Bg
-Bg
-Nz
-Wf
-ZY
-Tw
-Tw
-Tw
-Tw
-Tw
-Tw
-Tw
-Tw
-Tw
-Bd
-zv
-EX
-EX
-Wg
-Wg
-EX
-zv
-ap
-ap
-ap
-Qb
-DO
-ZA
-ZA
-ZA
-MQ
-ZA
-ZA
-NT
-EN
-EN
-Zu
-JX
-Jg
-Kh
-zs
-Gz
-Oo
ap
ap
ap
@@ -16231,7 +14961,80 @@ ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Xl
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+OY
+Xl
"}
(20,1,1) = {"
gp
@@ -16293,79 +15096,6 @@ ap
ap
ap
ap
-Nz
-PI
-QU
-yM
-vs
-yM
-yM
-Nz
-Nz
-zT
-Nz
-Nz
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-OK
-Cj
-Bg
-Bg
-Nz
-Bg
-Bg
-Nz
-Wf
-Tw
-Tw
-Tw
-Tw
-Tw
-Tw
-Tw
-Tw
-Tw
-Tw
-Tw
-vZ
-EX
-CK
-PL
-Lb
-SM
-zv
-ap
-ap
-ap
-Oj
-Ge
-OH
-ZA
-ZA
-ZR
-ZA
-ZA
-Xo
-QT
-Gk
-ZA
-EF
-UB
-UB
-VA
-Gz
-Oo
ap
ap
ap
@@ -16373,7 +15103,80 @@ ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
+Xl
"}
(21,1,1) = {"
gp
@@ -16435,79 +15238,6 @@ ap
ap
ap
ap
-Nz
-PI
-yM
-yM
-yM
-yM
-yM
-yM
-Jc
-Ns
-Jc
-Jc
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-Nz
-FQ
-xX
-Bg
-Bh
-Bg
-Bg
-Nz
-Wf
-Tw
-Ue
-Tw
-Tw
-Tw
-Tw
-Tw
-Tw
-Tw
-Tw
-Tw
-zv
-EX
-EX
-LQ
-LQ
-EX
-zv
-ap
-ap
-ap
-Qb
-FE
-ZA
-ZA
-ZA
-Yn
-ZA
-ZA
-Pw
-yI
-yI
-Zu
-JX
-Ix
-wE
-vX
-Gz
-Oo
ap
ap
ap
@@ -16515,7 +15245,80 @@ ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
"}
(22,1,1) = {"
gp
@@ -16577,79 +15380,6 @@ ap
ap
ap
ap
-Nz
-PI
-vs
-yM
-yM
-yM
-yM
-Jc
-Jc
-Db
-St
-ZB
-Jc
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-Nz
-Nz
-Nz
-Nz
-Nz
-Bg
-Bg
-Bg
-Wf
-Wf
-Np
-Wf
-Wf
-Wf
-Ny
-Wf
-Wf
-Wf
-Tw
-Tw
-Wf
-Rb
-EX
-EX
-EX
-EX
-Wf
-ap
-ap
-ap
-LN
-Pt
-qK
-ZA
-ZA
-pF
-ZA
-OZ
-JX
-SU
-RB
-Yq
-JX
-JX
-JX
-JX
-Gz
-Oo
ap
ap
ap
@@ -16657,7 +15387,80 @@ ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
"}
(23,1,1) = {"
gp
@@ -16719,79 +15522,6 @@ ap
ap
ap
ap
-Nz
-PI
-yM
-yM
-yM
-yM
-yM
-wQ
-ZB
-Jc
-Un
-ZB
-ZB
-Jc
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-Nz
-FQ
-xX
-Bg
-Bh
-Bg
-Bg
-Bg
-Wf
-Id
-Id
-SI
-Fl
-Ju
-QB
-QB
-OQ
-Wf
-Tw
-Tw
-Wf
-Wf
-Wf
-vZ
-Wf
-Wf
-Wf
-ap
-ap
-JX
-JX
-JX
-Sy
-Hg
-KL
-MQ
-ZA
-BN
-JX
-Bo
-TL
-TL
-Zm
-TL
-Ab
-JX
-JX
-JX
ap
ap
ap
@@ -16799,7 +15529,80 @@ ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
"}
(24,1,1) = {"
gp
@@ -16861,78 +15664,6 @@ ap
ap
ap
ap
-Nz
-PI
-yM
-Jc
-Jc
-Jc
-Jc
-Jc
-Ir
-Sc
-vY
-KH
-MB
-Jc
-Jc
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-vs
-yM
-yM
-OK
-ya
-Bg
-Bg
-Nz
-Bg
-Bg
-Hq
-ar
-aB
-Id
-uU
-QB
-QB
-QB
-QB
-DZ
-Wf
-Tw
-Tw
-Wf
-wU
-Tw
-Tw
-zv
-ap
-ap
-ap
-ap
-ap
-ap
-JX
-JX
-JX
-JX
-JX
-ZR
-JX
-JX
-Es
-TL
-TL
-TL
-TL
-Sv
-JX
-JX
ap
ap
ap
@@ -16941,7 +15672,79 @@ ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
"}
(25,1,1) = {"
gp
@@ -17003,77 +15806,6 @@ ap
ap
ap
ap
-Nz
-PI
-yM
-yM
-yM
-yM
-wQ
-Jc
-KN
-Je
-wi
-wi
-wi
-vq
-wb
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-Nz
-Nz
-Nz
-Nz
-Nz
-Bg
-Bg
-IA
-ar
-aB
-Id
-Id
-Zv
-QB
-QB
-QB
-DM
-Wf
-Tw
-Tw
-Wf
-Tw
-Tw
-Tw
-zv
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-JX
-UL
-XW
-xt
-xt
-VT
-TL
-Od
-UO
-Jz
-HJ
-JX
-JX
ap
ap
ap
@@ -17083,7 +15815,78 @@ ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
"}
(26,1,1) = {"
gp
@@ -17145,77 +15948,6 @@ ap
ap
ap
ap
-Nz
-PI
-yM
-yM
-yM
-yM
-Ml
-Jc
-yl
-Je
-wi
-wi
-IG
-xQ
-HL
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-Nz
-Ch
-Cl
-FF
-Nz
-Xu
-Nz
-Nz
-ar
-aB
-aB
-Id
-Id
-Np
-Rp
-IR
-Wf
-Wf
-Tw
-Tw
-Wf
-Tw
-Tw
-Tw
-zv
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-JX
-KT
-xt
-xt
-zL
-JX
-JX
-JX
-JX
-JX
-JX
-JX
-JX
ap
ap
ap
@@ -17225,7 +15957,78 @@ ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
"}
(27,1,1) = {"
gp
@@ -17287,73 +16090,6 @@ ap
ap
ap
ap
-Nz
-PI
-yM
-yM
-yM
-yM
-wQ
-Jc
-YS
-Je
-wi
-wi
-wi
-xD
-Gi
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-Nz
-Yi
-Yi
-Yi
-Yi
-Yi
-wq
-Nz
-ar
-aB
-aB
-aB
-Id
-Id
-Wf
-Wf
-Wf
-Tw
-Tw
-Tw
-Wf
-Tw
-Tw
-Tw
-Wf
-Wf
-ZZ
-ZZ
-ZZ
-JX
-JX
-JX
-JX
-JX
-NY
-xt
-wS
-xt
-Dx
-Cf
-JX
-JX
ap
ap
ap
@@ -17367,7 +16103,74 @@ ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
"}
(28,1,1) = {"
gp
@@ -17429,73 +16232,6 @@ ap
ap
ap
ap
-Nz
-PI
-yM
-Jc
-Jc
-Jc
-Jc
-Jc
-wa
-Cu
-wi
-vC
-wv
-Jc
-Jc
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-Nz
-QJ
-Yi
-Yi
-Yi
-Yi
-Dg
-Nz
-ar
-aB
-aB
-aB
-Wf
-Hm
-Jp
-Mx
-Wf
-Tw
-Tw
-Tw
-Wf
-xR
-Bd
-Tw
-Tw
-Tw
-IM
-yw
-IM
-Bj
-IS
-BH
-JX
-AZ
-xt
-HS
-xt
-QI
-XG
-Lz
-Gz
-Oo
ap
ap
ap
@@ -17509,7 +16245,74 @@ ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
"}
(29,1,1) = {"
gp
@@ -17571,73 +16374,6 @@ ap
ap
ap
ap
-Nz
-PI
-yM
-yM
-yM
-yM
-yM
-wQ
-ZB
-wi
-wi
-ZB
-ZB
-Jc
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-ar
-aB
-aB
-aB
-Wf
-XT
-Xq
-Xq
-Ig
-Tw
-Tw
-Wf
-Wf
-Wf
-Bd
-Bd
-Tw
-Tw
-IM
-xG
-IM
-Za
-Li
-FO
-LT
-JK
-CE
-CE
-CE
-CE
-OX
-yA
-Gz
-Oo
ap
ap
ap
@@ -17651,7 +16387,74 @@ ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
"}
(30,1,1) = {"
gp
@@ -17713,73 +16516,6 @@ ap
ap
ap
ap
-Nz
-PI
-yM
-yM
-yM
-yM
-yM
-Jc
-Jc
-ui
-zb
-ZB
-Jc
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-Nz
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ar
-aB
-aB
-aB
-Wf
-VW
-Xq
-Xq
-Wf
-Tw
-Tw
-Wf
-Id
-Wf
-Wf
-Wf
-Wf
-Wf
-Gx
-Gx
-Gx
-JX
-JX
-JX
-JX
-JX
-JX
-JX
-xV
-vG
-Aw
-JX
-JX
-JX
ap
ap
ap
@@ -17793,7 +16529,74 @@ ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
"}
(31,1,1) = {"
gp
@@ -17855,72 +16658,6 @@ ap
ap
ap
ap
-Nz
-PI
-QU
-QU
-yM
-yM
-yM
-yM
-Jc
-Jc
-Jc
-Jc
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-CG
-yM
-yM
-Nz
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ar
-aB
-aB
-aB
-Wf
-wj
-MO
-LH
-Wf
-Np
-Tw
-Wf
-Id
-Id
-Id
-Id
-Id
-Id
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-JX
-JX
ap
ap
ap
@@ -17935,7 +16672,73 @@ ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
"}
(32,1,1) = {"
gp
@@ -17997,59 +16800,6 @@ ap
ap
ap
ap
-Nz
-PI
-QU
-QU
-QU
-yM
-yM
-vs
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-Nz
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ar
-aB
-aB
-aB
-Wf
-Wf
-Wf
-Wf
-Wf
-ND
-JJ
-Id
-Id
-Id
-Id
-aB
-aB
-aB
-aB
-aB
ap
ap
ap
@@ -18074,10 +16824,63 @@ ap
ap
ap
ap
-aB
-aB
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
"}
(33,1,1) = {"
gp
@@ -18139,61 +16942,6 @@ ap
ap
ap
ap
-Nz
-PI
-QU
-QU
-QU
-QU
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-Nz
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ar
-aB
-aB
-aB
-Wf
-DK
-PK
-LI
-Wf
-Bd
-Bd
-EU
-Id
-Id
-Id
-Id
-aB
-aB
-aB
-aB
-aB
-aB
ap
ap
ap
@@ -18215,11 +16963,66 @@ ap
ap
ap
ap
-aB
-aB
-aB
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
"}
(34,1,1) = {"
gp
@@ -18281,61 +17084,6 @@ ap
ap
ap
ap
-Nz
-PI
-QU
-QU
-QU
-QU
-QU
-yM
-yM
-yM
-yM
-vs
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-yM
-Nz
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ar
-aB
-aB
-aB
-Wf
-Uq
-Np
-Bk
-Wf
-Ms
-EZ
-Bd
-yL
-EZ
-PS
-Id
-Id
-aB
-aB
-aB
-aB
-aB
ap
ap
ap
@@ -18357,11 +17105,66 @@ ap
ap
ap
ap
-aB
-aB
-aB
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
"}
(35,1,1) = {"
gp
@@ -18423,62 +17226,6 @@ ap
ap
ap
ap
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-Nz
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ar
-aB
-aB
-aB
-Wf
-Iy
-xm
-Pm
-Mg
-EZ
-Ev
-EZ
-EZ
-Uy
-EZ
-RX
-Id
-aB
-aB
-aB
-aB
-aB
-aB
ap
ap
ap
@@ -18499,11 +17246,67 @@ ap
ap
ap
ap
-aB
-aB
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
"}
(36,1,1) = {"
gp
@@ -18598,34 +17401,6 @@ ap
ap
ap
ap
-ar
-aB
-aB
-aB
-Wf
-Tv
-Np
-iO
-Mg
-EZ
-HN
-EZ
-EZ
-HN
-EZ
-VG
-Id
-Id
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
ap
ap
ap
@@ -18636,8 +17411,6 @@ ap
ap
ap
ap
-aB
-aB
ap
ap
ap
@@ -18645,7 +17418,37 @@ ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
"}
(37,1,1) = {"
gp
@@ -18740,54 +17543,54 @@ ap
ap
ap
ap
-ar
-aB
-aB
-aB
-Wf
-Eo
-Np
-xm
-Mg
-Il
-Xt
-EZ
-EZ
-HN
-EZ
-EZ
-AN
-Id
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-ap
-ap
-ap
-ap
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
ap
ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
"}
(38,1,1) = {"
gp
@@ -18882,54 +17685,54 @@ ap
ap
ap
ap
-ar
-aB
-aB
-aB
-Wf
-XF
-Np
-AA
-Wf
-EZ
-EZ
-SJ
-Jt
-ID
-EZ
-Id
-EZ
-Jq
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
ap
ap
ap
ap
-Af
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
"}
(39,1,1) = {"
gp
@@ -19024,54 +17827,54 @@ ap
ap
ap
ap
-ar
-aB
-aB
-aB
-Wf
-AB
-ZI
-Ep
-Wf
-Id
-Id
-Id
-Id
-Id
-Id
-Id
-Id
-Id
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-aB
-ZL
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
"}
(40,1,1) = {"
gp
@@ -19166,54 +17969,54 @@ ap
ap
ap
ap
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ar
-ZL
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
"}
(41,1,1) = {"
Gq
@@ -21270,80 +20073,80 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Qw
+Qw
+Nz
+Nz
+Nz
+Nz
+Nz
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+XL
+Af
+Af
+Af
+Af
+Af
+Af
+Af
+Af
+Af
+Af
+Af
+Af
+Af
+Af
+Af
+Af
+Af
+Af
+Af
+Af
"}
(56,1,1) = {"
Gq
@@ -21412,6 +20215,60 @@ ap
ap
ap
ap
+Nz
+Wy
+JE
+xf
+Nz
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+Nz
+Bg
+Bg
+OK
+Fw
+Ac
+DC
+HD
+ar
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
ap
ap
ap
@@ -21431,61 +20288,7 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Af
"}
(57,1,1) = {"
Gq
@@ -21554,6 +20357,59 @@ ap
ap
ap
ap
+Nz
+BC
+JE
+xf
+Nz
+yM
+yM
+yM
+CG
+yM
+yM
+vs
+yM
+yM
+yM
+yM
+yM
+yM
+Nz
+Bg
+Bg
+QC
+xf
+xf
+YA
+Ow
+ar
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
ap
ap
ap
@@ -21567,67 +20423,14 @@ ap
ap
ap
ap
+aB
ap
ap
ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Af
"}
(58,1,1) = {"
Gq
@@ -21696,6 +20499,58 @@ ap
ap
ap
ap
+Nz
+QZ
+JE
+xf
+Nz
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+Nz
+Bg
+Bg
+OK
+Pi
+yv
+Yz
+Ji
+ar
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
ap
ap
ap
@@ -21710,66 +20565,14 @@ ap
ap
ap
ap
+aB
+aB
+aB
ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Af
"}
(59,1,1) = {"
Gq
@@ -21838,6 +20641,53 @@ ap
ap
ap
ap
+Nz
+Nz
+QC
+Nz
+Nz
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+CG
+yM
+yM
+OK
+Bg
+Bg
+Nz
+Nz
+Nz
+Nz
+Nz
+ar
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
ap
ap
ap
@@ -21856,62 +20706,15 @@ ap
ap
ap
ap
+aB
+aB
+aB
+aB
ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Af
"}
(60,1,1) = {"
Gq
@@ -21977,6 +20780,54 @@ ap
ap
ap
ap
+Nz
+Nz
+Nz
+Nz
+Bg
+Bg
+Bg
+Nz
+Nz
+Nz
+Nz
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+OK
+Bg
+Bg
+HX
+OK
+Ye
+Ye
+Ew
+ar
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
ap
ap
ap
@@ -21997,63 +20848,15 @@ ap
ap
ap
ap
+aB
+aB
+aB
+aB
+aB
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Af
"}
(61,1,1) = {"
Gq
@@ -22119,6 +20922,53 @@ ap
ap
ap
ap
+Nz
+WY
+FM
+IL
+Bg
+Bg
+Bg
+Bg
+Bg
+wA
+Nz
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+OK
+Bg
+Bg
+Bg
+uZ
+Ye
+Ye
+At
+ar
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
ap
ap
ap
@@ -22140,62 +20990,15 @@ ap
ap
ap
ap
+aB
+aB
+aB
+aB
+aB
+aB
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Af
"}
(62,1,1) = {"
Gq
@@ -22261,6 +21064,53 @@ ap
ap
ap
ap
+Nz
+Bg
+Bg
+Bg
+Bg
+Bg
+Bg
+Bg
+Bg
+wA
+Nz
+RU
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+OK
+Bg
+Bg
+Bg
+OK
+Ye
+Ye
+FX
+ar
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
ap
ap
ap
@@ -22283,61 +21133,14 @@ ap
ap
ap
ap
+aB
+aB
+aB
+aB
+aB
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Af
"}
(63,1,1) = {"
Gq
@@ -22403,6 +21206,52 @@ ap
ap
ap
ap
+Nz
+Bg
+Bg
+Te
+He
+He
+He
+Ly
+Bg
+wA
+Nz
+xW
+xW
+xW
+xW
+xW
+xW
+xW
+xW
+xW
+xW
+Nz
+Bg
+Bg
+Bg
+Nz
+Nz
+Nz
+Nz
+ar
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
ap
ap
ap
@@ -22417,6 +21266,8 @@ ap
ap
ap
ap
+JX
+JX
ap
ap
ap
@@ -22425,61 +21276,13 @@ ap
ap
ap
ap
+aB
+aB
+aB
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Af
"}
(64,1,1) = {"
as
@@ -22545,83 +21348,83 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Nz
+TO
+Bg
+AF
+FV
+FV
+FV
+Dd
+Bg
+Bg
+OK
+Ra
+Ra
+Ra
+Ra
+Ra
+Ra
+Ra
+Ra
+Ra
+Ra
+OK
+Bg
+Bg
+Bg
+Bg
+Bg
+Bg
+Qw
+ar
+Id
+Id
+Id
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+Wf
+Wf
+Wf
+Wf
+Wf
+ZZ
+ZZ
+ZZ
+JX
+JX
+JX
+JX
+JX
+JX
+JX
+xV
+vG
+Aw
+JX
+JX
+JX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Af
"}
(65,1,1) = {"
as
@@ -22687,83 +21490,83 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Nz
+FN
+Bg
+AF
+FV
+FV
+FV
+Dd
+Bg
+Bg
+AP
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+Jk
+AP
+Bg
+Bg
+Bg
+Bg
+Bg
+Bg
+Nz
+Wf
+Id
+EZ
+Id
+Id
+aB
+Wf
+Wf
+Wf
+Wf
+Wf
+Wf
+Wf
+Wf
+Tw
+Tw
+Bd
+Tw
+IM
+yw
+IM
+PQ
+WM
+Zo
+Wr
+JY
+CE
+CE
+CE
+Av
+Av
+YX
+Gz
+zm
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Af
"}
(66,1,1) = {"
as
@@ -22829,83 +21632,83 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Nz
+TO
+Bg
+AF
+FV
+FV
+FV
+Dd
+Bg
+Bg
+OK
+KX
+KX
+KX
+KX
+KX
+KX
+KX
+KX
+Jk
+Jk
+OK
+IP
+Bg
+Bg
+Bg
+Bg
+Bg
+Qw
+Wf
+Id
+EZ
+EZ
+Id
+Id
+Wf
+Be
+vI
+Vx
+vI
+EH
+Wf
+ZY
+Tw
+Tw
+Tw
+Bd
+IM
+xG
+IM
+Wn
+Cg
+PY
+JX
+Yf
+xt
+xt
+xt
+xt
+xt
+Bi
+Gz
+zm
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Af
"}
(67,1,1) = {"
as
@@ -22971,83 +21774,83 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Nz
+Bg
+Bg
+Fs
+SL
+SL
+SL
+Hf
+Bg
+wA
+Nz
+WX
+WX
+WX
+WX
+WX
+WX
+WX
+WX
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Bg
+Bg
+Nz
+Wf
+EZ
+EZ
+EZ
+EZ
+Id
+Wf
+Wx
+Vx
+yD
+Vx
+Wx
+Wf
+Tw
+Tw
+Tw
+Wf
+Wf
+Gx
+Gx
+Gx
+JX
+JX
+JX
+JX
+JX
+OF
+xt
+xt
+Lm
+xt
+Bi
+JX
+JX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Af
"}
(68,1,1) = {"
as
@@ -23113,83 +21916,83 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Nz
+Bg
+Bg
+Bg
+Bg
+Bg
+Bg
+Bg
+Ng
+wA
+Nz
+RU
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+Nz
+Yp
+Bg
+Bg
+Bg
+BE
+OK
+Bg
+Bg
+Nz
+Wf
+Wf
+RN
+Ww
+Wf
+Wf
+Wf
+uX
+vI
+Vx
+vI
+AY
+Wf
+Tw
+Tw
+Tw
+zv
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+JX
+LJ
+xt
+xt
+DF
+JX
+JX
+JX
+JX
+JX
+JX
+JX
+JX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Af
"}
(69,1,1) = {"
as
@@ -23255,83 +22058,83 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Nz
+Hq
+Bg
+Bg
+Bg
+Bg
+Bg
+Bg
+Bg
+wA
+Nz
+yM
+yM
+yM
+yM
+yM
+CG
+yM
+yM
+OK
+Bg
+Bg
+wA
+Bg
+Bg
+Nz
+Bg
+Bg
+Nz
+Wf
+uY
+Tw
+EZ
+vt
+Tw
+Wf
+Wx
+Vx
+Vx
+Vx
+Wx
+Wf
+Bd
+Tw
+Tw
+zv
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+JX
+KZ
+Wa
+xt
+xt
+WG
+Ak
+Ak
+IW
+Ak
+Ak
+JX
+JX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Af
"}
(70,1,1) = {"
as
@@ -23393,87 +22196,87 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Bg
+Bg
+Bg
+Nz
+Nz
+Nz
+Nz
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+OK
+Bg
+wA
+VH
+yf
+Bg
+Bh
+Bg
+Bg
+Nz
+Wf
+uY
+Tw
+Tw
+Tw
+Tw
+Wf
+Yd
+vI
+Vx
+Po
+Dk
+Wf
+Bd
+Bd
+Tw
+zv
+ap
+ap
+ap
+ap
+ap
+ap
+JX
+JX
+JX
+JX
+JX
+ZR
+JX
+JX
+we
+Ak
+Mq
+XI
+Ak
+vu
+JX
+JX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Af
"}
(71,1,1) = {"
as
@@ -23535,87 +22338,87 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Nz
+PI
+PI
+PI
+QU
+yM
+yM
+Nz
+Nz
+zT
+Nz
+Nz
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+OK
+Bg
+Bg
+wA
+Bg
+Bg
+Nz
+Bg
+Bg
+Nz
+Wf
+IC
+Tw
+Tw
+Tw
+Tw
+Wf
+Nk
+LY
+Tg
+AV
+Wx
+Wf
+Wf
+Wf
+vZ
+Wf
+Wf
+Wf
+ap
+ap
+JX
+JX
+JX
+JX
+Hg
+KL
+Yn
+ZA
+zn
+JX
+Ak
+Ak
+Ak
+Ak
+Ec
+Ak
+JX
+JX
+JX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Af
"}
(72,1,1) = {"
as
@@ -23677,87 +22480,87 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Nz
+PI
+QU
+QU
+yM
+vs
+yM
+OK
+EA
+EA
+EA
+OK
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+Nz
+Jv
+Bg
+Bg
+Bg
+Jv
+OK
+Bg
+Bg
+Nz
+Wf
+Wf
+Wf
+Ig
+Wf
+Wf
+Wf
+Wf
+Wf
+ND
+Wf
+Wf
+Wf
+EX
+EX
+EX
+EX
+Rn
+Wf
+ap
+ap
+ap
+xL
+PX
+Ai
+ZA
+ZA
+pF
+ZA
+vK
+JX
+SU
+RB
+Yq
+JX
+JX
+JX
+JX
+Gz
+zm
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Af
"}
(73,1,1) = {"
as
@@ -23819,87 +22622,87 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Nz
+PI
+QU
+yM
+yM
+yM
+yM
+OK
+EA
+EA
+EA
+OK
+yM
+vs
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Bg
+Bg
+Nz
+Wf
+ZY
+Tw
+Tw
+Tw
+Tw
+Tw
+Tw
+Tw
+Tw
+Tw
+Bd
+zv
+EX
+EX
+Wg
+Wg
+EX
+zv
+ap
+ap
+ap
+Qb
+ZA
+ZA
+ZA
+ZA
+MQ
+ZA
+ZA
+NT
+EN
+EN
+Zu
+JX
+Jg
+Kh
+zs
+Gz
+zm
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Af
"}
(74,1,1) = {"
ar
@@ -23961,87 +22764,87 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Nz
+PI
+QU
+yM
+vs
+yM
+yM
+Nz
+Nz
+zT
+Nz
+Nz
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+OK
+Cj
+Bg
+Bg
+Nz
+Bg
+Bg
+Nz
+Wf
+Tw
+Tw
+Tw
+Tw
+Tw
+Tw
+Tw
+Tw
+Tw
+Tw
+Tw
+vZ
+EX
+CK
+PL
+Lb
+SM
+zv
+ap
+ap
+ap
+Qb
+Ge
+OH
+ZA
+ZA
+ZR
+ZA
+ZA
+Xo
+QT
+Gk
+ZA
+EF
+UB
+UB
+VA
+Gz
+zm
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Af
"}
(75,1,1) = {"
as
@@ -24103,87 +22906,87 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Nz
+PI
+yM
+yM
+yM
+yM
+yM
+yM
+Jc
+Ns
+Jc
+Jc
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+Nz
+FQ
+xX
+Bg
+Bh
+Bg
+Bg
+Nz
+Wf
+Tw
+Ue
+Tw
+Tw
+Tw
+Tw
+Tw
+Tw
+Tw
+Tw
+Tw
+zv
+EX
+EX
+LQ
+LQ
+EX
+zv
+ap
+ap
+ap
+Qb
+ZA
+ZA
+ZA
+ZA
+Yn
+ZA
+ZA
+Pw
+yI
+yI
+Zu
+JX
+Ix
+wE
+vX
+Gz
+zm
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Af
"}
(76,1,1) = {"
as
@@ -24245,87 +23048,87 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Nz
+PI
+vs
+yM
+yM
+yM
+yM
+Jc
+Jc
+Db
+St
+ZB
+Jc
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+Nz
+Nz
+Nz
+Nz
+Nz
+Bg
+Bg
+Bg
+Wf
+Wf
+Np
+Wf
+Wf
+Wf
+Ny
+Wf
+Wf
+Wf
+Tw
+Tw
+Wf
+Rb
+EX
+EX
+EX
+EX
+Wf
+ap
+ap
+ap
+LN
+Pt
+qK
+ZA
+ZA
+pF
+ZA
+OZ
+JX
+SU
+RB
+Yq
+JX
+JX
+JX
+JX
+Gz
+zm
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Af
"}
(77,1,1) = {"
as
@@ -24387,87 +23190,87 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Nz
+PI
+yM
+yM
+yM
+yM
+yM
+wQ
+ZB
+Jc
+Un
+ZB
+ZB
+Jc
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+Nz
+FQ
+xX
+Bg
+Bh
+Bg
+Bg
+Bg
+Wf
+Id
+Id
+SI
+Fl
+Ju
+QB
+QB
+OQ
+Wf
+Tw
+Tw
+Wf
+Wf
+Wf
+vZ
+Wf
+Wf
+Wf
+ap
+ap
+JX
+JX
+JX
+Sy
+Hg
+KL
+MQ
+ZA
+BN
+JX
+Bo
+TL
+TL
+Zm
+TL
+Ab
+JX
+JX
+JX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Af
"}
(78,1,1) = {"
as
@@ -24529,87 +23332,87 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Nz
+PI
+yM
+Jc
+Jc
+Jc
+Jc
+Jc
+Ir
+Sc
+vY
+KH
+MB
+Jc
+Jc
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+vs
+yM
+yM
+OK
+ya
+Bg
+Bg
+Nz
+Bg
+Bg
+Hq
+ar
+aB
+Id
+uU
+QB
+QB
+QB
+QB
+DZ
+Wf
+Tw
+Tw
+Wf
+wU
+Tw
+Tw
+zv
+ap
+ap
+ap
+ap
+ap
+ap
+JX
+JX
+JX
+JX
+JX
+ZR
+JX
+JX
+Es
+TL
+TL
+TL
+TL
+Sv
+JX
+JX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Af
"}
(79,1,1) = {"
as
@@ -24671,87 +23474,87 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Nz
+PI
+yM
+yM
+yM
+yM
+wQ
+Jc
+KN
+Je
+wi
+wi
+wi
+vq
+wb
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+Nz
+Nz
+Nz
+Nz
+Nz
+Bg
+Bg
+IA
+ar
+aB
+Id
+Id
+Zv
+QB
+QB
+QB
+DM
+Wf
+Tw
+Tw
+Wf
+Tw
+Tw
+Tw
+zv
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+JX
+UL
+XW
+xt
+xt
+VT
+TL
+Od
+UO
+Jz
+HJ
+JX
+JX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Af
"}
(80,1,1) = {"
as
@@ -24813,87 +23616,87 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Nz
+PI
+yM
+yM
+yM
+yM
+Ml
+Jc
+yl
+Je
+wi
+wi
+IG
+xQ
+HL
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+Nz
+Ch
+Cl
+FF
+Nz
+Xu
+Nz
+Nz
+ar
+aB
+aB
+Id
+Id
+Np
+Rp
+IR
+Wf
+Wf
+Tw
+Tw
+Wf
+Tw
+Tw
+Tw
+zv
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+JX
+KT
+xt
+xt
+zL
+JX
+JX
+JX
+JX
+JX
+JX
+JX
+JX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Af
"}
(81,1,1) = {"
as
@@ -24955,87 +23758,87 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Nz
+PI
+yM
+yM
+yM
+yM
+wQ
+Jc
+YS
+Je
+wi
+wi
+wi
+xD
+Gi
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+Nz
+Yi
+Yi
+Yi
+Yi
+Yi
+wq
+Nz
+ar
+aB
+aB
+aB
+Id
+Id
+Wf
+Wf
+Wf
+Tw
+Tw
+Tw
+Wf
+Tw
+Tw
+Tw
+Wf
+Wf
+ZZ
+ZZ
+ZZ
+JX
+JX
+JX
+JX
+JX
+NY
+xt
+wS
+xt
+Dx
+Cf
+JX
+JX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Af
"}
(82,1,1) = {"
as
@@ -25097,87 +23900,87 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Nz
+PI
+yM
+Jc
+Jc
+Jc
+Jc
+Jc
+wa
+Cu
+wi
+vC
+wv
+Jc
+Jc
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+Nz
+QJ
+Yi
+Yi
+Yi
+Yi
+Dg
+Nz
+ar
+aB
+aB
+aB
+Wf
+Hm
+Jp
+Mx
+Wf
+Tw
+Tw
+Tw
+Wf
+xR
+Bd
+Tw
+Tw
+Tw
+IM
+yw
+IM
+Bj
+IS
+BH
+JX
+AZ
+xt
+HS
+xt
+QI
+XG
+Lz
+Gz
+zm
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Af
"}
(83,1,1) = {"
as
@@ -25239,87 +24042,87 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Nz
+PI
+yM
+yM
+yM
+yM
+yM
+wQ
+ZB
+wi
+wi
+ZB
+ZB
+Jc
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+ar
+aB
+aB
+aB
+Wf
+XT
+Xq
+Xq
+Ig
+Tw
+Tw
+Wf
+Wf
+Wf
+Bd
+Bd
+Tw
+Tw
+IM
+xG
+IM
+Za
+Li
+FO
+LT
+JK
+CE
+CE
+CE
+CE
+OX
+yA
+Gz
+zm
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+Af
"}
(84,1,1) = {"
as
@@ -25381,6 +24184,32 @@ ap
ap
ap
ap
+Nz
+PI
+yM
+yM
+yM
+yM
+yM
+Jc
+Jc
+ui
+zb
+ZB
+Jc
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+Nz
ap
ap
ap
@@ -25388,6 +24217,40 @@ ap
ap
ap
ap
+ar
+aB
+aB
+aB
+Wf
+VW
+Xq
+Xq
+Wf
+Tw
+Tw
+Wf
+Id
+Wf
+Wf
+Wf
+Wf
+Wf
+Gx
+Gx
+Gx
+JX
+JX
+JX
+JX
+JX
+JX
+JX
+xV
+vG
+Aw
+JX
+JX
+JX
ap
ap
ap
@@ -25401,67 +24264,7 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Af
"}
(85,1,1) = {"
ar
@@ -25523,6 +24326,32 @@ ap
ap
ap
ap
+Nz
+PI
+QU
+QU
+yM
+yM
+yM
+yM
+Jc
+Jc
+Jc
+Jc
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+CG
+yM
+yM
+Nz
ap
ap
ap
@@ -25530,6 +24359,24 @@ ap
ap
ap
ap
+ar
+aB
+aB
+aB
+Wf
+wj
+MO
+LH
+Wf
+Np
+Tw
+Wf
+Id
+Id
+Id
+Id
+Id
+Id
ap
ap
ap
@@ -25543,6 +24390,8 @@ ap
ap
ap
ap
+JX
+JX
ap
ap
ap
@@ -25557,53 +24406,7 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Af
"}
(86,1,1) = {"
as
@@ -25665,6 +24468,32 @@ ap
ap
ap
ap
+Nz
+PI
+QU
+QU
+QU
+yM
+yM
+vs
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+Nz
ap
ap
ap
@@ -25672,6 +24501,26 @@ ap
ap
ap
ap
+ar
+aB
+aB
+aB
+Wf
+Wf
+Wf
+Wf
+Wf
+ND
+JJ
+Id
+Id
+Id
+Id
+aB
+aB
+aB
+aB
+aB
ap
ap
ap
@@ -25696,56 +24545,10 @@ ap
ap
ap
ap
+aB
+aB
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Af
"}
(87,1,1) = {"
as
@@ -25807,6 +24610,32 @@ ap
ap
ap
ap
+Nz
+PI
+QU
+QU
+QU
+QU
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+Nz
ap
ap
ap
@@ -25814,6 +24643,28 @@ ap
ap
ap
ap
+ar
+aB
+aB
+aB
+Wf
+DK
+PK
+LI
+Wf
+Bd
+Bd
+EU
+Id
+Id
+Id
+Id
+aB
+aB
+aB
+aB
+aB
+aB
ap
ap
ap
@@ -25835,59 +24686,11 @@ ap
ap
ap
ap
+aB
+aB
+aB
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Af
"}
(88,1,1) = {"
as
@@ -25949,6 +24752,32 @@ ap
ap
ap
ap
+Nz
+PI
+QU
+QU
+QU
+QU
+QU
+yM
+yM
+yM
+yM
+vs
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+yM
+Nz
ap
ap
ap
@@ -25956,6 +24785,28 @@ ap
ap
ap
ap
+ar
+aB
+aB
+aB
+Wf
+Uq
+Np
+Bk
+Wf
+Ms
+EZ
+Bd
+yL
+EZ
+PS
+Id
+Id
+aB
+aB
+aB
+aB
+aB
ap
ap
ap
@@ -25977,59 +24828,11 @@ ap
ap
ap
ap
+aB
+aB
+aB
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Af
"}
(89,1,1) = {"
as
@@ -26091,6 +24894,32 @@ ap
ap
ap
ap
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
+Nz
ap
ap
ap
@@ -26098,6 +24927,29 @@ ap
ap
ap
ap
+ar
+aB
+aB
+aB
+Wf
+Iy
+xm
+Pm
+Mg
+EZ
+Ev
+EZ
+EZ
+Uy
+EZ
+RX
+Id
+aB
+aB
+aB
+aB
+aB
+aB
ap
ap
ap
@@ -26118,60 +24970,11 @@ ap
ap
ap
ap
+aB
+aB
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+Af
"}
(90,1,1) = {"
as
@@ -26222,39 +25025,6 @@ mv
mv
mv
mv
-mv
-mv
-mv
-mv
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
ap
ap
ap
@@ -26299,6 +25069,34 @@ ap
ap
ap
ap
+ar
+aB
+aB
+aB
+Wf
+Tv
+Np
+iO
+Mg
+EZ
+HN
+EZ
+EZ
+HN
+EZ
+VG
+Id
+Id
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
ap
ap
ap
@@ -26309,11 +25107,16 @@ ap
ap
ap
ap
+aB
+aB
ap
ap
ap
ap
ap
+ap
+ap
+Af
"}
(91,1,1) = {"
as
@@ -26367,45 +25170,6 @@ ap
ap
ap
ap
-mv
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-gp
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
ap
ap
ap
@@ -26447,15 +25211,54 @@ ap
ap
ap
ap
+ar
+aB
+aB
+aB
+Wf
+Eo
+Np
+xm
+Mg
+Il
+Xt
+EZ
+EZ
+HN
+EZ
+EZ
+AN
+Id
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
ap
ap
ap
ap
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
ap
ap
ap
ap
ap
+Af
"}
(92,1,1) = {"
as
@@ -26509,50 +25312,6 @@ ap
ap
ap
ap
-mv
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-gp
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
ap
ap
ap
@@ -26594,10 +25353,54 @@ ap
ap
ap
ap
+ar
+aB
+aB
+aB
+Wf
+XF
+Np
+AA
+Wf
+EZ
+EZ
+SJ
+Jt
+ID
+EZ
+Id
+EZ
+Jq
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
ap
ap
ap
ap
+Af
"}
(93,1,1) = {"
as
@@ -26651,54 +25454,6 @@ ap
ap
ap
ap
-mv
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-gp
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
ap
ap
ap
@@ -26740,6 +25495,54 @@ ap
ap
ap
ap
+ar
+aB
+aB
+aB
+Wf
+AB
+ZI
+Ep
+Wf
+Id
+Id
+Id
+Id
+Id
+Id
+Id
+Id
+Id
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+ZL
"}
(94,1,1) = {"
as
@@ -26793,54 +25596,6 @@ ap
ap
ap
ap
-mv
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-gp
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
ap
ap
ap
@@ -26882,6 +25637,54 @@ ap
ap
ap
ap
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ar
+ZL
"}
(95,1,1) = {"
as
@@ -26964,7 +25767,7 @@ ap
ap
ap
ap
-gp
+ap
ap
ap
ap
@@ -27106,7 +25909,7 @@ ap
ap
ap
ap
-gp
+ap
ap
ap
ap
@@ -27229,18 +26032,6 @@ ap
ap
ap
ap
-CL
-CL
-BF
-Dh
-Dh
-Dh
-BF
-CL
-CL
-KD
-CL
-CL
ap
ap
ap
@@ -27248,7 +26039,19 @@ ap
ap
ap
ap
-gp
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
ap
@@ -27370,27 +26173,27 @@ ap
ap
ap
ap
-CL
-Kz
-DL
-CL
-Uc
-Ke
-Bb
-CL
-ab
-TA
-Bv
-Ke
-Vs
-CL
ap
ap
ap
ap
ap
ap
-gp
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
ap
@@ -27512,27 +26315,27 @@ ap
ap
ap
ap
-CL
-SA
-Qs
-CL
-Ct
-xz
-Ri
-CL
-Bq
-RE
-xz
-zc
-Do
-CL
ap
ap
ap
ap
ap
ap
-gp
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
ap
@@ -27654,27 +26457,27 @@ ap
ap
ap
ap
-CL
-DT
-Kl
-CL
-BR
-BZ
-EY
-CL
-SH
-Kd
-xz
-zc
-vB
-CL
ap
ap
ap
ap
ap
ap
-gp
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
ap
@@ -27796,27 +26599,27 @@ ap
ap
ap
ap
-CL
-DW
-Qs
-Yx
-yj
-xz
-Ob
-Xf
-yj
-xz
-xz
-xz
-Yb
-KD
ap
ap
ap
ap
ap
ap
-gp
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
ap
@@ -27938,27 +26741,27 @@ ap
ap
ap
ap
-CL
-DL
-DL
-CL
-yY
-xz
-Ek
-CL
-Kf
-Kb
-Kb
-xz
-Me
-JR
ap
ap
ap
ap
ap
ap
-gp
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
ap
@@ -28080,27 +26883,27 @@ ap
ap
ap
ap
-CL
-CL
-CL
-CL
-CL
-zS
-CL
-CL
-Gv
-Hi
-Zy
-Kd
-Me
-JR
ap
ap
ap
ap
ap
ap
-gp
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
ap
@@ -28222,27 +27025,27 @@ ap
ap
ap
ap
-CL
-Rd
-KK
-CL
-Lx
-xz
-Hs
-CL
-Bs
-yS
-yS
-xz
-Me
-JR
ap
ap
ap
ap
ap
ap
-gp
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
ap
@@ -28364,27 +27167,27 @@ ap
ap
ap
ap
-CL
-Cv
-Qs
-Yx
-xJ
-xz
-Ob
-Kc
-xJ
-xz
-xz
-xz
-Nl
-KD
ap
ap
ap
ap
ap
ap
-gp
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
aB
@@ -28506,27 +27309,27 @@ ap
ap
ap
ap
-CL
-HO
-JN
-CL
-Bm
-MU
-wn
-CL
-zl
-Kd
-xz
-Hl
-UZ
-CL
ap
ap
ap
ap
ap
ap
-gp
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
aB
@@ -28648,27 +27451,27 @@ ap
ap
ap
ap
-CL
-Mb
-SB
-CL
-SV
-RE
-Ql
-CL
-BR
-xz
-xz
-Hl
-Do
-CL
ap
ap
ap
ap
ap
ap
-gp
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
aB
aB
@@ -28790,27 +27593,27 @@ ap
ap
ap
ap
-CL
-Kz
-DL
-CL
-JF
-Ah
-VK
-CL
-EJ
-Ez
-On
-Qo
-Vs
-CL
ap
ap
ap
ap
ap
ap
-gp
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
aB
aB
@@ -28933,18 +27736,6 @@ ap
ap
ap
ap
-CL
-CL
-BF
-Tk
-Tk
-Tk
-BF
-CL
-CL
-KD
-CL
-CL
ap
ap
ap
@@ -28952,7 +27743,19 @@ ap
ap
ap
ap
-gp
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
aB
aB
@@ -29094,7 +27897,7 @@ ap
ap
ap
ap
-gp
+ap
aB
aB
oX
@@ -29236,7 +28039,7 @@ ap
ap
ap
ap
-gp
+ap
aB
aB
oX
@@ -29377,8 +28180,8 @@ ap
ap
ap
ap
-gp
-gp
+ap
+ap
aB
aB
oX
@@ -29519,7 +28322,7 @@ ap
ap
ap
ap
-gp
+ap
aB
aB
aB
@@ -29661,7 +28464,7 @@ ap
ap
ap
ap
-gp
+ap
aB
aB
aB
@@ -29803,7 +28606,7 @@ ap
ap
ap
ap
-gp
+ap
aB
aB
aB
@@ -29918,34 +28721,34 @@ ap
ap
ap
mv
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
-gp
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
aB
aB
aB
@@ -30469,38 +29272,38 @@ hx
hx
hx
fZ
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
ap
@@ -30611,38 +29414,38 @@ hy
hJ
hO
fZ
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
ap
@@ -30753,38 +29556,38 @@ hz
hK
hP
fZ
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
ap
@@ -30895,38 +29698,38 @@ hz
hK
hP
fZ
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
ap
@@ -31037,38 +29840,38 @@ hA
hL
hQ
fZ
-gX
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-gX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
ap
@@ -31179,38 +29982,38 @@ hx
hx
hx
fZ
-gX
-hm
-hm
-hv
-hm
-hm
-hm
-ia
-in
-in
-in
-ia
-in
-in
-in
-ia
-in
-in
-in
-ia
-in
-in
-in
-ia
-in
-hm
-hm
-hv
-hm
-hm
-ai
-mu
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
ap
@@ -31321,38 +30124,38 @@ aL
aL
aL
ar
-gX
-hn
-hn
-hn
-hn
-hn
-hn
-ib
-ib
-hn
-hn
-hn
-hn
-hn
-hn
-ip
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-lo
-lo
-hn
-hn
-hn
-hn
-hn
-aj
-gX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
ap
@@ -31463,38 +30266,38 @@ hB
hD
hD
fZ
-gX
-ho
-ho
-ho
-ho
-ho
-ho
-ic
-ho
-ho
-ho
-ho
-ho
-ho
-ho
-ho
-ho
-ho
-ho
-ho
-ho
-ho
-ho
-ho
-lx
-ho
-ho
-ho
-ho
-ho
-al
-gX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
ap
@@ -31520,9 +30323,9 @@ aB
aB
aB
aB
-oX
-oX
-oX
+aB
+aB
+aB
oX
oX
oX
@@ -31605,38 +30408,38 @@ hC
hC
hC
fZ
-gX
-hn
-hn
-hn
-hn
-hn
-hn
-ib
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-lo
-hn
-hn
-hn
-hn
-hn
-aj
-gX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
ap
@@ -31662,17 +30465,17 @@ aB
aB
aB
aB
-oX
-dy
-dy
-dy
-dy
-dy
-dy
-dy
-dy
-dy
-dy
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
oX
sj
sR
@@ -31747,38 +30550,6 @@ hD
hD
hD
fZ
-gX
-hn
-hn
-hn
-hn
-hn
-hn
-ib
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-lo
-hn
-hn
-hn
-hn
-hn
-aj
-gX
ap
ap
ap
@@ -31795,6 +30566,49 @@ ap
ap
ap
ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
aB
aB
aB
@@ -31805,18 +30619,7 @@ aB
aB
aB
oX
-dy
-dD
-jr
-pf
-pf
-pf
-qF
-qG
-qV
-dy
-oX
-sJ
+sj
sR
oX
tl
@@ -31889,38 +30692,6 @@ hD
hD
hD
fZ
-gX
-hn
-hn
-hn
-hn
-hn
-hn
-id
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-lo
-hn
-hn
-hn
-hn
-hn
-aj
-gX
ap
ap
ap
@@ -31937,6 +30708,49 @@ ap
ap
ap
ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
aB
aB
aB
@@ -31947,18 +30761,7 @@ aB
aB
aB
oX
-dy
-hZ
-hZ
-hZ
-hZ
-hZ
-hZ
-hZ
-qW
-ro
-sC
-pk
+sj
sR
sO
tm
@@ -32031,38 +30834,38 @@ hE
hE
hE
fZ
-gX
-hn
-hn
-hn
-hn
-hn
-hn
-id
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-lo
-hn
-hn
-hn
-hn
-hn
-aj
-gX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
ap
@@ -32088,17 +30891,17 @@ aB
aB
aB
aB
-oX
-dy
-hq
-hq
-pL
-pL
-hq
-hZ
-qH
-qV
-dy
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
oX
qA
sR
@@ -32173,38 +30976,38 @@ hD
hD
hR
fZ
-gX
-ho
-ho
-ho
-ho
-ho
-ho
-ie
-ho
-ho
-ho
-ho
-ho
-ho
-ho
-ho
-ho
-ho
-ho
-ho
-ho
-ho
-ho
-ho
-lx
-ho
-ho
-ho
-ho
-ho
-al
-gX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
ap
@@ -32230,17 +31033,17 @@ aB
aB
aB
aB
-oX
-dy
-dy
-dy
-dy
-dy
-dy
-dy
-dy
-dy
-dy
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
oX
sj
sR
@@ -32315,38 +31118,38 @@ aL
aL
aL
ar
-gX
-hn
-hn
-hn
-hn
-hn
-hn
-id
-id
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-hn
-lo
-lo
-hn
-hn
-hn
-hn
-hn
-aj
-gX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
ap
@@ -32372,17 +31175,17 @@ aB
aB
aB
aB
-oX
-oX
-oX
-oX
-oX
-oX
-oX
-oX
-oX
-oX
-oX
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
oX
sj
sR
@@ -32457,38 +31260,38 @@ hF
hF
hF
fZ
-gX
-hp
-hp
-hp
-hI
-hp
-hp
-if
-iq
-if
-if
-if
-iq
-if
-if
-if
-iq
-if
-if
-if
-iq
-if
-if
-if
-iq
-hp
-hp
-hp
-hI
-hp
-dZ
-gX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
ap
@@ -32514,17 +31317,17 @@ aB
aB
aB
aB
-oX
-dz
-dz
-dz
-dz
-dz
-dz
-dz
-dz
-dz
-dz
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
oX
sj
sR
@@ -32599,38 +31402,6 @@ hF
hF
hF
fZ
-gX
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-hl
-gX
ap
ap
ap
@@ -32649,6 +31420,49 @@ ap
ap
ap
ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
aB
aB
aB
@@ -32657,18 +31471,7 @@ aB
aB
aB
oX
-dz
-ij
-oZ
-qd
-qd
-qd
-iH
-qI
-rm
-dz
-oX
-sK
+sj
sR
sO
tq
@@ -32741,38 +31544,6 @@ hF
hF
hF
fZ
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
ap
ap
ap
@@ -32791,6 +31562,49 @@ ap
ap
ap
ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
aB
aB
aB
@@ -32799,18 +31613,7 @@ aB
aB
aB
oX
-dz
-iH
-iH
-iH
-iH
-iH
-iH
-iH
-rn
-rp
-sD
-pk
+sj
sR
sO
tr
@@ -32883,38 +31686,38 @@ hF
hF
hF
fZ
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
ap
@@ -32940,17 +31743,17 @@ aB
aB
aB
aB
-oX
-dz
-iu
-iu
-qe
-qe
-iu
-iH
-qJ
-rm
-dz
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
oX
pk
sR
@@ -33025,38 +31828,38 @@ hF
hF
hF
fZ
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
ap
@@ -33082,17 +31885,17 @@ aB
aB
aB
aB
-oX
-dz
-dz
-dz
-dz
-dz
-dz
-dz
-dz
-dz
-dz
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
oX
sL
sV
@@ -33167,38 +31970,38 @@ hF
hF
hF
fZ
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
-gX
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
+ap
ap
ap
ap
@@ -33224,17 +32027,17 @@ aB
aB
aB
aB
-oX
-oX
-oX
-oX
-oX
-oX
-oX
-oX
-oX
-oX
-oX
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
+aB
oX
oX
oX
diff --git a/maps/tether/submaps/tether_ships.dmm b/maps/tether/submaps/tether_ships.dmm
index 3f209f234e0..60668e57d3a 100644
--- a/maps/tether/submaps/tether_ships.dmm
+++ b/maps/tether/submaps/tether_ships.dmm
@@ -25,6 +25,19 @@
/turf/space,
/turf/space/transit/north,
/area/space)
+"aD" = (
+/obj/effect/floor_decal/transit/orange{
+ dir = 4
+ },
+/turf/unsimulated/floor/techfloor_grid{
+ icon = 'icons/turf/transit_vr.dmi'
+ },
+/area/centcom/ferry)
+"bB" = (
+/turf/unsimulated/floor/maglev{
+ icon = 'icons/turf/transit_vr.dmi'
+ },
+/area/centcom/ferry)
"dJ" = (
/turf/unsimulated/wall/seperator,
/area/space)
@@ -306,6 +319,27 @@
icon_state = "rock"
},
/area/space)
+"iD" = (
+/obj/effect/step_trigger/thrower{
+ affect_ghosts = 1;
+ direction = 2;
+ name = "thrower_throwdown";
+ stopper = 0;
+ tiles = 0
+ },
+/turf/space/sandyscroll,
+/area/space)
+"jf" = (
+/obj/effect/step_trigger/thrower{
+ affect_ghosts = 1;
+ direction = 4;
+ name = "thrower_escapeshuttletop(right)";
+ tiles = 0
+ },
+/turf/unsimulated/floor/techfloor_grid{
+ icon = 'icons/turf/transit_vr.dmi'
+ },
+/area/centcom/ferry)
"kd" = (
/obj/effect/step_trigger/teleporter/random{
affect_ghosts = 1;
@@ -319,6 +353,58 @@
},
/turf/space/transit/north,
/area/space)
+"mU" = (
+/turf/unsimulated/wall{
+ icon = 'icons/turf/transit_vr.dmi'
+ },
+/area/centcom/ferry)
+"oo" = (
+/turf/unsimulated/mineral{
+ icon = 'icons/turf/transit_vr.dmi';
+ icon_state = "rock"
+ },
+/area/centcom/ferry)
+"pE" = (
+/obj/effect/floor_decal/transit/orange{
+ dir = 8
+ },
+/obj/effect/step_trigger/lost_in_space/tram,
+/turf/unsimulated/floor/techfloor_grid{
+ icon = 'icons/turf/transit_vr.dmi'
+ },
+/area/centcom/ferry)
+"qv" = (
+/obj/effect/floor_decal/transit/orange{
+ dir = 8
+ },
+/obj/effect/transit/light{
+ dir = 8
+ },
+/obj/effect/step_trigger/thrower{
+ affect_ghosts = 1;
+ direction = 2;
+ name = "thrower_throwdownside";
+ nostop = 1;
+ stopper = 0;
+ tiles = 0
+ },
+/turf/unsimulated/floor/techfloor_grid{
+ icon = 'icons/turf/transit_vr.dmi'
+ },
+/area/centcom/ferry)
+"ue" = (
+/obj/effect/step_trigger/thrower{
+ affect_ghosts = 1;
+ direction = 2;
+ name = "thrower_throwdownside";
+ nostop = 1;
+ stopper = 0;
+ tiles = 0
+ },
+/turf/unsimulated/floor/techfloor_grid{
+ icon = 'icons/turf/transit_vr.dmi'
+ },
+/area/centcom/ferry)
"yn" = (
/obj/effect/shuttle_landmark/transit{
base_area = /area/space;
@@ -328,9 +414,93 @@
},
/turf/space/transit/north,
/area/space)
+"yO" = (
+/obj/effect/step_trigger/lost_in_space/tram,
+/turf/unsimulated/floor/maglev{
+ icon = 'icons/turf/transit_vr.dmi'
+ },
+/area/centcom/ferry)
+"AG" = (
+/obj/effect/floor_decal/transit/orange{
+ dir = 4
+ },
+/obj/effect/transit/light{
+ dir = 4
+ },
+/obj/effect/step_trigger/thrower{
+ affect_ghosts = 1;
+ direction = 2;
+ name = "thrower_throwdownside";
+ nostop = 1;
+ stopper = 0;
+ tiles = 0
+ },
+/turf/unsimulated/floor/techfloor_grid{
+ icon = 'icons/turf/transit_vr.dmi'
+ },
+/area/centcom/ferry)
+"BP" = (
+/obj/effect/step_trigger/thrower{
+ affect_ghosts = 1;
+ direction = 2;
+ name = "thrower_throwdownside";
+ nostop = 1;
+ stopper = 0;
+ tiles = 0
+ },
+/turf/unsimulated/floor/maglev{
+ icon = 'icons/turf/transit_vr.dmi'
+ },
+/area/centcom/ferry)
+"Eh" = (
+/turf/unsimulated/floor/techfloor_grid{
+ icon = 'icons/turf/transit_vr.dmi'
+ },
+/area/centcom/ferry)
+"GJ" = (
+/obj/effect/floor_decal/transit/orange{
+ dir = 8
+ },
+/obj/effect/step_trigger/thrower{
+ affect_ghosts = 1;
+ direction = 2;
+ name = "thrower_throwdownside";
+ nostop = 1;
+ stopper = 0;
+ tiles = 0
+ },
+/turf/unsimulated/floor/techfloor_grid{
+ icon = 'icons/turf/transit_vr.dmi'
+ },
+/area/centcom/ferry)
+"Hq" = (
+/obj/effect/transit/light{
+ dir = 8
+ },
+/turf/unsimulated/mineral{
+ icon = 'icons/turf/transit_vr.dmi';
+ icon_state = "rock"
+ },
+/area/centcom/ferry)
"HO" = (
/turf/space/transit/north,
/area/space)
+"HQ" = (
+/obj/effect/step_trigger/thrower{
+ affect_ghosts = 1;
+ direction = 2;
+ name = "thrower_throwdown";
+ stopper = 0;
+ tiles = 0
+ },
+/turf/space/bluespace,
+/area/space)
+"Ii" = (
+/obj/effect/step_trigger/lost_in_space/tram,
+/turf/unsimulated/floor/techfloor_grid{
+ icon = 'icons/turf/transit_vr.dmi'
+ },
+/area/centcom/ferry)
"Js" = (
/obj/effect/shuttle_landmark/transit{
base_area = /area/space;
@@ -340,10 +510,78 @@
},
/turf/space/transit/north,
/area/space)
+"JL" = (
+/obj/effect/floor_decal/transit/orange{
+ dir = 4
+ },
+/obj/effect/step_trigger/thrower{
+ affect_ghosts = 1;
+ direction = 2;
+ name = "thrower_throwdownside";
+ nostop = 1;
+ stopper = 0;
+ tiles = 0
+ },
+/turf/unsimulated/floor/techfloor_grid{
+ icon = 'icons/turf/transit_vr.dmi'
+ },
+/area/centcom/ferry)
+"Ma" = (
+/obj/effect/step_trigger/thrower{
+ affect_ghosts = 1;
+ direction = 2;
+ name = "thrower_throwdown";
+ stopper = 0;
+ tiles = 0
+ },
+/turf/space,
+/area/space)
"Nb" = (
/turf/space,
/turf/space/transit/north,
/area/space)
+"NF" = (
+/obj/effect/floor_decal/transit/orange{
+ dir = 4
+ },
+/obj/effect/transit/light{
+ dir = 4
+ },
+/turf/unsimulated/floor/techfloor_grid{
+ icon = 'icons/turf/transit_vr.dmi'
+ },
+/area/centcom/ferry)
+"NY" = (
+/obj/effect/floor_decal/transit/orange{
+ dir = 8
+ },
+/turf/unsimulated/floor/techfloor_grid{
+ icon = 'icons/turf/transit_vr.dmi'
+ },
+/area/centcom/ferry)
+"Qz" = (
+/obj/effect/shuttle_landmark{
+ base_area = /area/centcom/ferry;
+ base_turf = /turf/simulated/floor/tiled/techfloor/grid;
+ docking_controller = null;
+ landmark_tag = "escape_transit";
+ name = "Escape Transit"
+ },
+/turf/unsimulated/floor/techfloor_grid{
+ icon = 'icons/turf/transit_vr.dmi'
+ },
+/area/centcom/ferry)
+"QF" = (
+/obj/effect/step_trigger/thrower{
+ affect_ghosts = 1;
+ direction = 4;
+ name = "thrower_escapeshuttletop(right)";
+ tiles = 0
+ },
+/turf/unsimulated/floor/maglev{
+ icon = 'icons/turf/transit_vr.dmi'
+ },
+/area/centcom/ferry)
"SG" = (
/obj/effect/step_trigger/thrower{
affect_ghosts = 1;
@@ -355,6 +593,17 @@
},
/turf/space/transit/north,
/area/space)
+"SU" = (
+/obj/effect/step_trigger/thrower{
+ affect_ghosts = 1;
+ direction = 8;
+ name = "thrower_escapeshuttletop(left)";
+ tiles = 0
+ },
+/turf/unsimulated/floor/maglev{
+ icon = 'icons/turf/transit_vr.dmi'
+ },
+/area/centcom/ferry)
"TL" = (
/obj/effect/shuttle_landmark/transit{
base_area = /area/space;
@@ -364,6 +613,37 @@
},
/turf/space/transit/east,
/area/space)
+"UW" = (
+/obj/effect/floor_decal/transit/orange{
+ dir = 4
+ },
+/obj/effect/step_trigger/lost_in_space/tram,
+/turf/unsimulated/floor/techfloor_grid{
+ icon = 'icons/turf/transit_vr.dmi'
+ },
+/area/centcom/ferry)
+"XP" = (
+/obj/effect/step_trigger/thrower{
+ affect_ghosts = 1;
+ direction = 8;
+ name = "thrower_escapeshuttletop(left)";
+ tiles = 0
+ },
+/turf/unsimulated/floor/techfloor_grid{
+ icon = 'icons/turf/transit_vr.dmi'
+ },
+/area/centcom/ferry)
+"XR" = (
+/obj/effect/floor_decal/transit/orange{
+ dir = 8
+ },
+/obj/effect/transit/light{
+ dir = 8
+ },
+/turf/unsimulated/floor/techfloor_grid{
+ icon = 'icons/turf/transit_vr.dmi'
+ },
+/area/centcom/ferry)
(1,1,1) = {"
aa
@@ -421,91 +701,91 @@ aa
aa
aa
aa
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
"}
(2,1,1) = {"
aa
@@ -563,37 +843,39 @@ aa
aa
aa
aa
-dJ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
aa
-gV
-gV
+aa
+aa
+aa
+aa
+aa
+aa
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dJ
gV
gV
gV
@@ -645,9 +927,7 @@ ht
ht
ht
ht
-ht
-ht
-dJ
+aa
"}
(3,1,1) = {"
aa
@@ -705,35 +985,39 @@ aa
aa
aa
aa
-dJ
-dQ
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-dQ
aa
+aa
+aa
+aa
+aa
+aa
+aa
+dQ
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+dQ
+dJ
gV
et
et
@@ -758,8 +1042,6 @@ et
et
et
et
-et
-et
gV
dJ
ht
@@ -786,10 +1068,8 @@ hp
hp
hp
hp
-hp
-hp
ht
-dJ
+aa
"}
(4,1,1) = {"
aa
@@ -847,35 +1127,39 @@ aa
aa
aa
aa
-dJ
-dQ
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-dQ
aa
+aa
+aa
+aa
+aa
+aa
+aa
+dQ
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+dQ
+dJ
gV
et
et
@@ -900,8 +1184,6 @@ et
et
et
et
-et
-et
gV
dJ
ht
@@ -928,10 +1210,8 @@ hp
hp
hp
hp
-hp
-hp
ht
-dJ
+aa
"}
(5,1,1) = {"
aa
@@ -989,35 +1269,39 @@ aa
aa
aa
aa
-dJ
-dQ
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-dQ
aa
+aa
+aa
+aa
+aa
+aa
+aa
+dQ
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+iD
+iD
+iD
+iD
+iD
+iD
+gU
+gU
+dQ
+dJ
gV
et
et
@@ -1032,14 +1316,12 @@ et
et
et
et
-et
-et
-et
-et
-et
-et
-et
-et
+HQ
+HQ
+HQ
+HQ
+HQ
+HQ
et
et
et
@@ -1060,20 +1342,18 @@ hp
hp
hp
hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
+hz
+hz
+hz
+hz
+hz
+hz
hp
hp
hp
hp
ht
-dJ
+aa
"}
(6,1,1) = {"
aa
@@ -1131,59 +1411,61 @@ aa
aa
aa
aa
-dJ
-dQ
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-dQ
aa
+aa
+aa
+aa
+aa
+aa
+aa
+dQ
+gU
+gU
+gU
+gU
+gU
+iD
+iD
+iD
+iD
+iD
+iD
+iD
+iD
+iD
+iD
+iD
+gU
+gU
+gU
+gU
+iD
+iD
+gU
+dQ
+dJ
gV
et
et
et
et
et
+HQ
+HQ
+HQ
+HQ
+HQ
+HQ
+HQ
+HQ
+HQ
+HQ
+HQ
et
et
et
et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
+HQ
et
et
gV
@@ -1194,28 +1476,26 @@ hp
hp
hp
hp
+hz
+hz
+hz
+hz
+hz
+hz
+hz
+hz
+hz
+hz
+hz
hp
hp
hp
hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
+hz
+hz
hp
ht
-dJ
+aa
"}
(7,1,1) = {"
aa
@@ -1273,44 +1553,46 @@ aa
aa
aa
aa
-dJ
-dQ
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-dQ
aa
+aa
+aa
+aa
+aa
+aa
+aa
+dQ
+gU
+gU
+gU
+gU
+gU
+iD
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+iD
+gU
+dQ
+dJ
gV
et
et
et
et
et
-et
-et
-et
+HQ
et
et
et
@@ -1336,6 +1618,7 @@ hp
hp
hp
hp
+hz
hp
hp
hp
@@ -1351,13 +1634,10 @@ hp
hp
hp
hp
-hp
-hp
-hp
-hp
+hz
hp
ht
-dJ
+aa
"}
(8,1,1) = {"
aa
@@ -1415,44 +1695,46 @@ aa
aa
aa
aa
-dJ
-dQ
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-dQ
aa
+aa
+aa
+aa
+aa
+aa
+aa
+dQ
+gU
+gU
+gU
+gU
+iD
+iD
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+iD
+gU
+dQ
+dJ
gV
et
et
et
et
-et
-et
-et
-et
+HQ
+HQ
et
et
et
@@ -1477,6 +1759,8 @@ hp
hp
hp
hp
+hz
+hz
hp
hp
hp
@@ -1492,14 +1776,10 @@ hp
hp
hp
hp
-hp
-hp
-hp
-hp
-hp
+hz
hp
ht
-dJ
+aa
"}
(9,1,1) = {"
aa
@@ -1557,43 +1837,45 @@ aa
aa
aa
aa
-dJ
-dQ
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-dQ
aa
+aa
+aa
+aa
+aa
+aa
+aa
+dQ
+gU
+gU
+gU
+gU
+iD
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+iD
+gU
+dQ
+dJ
gV
et
et
et
et
-et
-et
-et
+HQ
et
et
et
@@ -1619,6 +1901,7 @@ hp
hp
hp
hp
+hz
hp
hp
hp
@@ -1635,13 +1918,10 @@ hp
hp
hp
hp
-hp
-hp
-hp
-hp
+hz
hp
ht
-dJ
+aa
"}
(10,1,1) = {"
aa
@@ -1699,39 +1979,45 @@ aa
aa
aa
aa
-dJ
-dQ
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-dQ
aa
+aa
+aa
+aa
+aa
+aa
+aa
+dQ
+gU
+gU
+gU
+iD
+iD
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+iD
+iD
+gU
+dQ
+dJ
gV
et
et
et
+HQ
+HQ
et
et
et
@@ -1747,11 +2033,7 @@ et
et
et
et
-et
-et
-et
-et
-et
+HQ
et
et
gV
@@ -1760,6 +2042,8 @@ ht
hp
hp
hp
+hz
+hz
hp
hp
hp
@@ -1775,15 +2059,11 @@ hp
hp
hp
hp
-hp
-hp
-hp
-hp
-hp
-hp
+hz
+hz
hp
ht
-dJ
+aa
"}
(11,1,1) = {"
aa
@@ -1837,15 +2117,22 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
dJ
dQ
gU
gU
gU
+iD
gU
gU
gU
@@ -1862,18 +2149,16 @@ gU
gU
gU
gU
-gU
-gU
-gU
-gU
-gU
+iD
+iD
gU
dQ
-aa
+dJ
gV
et
et
et
+HQ
et
et
et
@@ -1890,10 +2175,7 @@ et
et
et
et
-et
-et
-et
-et
+HQ
et
et
gV
@@ -1902,6 +2184,7 @@ ht
hp
hp
hp
+hz
hp
hp
hp
@@ -1918,14 +2201,11 @@ hp
hp
hp
hp
-hp
-hp
-hp
-hp
-hp
+hz
+hz
hp
ht
-dJ
+aa
"}
(12,1,1) = {"
aa
@@ -1979,43 +2259,48 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
dJ
-dQ
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-dQ
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+dQ
+gU
+gU
+gU
+iD
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+iD
+gU
+gU
+dQ
+dJ
gV
et
et
et
+HQ
et
et
et
@@ -2032,10 +2317,7 @@ et
et
et
et
-et
-et
-et
-et
+HQ
et
et
gV
@@ -2044,6 +2326,7 @@ ht
hp
hp
hp
+hz
hp
hp
hp
@@ -2060,14 +2343,11 @@ hp
hp
hp
hp
-hp
-hp
-hp
-hp
+hz
hp
hp
ht
-dJ
+aa
"}
(13,1,1) = {"
aa
@@ -2121,43 +2401,48 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
dJ
-dQ
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-dQ
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+dQ
+gU
+gU
+gU
+iD
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+iD
+gU
+gU
+dQ
+dJ
gV
et
et
et
+HQ
et
et
et
@@ -2174,10 +2459,7 @@ et
et
et
et
-et
-et
-et
-et
+HQ
et
et
gV
@@ -2186,6 +2468,7 @@ ht
hp
hp
hp
+hz
hp
hp
hp
@@ -2202,14 +2485,11 @@ hp
hp
hp
hp
-hp
-hp
-hp
-hp
+hz
hp
hp
ht
-dJ
+aa
"}
(14,1,1) = {"
aa
@@ -2263,43 +2543,48 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
dJ
-dQ
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-dQ
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+dQ
+gU
+gU
+gU
+iD
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+iD
+gU
+gU
+dQ
+dJ
gV
et
et
et
+HQ
et
et
et
@@ -2316,10 +2601,7 @@ et
et
et
et
-et
-et
-et
-et
+HQ
et
et
gV
@@ -2328,6 +2610,7 @@ ht
hp
hp
hp
+hz
hp
hp
hp
@@ -2344,14 +2627,11 @@ hp
hp
hp
hp
-hp
-hp
-hp
-hp
+hz
hp
hp
ht
-dJ
+aa
"}
(15,1,1) = {"
aa
@@ -2405,43 +2685,48 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
dJ
-dQ
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-dQ
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+dQ
+gU
+gU
+gU
+iD
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+iD
+iD
+gU
+dQ
+dJ
gV
et
et
et
+HQ
et
et
et
@@ -2458,10 +2743,7 @@ et
et
et
et
-et
-et
-et
-et
+HQ
et
et
gV
@@ -2470,6 +2752,7 @@ ht
hp
hp
hp
+hz
hp
hp
hp
@@ -2486,14 +2769,11 @@ hp
hp
hp
hp
-hp
-hp
-hp
-hp
-hp
+hz
+hz
hp
ht
-dJ
+aa
"}
(16,1,1) = {"
aa
@@ -2547,43 +2827,49 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
dJ
-dQ
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-dQ
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+dQ
+gU
+gU
+gU
+iD
+iD
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+iD
+iD
+gU
+dQ
+dJ
gV
et
et
et
+HQ
+HQ
et
et
et
@@ -2599,11 +2885,7 @@ et
et
et
et
-et
-et
-et
-et
-et
+HQ
et
et
gV
@@ -2612,6 +2894,8 @@ ht
hp
hp
hp
+hz
+hz
hp
hp
hp
@@ -2627,15 +2911,11 @@ hp
hp
hp
hp
-hp
-hp
-hp
-hp
-hp
-hp
+hz
+hz
hp
ht
-dJ
+aa
"}
(17,1,1) = {"
aa
@@ -2689,47 +2969,49 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
dJ
-dQ
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-dQ
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+dQ
+gU
+gU
+gU
+gU
+iD
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+iD
+gU
+dQ
+dJ
gV
et
et
et
et
-et
-et
-et
+HQ
et
et
et
@@ -2755,6 +3037,7 @@ hp
hp
hp
hp
+hz
hp
hp
hp
@@ -2771,13 +3054,10 @@ hp
hp
hp
hp
-hp
-hp
-hp
-hp
+hz
hp
ht
-dJ
+aa
"}
(18,1,1) = {"
aa
@@ -2831,44 +3111,50 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
dJ
-dQ
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-dQ
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+dQ
+gU
+gU
+gU
+gU
+iD
+iD
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+hd
+gU
+gU
+gU
+gU
+iD
+gU
+dQ
+dJ
gV
et
et
et
et
+HQ
+HQ
et
et
et
@@ -2879,11 +3165,7 @@ et
et
et
et
-et
-et
-et
-et
-et
+fg
et
et
et
@@ -2897,6 +3179,8 @@ hp
hp
hp
hp
+hz
+hz
hp
hp
hp
@@ -2907,19 +3191,15 @@ hp
hp
hp
hp
+hq
hp
hp
hp
hp
-hp
-hp
-hp
-hp
-hp
-hp
+hz
hp
ht
-dJ
+aa
"}
(19,1,1) = {"
aa
@@ -2973,45 +3253,50 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
dJ
-dQ
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-hd
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-dQ
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+dQ
+gU
+gU
+gU
+gU
+gU
+iD
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+iD
+gU
+dQ
+dJ
gV
et
et
et
et
et
+HQ
et
et
et
@@ -3024,9 +3309,6 @@ et
et
et
et
-fg
-et
-et
et
et
et
@@ -3040,6 +3322,7 @@ hp
hp
hp
hp
+hz
hp
hp
hp
@@ -3052,16 +3335,13 @@ hp
hp
hp
hp
-hq
-hp
-hp
-hp
hp
hp
hp
+hz
hp
ht
-dJ
+aa
"}
(20,1,1) = {"
aa
@@ -3115,45 +3395,57 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
dJ
-dQ
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-dQ
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+dQ
+gU
+gU
+gU
+gU
+gU
+iD
+iD
+iD
+iD
+iD
+iD
+iD
+iD
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+iD
+iD
+gU
+dQ
+dJ
gV
et
et
et
et
et
+HQ
+HQ
+HQ
+HQ
+HQ
+HQ
+HQ
+HQ
et
et
et
@@ -3161,17 +3453,7 @@ et
et
et
et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
+HQ
et
et
gV
@@ -3182,6 +3464,14 @@ hp
hp
hp
hp
+hz
+hz
+hz
+hz
+hz
+hz
+hz
+hz
hp
hp
hp
@@ -3189,21 +3479,11 @@ hp
hp
hp
hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
+hz
+hz
hp
ht
-dJ
+aa
"}
(21,1,1) = {"
aa
@@ -3217,7 +3497,7 @@ HO
HO
HO
SG
-Js
+HO
HO
HO
HO
@@ -3257,39 +3537,43 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
dJ
-dQ
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-dQ
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+dQ
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+iD
+iD
+iD
+iD
+iD
+iD
+iD
+iD
+iD
+gU
+gU
+dQ
+dJ
gV
et
et
@@ -3303,15 +3587,13 @@ et
et
et
et
-et
-et
-et
-et
-et
-et
-et
-et
-et
+HQ
+HQ
+HQ
+HQ
+HQ
+HQ
+HQ
et
et
et
@@ -3331,21 +3613,19 @@ hp
hp
hp
hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
+hz
+hz
+hz
+hz
+hz
+hz
+hz
+hz
+hz
hp
hp
ht
-dJ
+aa
"}
(22,1,1) = {"
aa
@@ -3399,39 +3679,43 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
dJ
-dQ
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-dQ
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+dQ
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+dQ
+dJ
gV
et
et
@@ -3456,8 +3740,6 @@ et
et
et
et
-et
-et
gV
dJ
ht
@@ -3484,10 +3766,8 @@ hp
hp
hp
hp
-hp
-hp
ht
-dJ
+aa
"}
(23,1,1) = {"
aa
@@ -3541,39 +3821,43 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
dJ
-dQ
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-dQ
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+dQ
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+dQ
+dJ
gV
et
et
@@ -3598,8 +3882,6 @@ et
et
et
et
-et
-et
gV
dJ
ht
@@ -3626,10 +3908,8 @@ hp
hp
hp
hp
-hp
-hp
ht
-dJ
+aa
"}
(24,1,1) = {"
aa
@@ -3683,95 +3963,95 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
dJ
-dQ
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-dQ
aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dQ
+dJ
+gV
+gV
+gV
+gV
+gV
+gV
+gV
+gV
+gV
+gV
+gV
+gV
+gV
+gV
+gV
+gV
+gV
+gV
+gV
+gV
+gV
+gV
+gV
gV
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
gV
dJ
ht
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
ht
-dJ
+ht
+ht
+ht
+ht
+ht
+ht
+ht
+ht
+ht
+ht
+ht
+ht
+ht
+ht
+ht
+ht
+ht
+ht
+ht
+ht
+ht
+ht
+ht
+aa
"}
(25,1,1) = {"
aa
@@ -3825,95 +4105,95 @@ aa
aa
aa
aa
+dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
aa
dJ
-dQ
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-dQ
aa
-gV
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-gV
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
dJ
-ht
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-ht
dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+aa
"}
(26,1,1) = {"
aa
@@ -3967,95 +4247,95 @@ aa
aa
aa
aa
+dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
aa
dJ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
-dQ
aa
-gV
-gV
-gV
-gV
-gV
-gV
-gV
-gV
-gV
-gV
-gV
-gV
-gV
-gV
-gV
-gV
-gV
-gV
-gV
-gV
-gV
-gV
-gV
-gV
-gV
-gV
-gV
-dJ
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
dJ
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+aa
"}
(27,1,1) = {"
aa
@@ -4109,95 +4389,95 @@ aa
aa
aa
aa
+dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
aa
dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+gO
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+gO
+dJ
+hu
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+hu
+aa
"}
(28,1,1) = {"
aa
@@ -4251,13 +4531,7 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+dJ
aa
aa
aa
@@ -4284,62 +4558,68 @@ aa
aa
aa
dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
gO
dJ
hu
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-dJ
+aa
"}
(29,1,1) = {"
aa
@@ -4353,7 +4633,7 @@ HO
HO
SG
HO
-HO
+Js
HO
HO
HO
@@ -4393,13 +4673,7 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+dJ
aa
aa
aa
@@ -4426,6 +4700,16 @@ aa
aa
aa
dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
gO
hc
hc
@@ -4442,14 +4726,12 @@ hc
hc
hc
hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
+ho
+ho
+ho
+ho
+ho
+ho
hc
hc
gO
@@ -4470,18 +4752,16 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Ma
+Ma
+Ma
+Ma
+Ma
+Ma
aa
aa
hu
-dJ
+aa
"}
(30,1,1) = {"
aa
@@ -4535,13 +4815,7 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+dJ
aa
aa
aa
@@ -4568,31 +4842,39 @@ aa
aa
aa
dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
gO
hc
hc
hc
hc
hc
+ho
+ho
+ho
+ho
+ho
+ho
+ho
+ho
+ho
+ho
+ho
hc
hc
hc
hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
+ho
+ho
hc
gO
dJ
@@ -4602,28 +4884,26 @@ aa
aa
aa
aa
+Ma
+Ma
+Ma
+Ma
+Ma
+Ma
+Ma
+Ma
+Ma
+Ma
+Ma
aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Ma
+Ma
aa
hu
-dJ
+aa
"}
(31,1,1) = {"
aa
@@ -4677,13 +4957,7 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+dJ
aa
aa
aa
@@ -4710,12 +4984,23 @@ aa
aa
aa
dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
gO
hc
hc
hc
hc
hc
+ho
hc
hc
hc
@@ -4731,10 +5016,7 @@ hc
hc
hc
hc
-hc
-hc
-hc
-hc
+ho
hc
gO
dJ
@@ -4744,6 +5026,7 @@ aa
aa
aa
aa
+Ma
aa
aa
aa
@@ -4759,13 +5042,10 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
+Ma
aa
hu
-dJ
+aa
"}
(32,1,1) = {"
aa
@@ -4819,13 +5099,7 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+dJ
aa
aa
aa
@@ -4852,11 +5126,23 @@ aa
aa
aa
dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
gO
hc
hc
hc
hc
+ho
+ho
hc
hc
hc
@@ -4872,11 +5158,7 @@ hc
hc
hc
hc
-hc
-hc
-hc
-hc
-hc
+ho
hc
gO
dJ
@@ -4885,6 +5167,8 @@ aa
aa
aa
aa
+Ma
+Ma
aa
aa
aa
@@ -4900,14 +5184,10 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
+Ma
aa
hu
-dJ
+aa
"}
(33,1,1) = {"
aa
@@ -4961,13 +5241,7 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+dJ
aa
aa
aa
@@ -4994,11 +5268,22 @@ aa
aa
aa
dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
gO
hc
hc
hc
hc
+ho
hc
hc
hc
@@ -5015,10 +5300,7 @@ hc
hc
hc
hc
-hc
-hc
-hc
-hc
+ho
hc
gO
dJ
@@ -5027,6 +5309,7 @@ aa
aa
aa
aa
+Ma
aa
aa
aa
@@ -5043,13 +5326,10 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
+Ma
aa
hu
-dJ
+aa
"}
(34,1,1) = {"
aa
@@ -5103,13 +5383,7 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+dJ
aa
aa
aa
@@ -5136,10 +5410,22 @@ aa
aa
aa
dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
gO
hc
hc
hc
+ho
+ho
hc
hc
hc
@@ -5155,12 +5441,8 @@ hc
hc
hc
hc
-hc
-hc
-hc
-hc
-hc
-hc
+ho
+ho
hc
gO
dJ
@@ -5168,6 +5450,8 @@ hu
aa
aa
aa
+Ma
+Ma
aa
aa
aa
@@ -5183,15 +5467,11 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
+Ma
+Ma
aa
hu
-dJ
+aa
"}
(35,1,1) = {"
aa
@@ -5245,43 +5525,48 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
gO
hc
hc
hc
+ho
hc
hc
hc
@@ -5298,11 +5583,8 @@ hc
hc
hc
hc
-hc
-hc
-hc
-hc
-hc
+ho
+ho
hc
gO
dJ
@@ -5310,6 +5592,7 @@ hu
aa
aa
aa
+Ma
aa
aa
aa
@@ -5326,14 +5609,11 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
+Ma
+Ma
aa
hu
-dJ
+aa
"}
(36,1,1) = {"
aa
@@ -5413,17 +5693,22 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
gO
hc
hc
hc
+ho
hc
hc
hc
@@ -5440,10 +5725,7 @@ hc
hc
hc
hc
-hc
-hc
-hc
-hc
+ho
hc
hc
gO
@@ -5452,6 +5734,7 @@ hu
aa
aa
aa
+Ma
aa
aa
aa
@@ -5468,14 +5751,11 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
+Ma
aa
aa
hu
-dJ
+aa
"}
(37,1,1) = {"
aa
@@ -5555,17 +5835,22 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
gO
hc
hc
hc
+ho
hc
hc
hc
@@ -5582,10 +5867,7 @@ hc
hc
hc
hc
-hc
-hc
-hc
-hc
+ho
hc
hc
gO
@@ -5594,6 +5876,7 @@ hu
aa
aa
aa
+Ma
aa
aa
aa
@@ -5610,14 +5893,11 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
+Ma
aa
aa
hu
-dJ
+aa
"}
(38,1,1) = {"
aa
@@ -5697,17 +5977,22 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
gO
hc
hc
hc
+ho
hc
hc
hc
@@ -5724,10 +6009,7 @@ hc
hc
hc
hc
-hc
-hc
-hc
-hc
+ho
hc
hc
gO
@@ -5736,6 +6018,7 @@ hu
aa
aa
aa
+Ma
aa
aa
aa
@@ -5752,14 +6035,11 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
+Ma
aa
aa
hu
-dJ
+aa
"}
(39,1,1) = {"
aa
@@ -5839,17 +6119,22 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
gO
hc
hc
hc
+ho
hc
hc
hc
@@ -5866,11 +6151,8 @@ hc
hc
hc
hc
-hc
-hc
-hc
-hc
-hc
+ho
+ho
hc
gO
dJ
@@ -5878,6 +6160,7 @@ hu
aa
aa
aa
+Ma
aa
aa
aa
@@ -5894,14 +6177,11 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
+Ma
+Ma
aa
hu
-dJ
+aa
"}
(40,1,1) = {"
aa
@@ -5981,17 +6261,23 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
gO
hc
hc
hc
+ho
+ho
hc
hc
hc
@@ -6007,12 +6293,8 @@ hc
hc
hc
hc
-hc
-hc
-hc
-hc
-hc
-hc
+ho
+ho
hc
gO
dJ
@@ -6020,6 +6302,8 @@ hu
aa
aa
aa
+Ma
+Ma
aa
aa
aa
@@ -6035,15 +6319,11 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
+Ma
+Ma
aa
hu
-dJ
+aa
"}
(41,1,1) = {"
aa
@@ -6123,18 +6403,23 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
gO
hc
hc
hc
hc
+ho
hc
hc
hc
@@ -6151,10 +6436,7 @@ hc
hc
hc
hc
-hc
-hc
-hc
-hc
+ho
hc
gO
dJ
@@ -6163,6 +6445,7 @@ aa
aa
aa
aa
+Ma
aa
aa
aa
@@ -6179,13 +6462,10 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
+Ma
aa
hu
-dJ
+aa
"}
(42,1,1) = {"
aa
@@ -6265,18 +6545,24 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
gO
hc
hc
hc
hc
+ho
+ho
hc
hc
hc
@@ -6287,16 +6573,12 @@ hc
hc
hc
hc
+gP
hc
hc
hc
hc
-hc
-hc
-hc
-hc
-hc
-hc
+ho
hc
gO
dJ
@@ -6305,6 +6587,8 @@ aa
aa
aa
aa
+Ma
+Ma
aa
aa
aa
@@ -6315,19 +6599,15 @@ aa
aa
aa
aa
+he
aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
+Ma
aa
hu
-dJ
+aa
"}
(43,1,1) = {"
aa
@@ -6407,19 +6687,24 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
gO
hc
hc
hc
hc
hc
+ho
hc
hc
hc
@@ -6435,10 +6720,7 @@ hc
hc
hc
hc
-hc
-hc
-hc
-hc
+ho
hc
gO
dJ
@@ -6448,6 +6730,7 @@ aa
aa
aa
aa
+Ma
aa
aa
aa
@@ -6463,13 +6746,10 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
+Ma
aa
hu
-dJ
+aa
"}
(44,1,1) = {"
aa
@@ -6549,19 +6829,31 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
gO
hc
hc
hc
hc
hc
+ho
+ho
+ho
+ho
+ho
+ho
+ho
+ho
hc
hc
hc
@@ -6569,18 +6861,8 @@ hc
hc
hc
hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
+ho
+ho
hc
gO
dJ
@@ -6590,6 +6872,14 @@ aa
aa
aa
aa
+Ma
+Ma
+Ma
+Ma
+Ma
+Ma
+Ma
+Ma
aa
aa
aa
@@ -6597,21 +6887,11 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+Ma
+Ma
aa
hu
-dJ
+aa
"}
(45,1,1) = {"
aa
@@ -6691,13 +6971,17 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
gO
hc
hc
@@ -6711,17 +6995,15 @@ hc
hc
hc
hc
-hc
-hc
-hc
-hc
-hc
-gP
-hc
-hc
-hc
-hc
-hc
+ho
+ho
+ho
+ho
+ho
+ho
+ho
+ho
+ho
hc
hc
gO
@@ -6739,21 +7021,19 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-he
-aa
-aa
-aa
-aa
-aa
+Ma
+Ma
+Ma
+Ma
+Ma
+Ma
+Ma
+Ma
+Ma
aa
aa
hu
-dJ
+aa
"}
(46,1,1) = {"
aa
@@ -6833,13 +7113,17 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
gO
hc
hc
@@ -6864,8 +7148,6 @@ hc
hc
hc
hc
-hc
-hc
gO
dJ
hu
@@ -6892,10 +7174,8 @@ aa
aa
aa
aa
-aa
-aa
hu
-dJ
+aa
"}
(47,1,1) = {"
aa
@@ -6975,13 +7255,17 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
gO
hc
hc
@@ -7006,8 +7290,6 @@ hc
hc
hc
hc
-hc
-hc
gO
dJ
hu
@@ -7034,10 +7316,8 @@ aa
aa
aa
aa
-aa
-aa
hu
-dJ
+aa
"}
(48,1,1) = {"
aa
@@ -7117,69 +7397,69 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
+gO
gO
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
gO
dJ
hu
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
hu
-dJ
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+hu
+aa
"}
(49,1,1) = {"
aa
@@ -7259,6 +7539,52 @@ aa
aa
aa
aa
+dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -7266,35 +7592,6 @@ aa
aa
aa
dJ
-gO
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-gO
-dJ
-hu
aa
aa
aa
@@ -7305,23 +7602,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-hu
-dJ
"}
(50,1,1) = {"
aa
@@ -7401,6 +7681,52 @@ aa
aa
aa
aa
+dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -7408,35 +7734,6 @@ aa
aa
aa
dJ
-gO
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-gO
-dJ
-hu
aa
aa
aa
@@ -7447,23 +7744,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-hu
-dJ
"}
(51,1,1) = {"
aa
@@ -7543,6 +7823,52 @@ aa
aa
aa
aa
+dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -7550,35 +7876,6 @@ aa
aa
aa
dJ
-gO
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-hc
-gO
-dJ
-hu
aa
aa
aa
@@ -7589,23 +7886,6 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-hu
-dJ
"}
(52,1,1) = {"
aa
@@ -7685,6 +7965,52 @@ aa
aa
aa
aa
+dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -7692,62 +8018,16 @@ aa
aa
aa
dJ
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-gO
-dJ
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-hu
-dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
"}
(53,1,1) = {"
aa
@@ -7827,6 +8107,52 @@ aa
aa
aa
aa
+dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -7834,62 +8160,16 @@ aa
aa
aa
dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
"}
(54,1,1) = {"
aa
@@ -7969,6 +8249,7 @@ aa
aa
aa
aa
+dJ
aa
aa
aa
@@ -8020,8 +8301,7 @@ aa
aa
aa
aa
-aa
-aa
+dJ
aa
aa
aa
@@ -8111,6 +8391,7 @@ aa
aa
aa
aa
+dJ
aa
aa
aa
@@ -8162,8 +8443,7 @@ aa
aa
aa
aa
-aa
-aa
+dJ
aa
aa
aa
@@ -8253,6 +8533,7 @@ aa
aa
aa
aa
+dJ
aa
aa
aa
@@ -8304,8 +8585,7 @@ aa
aa
aa
aa
-aa
-aa
+dJ
aa
aa
aa
@@ -8395,6 +8675,7 @@ aa
aa
aa
aa
+dJ
aa
aa
aa
@@ -8446,8 +8727,7 @@ aa
aa
aa
aa
-aa
-aa
+dJ
aa
aa
aa
@@ -8537,6 +8817,7 @@ aa
aa
aa
aa
+dJ
aa
aa
aa
@@ -8588,8 +8869,7 @@ aa
aa
aa
aa
-aa
-aa
+dJ
aa
aa
aa
@@ -8679,59 +8959,59 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
+dJ
aa
aa
aa
@@ -17461,38 +17741,38 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
aa
aa
aa
@@ -17603,38 +17883,38 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
aa
aa
aa
@@ -17745,38 +18025,38 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
aa
aa
aa
@@ -17887,38 +18167,38 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
aa
aa
aa
@@ -18029,38 +18309,38 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+oo
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+oo
aa
aa
aa
@@ -18171,38 +18451,38 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+oo
+NY
+NY
+XR
+NY
+NY
+NY
+qv
+GJ
+GJ
+GJ
+qv
+GJ
+GJ
+GJ
+qv
+GJ
+GJ
+GJ
+qv
+GJ
+GJ
+GJ
+qv
+GJ
+NY
+NY
+XR
+NY
+NY
+pE
+Hq
aa
aa
aa
@@ -18217,7 +18497,7 @@ HO
SG
HO
HO
-HO
+yn
HO
HO
HO
@@ -18313,38 +18593,38 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+oo
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+XP
+XP
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Qz
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+ue
+ue
+Eh
+Eh
+Eh
+Eh
+Eh
+Ii
+oo
aa
aa
aa
@@ -18455,38 +18735,38 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+oo
+bB
+bB
+bB
+bB
+bB
+bB
+SU
+bB
+bB
+bB
+bB
+bB
+bB
+bB
+bB
+bB
+bB
+bB
+bB
+bB
+bB
+bB
+bB
+BP
+bB
+bB
+bB
+bB
+bB
+yO
+oo
aa
aa
aa
@@ -18597,38 +18877,38 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+oo
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+XP
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+ue
+Eh
+Eh
+Eh
+Eh
+Eh
+Ii
+oo
aa
aa
aa
@@ -18739,38 +19019,38 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+oo
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+XP
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+ue
+Eh
+Eh
+Eh
+Eh
+Eh
+Ii
+oo
aa
aa
aa
@@ -18782,7 +19062,7 @@ HO
HO
HO
SG
-yn
+HO
HO
HO
HO
@@ -18881,38 +19161,38 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+oo
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+jf
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+ue
+Eh
+Eh
+Eh
+Eh
+Eh
+Ii
+oo
aa
aa
aa
@@ -19023,38 +19303,38 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+oo
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+jf
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+ue
+Eh
+Eh
+Eh
+Eh
+Eh
+Ii
+oo
aa
aa
aa
@@ -19165,38 +19445,38 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+oo
+bB
+bB
+bB
+bB
+bB
+bB
+QF
+bB
+bB
+bB
+bB
+bB
+bB
+bB
+bB
+bB
+bB
+bB
+bB
+bB
+bB
+bB
+bB
+BP
+bB
+bB
+bB
+bB
+bB
+yO
+oo
aa
aa
aa
@@ -19307,38 +19587,38 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+oo
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+jf
+jf
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+Eh
+ue
+ue
+Eh
+Eh
+Eh
+Eh
+Eh
+Ii
+oo
aa
aa
aa
@@ -19449,38 +19729,38 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+oo
+aD
+aD
+aD
+NF
+aD
+aD
+JL
+AG
+JL
+JL
+JL
+AG
+JL
+JL
+JL
+AG
+JL
+JL
+JL
+AG
+JL
+JL
+JL
+AG
+aD
+aD
+aD
+NF
+aD
+UW
+oo
aa
aa
aa
@@ -19591,38 +19871,38 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+oo
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+mU
+oo
aa
aa
aa
@@ -19733,38 +20013,38 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
aa
aa
aa
@@ -19875,38 +20155,38 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
aa
aa
aa
@@ -20017,38 +20297,38 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
aa
aa
aa
@@ -20159,38 +20439,38 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
+oo
aa
aa
aa
diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm
index 57914a2efb6..d79c6bceabc 100644
--- a/maps/tether/tether-01-surface1.dmm
+++ b/maps/tether/tether-01-surface1.dmm
@@ -35669,12 +35669,12 @@ aah
aah
auK
aAt
-aBv
-aBv
-aBv
-aBv
-aBv
-aBv
+auK
+auK
+auK
+auK
+auK
+auK
aah
aah
aah
@@ -35811,7 +35811,7 @@ aah
aah
auK
aAu
-aBv
+auK
aah
aah
aah
@@ -35953,7 +35953,7 @@ aah
aah
auK
aAu
-aBv
+auK
aah
aah
aah
@@ -36095,7 +36095,7 @@ aah
aah
auK
abB
-aBv
+auK
aah
aah
aah
@@ -36237,7 +36237,7 @@ aah
aah
auK
aAu
-aBv
+auK
aah
aah
aah
@@ -36379,7 +36379,7 @@ aah
aah
auK
aAv
-aBv
+auK
aah
aah
aah
@@ -36521,7 +36521,7 @@ agv
agv
azs
aAw
-aBv
+auK
aah
aah
aah
@@ -36663,7 +36663,7 @@ aip
aiJ
azs
aaT
-aBv
+auK
aah
aah
aah
@@ -36805,7 +36805,7 @@ ais
aiK
azs
aAu
-aBv
+auK
aah
aah
aah
@@ -36947,7 +36947,7 @@ aiH
aiL
azs
aAw
-aBv
+auK
aah
aah
aah
@@ -37089,7 +37089,7 @@ aiI
aiM
azs
aAu
-aBv
+auK
aah
aah
aah
@@ -37231,7 +37231,7 @@ agv
agv
azs
aAx
-aBv
+auK
aBv
aBv
aBv
diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index cfb8df48727..897a8641e0c 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -22533,6 +22533,9 @@
icon_state = "dangercorner";
dir = 1
},
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 6
+ },
/turf/simulated/floor/tiled,
/area/tether/surfacebase/shuttle_pad)
"aKe" = (
@@ -23491,6 +23494,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
},
+/obj/structure/cable/green{
+ icon_state = "2-4"
+ },
/turf/simulated/floor/tiled,
/area/tether/surfacebase/shuttle_pad)
"aMc" = (
@@ -23505,6 +23511,9 @@
d2 = 2;
icon_state = "1-2"
},
+/obj/structure/cable/green{
+ icon_state = "1-8"
+ },
/turf/simulated/floor/tiled,
/area/tether/surfacebase/shuttle_pad)
"aMd" = (
@@ -23934,6 +23943,10 @@
dir = 1
},
/obj/effect/floor_decal/steeldecal/steel_decals5,
+/obj/structure/cable/green{
+ icon_state = "1-2";
+ dir = 1
+ },
/turf/simulated/floor/tiled,
/area/tether/surfacebase/shuttle_pad)
"aMX" = (
@@ -24546,11 +24559,7 @@
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/shuttle_pad)
"aOl" = (
-/obj/structure/shuttle/engine/propulsion{
- anchored = 0;
- dir = 8;
- icon_state = "propulsion"
- },
+/obj/machinery/ion_engine,
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/shuttle_pad)
"aOm" = (
@@ -24840,6 +24849,7 @@
/area/tether/surfacebase/shuttle_pad)
"aOP" = (
/obj/machinery/light/small,
+/obj/item/weapon/tank/phoron,
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/shuttle_pad)
"aOQ" = (
@@ -30452,6 +30462,7 @@
/obj/item/device/flashlight/lamp/green{
pixel_x = -10
},
+/obj/item/weapon/paper/dockingcodes,
/turf/simulated/floor/carpet,
/area/crew_quarters/heads/hop)
"aZc" = (
@@ -30881,6 +30892,7 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
+/obj/item/weapon/paper/dockingcodes,
/turf/simulated/floor/wood,
/area/crew_quarters/captain)
"aZV" = (
@@ -31728,6 +31740,696 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_three_hall)
+"bKm" = (
+/obj/structure/cable{
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/general)
+"bMK" = (
+/obj/machinery/atmospherics/portables_connector{
+ dir = 8
+ },
+/obj/effect/floor_decal/industrial/outline/red,
+/turf/simulated/floor/tiled/monotile,
+/area/tether/surfacebase/shuttle_pad)
+"cMs" = (
+/obj/machinery/power/smes/buildable{
+ charge = 500000
+ },
+/obj/structure/cable{
+ d2 = 8;
+ icon_state = "0-8"
+ },
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
+/area/shuttle/tourbus/engines)
+"cZe" = (
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 4
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 9
+ },
+/obj/effect/floor_decal/corner/blue/border{
+ icon_state = "bordercolor";
+ dir = 9
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/general)
+"dhv" = (
+/obj/machinery/computer/ship/sensors,
+/turf/simulated/floor/tiled/white,
+/area/shuttle/tourbus/cockpit)
+"dhS" = (
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 8
+ },
+/obj/effect/floor_decal/rust/part_rusted1{
+ icon_state = "part_rusted1";
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/general)
+"dGZ" = (
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/general)
+"dHR" = (
+/obj/structure/cable/green{
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/general)
+"esm" = (
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 1;
+ pixel_y = 0
+ },
+/obj/effect/floor_decal/corner/blue/border{
+ icon_state = "bordercolor";
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 4;
+ icon_state = "borderfloorcorner2";
+ pixel_y = 0
+ },
+/obj/effect/floor_decal/corner/blue/bordercorner2{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/general)
+"eMW" = (
+/obj/machinery/computer/ship/engines{
+ icon_state = "computer";
+ dir = 8
+ },
+/turf/simulated/floor/tiled/white,
+/area/shuttle/tourbus/cockpit)
+"eNn" = (
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 8
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/general)
+"eQs" = (
+/obj/effect/floor_decal/rust/part_rusted1{
+ icon_state = "part_rusted1";
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/general)
+"fNt" = (
+/obj/structure/cable/green{
+ icon_state = "0-1";
+ dir = 1
+ },
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced,
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/engines)
+"ghf" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+ icon_state = "1-2";
+ dir = 1
+ },
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/shuttle_pad)
+"gqX" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/blue/border{
+ dir = 4
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 6
+ },
+/obj/effect/floor_decal/corner/blue/bordercorner2{
+ dir = 6
+ },
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 8
+ },
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/general)
+"guv" = (
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 4
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/blue/border{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 10;
+ icon_state = "borderfloorcorner2";
+ pixel_x = 0
+ },
+/obj/effect/floor_decal/corner/blue/bordercorner2{
+ dir = 10
+ },
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/general)
+"gHh" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 10
+ },
+/turf/simulated/wall/shull,
+/area/shuttle/tourbus/general)
+"gJT" = (
+/obj/structure/fuel_port{
+ pixel_x = 1;
+ pixel_y = 0
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 6
+ },
+/obj/effect/floor_decal/industrial/warning/full,
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/general)
+"gLd" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/shuttle_pad)
+"ieb" = (
+/obj/effect/floor_decal/borderfloorblack,
+/obj/effect/floor_decal/industrial/danger,
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+ frequency = 1380;
+ id_tag = "tourbus_pad";
+ pixel_y = 24
+ },
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/shuttle_pad)
+"isR" = (
+/obj/effect/floor_decal/steeldecal/steel_decals_central5{
+ icon_state = "steel_decals_central5";
+ dir = 4
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals_central5{
+ icon_state = "steel_decals_central5";
+ dir = 8
+ },
+/obj/machinery/door/airlock/glass_external/public{
+ frequency = 1380;
+ id_tag = "tourbus_right"
+ },
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/shuttle/tourbus/general)
+"jpB" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 6
+ },
+/turf/simulated/wall/shull,
+/area/shuttle/tourbus/general)
+"jvK" = (
+/turf/simulated/wall/shull,
+/area/shuttle/tourbus/cockpit)
+"jHw" = (
+/turf/simulated/wall/shull,
+/area/shuttle/tourbus/general)
+"jYd" = (
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 4
+ },
+/turf/simulated/floor/reinforced,
+/area/tether/surfacebase/shuttle_pad)
+"jZe" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
+/turf/simulated/floor/tiled/monotile,
+/area/tether/surfacebase/shuttle_pad)
+"mfi" = (
+/obj/effect/floor_decal/steeldecal/steel_decals_central5{
+ icon_state = "steel_decals_central5";
+ dir = 8
+ },
+/obj/effect/floor_decal/steeldecal/steel_decals_central5{
+ icon_state = "steel_decals_central5";
+ dir = 4
+ },
+/obj/machinery/door/airlock/glass_external{
+ icon_state = "door_locked";
+ id_tag = "tourbus_left";
+ locked = 1;
+ req_one_access = list()
+ },
+/obj/machinery/button/remote/airlock{
+ desiredstate = 1;
+ dir = 2;
+ icon_state = "doorctrl0";
+ id = "tourbus_left";
+ name = "hatch bolt control";
+ pixel_x = 0;
+ pixel_y = 30;
+ req_one_access = list(19,43,67);
+ specialfunctions = 4
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/shuttle/tourbus/general)
+"mDr" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/obj/machinery/door/blast/regular{
+ density = 0;
+ dir = 1;
+ icon_state = "pdoor0";
+ id = "shuttle blast";
+ name = "Shuttle Blast Doors";
+ opacity = 0
+ },
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/plating,
+/area/shuttle/tourbus/general)
+"mIX" = (
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 4
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/general)
+"mJR" = (
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 1
+ },
+/turf/simulated/floor/tiled/white,
+/area/shuttle/tourbus/cockpit)
+"mPg" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/blue/border{
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 8
+ },
+/obj/effect/floor_decal/corner/blue/bordercorner2{
+ dir = 8
+ },
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/general)
+"noN" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/blue/border,
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 9
+ },
+/obj/effect/floor_decal/corner/blue/bordercorner2{
+ dir = 9
+ },
+/obj/machinery/power/apc{
+ dir = 2;
+ name = "south bump";
+ pixel_y = -28;
+ req_access = list(67)
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 4
+ },
+/obj/structure/cable{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8";
+ pixel_x = 0
+ },
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/general)
+"nXl" = (
+/obj/machinery/door/airlock/glass{
+ req_one_access = list(19,43,67)
+ },
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/turf/simulated/floor/tiled/steel_grid,
+/area/shuttle/tourbus/cockpit)
+"onV" = (
+/obj/effect/shuttle_landmark{
+ base_area = /area/tether/surfacebase/shuttle_pad;
+ base_turf = /turf/simulated/floor/reinforced;
+ docking_controller = "tourbus_pad";
+ landmark_tag = "tourbus_dock";
+ name = "Tourbus Pad"
+ },
+/obj/effect/overmap/visitable/ship/landable/tourbus,
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 4
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/general)
+"ooM" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
+/turf/simulated/floor/tiled/monofloor{
+ dir = 1
+ },
+/area/tether/surfacebase/shuttle_pad)
+"oMK" = (
+/obj/machinery/atmospherics/unary/engine,
+/turf/simulated/floor/tiled/techmaint,
+/area/tether/surfacebase/shuttle_pad)
+"qem" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 8
+ },
+/obj/effect/floor_decal/industrial/danger{
+ icon_state = "danger";
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 5
+ },
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/shuttle_pad)
+"qff" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/blue/border,
+/obj/effect/floor_decal/borderfloor/corner2,
+/obj/effect/floor_decal/corner/blue/bordercorner2,
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 4
+ },
+/obj/machinery/power/terminal,
+/obj/structure/cable/green,
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 8
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/general)
+"qom" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced,
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/engines)
+"qwm" = (
+/turf/simulated/wall/shull,
+/area/shuttle/tourbus/engines)
+"qWU" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
+/turf/simulated/wall/shull,
+/area/shuttle/tourbus/engines)
+"rjV" = (
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 4
+ },
+/obj/effect/floor_decal/corner/blue/border{
+ dir = 4
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 5
+ },
+/obj/effect/floor_decal/corner/blue/bordercorner2{
+ dir = 5
+ },
+/obj/machinery/light/small{
+ dir = 4;
+ pixel_y = 0
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/general)
+"rpg" = (
+/obj/structure/handrail{
+ dir = 8
+ },
+/obj/machinery/light/small,
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/cockpit)
+"rxh" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 10
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/tether/surfacebase/shuttle_pad)
+"sur" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 10
+ },
+/obj/effect/floor_decal/corner/blue/border{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 4
+ },
+/obj/structure/cable{
+ icon_state = "0-4";
+ d2 = 4
+ },
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 4
+ },
+/obj/machinery/power/apc{
+ cell_type = /obj/item/weapon/cell/apc;
+ dir = 8;
+ name = "west bump";
+ pixel_x = -28
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/engines)
+"suC" = (
+/obj/machinery/atmospherics/unary/engine{
+ dir = 1
+ },
+/turf/simulated/floor/reinforced,
+/turf/simulated/shuttle/plating/carry,
+/area/shuttle/tourbus/engines)
+"sEq" = (
+/obj/machinery/light/small,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/machinery/door/window/southleft{
+ dir = 1;
+ icon_state = "left";
+ req_one_access = list(19,43,67)
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 9
+ },
+/turf/simulated/floor/tiled/dark,
+/area/shuttle/tourbus/engines)
+"sFW" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/structure/cable/green{
+ icon_state = "1-2";
+ dir = 1
+ },
+/turf/simulated/floor/tiled/monotile,
+/area/tether/surfacebase/shuttle_pad)
+"tdA" = (
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 4
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 1;
+ pixel_y = 0
+ },
+/obj/effect/floor_decal/corner/blue/border{
+ icon_state = "bordercolor";
+ dir = 1
+ },
+/obj/effect/floor_decal/borderfloor/corner2{
+ dir = 1
+ },
+/obj/effect/floor_decal/corner/blue/bordercorner2{
+ icon_state = "bordercolorcorner2";
+ dir = 1
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/general)
+"tla" = (
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/turf/simulated/floor/tiled/white,
+/area/shuttle/tourbus/cockpit)
+"tKs" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/general)
+"tSk" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/machinery/door/blast/regular{
+ density = 0;
+ dir = 4;
+ icon_state = "pdoor0";
+ id = "shuttle blast";
+ name = "Shuttle Blast Doors";
+ opacity = 0
+ },
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/plating,
+/area/shuttle/tourbus/cockpit)
+"ubn" = (
+/obj/effect/floor_decal/borderfloor{
+ dir = 6
+ },
+/obj/effect/floor_decal/corner/blue/border{
+ dir = 6
+ },
+/obj/machinery/embedded_controller/radio/simple_docking_controller{
+ frequency = 1380;
+ id_tag = "tourbus_docker";
+ pixel_x = 24;
+ pixel_y = 0;
+ tag_door = "tourbus_right"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 4
+ },
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 8
+ },
+/obj/machinery/power/apc{
+ dir = 2;
+ name = "south bump";
+ pixel_y = -28
+ },
+/obj/structure/cable,
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/general)
+"uxT" = (
+/obj/effect/floor_decal/steeldecal/steel_decals_central5{
+ icon_state = "steel_decals_central5";
+ dir = 8
+ },
+/obj/machinery/light{
+ dir = 4;
+ icon_state = "tube1";
+ pixel_x = 0
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
+/turf/simulated/floor/tiled/monotile,
+/area/tether/surfacebase/shuttle_pad)
+"uyk" = (
+/obj/machinery/shipsensors,
+/obj/effect/floor_decal/industrial/warning/full,
+/obj/machinery/light/small,
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/cockpit)
+"uDa" = (
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 8
+ },
+/obj/effect/floor_decal/borderfloor{
+ dir = 5
+ },
+/obj/effect/floor_decal/corner/blue/border{
+ dir = 5
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/general)
"uSA" = (
/obj/effect/shuttle_landmark{
base_area = /area/tether/surfacebase/shuttle_pad;
@@ -31738,6 +32440,151 @@
},
/turf/simulated/shuttle/floor/black,
/area/shuttle/tether)
+"uYO" = (
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 9
+ },
+/turf/simulated/floor/tiled/monofloor,
+/area/tether/surfacebase/shuttle_pad)
+"vfB" = (
+/obj/machinery/atmospherics/portables_connector{
+ dir = 4
+ },
+/obj/effect/floor_decal/industrial/outline/red,
+/obj/machinery/portable_atmospherics/canister/phoron,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/turf/simulated/floor/tiled/dark,
+/area/shuttle/tourbus/engines)
+"voF" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 8
+ },
+/obj/effect/floor_decal/industrial/danger{
+ icon_state = "danger";
+ dir = 8
+ },
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 4
+ },
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/shuttle_pad)
+"wqP" = (
+/obj/structure/bed/chair/bay/chair{
+ icon_state = "bay_chair_preview";
+ dir = 1
+ },
+/obj/machinery/power/apc{
+ dir = 2;
+ name = "south bump";
+ pixel_y = -28
+ },
+/obj/structure/cable{
+ icon_state = "0-4";
+ d2 = 4
+ },
+/turf/simulated/floor/tiled/white,
+/area/shuttle/tourbus/cockpit)
+"wtd" = (
+/obj/effect/floor_decal/borderfloorblack{
+ dir = 8
+ },
+/obj/effect/floor_decal/industrial/danger{
+ icon_state = "danger";
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{
+ icon_state = "map";
+ dir = 8
+ },
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/shuttle_pad)
+"wzi" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/machinery/door/blast/regular{
+ density = 0;
+ dir = 1;
+ icon_state = "pdoor0";
+ id = "shuttle blast";
+ name = "Shuttle Blast Doors";
+ opacity = 0
+ },
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/plating,
+/area/shuttle/tourbus/general)
+"wNz" = (
+/obj/machinery/computer/ship/helm,
+/turf/simulated/floor/tiled/white,
+/area/shuttle/tourbus/cockpit)
+"xdJ" = (
+/obj/machinery/computer/shuttle_control/explore/tourbus,
+/obj/machinery/light/small{
+ icon_state = "bulb1";
+ dir = 1
+ },
+/turf/simulated/floor/tiled/white,
+/area/shuttle/tourbus/cockpit)
+"xoe" = (
+/obj/structure/table/standard,
+/turf/simulated/floor/tiled/white,
+/area/shuttle/tourbus/cockpit)
+"xxJ" = (
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 8;
+ icon_state = "2-8"
+ },
+/obj/machinery/atmospherics/pipe/manifold4w/hidden/yellow,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2";
+ pixel_y = 0
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/general)
+"xHL" = (
+/obj/effect/floor_decal/rust/part_rusted1,
+/obj/machinery/atmospherics/binary/pump,
+/obj/structure/cable{
+ icon_state = "2-4"
+ },
+/turf/simulated/floor/tiled/steel_dirty,
+/area/shuttle/tourbus/general)
+"xJy" = (
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/shuttle_pad)
+"xZw" = (
+/obj/structure/bed/chair{
+ dir = 8
+ },
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/shuttle_pad)
(1,1,1) = {"
aaa
@@ -42761,17 +43608,17 @@ aJn
aKa
aKU
aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
+rpg
+jvK
+jvK
+jvK
+mDr
+jHw
+mfi
+jHw
+jpB
+qWU
+suC
aKU
aOI
aPb
@@ -42903,17 +43750,17 @@ aJn
aKa
aKU
aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
+jvK
+jvK
+xoe
+jvK
+cZe
+guv
+eQs
+mPg
+sur
+qwm
+qwm
aKU
aOI
aPb
@@ -43045,17 +43892,17 @@ ats
aKD
aKU
aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
+tSk
+wNz
+wqP
+jvK
+tdA
+dGZ
+tKs
+mIX
+noN
+vfB
+qom
aKU
avs
aKj
@@ -43187,17 +44034,17 @@ aJn
aKa
aKU
aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
+tSk
+xdJ
+tla
+nXl
+tKs
+bKm
+gJT
+xHL
+xxJ
+sEq
+qom
aKU
aOI
aPb
@@ -43329,17 +44176,17 @@ aJn
aKa
aKU
aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
+tSk
+dhv
+mJR
+jvK
+esm
+dhS
+dHR
+eNn
+qff
+cMs
+fNt
aKU
aOI
aPb
@@ -43468,20 +44315,20 @@ aXt
aIa
aOJ
ats
-aKa
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
+ieb
aKU
aKU
+jvK
+jvK
+eMW
+jvK
+uDa
+rjV
+onV
+gqX
+ubn
+qwm
+qwm
aKU
aOK
aKj
@@ -43613,17 +44460,17 @@ aJn
aKa
aKU
aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
-aKU
+uyk
+jvK
+jvK
+jvK
+wzi
+jHw
+isR
+jHw
+gHh
+qWU
+suC
aKU
aOI
aPb
@@ -43761,7 +44608,7 @@ aKU
aKU
aKU
aKU
-aKU
+jYd
aKU
aKU
aKU
@@ -43903,7 +44750,7 @@ aKU
aKU
aKU
aKU
-aKU
+jYd
aKU
aKU
aKU
@@ -44037,15 +44884,15 @@ aHW
aIz
aJn
aKd
+wtd
+wtd
+qem
aKV
aKV
aKV
aKV
aKV
-aKV
-aKV
-aKV
-aKV
+voF
aKV
aKV
aKV
@@ -44178,16 +45025,16 @@ aHk
aHX
aIz
aJn
-aKe
-aKe
-aKe
-aKe
-aKe
-aMU
-aKe
-aKe
-aNG
-aNN
+bMK
+bMK
+bMK
+rxh
+jZe
+uxT
+jZe
+jZe
+ooM
+uYO
aKe
aKe
aMU
@@ -44329,7 +45176,7 @@ aKj
aKe
aKg
aNH
-aNH
+xZw
aKg
aNX
aKj
@@ -44471,7 +45318,7 @@ aMV
aKe
aKg
aKg
-aKg
+xJy
aKg
aKe
aOc
@@ -44608,12 +45455,12 @@ aKh
aKW
aKf
aMb
-aMA
+sFW
aMW
-aMA
-aNx
-aNx
-aNx
+sFW
+ghf
+ghf
+gLd
aNx
aMA
aMW
@@ -46180,8 +47027,8 @@ aKU
aKU
aKj
aOl
-aOl
-aOl
+oMK
+aOk
aKj
aac
aac
diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm
index b3a3a0c714d..4048c12d7e1 100644
--- a/maps/tether/tether-05-station1.dmm
+++ b/maps/tether/tether-05-station1.dmm
@@ -37,16 +37,6 @@
},
/turf/simulated/floor/tiled,
/area/engineering/atmos/backup)
-"aaf" = (
-/obj/effect/shuttle_landmark{
- base_area = /area/space;
- base_turf = /turf/space;
- docking_controller = null;
- landmark_tag = "tether_excursion_nearby";
- name = "Nearby Tether"
- },
-/turf/space,
-/area/space)
"aag" = (
/obj/structure/sign/securearea{
desc = "A warning sign which reads 'RADIOACTIVE AREA'";
@@ -7048,7 +7038,7 @@
/obj/machinery/access_button{
command = "cycle_interior";
frequency = 1380;
- master_tag = "tether_dock";
+ master_tag = "dock_d2a1";
name = "interior access button";
pixel_x = -28;
pixel_y = 26;
@@ -7514,16 +7504,6 @@
/obj/structure/flora/ausbushes/brflowers,
/turf/simulated/floor/grass,
/area/hallway/station/atrium)
-"amK" = (
-/obj/effect/shuttle_landmark{
- base_area = /area/space;
- base_turf = /turf/space;
- docking_controller = "specops_dock";
- landmark_tag = "specops_tether";
- name = "Tether Docking Arm"
- },
-/turf/space,
-/area/space)
"amL" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -14118,9 +14098,9 @@
/obj/effect/shuttle_landmark{
base_area = /area/space;
base_turf = /turf/space;
- docking_controller = "d1a2_dock";
- landmark_tag = "tether_excursion_dockarm";
- name = "Tether Docking Arm"
+ docking_controller = "dock_d1a2";
+ landmark_tag = "tether_dockarm_d1a2";
+ name = "Tether Dock D1A2"
},
/turf/space,
/area/space)
@@ -15947,7 +15927,7 @@
/obj/machinery/access_button{
command = "cycle_interior";
frequency = 1380;
- master_tag = "trade_shuttle_dock_airlock";
+ master_tag = "dock_d1l";
name = "interior access button";
pixel_x = -28;
pixel_y = -26;
@@ -16302,7 +16282,7 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 1;
frequency = 1380;
- id_tag = "trade_shuttle_dock_pump"
+ id_tag = "dock_d1l_pump"
},
/turf/simulated/floor/tiled/dark,
/area/tether/station/dock_one)
@@ -17726,7 +17706,7 @@
/obj/machinery/access_button{
command = "cycle_interior";
frequency = 1380;
- master_tag = "tether_dock";
+ master_tag = "dock_d1a3";
name = "interior access button";
pixel_x = 28;
pixel_y = 26;
@@ -18765,9 +18745,9 @@
/obj/effect/shuttle_landmark{
base_area = /area/space;
base_turf = /turf/space;
- docking_controller = "trade_shuttle_dock_airlock";
- landmark_tag = "trade_station";
- name = "Tether Docking Arm"
+ docking_controller = "dock_d1l";
+ landmark_tag = "tether_dockarm_d1l";
+ name = "Tether Dock D1L"
},
/turf/space,
/area/space)
@@ -22036,9 +22016,9 @@
/obj/effect/shuttle_landmark{
base_area = /area/space;
base_turf = /turf/space;
- docking_controller = "tether_dock_airlock";
- landmark_tag = "tether_backup_high";
- name = "Tether Docking Arm"
+ docking_controller = "dock_d1a3";
+ landmark_tag = "tether_dockarm_d1a3";
+ name = "Tether Dock D1A3"
},
/turf/space,
/area/space)
@@ -22210,7 +22190,7 @@
/obj/machinery/access_button{
command = "cycle_exterior";
frequency = 1380;
- master_tag = "d1a2_dock";
+ master_tag = "dock_d1a2";
name = "exterior access button";
pixel_x = -5;
pixel_y = -26;
@@ -22219,7 +22199,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
- id_tag = "d1a2_dock_outer";
+ id_tag = "dock_d1a2_outer";
locked = 1;
name = "Docking Port Airlock"
},
@@ -22229,7 +22209,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
- id_tag = "d1a2_dock_inner";
+ id_tag = "dock_d1a2_inner";
locked = 1;
name = "Docking Port Airlock"
},
@@ -22242,25 +22222,25 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4;
frequency = 1380;
- id_tag = "d1a2_dock_pump"
+ id_tag = "dock_d1a2_pump"
},
/obj/machinery/light/small,
/obj/machinery/airlock_sensor{
frequency = 1380;
- id_tag = "d1a2_dock_sensor";
+ id_tag = "dock_d1a2_sensor";
pixel_x = 0;
pixel_y = -25
},
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1380;
- id_tag = "d1a2_dock";
+ id_tag = "dock_d1a2";
pixel_x = 0;
pixel_y = 30;
req_one_access = list(13);
- tag_airpump = "d1a2_dock_pump";
- tag_chamber_sensor = "d1a2_dock_sensor";
- tag_exterior_door = "d1a2_dock_outer";
- tag_interior_door = "d1a2_dock_inner"
+ tag_airpump = "dock_d1a2_pump";
+ tag_chamber_sensor = "dock_d1a2_sensor";
+ tag_exterior_door = "dock_d1a2_outer";
+ tag_interior_door = "dock_d1a2_inner"
},
/turf/simulated/floor/tiled/dark,
/area/tether/station/dock_one)
@@ -22268,7 +22248,7 @@
/obj/machinery/access_button{
command = "cycle_interior";
frequency = 1380;
- master_tag = "d1a2_dock";
+ master_tag = "dock_d1a2";
name = "interior access button";
pixel_x = -28;
pixel_y = 26;
@@ -22297,14 +22277,14 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
- id_tag = "specops_dock_outer";
+ id_tag = "dock_d2a2_outer";
locked = 1;
name = "Docking Port Airlock"
},
/obj/machinery/access_button{
command = "cycle_exterior";
frequency = 1380;
- master_tag = "specops_dock";
+ master_tag = "dock_d2a2";
name = "exterior access button";
pixel_x = -5;
pixel_y = -26;
@@ -22316,7 +22296,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
- id_tag = "specops_dock_inner";
+ id_tag = "dock_d2a2_inner";
locked = 1;
name = "Docking Port Airlock"
},
@@ -22329,23 +22309,23 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4;
frequency = 1380;
- id_tag = "specops_dock_pump"
+ id_tag = "dock_d2a2_pump"
},
/obj/machinery/light/small,
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1380;
- id_tag = "specops_dock";
+ id_tag = "dock_d2a2";
pixel_x = 0;
pixel_y = 30;
req_one_access = list(13);
- tag_airpump = null;
- tag_chamber_sensor = null;
- tag_exterior_door = null;
- tag_interior_door = null
+ tag_airpump = "dock_d2a2_pump";
+ tag_chamber_sensor = "dock_d2a2_sensor";
+ tag_exterior_door = "dock_d2a2_outer";
+ tag_interior_door = "dock_d2a2_inner"
},
/obj/machinery/airlock_sensor{
frequency = 1380;
- id_tag = "specops_dock_sensor";
+ id_tag = "dock_d2a2_sensor";
pixel_x = 0;
pixel_y = -25
},
@@ -22362,7 +22342,7 @@
/obj/machinery/access_button{
command = "cycle_interior";
frequency = 1380;
- master_tag = "specops_dock";
+ master_tag = "dock_d2a2";
name = "interior access button";
pixel_x = -28;
pixel_y = 26;
@@ -22455,7 +22435,7 @@
/obj/machinery/access_button{
command = "cycle_exterior";
frequency = 1380;
- master_tag = "d1a1_dock";
+ master_tag = "dock_d1a1";
name = "exterior access button";
pixel_x = -5;
pixel_y = -26;
@@ -22464,7 +22444,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
- id_tag = "d1a1_dock_outer";
+ id_tag = "dock_d1a1_outer";
locked = 1;
name = "Docking Port Airlock"
},
@@ -22477,7 +22457,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
- id_tag = "d1a1_dock_inner";
+ id_tag = "dock_d1a1_inner";
locked = 1;
name = "Docking Port Airlock"
},
@@ -22487,25 +22467,25 @@
/obj/machinery/light/small,
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1380;
- id_tag = "d1a1_dock";
+ id_tag = "dock_d1a1";
pixel_x = 0;
pixel_y = 30;
req_one_access = list(13);
- tag_airpump = "d1a1_dock_pump";
- tag_chamber_sensor = "d1a1_dock_sensor";
- tag_exterior_door = "d1a1_dock_outer";
- tag_interior_door = "d1a1_dock_inner"
+ tag_airpump = "dock_d1a1_pump";
+ tag_chamber_sensor = "dock_d1a1_sensor";
+ tag_exterior_door = "dock_d1a1_outer";
+ tag_interior_door = "dock_d1a1_inner"
},
/obj/machinery/airlock_sensor{
frequency = 1380;
- id_tag = "d1a1_dock_sensor";
+ id_tag = "dock_d1a1_sensor";
pixel_x = 0;
pixel_y = -25
},
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4;
frequency = 1380;
- id_tag = "d1a1_dock_pump"
+ id_tag = "dock_d1a1_pump"
},
/turf/simulated/floor/tiled/dark,
/area/tether/station/dock_one)
@@ -22513,7 +22493,7 @@
/obj/machinery/access_button{
command = "cycle_interior";
frequency = 1380;
- master_tag = "d1a1_dock";
+ master_tag = "dock_d1a1";
name = "interior access button";
pixel_x = -28;
pixel_y = 26;
@@ -22529,7 +22509,7 @@
/obj/machinery/access_button{
command = "cycle_exterior";
frequency = 1380;
- master_tag = "d2a1_dock";
+ master_tag = "dock_d2a1";
name = "exterior access button";
pixel_x = -5;
pixel_y = -26;
@@ -22538,7 +22518,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
- id_tag = "d2a1_dock_outer";
+ id_tag = "dock_d2a1_outer";
locked = 1;
name = "Docking Port Airlock"
},
@@ -22548,7 +22528,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
- id_tag = "d2a1_dock_inner";
+ id_tag = "dock_d2a1_inner";
locked = 1;
name = "Docking Port Airlock"
},
@@ -22561,25 +22541,25 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 4;
frequency = 1380;
- id_tag = "d2a1_dock_pump"
+ id_tag = "dock_d2a1_pump"
},
/obj/machinery/light/small,
/obj/machinery/airlock_sensor{
frequency = 1380;
- id_tag = "d2a1_dock_sensor";
+ id_tag = "dock_d2a1_sensor";
pixel_x = 0;
pixel_y = -25
},
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1380;
- id_tag = "d2a1_dock_airlock";
+ id_tag = "dock_d2a1";
pixel_x = 0;
pixel_y = 30;
req_one_access = list(13);
- tag_airpump = "d2a1_dock_pump";
- tag_chamber_sensor = "d2a1_dock_sensor";
- tag_exterior_door = "d2a1_dock_outer";
- tag_interior_door = "d2a1_dock_inner"
+ tag_airpump = "dock_d2a1_pump";
+ tag_chamber_sensor = "dock_d2a1_sensor";
+ tag_exterior_door = "dock_d2a1_outer";
+ tag_interior_door = "dock_d2a1_inner"
},
/turf/simulated/floor/tiled/dark,
/area/tether/station/dock_two)
@@ -22631,7 +22611,7 @@
/obj/machinery/access_button{
command = "cycle_interior";
frequency = 1380;
- master_tag = "nuke_shuttle_dock";
+ master_tag = "dock_d2l";
name = "interior access button";
pixel_x = 26;
pixel_y = -26;
@@ -22644,7 +22624,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
- id_tag = "trade_shuttle_dock_inner";
+ id_tag = "dock_d1l_inner";
locked = 1;
name = "Dock One Internal Access"
},
@@ -22654,7 +22634,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
- id_tag = "trade_shuttle_dock_inner";
+ id_tag = "dock_d1l_inner";
locked = 1;
name = "Dock One Internal Access"
},
@@ -22668,7 +22648,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
- id_tag = "nuke_shuttle_dock_inner";
+ id_tag = "dock_d2l_inner";
locked = 1;
name = "Docking Port Airlock"
},
@@ -22679,7 +22659,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
- id_tag = "nuke_shuttle_dock_inner";
+ id_tag = "dock_d2l_inner";
locked = 1;
name = "Docking Port Airlock"
},
@@ -22695,14 +22675,14 @@
},
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1380;
- id_tag = "trade_shuttle_dock_airlock";
+ id_tag = "dock_d1l";
pixel_x = 28;
pixel_y = 0;
req_one_access = list(13);
- tag_airpump = "trade_shuttle_dock_pump";
- tag_chamber_sensor = "trade_shuttle_dock_sensor";
- tag_exterior_door = "trade_shuttle_dock_outer";
- tag_interior_door = "trade_shuttle_dock_inner"
+ tag_airpump = "dock_d1l_pump";
+ tag_chamber_sensor = "dock_d1l_sensor";
+ tag_exterior_door = "dock_d1l_outer";
+ tag_interior_door = "dock_d1l_inner"
},
/turf/simulated/floor/tiled/dark,
/area/tether/station/dock_one)
@@ -22722,14 +22702,14 @@
"bQk" = (
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1380;
- id_tag = "nuke_shuttle_dock";
+ id_tag = "dock_d2l";
pixel_x = -28;
pixel_y = 0;
req_one_access = list(13);
- tag_airpump = null;
- tag_chamber_sensor = null;
- tag_exterior_door = null;
- tag_interior_door = null
+ tag_airpump = "dock_d2l_pump";
+ tag_chamber_sensor = "dock_d2l_sensor";
+ tag_exterior_door = "dock_d2l_outer";
+ tag_interior_door = "dock_d2l_inner"
},
/obj/effect/floor_decal/industrial/warning{
dir = 9
@@ -22760,11 +22740,11 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 1;
frequency = 1380;
- id_tag = "trade_shuttle_dock_pump"
+ id_tag = "dock_d1l_pump"
},
/obj/machinery/airlock_sensor{
frequency = 1380;
- id_tag = "trade_shuttle_dock_sensor";
+ id_tag = "dock_d1l_sensor";
pixel_x = 30;
pixel_y = 8
},
@@ -22774,11 +22754,11 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 1;
frequency = 1380;
- id_tag = "nuke_shuttle_dock_pump"
+ id_tag = "dock_d2l_pump"
},
/obj/machinery/airlock_sensor{
frequency = 1380;
- id_tag = "nuke_shuttle_dock_sensor";
+ id_tag = "dock_d2l_sensor";
pixel_x = -30;
pixel_y = 8
},
@@ -22791,7 +22771,7 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 1;
frequency = 1380;
- id_tag = "nuke_shuttle_dock_pump"
+ id_tag = "dock_d2l_pump"
},
/obj/effect/floor_decal/industrial/warning{
dir = 6
@@ -22819,7 +22799,7 @@
/obj/machinery/access_button{
command = "cycle_exterior";
frequency = 1380;
- master_tag = "trade_shuttle_dock_airlock";
+ master_tag = "dock_d1l";
name = "exterior access button";
pixel_x = 28;
pixel_y = -6;
@@ -22828,7 +22808,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
- id_tag = "trade_shuttle_dock_outer";
+ id_tag = "dock_d1l_outer";
locked = 1;
name = "Dock One External Access"
},
@@ -22838,7 +22818,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
- id_tag = "trade_shuttle_dock_outer";
+ id_tag = "dock_d1l_outer";
locked = 1;
name = "Dock One External Access"
},
@@ -22848,14 +22828,14 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
- id_tag = "nuke_shuttle_dock_outer";
+ id_tag = "dock_d2l_outer";
locked = 1;
name = "Docking Port Airlock"
},
/obj/machinery/access_button{
command = "cycle_exterior";
frequency = 1380;
- master_tag = "nuke_shuttle_dock";
+ master_tag = "dock_d2l";
name = "exterior access button";
pixel_x = -28;
pixel_y = -6;
@@ -22884,7 +22864,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
- id_tag = "nuke_shuttle_dock_outer";
+ id_tag = "dock_d2l_outer";
locked = 1;
name = "Docking Port Airlock"
},
@@ -23005,9 +22985,9 @@
/obj/effect/shuttle_landmark{
base_area = /area/space;
base_turf = /turf/space;
- docking_controller = "nuke_shuttle_dock_airlock";
- landmark_tag = "merc_tether_dock";
- name = "Tether Docking Arm"
+ docking_controller = "dock_d2l";
+ landmark_tag = "tether_dockarm_d2l";
+ name = "Tether Dock D2L"
},
/turf/space,
/area/space)
@@ -23177,6 +23157,15 @@
},
/turf/simulated/floor/plating,
/area/tether/station/dock_two)
+"cwR" = (
+/obj/effect/shuttle_landmark{
+ base_area = /area/space;
+ base_turf = /turf/space;
+ landmark_tag = "tether_space_NE";
+ name = "Near Tether (NE)"
+ },
+/turf/space,
+/area/space)
"dlV" = (
/obj/machinery/door/firedoor/glass,
/obj/structure/grille,
@@ -23222,7 +23211,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
- id_tag = "tether_dock_inner";
+ id_tag = "dock_d1a3_inner";
locked = 1;
name = "Docking Port Airlock"
},
@@ -23253,25 +23242,25 @@
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 8;
frequency = 1380;
- id_tag = "tether_dock_pump"
+ id_tag = "dock_d1a3_pump"
},
/obj/machinery/light/small,
/obj/machinery/airlock_sensor{
frequency = 1380;
- id_tag = "tether_dock_sensor";
+ id_tag = "dock_d1a3_sensor";
pixel_x = 0;
pixel_y = -25
},
/obj/machinery/embedded_controller/radio/airlock/docking_port{
frequency = 1380;
- id_tag = "tether_dock_airlock";
+ id_tag = "dock_d1a3";
pixel_x = 0;
pixel_y = 30;
req_one_access = list(13);
- tag_airpump = "tether_dock_pump";
- tag_chamber_sensor = "tether_dock_sensor";
- tag_exterior_door = "tether_dock_outer";
- tag_interior_door = "tether_dock_inner"
+ tag_airpump = "dock_d1a3_pump";
+ tag_chamber_sensor = "dock_d1a3_sensor";
+ tag_exterior_door = "dock_d1a3_outer";
+ tag_interior_door = "dock_d1a3_inner"
},
/turf/simulated/floor/tiled/dark,
/area/tether/station/dock_one)
@@ -23287,6 +23276,15 @@
},
/turf/simulated/floor/plating,
/area/tether/station/dock_one)
+"mnt" = (
+/obj/effect/shuttle_landmark{
+ base_area = /area/space;
+ base_turf = /turf/space;
+ landmark_tag = "tether_space_SW";
+ name = "Near Tether (SW)"
+ },
+/turf/space,
+/area/space)
"mNU" = (
/obj/machinery/door/firedoor/glass,
/obj/structure/grille,
@@ -23307,6 +23305,16 @@
/obj/random/tech_supply,
/turf/simulated/floor,
/area/engineering/shaft)
+"odO" = (
+/obj/effect/shuttle_landmark{
+ base_area = /area/space;
+ base_turf = /turf/space;
+ docking_controller = "dock_d1a1";
+ landmark_tag = "tether_dockarm_d1a1";
+ name = "Tether Dock D1A1"
+ },
+/turf/space,
+/area/space)
"oEH" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
@@ -23314,6 +23322,16 @@
/obj/machinery/light,
/turf/simulated/floor/tiled,
/area/hallway/station/docks)
+"pQN" = (
+/obj/effect/shuttle_landmark{
+ base_area = /area/space;
+ base_turf = /turf/space;
+ docking_controller = "dock_d2a2";
+ landmark_tag = "tether_dockarm_d2a2";
+ name = "Tether Dock D2A2"
+ },
+/turf/space,
+/area/space)
"qBc" = (
/obj/structure/disposalpipe/junction{
dir = 1;
@@ -23328,20 +23346,11 @@
},
/turf/simulated/floor/tiled,
/area/tether/station/dock_one)
-"ssv" = (
-/obj/effect/shuttle_landmark{
- base_area = /area/space;
- base_turf = /turf/space;
- landmark_tag = "skipjack_outside";
- name = "Skipjack Near Tether"
- },
-/turf/space,
-/area/space)
"tKI" = (
/obj/machinery/access_button{
command = "cycle_exterior";
frequency = 1380;
- master_tag = "tether_dock";
+ master_tag = "dock_d1a3";
name = "exterior access button";
pixel_x = -5;
pixel_y = -26;
@@ -23350,7 +23359,7 @@
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
icon_state = "door_locked";
- id_tag = "tether_dock_outer";
+ id_tag = "dock_d1a3_outer";
locked = 1;
name = "Docking Port Airlock"
},
@@ -23366,6 +23375,16 @@
/obj/structure/window/reinforced,
/turf/simulated/floor/plating,
/area/tether/station/dock_one)
+"vmt" = (
+/obj/effect/shuttle_landmark{
+ base_area = /area/space;
+ base_turf = /turf/space;
+ docking_controller = "dock_d2a1";
+ landmark_tag = "tether_dockarm_d2a1";
+ name = "Tether Dock D2A1"
+ },
+/turf/space,
+/area/space)
"vyI" = (
/mob/living/simple_mob/animal/passive/bird/parrot/poly,
/turf/simulated/floor/outdoors/grass/forest,
@@ -28043,7 +28062,7 @@ aaa
aaa
aaa
aaa
-aaa
+odO
aaa
aaa
aaa
@@ -30875,6 +30894,7 @@ aaa
aaa
aaa
aaa
+pQN
aaa
aaa
aaa
@@ -30882,8 +30902,7 @@ aaa
aaa
aaa
aaa
-aaa
-aaa
+vmt
aaa
aaa
aaa
@@ -31017,7 +31036,7 @@ aaa
aaa
aaa
aaa
-amK
+aaa
aaa
aaa
aaa
@@ -31453,7 +31472,7 @@ aIA
bXl
bPx
bXl
-aCF
+aCK
aCK
aaa
aaa
@@ -34635,7 +34654,7 @@ aaa
aaa
aaa
aaa
-aaf
+aaa
aaa
aaa
aaa
@@ -39278,7 +39297,7 @@ aaa
aaa
aaa
aaa
-aaa
+mnt
aaa
aaa
aaa
@@ -39751,7 +39770,7 @@ aaa
aaa
aaa
aaa
-aaa
+cwR
aaa
aaa
aaa
@@ -40888,7 +40907,7 @@ aaa
aaa
aaa
aaa
-ssv
+aaa
aaa
aaa
aaa
diff --git a/maps/tether/tether-07-station3.dmm b/maps/tether/tether-07-station3.dmm
index 744a333bd46..56c1ce51d75 100644
--- a/maps/tether/tether-07-station3.dmm
+++ b/maps/tether/tether-07-station3.dmm
@@ -2006,22 +2006,14 @@
/turf/simulated/floor/tiled/monotile,
/area/tether/exploration)
"di" = (
-/obj/machinery/meter,
-/obj/machinery/alarm{
- pixel_y = 22
- },
-/obj/machinery/atmospherics/pipe/simple/visible/yellow{
- dir = 4
- },
-/obj/machinery/light/small{
- dir = 1
- },
-/obj/machinery/floodlight,
+/obj/effect/floor_decal/industrial/outline/blue,
+/obj/machinery/atmospherics/portables_connector,
+/obj/machinery/portable_atmospherics/canister/air,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"dj" = (
/turf/simulated/wall/rshull,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"dk" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
@@ -2171,7 +2163,7 @@
/obj/item/weapon/bedsheet/brown,
/obj/structure/curtain/open/bed,
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"dz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -2189,8 +2181,13 @@
/area/maintenance/station/sec_upper)
"dB" = (
/obj/effect/floor_decal/industrial/warning,
+/obj/structure/cable/cyan{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"dC" = (
/obj/structure/bed/chair/comfy/blue{
icon_state = "comfychair_preview";
@@ -2205,15 +2202,15 @@
pixel_y = 0
},
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cockpit)
"dD" = (
/obj/machinery/button/remote/blast_door{
- dir = 8;
- id = "shuttle blast";
name = "Shuttle Blast Doors";
- pixel_x = 26;
- pixel_y = 39;
- req_access = list(67)
+ dir = 8;
+ pixel_x = -25;
+ pixel_y = -21;
+ req_access = list(67);
+ id = "shuttle blast"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 6
@@ -2221,8 +2218,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
+/obj/structure/cable/cyan{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cockpit)
"dE" = (
/obj/structure/bed/chair/comfy/blue{
icon_state = "comfychair_preview";
@@ -2234,17 +2236,20 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
-/obj/machinery/light_switch{
- dir = 2;
- name = "light switch ";
- pixel_x = 6;
- pixel_y = 32
- },
/obj/machinery/light{
dir = 4
},
+/obj/machinery/power/apc{
+ dir = 4;
+ name = "east bump";
+ pixel_x = 28
+ },
+/obj/structure/cable/cyan{
+ d2 = 8;
+ icon_state = "0-8"
+ },
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cockpit)
"dF" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -2482,7 +2487,7 @@
/obj/item/clothing/suit/space/void/pilot,
/obj/item/clothing/head/helmet/space/void/pilot,
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"dX" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
@@ -2504,7 +2509,7 @@
},
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"dZ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 4
@@ -2526,13 +2531,13 @@
specialfunctions = 4
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"ea" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cockpit)
"eb" = (
/obj/machinery/door/airlock/hatch{
req_one_access = list(67)
@@ -2540,8 +2545,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/firedoor/glass,
+/obj/structure/cable/cyan{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled/steel_ridged,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cockpit)
"ec" = (
/obj/structure/cable/yellow{
d1 = 1;
@@ -2555,7 +2565,7 @@
pixel_x = -22
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"ed" = (
/obj/structure/railing,
/turf/space,
@@ -2588,17 +2598,23 @@
d2 = 8;
icon_state = "4-8"
},
-/obj/item/device/radio/intercom{
- dir = 1;
- name = "Station Intercom (General)";
- pixel_y = 27
- },
/obj/machinery/light/small{
icon_state = "bulb1";
dir = 1
},
+/obj/structure/cable/cyan{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/obj/machinery/power/apc{
+ alarms_hidden = 1;
+ dir = 1;
+ name = "north bump";
+ pixel_x = 0;
+ pixel_y = 28
+ },
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"eh" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 8
@@ -2839,8 +2855,18 @@
"ex" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
+/obj/structure/cable/cyan{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
+/obj/structure/cable/cyan{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"ey" = (
/turf/simulated/floor/carpet,
/area/security/breakroom)
@@ -3263,25 +3289,20 @@
/turf/simulated/floor/wood,
/area/crew_quarters/heads/hos)
"fg" = (
-/obj/machinery/atmospherics/pipe/simple/visible/yellow{
- dir = 6
+/obj/structure/closet/crate/freezer/rations,
+/obj/item/weapon/storage/mre/menu11,
+/obj/item/weapon/storage/mre/menu10,
+/obj/machinery/alarm{
+ pixel_y = 22
},
-/obj/machinery/atmospherics/portables_connector{
- dir = 8
- },
-/obj/machinery/portable_atmospherics/canister/empty,
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 10
- },
-/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"fh" = (
/obj/machinery/light/spot{
pixel_y = 32
},
/turf/simulated/wall/rshull,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"fi" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
icon_state = "intact-scrubbers";
@@ -3291,7 +3312,7 @@
dir = 6
},
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"fj" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -3301,7 +3322,7 @@
dir = 4
},
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"fk" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 1
@@ -3478,7 +3499,7 @@
dir = 4
},
/turf/simulated/floor/tiled/steel_ridged,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"fy" = (
/turf/simulated/wall/r_wall,
/area/ai)
@@ -3767,17 +3788,13 @@
/turf/simulated/floor/bluegrid,
/area/ai)
"fV" = (
-/obj/machinery/atmospherics/unary/vent_pump/on{
+/obj/machinery/atmospherics/portables_connector{
dir = 1
},
-/obj/structure/table/rack,
-/obj/item/weapon/storage/belt/utility/full,
-/obj/item/clothing/head/pilot,
-/obj/item/clothing/head/pilot,
-/obj/item/weapon/storage/box/survival/space,
-/obj/item/weapon/storage/toolbox/emergency,
+/obj/effect/floor_decal/industrial/outline/yellow,
+/obj/machinery/portable_atmospherics/canister/empty,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"fW" = (
/obj/effect/floor_decal/borderfloorblack,
/obj/effect/floor_decal/borderfloorblack/corner2{
@@ -4194,29 +4211,30 @@
/turf/simulated/floor,
/area/maintenance/station/ai)
"gL" = (
-/obj/machinery/atmospherics/pipe/simple/visible/yellow,
-/obj/machinery/meter,
+/obj/machinery/atmospherics/binary/pump,
/obj/machinery/firealarm{
dir = 1;
pixel_x = 0;
pixel_y = -26
},
-/obj/structure/handrail{
+/obj/item/weapon/tank/phoron{
+ pixel_x = -5;
+ pixel_y = 5
+ },
+/obj/item/weapon/tank/phoron{
+ pixel_x = 6;
+ pixel_y = -6
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/excursion/general)
+"gM" = (
+/obj/machinery/atmospherics/portables_connector{
dir = 1
},
+/obj/effect/floor_decal/industrial/outline/red,
+/obj/machinery/portable_atmospherics/canister/phoron,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
-"gM" = (
-/obj/machinery/atmospherics/pipe/simple/visible/cyan{
- dir = 5
- },
-/obj/machinery/meter,
-/obj/item/device/radio/intercom{
- pixel_y = -24
- },
-/obj/machinery/light/small,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"gN" = (
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
@@ -4371,13 +4389,6 @@
/obj/machinery/portable_atmospherics/canister/air/airlock,
/turf/simulated/floor/tiled,
/area/security/eva)
-"hc" = (
-/obj/machinery/atmospherics/pipe/tank/air{
- dir = 8
- },
-/obj/effect/floor_decal/industrial/outline/blue,
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
"hd" = (
/obj/structure/table/woodentable,
/obj/machinery/photocopier/faxmachine{
@@ -5317,7 +5328,7 @@
},
/obj/structure/disposalpipe/trunk,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"iu" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 8
@@ -5632,7 +5643,7 @@
},
/obj/structure/plasticflaps,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"iL" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 6
@@ -5773,20 +5784,24 @@
/turf/simulated/wall,
/area/maintenance/cargo)
"iW" = (
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/obj/structure/fuel_port{
+ pixel_x = 0;
+ pixel_y = 3
+ },
+/turf/simulated/floor/tiled/monofloor,
+/area/shuttle/excursion/cargo)
"iX" = (
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 6
},
/turf/simulated/wall/rshull,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"iY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 4
},
/turf/simulated/wall/rshull,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"iZ" = (
/obj/effect/floor_decal/borderfloorblack/full,
/obj/effect/floor_decal/industrial/hatch/yellow,
@@ -6366,7 +6381,7 @@
dir = 1
},
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"jW" = (
/obj/structure/bed/chair/office/dark{
dir = 4
@@ -6398,14 +6413,14 @@
},
/obj/machinery/recharge_station,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"jZ" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 4
},
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"ka" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -6416,14 +6431,14 @@
},
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"kb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
/obj/effect/floor_decal/industrial/outline/red,
/obj/structure/closet/secure_closet/guncabinet/excursion,
/obj/item/weapon/pickaxe,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"kc" = (
/obj/effect/floor_decal/borderfloorblack/full,
/obj/effect/floor_decal/steeldecal/steel_decals5{
@@ -6538,7 +6553,7 @@
},
/obj/structure/handrail,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"kk" = (
/obj/effect/floor_decal/industrial/warning{
dir = 5
@@ -6560,7 +6575,7 @@
pixel_y = 0
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"kl" = (
/obj/structure/cable/cyan{
d2 = 2;
@@ -6752,7 +6767,7 @@
dir = 4
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"ky" = (
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
@@ -6760,7 +6775,7 @@
},
/obj/machinery/atmospherics/pipe/manifold4w/visible,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"kz" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 1
@@ -6962,7 +6977,7 @@
dir = 4
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"kR" = (
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
@@ -6971,15 +6986,16 @@
/obj/machinery/atmospherics/pipe/manifold/visible{
dir = 8
},
-/obj/effect/shuttle_landmark/transit{
+/obj/effect/shuttle_landmark{
base_area = /area/tether/exploration;
base_turf = /turf/simulated/floor/reinforced;
docking_controller = "expshuttle_dock";
landmark_tag = "tether_excursion_hangar";
name = "Excursion Shuttle Dock"
},
+/obj/effect/overmap/visitable/ship/landable/excursion,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"kS" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -7296,8 +7312,19 @@
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
+/obj/machinery/power/apc{
+ alarms_hidden = 1;
+ dir = 2;
+ name = "south bump";
+ pixel_y = -28;
+ req_access = list(67)
+ },
+/obj/structure/cable/cyan{
+ d2 = 8;
+ icon_state = "0-8"
+ },
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"lr" = (
/obj/effect/floor_decal/techfloor{
dir = 8
@@ -7746,15 +7773,6 @@
},
/turf/simulated/floor/tiled/techfloor/grid,
/area/ai)
-"lY" = (
-/obj/effect/shuttle_landmark{
- base_area = /area/space;
- base_turf = /turf/space;
- landmark_tag = "antag_space_nearby";
- name = "Space near Tether"
- },
-/turf/space,
-/area/space)
"lZ" = (
/obj/machinery/door/firedoor/glass,
/obj/structure/cable/green,
@@ -17007,11 +17025,6 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/chemistry)
-"An" = (
-/obj/structure/shuttle/engine/propulsion,
-/turf/simulated/floor/reinforced,
-/turf/simulated/shuttle/plating/airless/carry,
-/area/shuttle/excursion)
"Ao" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -27706,7 +27719,7 @@
dir = 10
},
/turf/simulated/wall/rshull,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"Rw" = (
/obj/structure/catwalk,
/obj/machinery/light/small{
@@ -28369,8 +28382,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/structure/cable/cyan{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"SP" = (
/obj/item/modular_computer/console/preset/command{
dir = 1
@@ -28393,7 +28411,7 @@
},
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"SR" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
@@ -28506,7 +28524,7 @@
dir = 1
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"Td" = (
/obj/structure/cable/green{
d1 = 1;
@@ -28568,8 +28586,13 @@
/obj/structure/handrail{
dir = 8
},
+/obj/structure/cable/cyan{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"Tj" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/floor/tiled,
@@ -28588,12 +28611,11 @@
/obj/structure/table/rack/shelf,
/obj/item/weapon/tank/oxygen,
/obj/item/device/suit_cooling_unit,
-/obj/item/clothing/head/helmet/space/void/pilot,
/obj/item/clothing/shoes/magboots,
/obj/item/clothing/suit/space/void/pilot,
/obj/item/clothing/head/helmet/space/void/pilot,
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"Tm" = (
/obj/machinery/airlock_sensor{
frequency = 1379;
@@ -28651,7 +28673,7 @@
icon_state = "0-2"
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"Tr" = (
/obj/structure/girder,
/turf/simulated/floor/plating,
@@ -28682,7 +28704,7 @@
dir = 1
},
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"Tv" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5;
@@ -28798,7 +28820,7 @@
dir = 1
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"TH" = (
/obj/structure/cable/green{
d1 = 1;
@@ -28825,13 +28847,12 @@
/turf/simulated/floor/tiled,
/area/quartermaster/belterdock)
"TJ" = (
-/obj/machinery/atmospherics/portables_connector{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/cyan{
+ dir = 9;
+ icon_state = "intact"
},
-/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
-/obj/effect/floor_decal/industrial/outline/red,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"TK" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 1;
@@ -28921,8 +28942,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/door/firedoor/glass,
+/obj/structure/cable/cyan{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled/steel_ridged,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"TU" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -28984,8 +29010,13 @@
},
/obj/structure/handrail,
/obj/machinery/light,
+/obj/structure/cable/cyan{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"TZ" = (
/obj/structure/table/standard,
/obj/item/weapon/paper/rogueminer,
@@ -29031,7 +29062,7 @@
},
/obj/effect/floor_decal/industrial/warning/full,
/turf/simulated/floor/plating,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"Ug" = (
/obj/effect/floor_decal/industrial/warning/corner{
icon_state = "warningcorner";
@@ -29085,7 +29116,7 @@
"Um" = (
/obj/machinery/sleep_console,
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"Un" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
@@ -29169,7 +29200,7 @@
pixel_y = 22
},
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"Ut" = (
/obj/effect/landmark/start{
name = "Medical Doctor"
@@ -29229,8 +29260,13 @@
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/structure/cable/cyan{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"UA" = (
/obj/effect/floor_decal/industrial/warning{
icon_state = "warning";
@@ -29248,7 +29284,7 @@
pixel_y = -22
},
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"UC" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -29270,11 +29306,11 @@
dir = 1
},
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"UE" = (
/obj/structure/bed/chair/shuttle,
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"UF" = (
/turf/simulated/shuttle/wall,
/area/shuttle/belter)
@@ -29297,35 +29333,33 @@
icon_state = "pipe-c"
},
/turf/simulated/wall/rshull,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"UK" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/structure/handrail{
dir = 1
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"UL" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
- dir = 1
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
- dir = 10
- },
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 9;
icon_state = "intact"
},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
-"UM" = (
-/obj/machinery/atmospherics/pipe/tank/carbon_dioxide{
- dir = 8;
- start_pressure = 3039.75
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
},
-/obj/effect/floor_decal/industrial/outline/red,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
+"UM" = (
+/obj/machinery/atmospherics/portables_connector,
+/obj/effect/floor_decal/industrial/outline/blue,
+/obj/machinery/portable_atmospherics/canister/air,
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/excursion/general)
"UN" = (
/obj/structure/table/standard,
/obj/machinery/recharger,
@@ -29361,7 +29395,7 @@
amount = 5
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"UP" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
icon_state = "intact-scrubbers";
@@ -29383,7 +29417,7 @@
icon_state = "intact"
},
/turf/simulated/wall/rshull,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"US" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
@@ -29424,7 +29458,7 @@
},
/obj/structure/handrail,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"UV" = (
/obj/effect/floor_decal/steeldecal/steel_decals10{
dir = 6
@@ -29435,11 +29469,12 @@
/turf/simulated/floor/tiled,
/area/security/security_bathroom)
"UW" = (
-/obj/machinery/atmospherics/pipe/manifold/visible/cyan{
+/obj/machinery/atmospherics/pipe/manifold/hidden/yellow{
dir = 1
},
+/obj/machinery/meter,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"UX" = (
/obj/machinery/computer/shuttle_control/belter{
dir = 8
@@ -29451,7 +29486,7 @@
dir = 1
},
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"UZ" = (
/obj/structure/shuttle/engine/heater{
dir = 8
@@ -29498,7 +29533,7 @@
pixel_y = 0
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"Ve" = (
/obj/structure/cable/green{
d1 = 1;
@@ -29534,19 +29569,16 @@
/obj/item/clothing/head/helmet/space/emergency,
/obj/structure/closet/emcloset/legacy,
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"Vg" = (
-/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/universal,
+/obj/item/device/radio/intercom{
+ dir = 8;
+ pixel_x = -24;
+ pixel_y = 0
},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 1
- },
-/obj/structure/closet/crate/freezer/rations,
-/obj/item/weapon/storage/mre/menu11,
-/obj/item/weapon/storage/mre/menu10,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"Vh" = (
/obj/structure/bed/chair/shuttle,
/turf/simulated/shuttle/floor/yellow/airless,
@@ -29557,7 +29589,7 @@
id_tag = "shuttlesens_exp_psg"
},
/turf/simulated/wall/rshull,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"Vj" = (
/obj/structure/closet/emcloset,
/obj/machinery/light{
@@ -29645,9 +29677,9 @@
/turf/simulated/floor/airless,
/area/shuttle/belter)
"Vu" = (
-/obj/structure/flight_left,
+/obj/machinery/computer/ship/helm,
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cockpit)
"Vv" = (
/obj/structure/sink{
pixel_y = 26
@@ -29667,7 +29699,7 @@
dir = 8
},
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"Vx" = (
/obj/structure/closet/crate,
/obj/machinery/light,
@@ -29712,7 +29744,7 @@
},
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"VC" = (
/obj/structure/bed/chair/shuttle{
dir = 1
@@ -29720,18 +29752,17 @@
/turf/simulated/shuttle/floor/yellow/airless,
/area/shuttle/belter)
"VD" = (
-/obj/machinery/atmospherics/binary/pump,
-/obj/machinery/atmospherics/pipe/simple/hidden/universal{
- dir = 4
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 6
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"VE" = (
/obj/structure/closet/walllocker/emerglocker{
pixel_x = -32
},
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"VF" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 4
@@ -29823,13 +29854,12 @@
icon_state = "map"
},
/turf/simulated/wall/rshull,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"VR" = (
-/obj/machinery/atmospherics/binary/pump{
- dir = 8
- },
+/obj/machinery/atmospherics/pipe/manifold/hidden/cyan,
+/obj/machinery/meter,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"VS" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8;
@@ -29856,7 +29886,7 @@
dir = 1
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"VX" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/tiled/monotile,
@@ -29871,16 +29901,14 @@
/turf/simulated/wall,
/area/maintenance/substation/cargo)
"Wd" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/universal{
- dir = 4
- },
+/obj/effect/floor_decal/industrial/outline,
/obj/machinery/atmospherics/portables_connector,
/obj/machinery/portable_atmospherics/canister/air,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"Wg" = (
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"Wh" = (
/obj/effect/floor_decal/carpet,
/obj/effect/floor_decal/carpet{
@@ -29916,14 +29944,17 @@
id_tag = "shuttlesens_exp_int"
},
/turf/simulated/wall/rshull,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"Wo" = (
/obj/structure/bed/chair/shuttle,
/obj/machinery/light{
dir = 1
},
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
+"Wp" = (
+/turf/simulated/wall/rshull,
+/area/shuttle/excursion/cargo)
"Wr" = (
/obj/structure/table/standard,
/obj/item/weapon/towel/random,
@@ -29939,7 +29970,14 @@
"Ws" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
/turf/simulated/wall/rshull,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
+"Wt" = (
+/obj/machinery/computer/ship/engines{
+ icon_state = "computer";
+ dir = 4
+ },
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/excursion/cargo)
"Wv" = (
/obj/machinery/alarm{
dir = 4;
@@ -29968,7 +30006,7 @@
},
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/plating,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"WB" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
@@ -29985,9 +30023,9 @@
/turf/simulated/floor/tiled/white,
/area/security/security_bathroom)
"WD" = (
-/obj/structure/flight_right,
+/obj/machinery/computer/ship/sensors,
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cockpit)
"WE" = (
/obj/effect/decal/remains,
/obj/item/clothing/under/rank/centcom_officer,
@@ -30013,7 +30051,7 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"WH" = (
/obj/machinery/light{
icon_state = "tube1";
@@ -30022,6 +30060,11 @@
/obj/structure/dogbed,
/turf/simulated/floor/carpet,
/area/crew_quarters/heads/hos)
+"WL" = (
+/obj/machinery/shipsensors,
+/obj/effect/floor_decal/industrial/warning/full,
+/turf/simulated/floor/reinforced,
+/area/shuttle/excursion/general)
"WN" = (
/obj/effect/floor_decal/carpet{
dir = 4
@@ -30037,7 +30080,7 @@
"WR" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"WS" = (
/obj/structure/disposaloutlet{
dir = 4
@@ -30049,7 +30092,17 @@
dir = 4
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
+"WV" = (
+/obj/structure/shuttle/engine/heater,
+/obj/structure/window/reinforced{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 6
+ },
+/turf/simulated/floor/reinforced,
+/area/shuttle/excursion/cargo)
"WY" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/tiled/dark,
@@ -30062,13 +30115,13 @@
},
/obj/structure/handrail,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"Xb" = (
/obj/structure/disposalpipe/segment{
dir = 4
},
/turf/simulated/wall/rshull,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"Xc" = (
/obj/structure/grille,
/obj/structure/window/reinforced/full,
@@ -30090,7 +30143,7 @@
icon_state = "4-8"
},
/turf/simulated/floor/plating,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"Xe" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
@@ -30110,13 +30163,14 @@
dir = 5;
icon_state = "intact"
},
-/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
-"Xk" = (
/obj/structure/cable/cyan{
- d2 = 4;
- icon_state = "0-4"
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
},
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/excursion/cargo)
+"Xk" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
},
@@ -30124,14 +30178,16 @@
icon_state = "intact-scrubbers";
dir = 4
},
-/obj/machinery/power/apc{
- dir = 2;
- name = "south bump";
- pixel_y = -28;
- req_access = list(67)
+/obj/item/device/radio/intercom{
+ pixel_y = -24
+ },
+/obj/structure/cable/cyan{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"Xl" = (
/obj/structure/cable/cyan{
d1 = 4;
@@ -30144,12 +30200,17 @@
/obj/structure/handrail{
dir = 1
},
+/obj/structure/cable/cyan{
+ d1 = 1;
+ d2 = 4;
+ icon_state = "1-4"
+ },
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"Xo" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"Xp" = (
/obj/structure/cable/cyan{
d2 = 8;
@@ -30157,7 +30218,7 @@
},
/obj/machinery/power/smes/buildable/point_of_interest,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"Xq" = (
/obj/structure/stasis_cage,
/turf/simulated/floor/tiled/monotile,
@@ -30165,18 +30226,21 @@
"Xr" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/yellow,
/turf/simulated/wall/rshull,
-/area/shuttle/excursion)
-"XA" = (
-/obj/structure/shuttle/engine/heater,
-/obj/structure/window/reinforced{
+/area/shuttle/excursion/cargo)
+"Xz" = (
+/obj/machinery/atmospherics/unary/engine{
dir = 1
},
-/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
- dir = 6
- },
/turf/simulated/floor/reinforced,
-/area/shuttle/excursion)
-"XB" = (
+/turf/simulated/shuttle/plating/airless/carry,
+/area/shuttle/excursion/cargo)
+"XC" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 5
+ },
+/turf/simulated/wall/rshull,
+/area/shuttle/excursion/cargo)
+"XD" = (
/obj/structure/shuttle/engine/heater,
/obj/structure/window/reinforced{
dir = 1
@@ -30185,20 +30249,14 @@
dir = 10
},
/turf/simulated/floor/reinforced,
-/area/shuttle/excursion)
-"XC" = (
-/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
- dir = 5
- },
-/turf/simulated/wall/rshull,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"XE" = (
/obj/machinery/conveyor_switch/oneway{
id = "shuttle_inbound"
},
/obj/effect/floor_decal/industrial/warning/full,
/turf/simulated/floor/plating,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"XG" = (
/obj/machinery/hologram/holopad,
/turf/simulated/floor/tiled,
@@ -30216,7 +30274,7 @@
dir = 1
},
/turf/simulated/floor/reinforced,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"XO" = (
/obj/structure/cable/green{
d1 = 2;
@@ -30225,6 +30283,22 @@
},
/turf/simulated/floor/tiled/steel,
/area/quartermaster/warehouse)
+"XQ" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/general)
+"XR" = (
+/obj/effect/overmap/visitable/sector/virgo3b,
+/turf/space,
+/area/space)
+"XS" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/machinery/door/firedoor/glass,
+/turf/simulated/floor/plating,
+/area/shuttle/excursion/cargo)
"XT" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -30248,13 +30322,9 @@
/turf/simulated/floor/tiled,
/area/hallway/station/upper)
"XZ" = (
-/obj/machinery/computer/shuttle_control/web/excursion{
- icon = 'icons/obj/computer.dmi';
- my_doors = list("expshuttle_door_Ro" = "Airlock Outer", "expshuttle_door_Ri" = "Airlock Inner", "expshuttle_door_cargo" = "Cargo Hatch");
- my_sensors = list("shuttlesens_exp" = "Exterior Environment", "shuttlesens_exp_int" = "Cargo Area", "shuttlesens_exp_psg" = "Passenger Area")
- },
+/obj/machinery/computer/shuttle_control/explore/excursion,
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cockpit)
"Yb" = (
/turf/simulated/floor/wood,
/area/crew_quarters/heads/cmo)
@@ -30263,14 +30333,11 @@
/turf/simulated/floor/wood,
/area/quartermaster/qm)
"Yg" = (
-/obj/machinery/atmospherics/pipe/manifold/visible/yellow{
- dir = 8
- },
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
- dir = 9
+/obj/machinery/atmospherics/pipe/simple/hidden/universal{
+ dir = 4
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"Yh" = (
/obj/structure/sink{
dir = 4;
@@ -30300,7 +30367,7 @@
dir = 1
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"Ym" = (
/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers,
@@ -30308,8 +30375,13 @@
dir = 6;
icon_state = "intact"
},
+/obj/structure/cable/cyan{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"Yp" = (
/turf/simulated/wall{
can_open = 0
@@ -30344,6 +30416,15 @@
/obj/structure/window/reinforced/full,
/turf/simulated/floor/plating,
/area/crew_quarters/medical_restroom)
+"YB" = (
+/obj/effect/shuttle_landmark{
+ base_area = /area/space;
+ base_turf = /turf/space;
+ landmark_tag = "tether_space_SE";
+ name = "Near Tether (SE)"
+ },
+/turf/space,
+/area/space)
"YC" = (
/obj/effect/floor_decal/carpet,
/turf/simulated/floor/carpet,
@@ -30367,6 +30448,25 @@
/obj/machinery/microwave,
/turf/simulated/floor/wood,
/area/security/breakroom)
+"YK" = (
+/obj/machinery/door/airlock/hatch{
+ req_one_access = list(67)
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ icon_state = "intact-scrubbers";
+ dir = 4
+ },
+/obj/machinery/door/firedoor/glass,
+/obj/structure/cable/cyan{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/turf/simulated/floor/tiled/steel_ridged,
+/area/shuttle/excursion/general)
"YQ" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
@@ -30405,8 +30505,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/door/firedoor/glass,
/obj/machinery/atmospherics/pipe/simple/hidden,
+/obj/structure/cable/cyan{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled/steel_ridged,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"Zd" = (
/obj/machinery/conveyor{
dir = 4;
@@ -30414,7 +30519,7 @@
},
/obj/structure/plasticflaps,
/turf/simulated/floor/plating,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"Zi" = (
/obj/machinery/alarm{
dir = 1;
@@ -30433,7 +30538,7 @@
dir = 1
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"Zn" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -30449,8 +30554,13 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 9
},
+/obj/structure/cable/cyan{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"Zp" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
icon_state = "intact-scrubbers";
@@ -30485,20 +30595,20 @@
dir = 4
},
/turf/simulated/floor/plating,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"ZB" = (
/obj/machinery/shuttle_sensor{
dir = 5;
id_tag = "shuttlesens_exp"
},
/turf/simulated/wall/rshull,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"ZD" = (
/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
dir = 9
},
/turf/simulated/wall/rshull,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"ZE" = (
/obj/machinery/door/airlock/glass_external{
frequency = 1380;
@@ -30523,10 +30633,13 @@
dir = 8
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"ZF" = (
/turf/simulated/mineral/vacuum,
/area/crew_quarters/heads/hos)
+"ZG" = (
+/turf/simulated/wall/rshull,
+/area/shuttle/excursion/cockpit)
"ZL" = (
/obj/machinery/door/airlock/hatch{
req_one_access = list(67)
@@ -30540,7 +30653,7 @@
},
/obj/machinery/door/firedoor/glass,
/turf/simulated/floor/tiled/steel_ridged,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"ZM" = (
/obj/structure/table/woodentable,
/obj/item/device/radio/off,
@@ -30574,7 +30687,7 @@
dir = 1
},
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"ZU" = (
/obj/machinery/suit_cycler/pilot,
/obj/machinery/firealarm{
@@ -30583,7 +30696,7 @@
pixel_y = -26
},
/turf/simulated/floor/tiled,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"ZV" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -30600,15 +30713,17 @@
},
/obj/machinery/atmospherics/pipe/simple/hidden/yellow,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/cargo)
"ZX" = (
-/obj/machinery/atmospherics/portables_connector{
- dir = 8
+/obj/machinery/atmospherics/pipe/simple/hidden/yellow{
+ dir = 10
+ },
+/obj/machinery/light/small{
+ dir = 4;
+ pixel_y = 0
},
-/obj/machinery/portable_atmospherics/canister/air,
-/obj/effect/floor_decal/industrial/outline/blue,
/turf/simulated/floor/tiled/techfloor/grid,
-/area/shuttle/excursion)
+/area/shuttle/excursion/general)
"ZY" = (
/turf/simulated/wall/r_wall,
/area/security/security_lockerroom)
@@ -30894,7 +31009,7 @@ aa
aa
aa
aa
-aa
+XR
aa
"}
(3,1,1) = {"
@@ -33142,7 +33257,7 @@ aa
aa
aa
aa
-aa
+YB
aa
aa
aa
@@ -41308,8 +41423,8 @@ cK
cK
XE
Zd
-dj
-dj
+Wp
+Wp
cK
ms
Oz
@@ -41445,14 +41560,14 @@ dj
Wx
dj
Wx
-dj
-dj
-dj
+Wp
+Wp
+Wp
Zy
WG
-dj
-XA
-An
+Wp
+Wp
+cK
ms
Oz
be
@@ -41579,7 +41694,7 @@ be
bX
cE
cK
-cK
+WL
dj
Tl
ZU
@@ -41587,14 +41702,14 @@ dj
Vf
VE
Vw
-dj
+Wp
it
Wn
UJ
Xb
-dj
-XN
-An
+Wp
+WV
+Xz
ms
Xq
be
@@ -41729,14 +41844,14 @@ dj
UE
Wg
Um
-dj
+Wp
iK
jY
-iW
+Wt
WS
-dj
+Wp
XN
-An
+Xz
ms
Xq
be
@@ -41871,7 +41986,7 @@ Vi
Wo
Wg
jV
-dj
+Wp
VU
Zk
WR
@@ -42013,13 +42128,13 @@ dj
Us
fi
UD
-dj
+Wp
Xa
jZ
WR
Xo
-XN
-An
+iY
+Wp
cK
ms
Xq
@@ -42151,17 +42266,17 @@ Vu
dC
ea
fj
-ea
+XQ
UE
fj
UY
-ea
+XS
iW
ka
WR
UK
iY
-dj
+Wp
cK
ms
mq
@@ -42433,19 +42548,19 @@ cG
VB
WD
dE
-dj
+ZG
TY
dj
dj
fx
dj
-dj
+Wp
iX
kb
ZW
lq
Xr
-dj
+Wp
cK
ms
mq
@@ -42576,18 +42691,18 @@ dj
dj
dj
dj
-ZL
+YK
dj
Wd
UL
Vg
fV
iY
-ea
+XS
kx
-dj
-XN
-An
+Wp
+iY
+Wp
cK
ms
mq
@@ -42866,13 +42981,13 @@ di
VR
UW
gM
-dj
+Wp
kj
kQ
TG
-dj
+Wp
XN
-An
+Xz
ms
mq
be
@@ -43007,14 +43122,14 @@ dj
UM
TJ
ZX
-hc
-dj
+gM
+Wp
kk
kR
Vd
-dj
-XN
-An
+Wp
+XD
+Xz
ms
QL
be
@@ -43154,9 +43269,9 @@ VQ
Ws
ZE
ZB
-dj
-XB
-An
+Wp
+Wp
+cK
ms
Sq
be
@@ -43296,8 +43411,8 @@ Uf
cK
cK
cK
-dj
-dj
+Wp
+Wp
cK
ms
mq
@@ -46718,7 +46833,7 @@ aa
aa
aa
aa
-lY
+aa
aa
aa
aa
diff --git a/maps/tether/tether-08-mining.dmm b/maps/tether/tether-08-mining.dmm
index 1924ae31b54..fa321b0b8a0 100644
--- a/maps/tether/tether-08-mining.dmm
+++ b/maps/tether/tether-08-mining.dmm
@@ -11,9 +11,6 @@
"ad" = (
/turf/simulated/floor/outdoors/grass/sif/virgo3b,
/area/shuttle/tether/crash2)
-"ae" = (
-/turf/simulated/floor/outdoors/grass/sif/virgo3b,
-/area/shuttle/antag_ground)
"af" = (
/obj/effect/floor_decal/rust,
/turf/simulated/floor/tiled/steel_dirty/virgo3b,
@@ -1059,6 +1056,15 @@
},
/turf/simulated/floor/bluegrid,
/area/outpost/mining_main/airlock)
+"Ck" = (
+/obj/effect/shuttle_landmark{
+ base_area = /area/mine/explored;
+ base_turf = /turf/simulated/floor/outdoors/grass/sif/virgo3b;
+ landmark_tag = "tether_mine_nw";
+ name = "Tether Mine (NW)"
+ },
+/turf/simulated/floor/outdoors/grass/sif/virgo3b,
+/area/mine/explored)
"Cx" = (
/turf/simulated/mineral/floor/virgo3b{
color = "#AAAAAA"
@@ -2978,7 +2984,7 @@ aa
ab
ab
ab
-ab
+Ck
ab
ab
ab
@@ -4423,9 +4429,9 @@ ab
ab
ab
ab
-ac
-ac
-ac
+ab
+ab
+ab
ab
ab
ab
@@ -4565,10 +4571,10 @@ ab
ab
ab
ab
-ac
-ac
-ac
-ac
+ab
+ab
+ab
+ab
ac
ac
ac
@@ -4707,9 +4713,9 @@ ab
ab
ab
ab
-ac
-ac
-ac
+ab
+ab
+ab
ac
ac
ac
@@ -4849,9 +4855,9 @@ ab
ab
ab
ab
-ac
-ac
-ac
+ab
+ab
+ab
ac
ac
ac
@@ -4991,9 +4997,9 @@ ab
ab
ab
ab
-ac
-ac
-ac
+ab
+ab
+ab
ac
ac
ac
@@ -5128,14 +5134,14 @@ ab
ab
ab
ab
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
ac
ac
ac
@@ -5270,14 +5276,14 @@ ab
ab
ab
ab
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
ac
ac
ac
@@ -5412,10 +5418,10 @@ ab
ab
ab
ab
-ac
-ac
-ac
-ac
+ab
+ab
+ab
+ab
ac
ac
ac
@@ -5551,12 +5557,12 @@ ab
ab
ab
ab
-ac
-ac
-ac
-ac
-ac
-ac
+ab
+ab
+ab
+ab
+ab
+ab
ac
ac
ac
@@ -5693,11 +5699,11 @@ ab
ab
ab
ab
-ac
-ac
-ac
-ac
-ac
+ab
+ab
+ab
+ab
+ab
ac
ac
ac
@@ -5832,14 +5838,14 @@ ab
ab
ab
ab
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
ac
ac
ac
@@ -5974,12 +5980,12 @@ ab
ab
ab
ab
-ac
-ac
-ac
-ac
-ac
-ac
+ab
+ab
+ab
+ab
+ab
+ab
ac
ac
ac
@@ -6115,12 +6121,12 @@ ab
ab
ab
ab
-ac
-ac
-ac
-ac
-ac
-ac
+ab
+ab
+ab
+ab
+ab
+ab
ac
ac
ac
@@ -6257,12 +6263,12 @@ ab
ab
ab
ab
-ac
-ac
-ac
-ac
-ac
-ac
+ab
+ab
+ab
+ab
+ab
+ab
ac
ac
ac
@@ -6399,10 +6405,10 @@ ab
ab
ab
ab
-ac
-ac
-ac
-ac
+ab
+ab
+ab
+ab
ac
ac
ac
@@ -6541,9 +6547,9 @@ ab
ab
ab
ab
-ac
-ac
-ac
+ab
+ab
+ab
ac
ac
ac
@@ -6684,8 +6690,8 @@ ab
ab
ab
ab
-ac
-ac
+ab
+ab
ac
ac
ac
@@ -6826,8 +6832,8 @@ ab
ab
ab
ab
-ac
-ac
+ab
+ab
ac
ac
ac
@@ -6968,8 +6974,8 @@ ab
ab
ab
ab
-ac
-ac
+ab
+ab
ac
ac
ac
@@ -18091,16 +18097,16 @@ ab
ab
ab
ab
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
ab
ab
ab
@@ -18233,16 +18239,16 @@ ab
ab
ab
ab
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
ab
ab
ab
@@ -18375,16 +18381,16 @@ ab
ab
ab
ab
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
ab
ab
ab
@@ -18517,16 +18523,16 @@ ab
ab
ab
ab
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
ab
ab
ab
@@ -18659,16 +18665,16 @@ ab
ab
ab
ab
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
-ae
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
ab
ab
ab
diff --git a/maps/tether/tether-09-solars.dmm b/maps/tether/tether-09-solars.dmm
index 5b59118b777..a1bb5ac1147 100644
--- a/maps/tether/tether-09-solars.dmm
+++ b/maps/tether/tether-09-solars.dmm
@@ -5,9 +5,6 @@
"ab" = (
/turf/simulated/floor/outdoors/grass/sif/virgo3b,
/area/mine/explored)
-"ac" = (
-/turf/simulated/floor/outdoors/grass/sif/virgo3b,
-/area/shuttle/antag_ground)
"ad" = (
/turf/simulated/floor/outdoors/dirt/virgo3b,
/area/mine/explored)
@@ -846,15 +843,6 @@
"bN" = (
/turf/simulated/floor/outdoors/dirt/virgo3b,
/area/shuttle/tether/crash1)
-"bO" = (
-/obj/effect/shuttle_landmark{
- base_area = /area/mine/explored;
- base_turf = /turf/simulated/floor/outdoors/dirt/virgo3b;
- landmark_tag = "merc_tether_solars";
- name = "Tether Solar Farm"
- },
-/turf/simulated/floor/outdoors/dirt/virgo3b,
-/area/mine/explored)
"bP" = (
/obj/structure/symbol/em,
/turf/simulated/wall,
@@ -8185,6 +8173,24 @@
},
/turf/simulated/floor/tiled,
/area/rnd/outpost/breakroom)
+"zg" = (
+/obj/effect/shuttle_landmark{
+ base_area = /area/mine/explored;
+ base_turf = /turf/simulated/floor/outdoors/dirt/virgo3b;
+ landmark_tag = "tether_solars_sw";
+ name = "Tether Solar Farm (SW)"
+ },
+/turf/simulated/floor/outdoors/grass/sif/virgo3b,
+/area/mine/explored)
+"SO" = (
+/obj/effect/shuttle_landmark{
+ base_area = /area/mine/explored;
+ base_turf = /turf/simulated/floor/outdoors/dirt/virgo3b;
+ landmark_tag = "tether_solars_ne";
+ name = "Tether Solar Farm (NE)"
+ },
+/turf/simulated/floor/outdoors/grass/sif/virgo3b,
+/area/mine/explored)
(1,1,1) = {"
aa
@@ -10616,16 +10622,16 @@ ab
ab
ab
ab
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
ab
ab
ab
@@ -10758,16 +10764,16 @@ ab
ab
ab
ab
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
ab
ab
ab
@@ -10900,16 +10906,16 @@ ab
ab
ab
ab
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
ab
ab
ab
@@ -11042,16 +11048,16 @@ ab
ab
ab
ab
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
ab
ab
ab
@@ -11145,7 +11151,7 @@ ab
ab
ab
ab
-ab
+zg
ab
ab
ab
@@ -11184,16 +11190,16 @@ ab
ab
ab
ab
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
-ac
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
+ab
ab
ab
ab
@@ -22125,7 +22131,7 @@ ab
ab
ad
ad
-bO
+ad
ad
ad
ad
@@ -23113,7 +23119,7 @@ ab
ab
ab
ab
-ab
+SO
ab
ab
ab
diff --git a/maps/tether/tether-10-colony.dmm b/maps/tether/tether-10-colony.dmm
index 6e621e27e90..74689b5d6ee 100644
--- a/maps/tether/tether-10-colony.dmm
+++ b/maps/tether/tether-10-colony.dmm
@@ -52,9 +52,7 @@
/turf/simulated/shuttle/plating/airless,
/area/shuttle/specialops/centcom)
"aj" = (
-/obj/structure/flight_right{
- dir = 8
- },
+/obj/structure/table/steel_reinforced,
/turf/simulated/shuttle/floor{
icon_state = "floor_red"
},
@@ -326,11 +324,9 @@
icon_state = "tube1";
dir = 8
},
-/obj/machinery/computer/shuttle_control/web/specialops{
- dir = 8;
- icon = 'icons/obj/computer.dmi';
- my_doors = list("specops_shuttle_fore_hatch" = "Docking Hatch");
- my_sensors = list("shuttlesens_specops_int" = "Shuttle Interior")
+/obj/machinery/computer/shuttle_control/multi/specops{
+ icon_state = "computer";
+ dir = 4
},
/turf/simulated/shuttle/floor{
icon_state = "floor_red"
@@ -358,6 +354,12 @@
pixel_y = -25;
tag_door = "specops_shuttle_fore_hatch"
},
+/obj/effect/shuttle_landmark{
+ base_area = /area/centcom/specops;
+ base_turf = /turf/unsimulated/floor;
+ landmark_tag = "specops_base";
+ name = "ERT Shuttle Bay"
+ },
/turf/simulated/shuttle/floor{
icon_state = "floor_red"
},
@@ -370,12 +372,6 @@
locked = 1;
name = "Forward Docking Hatch"
},
-/obj/effect/shuttle_landmark{
- base_area = /area/centcom/specops;
- base_turf = /turf/unsimulated/floor;
- landmark_tag = "specops_base";
- name = "Central Command"
- },
/turf/simulated/shuttle/plating,
/area/shuttle/specialops/centcom)
"aG" = (
@@ -492,9 +488,7 @@
name = "Spec Ops Intercom";
pixel_y = -28
},
-/obj/structure/flight_left{
- dir = 8
- },
+/obj/structure/table/steel_reinforced,
/turf/simulated/shuttle/floor{
icon_state = "floor_red"
},
@@ -17311,6 +17305,9 @@
/obj/structure/closet/crate/bin,
/turf/simulated/floor/tiled/techmaint,
/area/mothership/processing)
+"ET" = (
+/turf/unsimulated/wall/planetary/virgo3b,
+/area/holodeck/holodorm/source_snow)
"EU" = (
/obj/structure/closet/crate/secure/gear{
req_one_access = list(108)
@@ -18360,6 +18357,9 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/mothership/engineering)
+"Hx" = (
+/turf/space,
+/area/holodeck/source_courtroom)
"Hy" = (
/obj/structure/bed/padded,
/obj/item/weapon/bedsheet,
@@ -18457,6 +18457,9 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/mothership/eva)
+"HK" = (
+/turf/space,
+/area/holodeck/source_snowfield)
"HL" = (
/obj/structure/cable/cyan{
d1 = 1;
@@ -18476,6 +18479,9 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/mothership/hallway)
+"HM" = (
+/turf/space,
+/area/holodeck/source_desert)
"HN" = (
/obj/structure/table/woodentable,
/obj/item/modular_computer/laptop/preset/custom_loadout/elite,
@@ -18859,6 +18865,9 @@
/obj/structure/table/steel_reinforced,
/turf/simulated/floor/tiled/white,
/area/mothership/medical)
+"IC" = (
+/turf/space,
+/area/holodeck/source_thunderdomecourt)
"ID" = (
/obj/item/weapon/storage/box/flashshells,
/obj/item/weapon/storage/box/flashshells,
@@ -19308,6 +19317,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/white,
/area/mothership/chemistry)
+"JB" = (
+/turf/unsimulated/wall/planetary/virgo3b,
+/area/holodeck/holodorm/source_boxing)
"JC" = (
/obj/machinery/power/thermoregulator,
/turf/unsimulated/floor{
@@ -19579,6 +19591,9 @@
/obj/structure/closet/secure_closet/personal,
/turf/simulated/shuttle/floor/alien,
/area/unknown/dorm2)
+"Kc" = (
+/turf/space,
+/area/holodeck/holodorm/source_beach)
"Kd" = (
/obj/effect/floor_decal/borderfloorblack{
dir = 4
@@ -19931,6 +19946,9 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/mothership/bridge)
+"KJ" = (
+/turf/unsimulated/wall/planetary/virgo3b,
+/area/holodeck/holodorm/source_garden)
"KK" = (
/turf/simulated/shuttle/wall/alien/hard_corner,
/area/unknown/dorm1)
@@ -19987,6 +20005,9 @@
/obj/machinery/biogenerator,
/turf/simulated/floor/tiled/techmaint,
/area/mothership/hydroponics)
+"KQ" = (
+/turf/space,
+/area/holodeck/source_emptycourt)
"KR" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 6
@@ -20334,6 +20355,9 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/mothership/engineering)
+"LB" = (
+/turf/space,
+/area/holodeck/source_wildlife)
"LC" = (
/obj/machinery/vending/loadout/loadout_misc,
/turf/simulated/floor/tiled/techmaint,
@@ -20621,6 +20645,9 @@
"Mp" = (
/turf/simulated/floor/tiled/techmaint,
/area/mothership/warden)
+"Mq" = (
+/turf/space,
+/area/holodeck/source_picnicarea)
"Mr" = (
/obj/structure/table/steel_reinforced,
/obj/machinery/chemical_dispenser/bar_coffee/full,
@@ -20728,6 +20755,9 @@
stripe_color = "#45b3d8"
},
/area/mothership/treatment)
+"MH" = (
+/turf/space,
+/area/holodeck/source_beach)
"MI" = (
/obj/structure/table/steel_reinforced,
/obj/machinery/recharger,
@@ -21012,6 +21042,9 @@
},
/turf/simulated/floor/tiled/white,
/area/mothership/medical)
+"Nt" = (
+/turf/space,
+/area/holodeck/source_theatre)
"Nu" = (
/obj/machinery/telecomms/processor/preset_cent,
/turf/simulated/floor/bluegrid,
@@ -21038,6 +21071,9 @@
icon_state = "dark"
},
/area/centcom/specops)
+"Ny" = (
+/turf/space,
+/area/holodeck/holodorm/source_seating)
"Nz" = (
/obj/structure/table/woodentable,
/obj/item/modular_computer/laptop/preset/custom_loadout/elite,
@@ -21868,6 +21904,9 @@
},
/turf/simulated/floor/carpet/blue,
/area/mothership/breakroom)
+"Pd" = (
+/turf/space,
+/area/holodeck/source_meetinghall)
"Pe" = (
/obj/machinery/door_timer/cell_1{
id = "Cell M1";
@@ -22332,6 +22371,9 @@
/obj/machinery/light/small,
/turf/simulated/floor/tiled/techmaint,
/area/mothership/bathroom1)
+"Qb" = (
+/turf/space,
+/area/holodeck/holodorm/source_garden)
"Qc" = (
/obj/structure/cable/cyan{
d1 = 4;
@@ -22374,6 +22416,9 @@
stripe_color = "#45b3d8"
},
/area/mothership/breakroom)
+"Qi" = (
+/turf/space,
+/area/holodeck/source_plating)
"Qj" = (
/obj/machinery/atmospherics/pipe/simple/visible/supply{
icon_state = "intact-supply";
@@ -22787,6 +22832,9 @@
icon_state = "white"
},
/area/centcom/medical)
+"Rd" = (
+/turf/space,
+/area/holodeck/source_boxingcourt)
"Re" = (
/obj/structure/table/reinforced,
/obj/item/device/binoculars,
@@ -23250,6 +23298,9 @@
/obj/item/weapon/gun/energy/protector,
/turf/simulated/floor/tiled/techmaint,
/area/mothership/armory)
+"Se" = (
+/turf/space,
+/area/holodeck/holodorm/source_desert)
"Sf" = (
/turf/simulated/shuttle/wall/voidcraft/blue{
hard_corner = 1;
@@ -23313,6 +23364,9 @@
},
/turf/simulated/floor/wood,
/area/mothership/breakroom)
+"Sp" = (
+/turf/space,
+/area/holodeck/holodorm/source_boxing)
"Sq" = (
/obj/machinery/optable,
/turf/simulated/floor/tiled/white,
@@ -23353,6 +23407,9 @@
/obj/machinery/media/jukebox,
/turf/simulated/floor/wood,
/area/mothership/breakroom)
+"Sy" = (
+/turf/space,
+/area/holodeck/holodorm/source_basic)
"Sz" = (
/obj/structure/closet/alien,
/turf/simulated/shuttle/floor/alien,
@@ -23969,6 +24026,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/white,
/area/mothership/resleeving)
+"TU" = (
+/turf/space,
+/area/holodeck/holodorm/source_off)
"TV" = (
/obj/item/clothing/accessory/storage/black_vest,
/obj/item/clothing/accessory/storage/black_vest,
@@ -24967,6 +25027,9 @@
/obj/machinery/meter,
/turf/simulated/floor/tiled/techmaint,
/area/mothership/engineering)
+"VW" = (
+/turf/unsimulated/wall/planetary/virgo3b,
+/area/holodeck/holodorm/source_beach)
"VX" = (
/obj/structure/closet/secure_closet/personal,
/turf/simulated/floor/wood,
@@ -25101,6 +25164,9 @@
/obj/machinery/meter,
/turf/simulated/floor/tiled/techmaint,
/area/mothership/engineering)
+"Wl" = (
+/turf/space,
+/area/holodeck/holodorm/source_snow)
"Wn" = (
/obj/structure/table/steel_reinforced,
/obj/item/weapon/storage/firstaid/surgery,
@@ -25281,6 +25347,9 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/mothership/warden)
+"WG" = (
+/turf/space,
+/area/holodeck/source_space)
"WH" = (
/obj/structure/prop/alien/computer{
dir = 8
@@ -25371,6 +25440,9 @@
stripe_color = "#45b3d8"
},
/area/mothership/telecomms1)
+"WV" = (
+/turf/space,
+/area/holodeck/holodorm/source_space)
"WW" = (
/obj/structure/closet/secure_closet/scientist,
/turf/simulated/floor/tiled/techmaint,
@@ -25509,6 +25581,9 @@
/obj/item/modular_computer/console/preset/mercenary,
/turf/simulated/floor/tiled/steel_grid,
/area/mothership/bridge)
+"Xp" = (
+/turf/space,
+/area/holodeck/source_basketball)
"Xq" = (
/obj/structure/shuttle/engine/heater,
/obj/structure/window/reinforced{
@@ -27013,49 +27088,49 @@ OF
OF
OF
OF
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
OF
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
OF
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
OF
"}
(3,1,1) = {"
@@ -27155,49 +27230,49 @@ OF
OF
OF
OF
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
OF
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
OF
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
OF
"}
(4,1,1) = {"
@@ -27297,49 +27372,49 @@ OF
OF
OF
OF
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
OF
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
OF
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
OF
"}
(5,1,1) = {"
@@ -27439,49 +27514,49 @@ OF
OF
OF
OF
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
OF
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
OF
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
OF
"}
(6,1,1) = {"
@@ -27581,49 +27656,49 @@ OF
OF
OF
OF
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
OF
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
OF
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
OF
"}
(7,1,1) = {"
@@ -27723,49 +27798,49 @@ OF
OF
OF
OF
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
OF
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
OF
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
OF
"}
(8,1,1) = {"
@@ -27865,49 +27940,49 @@ OF
OF
OF
OF
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
OF
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
OF
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
OF
"}
(9,1,1) = {"
@@ -28007,49 +28082,49 @@ OF
OF
OF
OF
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
OF
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
OF
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
OF
"}
(10,1,1) = {"
@@ -28149,49 +28224,49 @@ OF
OF
OF
OF
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
OF
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
OF
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
OF
"}
(11,1,1) = {"
@@ -28291,49 +28366,49 @@ OF
OF
OF
OF
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
+LB
OF
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
+MH
OF
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
+HM
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
+WG
OF
"}
(12,1,1) = {"
@@ -28575,49 +28650,49 @@ OF
OF
OF
OF
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
OF
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
OF
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
OF
"}
(14,1,1) = {"
@@ -28717,49 +28792,49 @@ OF
OF
OF
OF
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
OF
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
OF
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
OF
"}
(15,1,1) = {"
@@ -28859,49 +28934,49 @@ OF
OF
OF
OF
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
OF
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
OF
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
OF
"}
(16,1,1) = {"
@@ -29001,49 +29076,49 @@ OF
OF
OF
OF
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
OF
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
OF
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
OF
"}
(17,1,1) = {"
@@ -29143,49 +29218,49 @@ OF
OF
OF
OF
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
OF
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
OF
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
OF
"}
(18,1,1) = {"
@@ -29285,49 +29360,49 @@ OF
OF
OF
OF
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
OF
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
OF
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
OF
"}
(19,1,1) = {"
@@ -29427,49 +29502,49 @@ OF
OF
OF
OF
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
OF
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
OF
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
OF
"}
(20,1,1) = {"
@@ -29569,49 +29644,49 @@ OF
OF
OF
OF
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
OF
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
OF
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
OF
"}
(21,1,1) = {"
@@ -29711,49 +29786,49 @@ OF
OF
OF
OF
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
OF
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
OF
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
OF
"}
(22,1,1) = {"
@@ -29853,49 +29928,49 @@ OF
OF
OF
OF
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
+Qi
OF
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
+IC
OF
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
+Mq
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
+HK
OF
"}
(23,1,1) = {"
@@ -30137,49 +30212,49 @@ OF
OF
OF
OF
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
OF
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
OF
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
OF
"}
(25,1,1) = {"
@@ -30279,49 +30354,49 @@ OF
OF
OF
OF
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
OF
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
OF
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
OF
"}
(26,1,1) = {"
@@ -30421,49 +30496,49 @@ OF
OF
OF
OF
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
OF
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
OF
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
OF
"}
(27,1,1) = {"
@@ -30563,49 +30638,49 @@ OF
OF
OF
OF
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
OF
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
OF
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
OF
"}
(28,1,1) = {"
@@ -30705,49 +30780,49 @@ OF
OF
OF
OF
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
OF
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
OF
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
OF
"}
(29,1,1) = {"
@@ -30847,49 +30922,49 @@ OF
OF
OF
OF
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
OF
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
OF
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
OF
"}
(30,1,1) = {"
@@ -30989,49 +31064,49 @@ OF
OF
OF
OF
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
OF
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
OF
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
OF
"}
(31,1,1) = {"
@@ -31131,49 +31206,49 @@ OF
OF
OF
OF
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
OF
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
OF
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
OF
"}
(32,1,1) = {"
@@ -31273,49 +31348,49 @@ OF
OF
OF
OF
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
OF
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
OF
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
OF
"}
(33,1,1) = {"
@@ -31415,49 +31490,49 @@ OF
OF
OF
OF
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
+KQ
OF
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
+Rd
OF
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
+Nt
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
+Pd
OF
"}
(34,1,1) = {"
@@ -31701,47 +31776,47 @@ OF
OF
OF
OF
+Sy
+Sy
+Sy
OF
+TU
+TU
+TU
OF
+Se
+Se
+Se
OF
+Ny
+Ny
+Ny
OF
+WV
+WV
+WV
OF
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
OF
"}
(36,1,1) = {"
@@ -31843,47 +31918,47 @@ OF
OF
OF
OF
+Sy
+Sy
+Sy
OF
+TU
+TU
+TU
OF
+Se
+Se
+Se
OF
+Ny
+Ny
+Ny
OF
+WV
+WV
+WV
OF
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
OF
"}
(37,1,1) = {"
@@ -31985,47 +32060,47 @@ OF
OF
OF
OF
+Sy
+Sy
+Sy
OF
+TU
+TU
+TU
OF
+Se
+Se
+Se
OF
+Ny
+Ny
+Ny
OF
+WV
+WV
+WV
OF
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
OF
"}
(38,1,1) = {"
@@ -32127,47 +32202,47 @@ OF
OF
OF
OF
+Sy
+Sy
+Sy
OF
+TU
+TU
+TU
OF
+Se
+Se
+Se
OF
+Ny
+Ny
+Ny
OF
+WV
+WV
+WV
OF
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
OF
"}
(39,1,1) = {"
@@ -32269,47 +32344,47 @@ OF
OF
OF
OF
+Sy
+Sy
+Sy
OF
+TU
+TU
+TU
OF
+Se
+Se
+Se
OF
+Ny
+Ny
+Ny
OF
+WV
+WV
+WV
OF
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
OF
"}
(40,1,1) = {"
@@ -32411,47 +32486,47 @@ OF
OF
OF
OF
+Sy
+Sy
+Sy
OF
+TU
+TU
+TU
OF
+Se
+Se
+Se
OF
+Ny
+Ny
+Ny
OF
+WV
+WV
+WV
OF
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
OF
"}
(41,1,1) = {"
@@ -32573,27 +32648,27 @@ OF
OF
OF
OF
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
OF
"}
(42,1,1) = {"
@@ -32699,43 +32774,43 @@ OF
OF
OF
OF
+Kc
+Kc
+Kc
OF
+Wl
+Wl
+Wl
OF
+Qb
+Qb
+Qb
OF
+Sp
+Sp
+Sp
OF
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
OF
"}
(43,1,1) = {"
@@ -32841,43 +32916,43 @@ OF
OF
OF
OF
+Kc
+Kc
+Kc
OF
+Wl
+Wl
+Wl
OF
+Qb
+Qb
+Qb
OF
+Sp
+Sp
+Sp
OF
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
OF
"}
(44,1,1) = {"
@@ -32983,43 +33058,43 @@ OF
OF
OF
OF
+Kc
+Kc
+Kc
OF
+Wl
+Wl
+Wl
OF
+Qb
+Qb
+Qb
OF
+Sp
+Sp
+Sp
OF
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
+Hx
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
+Xp
OF
"}
(45,1,1) = {"
@@ -33125,21 +33200,21 @@ OF
OF
OF
OF
+Kc
+Kc
+Kc
OF
+Wl
+Wl
+Wl
OF
+Qb
+Qb
+Qb
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+Sp
+Sp
+Sp
OF
OF
OF
@@ -33267,21 +33342,21 @@ OF
OF
OF
OF
+Kc
+Kc
+Kc
OF
+Wl
+Wl
+Wl
OF
+Qb
+Qb
+Qb
OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
-OF
+Sp
+Sp
+Sp
OF
OF
OF
@@ -33409,21 +33484,21 @@ aa
aa
aa
aa
+VW
+VW
+VW
aa
+ET
+ET
+ET
aa
+KJ
+KJ
+KJ
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+JB
+JB
+JB
aa
aa
aa
diff --git a/maps/tether/tether_areas2.dm b/maps/tether/tether_areas2.dm
index 7e8e64ca133..c5b8c287700 100644
--- a/maps/tether/tether_areas2.dm
+++ b/maps/tether/tether_areas2.dm
@@ -884,14 +884,31 @@
name = "\improper Exploration Showers"
/area/shuttle/excursion
- name = "\improper Excursion Shuttle"
- icon_state = "shuttle2"
requires_power = 1
+ icon_state = "shuttle2"
-/area/shuttle/blue_fo
- name = "\improper Hybrid Shuttle"
- icon_state = "shuttle2"
+/area/shuttle/excursion/general
+ name = "\improper Excursion Shuttle"
+
+/area/shuttle/excursion/cockpit
+ name = "\improper Excursion Shuttle Cockpit"
+
+/area/shuttle/excursion/cargo
+ name = "\improper Excursion Shuttle Cockpit"
+
+/area/shuttle/tourbus
requires_power = 1
+ icon_state = "shuttle2"
+
+/area/shuttle/tourbus/general
+ name = "\improper Tour Bus"
+
+/area/shuttle/tourbus/cockpit
+ name = "\improper Tour Bus Cockpit"
+
+/area/shuttle/tourbus/engines
+ name = "\improper Tour Bus Engines"
+
// Belter Dock
@@ -919,16 +936,6 @@
requires_power = 0
dynamic_lighting = 0
-//Antag space shuttle
-/area/shuttle/antag_space
- name = "\improper Syndicate PS"
- icon_state = "shuttle2"
-
-//Antag ground 'shuttle'
-/area/shuttle/antag_ground
- name = "\improper Syndicate LC"
- icon_state = "shuttle2"
-
//Merc shuttle
/area/shuttle/mercenary
name = "\improper Mercenary Shuttle"
diff --git a/maps/tether/tether_defines.dm b/maps/tether/tether_defines.dm
index f876242cb12..8a0127c6e93 100644
--- a/maps/tether/tether_defines.dm
+++ b/maps/tether/tether_defines.dm
@@ -37,6 +37,10 @@
full_name = "NSB Adephagia"
path = "tether"
+ use_overmap = TRUE
+ overmap_z = Z_LEVEL_MISC
+ overmap_size = 20
+
zlevel_datum_type = /datum/map_z_level/tether
lobby_icon = 'icons/misc/title_vr.dmi'
@@ -107,6 +111,8 @@
meteor_strike_areas = list(/area/tether/surfacebase/outside/outside3)
+ default_skybox = /datum/skybox_settings/tether
+
unit_test_exempt_areas = list(
/area/tether/surfacebase/outside/outside1,
/area/tether/elevator,
@@ -181,6 +187,10 @@
return 1
+/datum/skybox_settings/tether
+ icon_state = "space5"
+ use_stars = FALSE
+
/datum/planet/virgo3b
expected_z_levels = list(
Z_LEVEL_SURFACE_LOW,
@@ -218,6 +228,27 @@
else
return list(srcz) //prevents runtimes when using CMC. any Z-level not defined above will be 'isolated' and only show to GPSes/CMCs on that same Z (e.g. CentCom).
+// Overmap represetation of tether
+/obj/effect/overmap/visitable/sector/virgo3b
+ name = "Virgo 3B"
+ desc = "Full of phoron, and home to the NSB Adephagia, where you can dock and refuel your craft."
+ base = 1
+ icon_state = "globe"
+ color = "#d35b5b"
+ initial_generic_waypoints = list(
+ "tether_dockarm_d1a1", //Bottom left,
+ "tether_dockarm_d1a2", //Top left,
+ "tether_dockarm_d1a3", //Left on inside,
+ "tether_dockarm_d2a1", //Bottom right,
+ "tether_dockarm_d2a2", //Top right,
+ "tether_dockarm_d1l", //End of left arm,
+ "tether_dockarm_d2l", //End of right arm,
+ "tether_space_SE", //station1, bottom right of space,
+ "tether_space_NE", //station1, top right of space,
+ "tether_space_SW", //station3, bottom left of space,
+ "tether_excursion_hangar" //Excursion shuttle hangar
+ )
+
// For making the 6-in-1 holomap, we calculate some offsets
#define TETHER_MAP_SIZE 140 // Width and height of compiled in tether z levels.
#define TETHER_HOLOMAP_CENTER_GUTTER 40 // 40px central gutter between columns
@@ -304,44 +335,3 @@
z = Z_LEVEL_MISC
name = "Misc"
flags = MAP_LEVEL_ADMIN|MAP_LEVEL_XENOARCH_EXEMPT
-
-/*
-/datum/map_z_level/tether/wilderness
- name = "Wilderness"
- flags = MAP_LEVEL_PLAYER
- var/activated = 0
- var/list/frozen_mobs = list()
-
-/datum/map_z_level/tether/wilderness/proc/activate_mobs()
- if(activated && isemptylist(frozen_mobs))
- return
- activated = 1
- for(var/mob/living/simple_mob/M in frozen_mobs)
- M.life_disabled = 0
- frozen_mobs -= M
- frozen_mobs.Cut()
-
-/datum/map_z_level/tether/wilderness/wild_1
- z = Z_LEVEL_SURFACE_WILDERNESS_1
-
-/datum/map_z_level/tether/wilderness/wild_2
- z = Z_LEVEL_SURFACE_WILDERNESS_2
-
-/datum/map_z_level/tether/wilderness/wild_3
- z = Z_LEVEL_SURFACE_WILDERNESS_3
-
-/datum/map_z_level/tether/wilderness/wild_4
- z = Z_LEVEL_SURFACE_WILDERNESS_4
-
-/datum/map_z_level/tether/wilderness/wild_5
- z = Z_LEVEL_SURFACE_WILDERNESS_5
-
-/datum/map_z_level/tether/wilderness/wild_6
- z = Z_LEVEL_SURFACE_WILDERNESS_6
-
-/datum/map_z_level/tether/wilderness/wild_crash
- z = Z_LEVEL_SURFACE_WILDERNESS_CRASH
-
-/datum/map_z_level/tether/wilderness/wild_ruins
- z = Z_LEVEL_SURFACE_WILDERNESS_RUINS
-*/
diff --git a/maps/tether/tether_shuttle_defs.dm b/maps/tether/tether_shuttle_defs.dm
index cf1e25d3648..700953152f9 100644
--- a/maps/tether/tether_shuttle_defs.dm
+++ b/maps/tether/tether_shuttle_defs.dm
@@ -8,9 +8,6 @@
landmark_offsite = "escape_cc"
landmark_station = "escape_station"
landmark_transition = "escape_transit"
- //docking_controller_tag = "escape_shuttle"
- //dock_target_station = "escape_dock"
- //dock_target_offsite = "centcom_dock"
move_time = SHUTTLE_TRANSIT_DURATION_RETURN
//////////////////////////////////////////////////////////////
@@ -23,8 +20,6 @@
landmark_offsite = "escapepod1_cc"
landmark_transition = "escapepod1_transit"
docking_controller_tag = "large_escape_pod_1"
- //dock_target_station = "large_escape_pod_1_berth"
- //dock_target_offsite = "large_escape_pod_1_recovery"
move_time = SHUTTLE_TRANSIT_DURATION_RETURN
//////////////////////////////////////////////////////////////
@@ -37,21 +32,24 @@
landmark_offsite = "supply_cc"
landmark_station = "supply_station"
docking_controller_tag = "supply_shuttle"
- //dock_target_station = "cargo_bay"
flags = SHUTTLE_FLAGS_PROCESS|SHUTTLE_FLAGS_SUPPLY
//////////////////////////////////////////////////////////////
// Trade Ship
-/datum/shuttle/autodock/ferry/trade
+/datum/shuttle/autodock/multi/trade
name = "Trade"
- location = FERRY_LOCATION_OFFSITE
+ current_location = "trade_dock"
shuttle_area = /area/shuttle/trade
- warmup_time = 10 //want some warmup time so people can cancel.
- landmark_offsite = "trade_cc"
- landmark_station = "trade_station"
docking_controller_tag = "trade_shuttle"
- //dock_target_station = "trade_shuttle_dock_airlock"
- //dock_target_offsite = "trade_shuttle_bay"
+ warmup_time = 10 //want some warmup time so people can cancel.
+ destination_tags = list(
+ "trade_dock",
+ "tether_dockarm_d1l",
+ "aerostat_south",
+ "beach_e",
+ "beach_c",
+ "beach_nw"
+ )
//////////////////////////////////////////////////////////////
// Tether Shuttle
@@ -61,48 +59,11 @@
warmup_time = 5
move_time = 45
landmark_offsite = "tether_backup_low"
- landmark_station = "tether_backup_high"
+ landmark_station = "tether_dockarm_d1a3"
landmark_transition = "tether_backup_transit"
shuttle_area = /area/shuttle/tether
//crash_areas = list(/area/shuttle/tether/crash1, /area/shuttle/tether/crash2)
docking_controller_tag = "tether_shuttle"
- //dock_target_station = "tether_dock_airlock"
- //dock_target_offsite = "tether_pad_airlock"
-
-//////////////////////////////////////////////////////////////
-// Antag Space "Proto Shuttle" Shuttle
-/datum/shuttle/autodock/multi/protoshuttle
- name = "Proto"
- warmup_time = 8
- move_time = 60
- current_location = "antag_space_base"
- shuttle_area = /area/shuttle/antag_space
- landmark_transition = "antag_space_transit"
- destination_tags = list(
- "antag_space_nearby",
- "antag_space_docks"
- //"Nearby" = /area/shuttle/antag_space/north,
- //"Docks" = /area/shuttle/antag_space/docks
- )
- docking_controller_tag = "antag_space_shuttle"
- //destination_dock_targets = list("Home Base" = "antag_space_dock")
-
-//////////////////////////////////////////////////////////////
-// Antag Surface "Land Crawler" Shuttle
-/datum/shuttle/autodock/multi/landcrawler
- name = "Land Crawler"
- warmup_time = 8
- move_time = 60
- current_location = "antag_ground_base"
- shuttle_area = /area/shuttle/antag_ground
- landmark_transition = "antag_ground_transit"
- destination_tags = list(
- "antag_ground_solars",
- "antag_ground_mining"
- //"Solar Array" = /area/shuttle/antag_ground/solars,
- //"Mining Outpost" = /area/shuttle/antag_ground/mining
- )
- docking_controller_tag = "antag_ground_shuttle"
//////////////////////////////////////////////////////////////
// Mercenary Shuttle
@@ -114,16 +75,109 @@
shuttle_area = /area/shuttle/mercenary
destination_tags = list(
"merc_base",
- "merc_tether_solars",
- "merc_tether_dock"
+ "aerostat_south",
+ "beach_e",
+ "beach_nw",
+ "tether_solars_ne",
+ "tether_solars_sw",
+ "tether_mine_nw",
+ "tether_space_NE",
+ "tether_space_SE",
+ "tether_space_SW",
+ "tether_dockarm_d2l" //End of right docking arm
)
docking_controller_tag = "merc_shuttle"
announcer = "Automated Traffic Control"
-
-/datum/shuttle/autodock/multi/mercenary/New()
arrival_message = "Attention. An unregistered vessel is approaching Virgo-3B."
departure_message = "Attention. A unregistered vessel is now leaving Virgo-3B."
- ..()
+
+
+//////////////////////////////////////////////////////////////
+// Ninja Shuttle
+/datum/shuttle/autodock/multi/ninja
+ name = "Ninja"
+ warmup_time = 8
+ move_time = 60
+ can_cloak = TRUE
+ cloaked = TRUE
+ current_location = "ninja_base"
+ landmark_transition = "ninja_transit"
+ shuttle_area = /area/shuttle/ninja
+ destination_tags = list(
+ "ninja_base",
+ "aerostat_northeast",
+ "beach_e",
+ "beach_nw",
+ "tether_solars_ne",
+ "tether_solars_sw",
+ "tether_mine_nw",
+ "tether_space_NE",
+ "tether_space_SE",
+ "tether_space_SW",
+ "tether_dockarm_d1a3" //Inside of left dockarm
+ )
+ docking_controller_tag = "ninja_shuttle"
+ announcer = "Automated Traffic Control"
+ arrival_message = "Attention. An unregistered vessel is approaching Virgo-3B."
+ departure_message = "Attention. A unregistered vessel is now leaving Virgo-3B."
+
+//////////////////////////////////////////////////////////////
+// Skipjack
+/datum/shuttle/autodock/multi/heist
+ name = "Skipjack"
+ warmup_time = 8
+ move_time = 60
+ can_cloak = TRUE
+ cloaked = TRUE
+ current_location = "skipjack_base"
+ landmark_transition = "skipjack_transit"
+ shuttle_area = /area/shuttle/skipjack
+ destination_tags = list(
+ "skipjack_base",
+ "aerostat_south",
+ "beach_e",
+ "beach_nw",
+ "tether_solars_ne",
+ "tether_solars_sw",
+ "tether_mine_nw",
+ "tether_space_NE",
+ "tether_space_SE",
+ "tether_space_SW",
+ "tether_dockarm_d1l" //End of left dockarm
+ )
+ //docking_controller_tag = ??? doesn't have one?
+ announcer = "Automated Traffic Control"
+ arrival_message = "Attention. An unregistered vessel is approaching Virgo-3B."
+ departure_message = "Attention. A unregistered vessel is now leaving Virgo-3B."
+
+//////////////////////////////////////////////////////////////
+// ERT Shuttle
+/datum/shuttle/autodock/multi/specialops
+ name = "NDV Phantom"
+ can_cloak = TRUE
+ cloaked = FALSE
+ warmup_time = 8
+ move_time = 60
+ current_location = "specops_base"
+ landmark_transition = "specops_transit"
+ shuttle_area = /area/shuttle/specialops
+ destination_tags = list(
+ "specops_base",
+ "aerostat_northwest",
+ "beach_e",
+ "beach_nw",
+ "tether_solars_ne",
+ "tether_solars_sw",
+ "tether_mine_nw",
+ "tether_space_NE",
+ "tether_space_SE",
+ "tether_space_SW",
+ "tether_dockarm_d2a2" //Top of right docking arm
+ )
+ docking_controller_tag = "specops_shuttle_hatch"
+ announcer = "Automated Traffic Control"
+ arrival_message = "Attention. An NT support vessel is approaching Virgo-3B."
+ departure_message = "Attention. A NT support vessel is now leaving Virgo-3B."
//////////////////////////////////////////////////////////////
// RogueMiner "Belter: Shuttle
@@ -138,8 +192,6 @@
landmark_offsite = "belter_zone1"
landmark_transition = "belter_transit"
docking_controller_tag = "belter_docking"
- //dock_target_station = "belter_nodocking" //Fake tags to prevent the shuttle from opening doors.
- //dock_target_offsite = "belter_nodocking"
/datum/shuttle/autodock/ferry/belter/New()
move_time = move_time + rand(-5 SECONDS, 5 SECONDS)
diff --git a/maps/tether/tether_shuttles.dm b/maps/tether/tether_shuttles.dm
index 65926e2c92a..270c16461e7 100644
--- a/maps/tether/tether_shuttles.dm
+++ b/maps/tether/tether_shuttles.dm
@@ -7,18 +7,30 @@
shuttle_tag = "Tether Backup"
req_one_access = list(access_heads,access_pilot)
-/obj/machinery/computer/shuttle_control/multi/tether_antag_ground
- name = "land crawler control console"
- shuttle_tag = "Land Crawler"
+/obj/machinery/computer/shuttle_control/multi/mercenary
+ name = "vessel control console"
+ shuttle_tag = "Mercenary"
+ req_one_access = list(access_syndicate)
-/obj/machinery/computer/shuttle_control/multi/tether_antag_space
- name = "protoshuttle control console"
- shuttle_tag = "Proto"
+/obj/machinery/computer/shuttle_control/multi/ninja
+ name = "vessel control console"
+ shuttle_tag = "Ninja"
+ //req_one_access = list()
-/obj/machinery/computer/shuttle_control/cruiser_shuttle
- name = "cruiser shuttle control console"
- shuttle_tag = "Cruiser Shuttle"
- req_one_access = list(access_heads)
+/obj/machinery/computer/shuttle_control/multi/skipjack
+ name = "vessel control console"
+ shuttle_tag = "Skipjack"
+ //req_one_access = list()
+
+/obj/machinery/computer/shuttle_control/multi/specops
+ name = "vessel control console"
+ shuttle_tag = "NDV Phantom"
+ req_one_access = list(access_cent_specops)
+
+/obj/machinery/computer/shuttle_control/multi/trade
+ name = "vessel control console"
+ shuttle_tag = "Trade"
+ req_one_access = list(access_trader)
//
// "Tram" Emergency Shuttler
@@ -165,312 +177,52 @@
update_icon()
return 1
*/
+
////////////////////////////////////////
//////// Excursion Shuttle /////////////
////////////////////////////////////////
-/obj/machinery/computer/shuttle_control/web/excursion
- name = "shuttle control console"
- shuttle_tag = "Excursion Shuttle"
- req_access = list()
- req_one_access = list(access_pilot)
- var/wait_time = 45 MINUTES
-
-/obj/machinery/computer/shuttle_control/web/excursion/ui_interact()
- if(world.time < wait_time)
- to_chat(usr,"The console is locked while the shuttle refuels. It will be complete in [round((wait_time - world.time)/10/60)] minute\s.")
- return FALSE
-
- . = ..()
-
-/datum/shuttle/autodock/web_shuttle/excursion
+// The 'shuttle' of the excursion shuttle
+/datum/shuttle/autodock/overmap/excursion
name = "Excursion Shuttle"
warmup_time = 0
current_location = "tether_excursion_hangar"
docking_controller_tag = "expshuttle_docker"
- web_master_type = /datum/shuttle_web_master/excursion
- shuttle_area = /area/shuttle/excursion
- var/abduct_chance = 0 //Prob
+ shuttle_area = list(/area/shuttle/excursion/cockpit, /area/shuttle/excursion/general, /area/shuttle/excursion/cargo)
+ fuel_consumption = 3
-/datum/shuttle/autodock/web_shuttle/excursion/long_jump(var/obj/effect/shuttle_landmark/destination, var/obj/effect/shuttle_landmark/interim, var/travel_time)
- if(prob(abduct_chance))
- abduct_chance = 0
- var/list/occupants = list()
- for(var/area/A in shuttle_area)
- for(var/mob/living/L in A)
- occupants += key_name(L)
- log_and_message_admins("Shuttle abduction occuring with (only mobs on turfs): [english_list(occupants)]")
- //Build the route to the alien ship
- var/obj/shuttle_connector/alienship/ASC = new /obj/shuttle_connector/alienship(null)
- ASC.setup_routes()
+// The 'ship' of the excursion shuttle
+/obj/effect/overmap/visitable/ship/landable/excursion
+ name = "Excursion Shuttle"
+ desc = "The traditional Excursion Shuttle. NT Approved!"
+ vessel_mass = 10000
+ vessel_size = SHIP_SIZE_SMALL
+ shuttle = "Excursion Shuttle"
- //Redirect us onto that route instead
- var/datum/shuttle/autodock/web_shuttle/WS = shuttle_controller.shuttles[name]
- var/datum/shuttle_destination/ASD = WS.web_master.get_destination_by_type(/datum/shuttle_destination/excursion/alienship)
- WS.web_master.future_destination = ASD
- . = ..(ASD.my_landmark,interim,travel_time)
- else
- . = ..()
-
-/datum/shuttle_web_master/excursion
- destination_class = /datum/shuttle_destination/excursion
- starting_destination = /datum/shuttle_destination/excursion/tether
-
-/datum/shuttle_destination/excursion/tether
- name = "NSB Adephagia Excursion Hangar"
- my_landmark = "tether_excursion_hangar"
-
- radio_announce = 1
- announcer = "Docking System"
-
- routes_to_make = list(
- /datum/shuttle_destination/excursion/outside_tether = 0,
- )
-
-/datum/shuttle_destination/excursion/tether/get_arrival_message()
- return "Attention, [master.my_shuttle.visible_name] has arrived at the Excursion Hangar."
-
-/datum/shuttle_destination/excursion/tether/get_departure_message()
- return "Attention, [master.my_shuttle.visible_name] has departed from the Excursion Hangar."
-
-
-/datum/shuttle_destination/excursion/outside_tether
- name = "Nearby NSB Adephagia"
- my_landmark = "tether_excursion_nearby"
- preferred_interim_tag = "tether_excursion_transit_space"
-
- routes_to_make = list(
- /datum/shuttle_destination/excursion/docked_tether = 0,
- /datum/shuttle_destination/excursion/virgo3b_orbit = 30 SECONDS
- )
-
-
-/datum/shuttle_destination/excursion/docked_tether
- name = "NSB Adephagia Docking Arm"
- my_landmark = "tether_excursion_dockarm"
-
- radio_announce = 1
- announcer = "Docking System"
-
-/datum/shuttle_destination/excursion/docked_tether/get_arrival_message()
- return "Attention, [master.my_shuttle.visible_name] has arrived at Docking Arm One."
-
-/datum/shuttle_destination/excursion/docked_tether/get_departure_message()
- return "Attention, [master.my_shuttle.visible_name] has departed from Docking Arm One."
-
-
-/datum/shuttle_destination/excursion/virgo3b_orbit
- name = "Virgo 3B Orbit"
- my_landmark = "tether_excursion_space"
- preferred_interim_tag = "tether_excursion_transit_space"
-
- routes_to_make = list(
- /datum/shuttle_destination/excursion/virgo3b_sky = 30 SECONDS,
- /datum/shuttle_destination/excursion/bluespace = 30 SECONDS
- )
-
-
-/datum/shuttle_destination/excursion/virgo3b_sky
- name = "Skies of Virgo 3B"
- my_landmark = "tether_excursion_virgo3bsky"
-
-////////// Aliems!!
-/obj/machinery/computer/shuttle_control/web/excursion/blue
- name = "shuttle control console"
- icon = 'icons/obj/flight_computer_vr.dmi'
- icon_state = "center"
- shuttle_tag = "Hybrid Shuttle"
- req_access = list()
+/obj/machinery/computer/shuttle_control/explore/excursion
+ name = "short jump console"
+ shuttle_tag = "Excursion Shuttle"
req_one_access = list(access_pilot)
- wait_time = 0
- var/setup = FALSE
-/obj/machinery/computer/shuttle_control/web/excursion/blue/ui_interact()
- if(!setup && alert("Steal the excursion shuttle's destinations and copy them to this shuttle?","Shuttle Setup","Yes","Cancel") == "Yes")
- var/datum/shuttle/autodock/web_shuttle/HS = shuttle_controller.shuttles[shuttle_tag]
- var/datum/shuttle/autodock/web_shuttle/ES = shuttle_controller.shuttles["Excursion Shuttle"]
- if(!ES.web_master.destinations.len)
- return
-
- // First, instantiate all the destination subtypes relevant to this datum.
- for(var/new_type in ES.web_master.destinations)
- var/datum/shuttle_destination/D = new_type
- //if(D.skip_me) //Don't care
- // continue
- HS.web_master.destinations += new D.type(HS.web_master)
-
- // Now start the process of connecting all of them.
- for(var/datum/shuttle_destination/D in HS.web_master.destinations)
- for(var/type_to_link in D.routes_to_make)
- var/travel_delay = D.routes_to_make[type_to_link]
- D.link_destinations(HS.web_master.get_destination_by_type(type_to_link), D.preferred_interim_tag, travel_delay)
-
- HS.web_master.current_destination = HS.web_master.get_destination_by_type(/datum/shuttle_destination/excursion/deepish_space)
- setup = TRUE
- ..()
- else
- return ..()
-
-/datum/shuttle/autodock/web_shuttle/excursion/blue
- name = "Hybrid Shuttle"
- visible_name = "XN-39 Prototype"
+////////////////////////////////////////
+//////// Tour Bus /////////////
+////////////////////////////////////////
+/datum/shuttle/autodock/overmap/tourbus
+ name = "Tour Bus"
warmup_time = 0
- current_location = "bluefo_start"
- docking_controller_tag = "hybrid_shuttle_docker"
- web_master_type = /datum/shuttle_web_master/excursion/blue
- shuttle_area = /area/shuttle/blue_fo
- abduct_chance = 0
- flags = SHUTTLE_FLAGS_NONE
+ current_location = "tourbus_dock"
+ docking_controller_tag = "tourbus_docker"
+ shuttle_area = list(/area/shuttle/tourbus/cockpit, /area/shuttle/tourbus/general, /area/shuttle/tourbus/engines)
+ fuel_consumption = 1
-/datum/shuttle_web_master/excursion/blue
- destination_class = /datum/shuttle_destination/excursion
- starting_destination = /datum/shuttle_destination/excursion/deepish_space
+// The 'ship' of the excursion shuttle
+/obj/effect/overmap/visitable/ship/landable/tourbus
+ name = "Tour Bus"
+ desc = "A small 'space bus', if you will."
+ vessel_mass = 2000
+ vessel_size = SHIP_SIZE_SMALL
+ shuttle = "Tour Bus"
-/datum/shuttle_web_master/excursion/blue/build_destinations()
- return
-
-/datum/shuttle_destination/excursion/deepish_space
- name = "Deepish Space"
- my_landmark = "bluefo_start"
- preferred_interim_tag = "tether_excursion_transit_space"
- routes_to_make = list(
- /datum/shuttle_destination/excursion/bluespace = 0
- )
-
-/datum/shuttle_destination/excursion/deepish_space/link_destinations(var/datum/shuttle_destination/other_place, var/interim_tag, var/travel_time = 0)
- var/datum/shuttle_route/new_route = new(src, other_place, interim_tag, travel_time)
- routes += new_route
-
-////////// Distant Destinations
-/datum/shuttle_destination/excursion/bluespace
- name = "Bluespace Jump"
- my_landmark = "tether_excursion_bluespace"
- preferred_interim_tag = "tether_excursion_transit_space"
-
-// Heist
-/obj/machinery/computer/shuttle_control/web/heist
- name = "skipjack control console"
- req_access = list(access_syndicate)
- shuttle_tag = "Skipjack"
-
-/datum/shuttle/autodock/web_shuttle/heist
- name = "Skipjack"
- current_location = "skipjack_base"
- shuttle_area = /area/shuttle/skipjack
- web_master_type = /datum/shuttle_web_master/heist
- warmup_time = 0
- can_cloak = TRUE
- cloaked = TRUE
-
-/datum/shuttle_web_master/heist
- destination_class = /datum/shuttle_destination/heist
- starting_destination = /datum/shuttle_destination/heist/root
-
-/datum/shuttle_destination/heist/root
- name = "Raider Outpost"
- my_landmark = "skipjack_base"
- preferred_interim_tag = "skipjack_transit"
-
- routes_to_make = list(
- /datum/shuttle_destination/heist/outside_tether = 1 MINUTE
- )
-
-/datum/shuttle_destination/heist/outside_tether
- name = "NSB Adephagia - Nearby"
- my_landmark = "skipjack_outside"
- preferred_interim_tag = "skipjack_transit"
-
- routes_to_make = list(
- /datum/shuttle_destination/heist/root = 1 MINUTE
- )
-
-// Ninja
-/obj/machinery/computer/shuttle_control/web/ninja
- name = "stealth shuttle control console"
- req_access = list(access_syndicate)
- shuttle_tag = "Ninja"
-
-/datum/shuttle/autodock/web_shuttle/ninja
- name = "Ninja"
- visible_name = "Unknown Vessel"
- current_location = "ninja_base"
- shuttle_area = /area/shuttle/ninja
- docking_controller_tag = "ninja_shuttle"
- web_master_type = /datum/shuttle_web_master/ninja
- warmup_time = 0
- can_cloak = TRUE
- cloaked = TRUE
-
-/datum/shuttle_web_master/ninja
- destination_class = /datum/shuttle_destination/ninja
- starting_destination = /datum/shuttle_destination/ninja/root
-
-/datum/shuttle_destination/ninja/root
- name = "Dojo Outpost"
- my_landmark = "ninja_base"
- preferred_interim_tag = "ninja_transit"
-
- routes_to_make = list(
- /datum/shuttle_destination/ninja/outside_tether = 30 SECONDS
- )
-
-/datum/shuttle_destination/ninja/outside_tether
- name = "NSB Adephagia - Nearby"
- my_landmark = "ninja_outside"
- preferred_interim_tag = "ninja_transit"
-
- routes_to_make = list(
- /datum/shuttle_destination/ninja/root = 30 SECONDS
- )
-
-////////////////////////////////////
-//////// Specops Shuttle ///////////
-////////////////////////////////////
-
-/obj/machinery/computer/shuttle_control/web/specialops
- name = "shuttle control console"
- shuttle_tag = "Special Operations Shuttle"
- req_access = list()
- req_one_access = list(access_cent_specops)
-
-/datum/shuttle/autodock/web_shuttle/specialops
- name = "Special Operations Shuttle"
- visible_name = "NDV Phantom"
- current_location = "specops_base"
- shuttle_area = /area/shuttle/specialops
- docking_controller_tag = "specops_shuttle_hatch"
- web_master_type = /datum/shuttle_web_master/specialops
- can_rename = FALSE
- can_cloak = TRUE
- cloaked = FALSE
-
-/datum/shuttle_web_master/specialops
- destination_class = /datum/shuttle_destination/specialops
- starting_destination = /datum/shuttle_destination/specialops/centcom
-
-/datum/shuttle_destination/specialops/tether
- name = "NSB Adephagia Docking Arm 2"
- my_landmark = "specops_tether"
- preferred_interim_tag = "specops_transit"
-
- radio_announce = 1
- announcer = "A.L.I.C.E."
-
- routes_to_make = list(
- /datum/shuttle_destination/specialops/centcom = 15,
- )
-
-/datum/shuttle_destination/specialops/tether/get_arrival_message()
- return "Attention, [master.my_shuttle.visible_name] has arrived at the Docking Arm 2."
-
-/datum/shuttle_destination/specialops/tether/get_departure_message()
- return "Attention, [master.my_shuttle.visible_name] has departed from the Docking Arm 2."
-
-
-/datum/shuttle_destination/specialops/centcom
- name = "Central Command"
- my_landmark = "specops_base"
- preferred_interim_tag = "specops_transit"
-
- routes_to_make = list(
- /datum/shuttle_destination/specialops/tether = 15
- )
\ No newline at end of file
+/obj/machinery/computer/shuttle_control/explore/tourbus
+ name = "short jump console"
+ shuttle_tag = "Tour Bus"
+ req_one_access = list(access_pilot)