diff --git a/code/game/objects/structures/props/alien_props_vr.dm b/code/game/objects/structures/props/alien_props_vr.dm
new file mode 100644
index 0000000000..b306d610ba
--- /dev/null
+++ b/code/game/objects/structures/props/alien_props_vr.dm
@@ -0,0 +1,13 @@
+/obj/structure/prop/alien/computer/hybrid
+ name = "hybrid console"
+ desc = "The console flashes what appear to be symbols you've never seen before, intermixed with human writing moving too fast to comprehend."
+ icon = 'icons/obj/abductor_vr.dmi'
+ icon_state = "console-c"
+ interaction_message = "The screen flashes an 'access denied' message at you. Perhaps for the best."
+
+/obj/structure/prop/alien/pod/hybrid
+ name = "hybrid pod"
+ desc = "This seems to be a container for something."
+ icon = 'icons/obj/abductor_vr.dmi'
+ icon_state = "experiment"
+ interaction_message = "You don't see any mechanism to open this thing. Probably for the best."
\ No newline at end of file
diff --git a/code/game/turfs/simulated/floor_types_vr.dm b/code/game/turfs/simulated/floor_types_vr.dm
index e89c3d0b29..d0ca91c600 100644
--- a/code/game/turfs/simulated/floor_types_vr.dm
+++ b/code/game/turfs/simulated/floor_types_vr.dm
@@ -1,3 +1,17 @@
+/turf/simulated/shuttle/floor/alienplating/blue
+ icon = 'icons/turf/shuttle_alien_blue.dmi'
+ icon_state = "alienplating"
+
+/turf/simulated/shuttle/floor/alienplating/blue/half
+ icon_state = "alienplatinghalf"
+
+/turf/simulated/shuttle/floor/alien/blue
+ icon = 'icons/turf/shuttle_alien_blue.dmi'
+ icon_state = "alienpod1"
+ light_range = 4
+ light_power = 0.8
+ light_color = "#66ffff" // Bright cyan.
+
/turf/simulated/floor/flesh
name = "flesh"
desc = "This slick flesh ripples and squishes under your touch"
diff --git a/code/modules/mining/shelter_atoms_vr.dm b/code/modules/mining/shelter_atoms_vr.dm
new file mode 100644
index 0000000000..664b0cff51
--- /dev/null
+++ b/code/modules/mining/shelter_atoms_vr.dm
@@ -0,0 +1,13 @@
+/obj/structure/fans/hardlight
+ name = "hardlight shield"
+ desc = "Retains air, allows passage."
+ plane = TURF_PLANE
+ layer = ABOVE_TURF_LAYER
+ density = FALSE
+ icon = 'icons/effects/effects_vr.dmi'
+ icon_state = "hardlight"
+ buildstackamount = 2
+
+ light_range = 3
+ light_power = 1
+ light_color = "#FFFFFF"
\ No newline at end of file
diff --git a/code/modules/power/smes_vr.dm b/code/modules/power/smes_vr.dm
new file mode 100644
index 0000000000..a333660a43
--- /dev/null
+++ b/code/modules/power/smes_vr.dm
@@ -0,0 +1,34 @@
+/obj/machinery/power/smes/buildable/hybrid
+ name = "hybrid power storage unit"
+ desc = "A high-capacity superconducting magnetic energy storage (SMES) unit, modified with alien technology to generate small amounts of power from seemingly nowhere."
+ icon = 'icons/obj/power_vr.dmi'
+ var/recharge_rate = 10000
+ var/overlay_icon = 'icons/obj/power_vr.dmi'
+
+/obj/machinery/power/smes/buildable/hybrid/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+ if(W.is_screwdriver() || W.is_wirecutter())
+ to_chat(user,"\The [src] full of weird alien technology that's best not messed with.")
+ return 0
+
+/obj/machinery/power/smes/buildable/hybrid/update_icon()
+ cut_overlays()
+ if(stat & BROKEN) return
+
+ add_overlay("smes-op[outputting]")
+
+ if(inputting == 2)
+ add_overlay("smes-oc2")
+ else if (inputting == 1)
+ add_overlay("smes-oc1")
+ else
+ if(input_attempt)
+ add_overlay("smes-oc0")
+
+ var/clevel = chargedisplay()
+ if(clevel>0)
+ add_overlay("smes-og[clevel]")
+ return
+
+/obj/machinery/power/smes/buildable/hybrid/process()
+ charge += min(recharge_rate, capacity - charge)
+ ..()
diff --git a/code/modules/tables/presets_vr.dm b/code/modules/tables/presets_vr.dm
index 16658e19a5..085c4c6d8f 100644
--- a/code/modules/tables/presets_vr.dm
+++ b/code/modules/tables/presets_vr.dm
@@ -16,4 +16,6 @@
/obj/structure/table/darkglass/dismantle(obj/item/weapon/wrench/W, mob/user)
to_chat(user, "You cannot dismantle \the [src].")
- return
\ No newline at end of file
+ return
+/obj/structure/table/alien/blue
+ icon = 'icons/turf/shuttle_alien_blue.dmi'
diff --git a/icons/effects/effects_vr.dmi b/icons/effects/effects_vr.dmi
new file mode 100644
index 0000000000..276a33bae6
Binary files /dev/null and b/icons/effects/effects_vr.dmi differ
diff --git a/icons/obj/abductor_vr.dmi b/icons/obj/abductor_vr.dmi
new file mode 100644
index 0000000000..9697506706
Binary files /dev/null and b/icons/obj/abductor_vr.dmi differ
diff --git a/icons/obj/flight_computer_vr.dmi b/icons/obj/flight_computer_vr.dmi
new file mode 100644
index 0000000000..44d87c1c72
Binary files /dev/null and b/icons/obj/flight_computer_vr.dmi differ
diff --git a/icons/obj/power_vr.dmi b/icons/obj/power_vr.dmi
index 1971b2d531..05a1cfa484 100644
Binary files a/icons/obj/power_vr.dmi and b/icons/obj/power_vr.dmi differ
diff --git a/icons/turf/shuttle_alien_blue.dmi b/icons/turf/shuttle_alien_blue.dmi
index 203c11756e..1416dd6c42 100644
Binary files a/icons/turf/shuttle_alien_blue.dmi and b/icons/turf/shuttle_alien_blue.dmi differ
diff --git a/maps/tether/submaps/tether_misc.dmm b/maps/tether/submaps/tether_misc.dmm
index c0c7a9ae91..dbef82d90c 100644
--- a/maps/tether/submaps/tether_misc.dmm
+++ b/maps/tether/submaps/tether_misc.dmm
@@ -3,6 +3,14 @@
/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";
@@ -10092,6 +10100,17 @@
},
/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;
@@ -10205,6 +10224,15 @@
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{
@@ -10281,6 +10309,9 @@
"xt" = (
/turf/simulated/shuttle/plating,
/area/shuttle/skipjack)
+"xz" = (
+/turf/simulated/floor/tiled/techfloor/grid,
+/area/shuttle/blue_fo)
"xD" = (
/obj/structure/flight_left{
dir = 1
@@ -10295,6 +10326,17 @@
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,
@@ -10384,6 +10426,17 @@
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,
@@ -10438,6 +10491,21 @@
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{
@@ -10445,6 +10513,20 @@
},
/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)
"zn" = (
/obj/structure/table/rack,
/obj/item/weapon/gun/launcher/crossbow,
@@ -10484,6 +10566,10 @@
/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'
@@ -10530,6 +10616,14 @@
},
/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
@@ -10661,6 +10755,16 @@
/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"
@@ -10708,12 +10812,52 @@
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)
@@ -10736,6 +10880,9 @@
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;
@@ -10770,6 +10917,23 @@
/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
@@ -10828,12 +10992,40 @@
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,
@@ -10854,6 +11046,9 @@
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
@@ -10891,6 +11086,13 @@
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,
@@ -10898,6 +11100,13 @@
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,
@@ -10934,6 +11143,10 @@
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{
@@ -10944,6 +11157,14 @@
/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{
@@ -10959,6 +11180,17 @@
},
/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,
@@ -11010,6 +11242,14 @@
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";
@@ -11029,6 +11269,14 @@
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
@@ -11047,6 +11295,10 @@
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"
@@ -11195,6 +11447,22 @@
"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,
@@ -11240,6 +11508,22 @@
/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{
@@ -11254,6 +11538,17 @@
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,
@@ -11293,6 +11588,19 @@
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,
@@ -11539,6 +11847,13 @@
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)
@@ -11559,6 +11874,19 @@
},
/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;
@@ -11579,11 +11907,73 @@
},
/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;
@@ -11593,6 +11983,13 @@
/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,
@@ -11656,6 +12053,14 @@
/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{
@@ -11757,6 +12162,19 @@
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.";
@@ -11832,6 +12250,11 @@
},
/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';
@@ -11849,6 +12272,14 @@
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,
@@ -11924,6 +12355,14 @@
/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;
@@ -11953,6 +12392,20 @@
},
/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,
@@ -12112,6 +12565,25 @@
/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';
@@ -12175,6 +12647,15 @@
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{
@@ -12202,6 +12683,10 @@
},
/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{
@@ -12288,6 +12773,34 @@
},
/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{
@@ -12339,6 +12852,16 @@
},
/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
@@ -12366,6 +12889,13 @@
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,
@@ -12397,6 +12927,17 @@
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{
@@ -12421,6 +12962,16 @@
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{
@@ -12483,6 +13034,26 @@
/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"
@@ -12509,6 +13080,13 @@
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)
@@ -12618,6 +13196,18 @@
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)
"Xo" = (
/obj/structure/table/steel,
/obj/item/clothing/glasses/regular,
@@ -12706,6 +13296,14 @@
/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,
@@ -12786,6 +13384,10 @@
},
/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{
@@ -12849,6 +13451,24 @@
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)
@@ -25606,35 +26226,35 @@ mv
mv
mv
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
-ap
+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
@@ -25776,7 +26396,7 @@ ap
ap
ap
ap
-ap
+gp
ap
ap
ap
@@ -25918,7 +26538,7 @@ ap
ap
ap
ap
-ap
+gp
ap
ap
ap
@@ -26060,7 +26680,7 @@ ap
ap
ap
ap
-ap
+gp
ap
ap
ap
@@ -26202,7 +26822,7 @@ ap
ap
ap
ap
-ap
+gp
ap
ap
ap
@@ -26344,7 +26964,7 @@ ap
ap
ap
ap
-ap
+gp
ap
ap
ap
@@ -26486,7 +27106,7 @@ ap
ap
ap
ap
-ap
+gp
ap
ap
ap
@@ -26609,6 +27229,18 @@ ap
ap
ap
ap
+CL
+CL
+BF
+Dh
+Dh
+Dh
+BF
+CL
+CL
+KD
+CL
+CL
ap
ap
ap
@@ -26616,19 +27248,7 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+gp
ap
ap
ap
@@ -26750,27 +27370,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
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+gp
ap
ap
ap
@@ -26892,27 +27512,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
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+gp
ap
ap
ap
@@ -27034,27 +27654,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
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+gp
ap
ap
ap
@@ -27176,27 +27796,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
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+gp
ap
ap
ap
@@ -27318,27 +27938,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
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+gp
ap
ap
ap
@@ -27460,27 +28080,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
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+gp
ap
ap
ap
@@ -27602,27 +28222,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
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+gp
ap
ap
ap
@@ -27744,27 +28364,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
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+gp
ap
ap
aB
@@ -27886,27 +28506,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
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+gp
ap
ap
aB
@@ -28028,27 +28648,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
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+gp
ap
aB
aB
@@ -28170,27 +28790,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
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+gp
ap
aB
aB
@@ -28313,6 +28933,18 @@ ap
ap
ap
ap
+CL
+CL
+BF
+Tk
+Tk
+Tk
+BF
+CL
+CL
+KD
+CL
+CL
ap
ap
ap
@@ -28320,19 +28952,7 @@ ap
ap
ap
ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
-ap
+gp
ap
aB
aB
@@ -28474,7 +29094,7 @@ ap
ap
ap
ap
-ap
+gp
aB
aB
oX
@@ -28616,7 +29236,7 @@ ap
ap
ap
ap
-ap
+gp
aB
aB
oX
@@ -28757,8 +29377,8 @@ ap
ap
ap
ap
-ap
-ap
+gp
+gp
aB
aB
oX
@@ -28899,7 +29519,7 @@ ap
ap
ap
ap
-ap
+gp
aB
aB
aB
@@ -29041,7 +29661,7 @@ ap
ap
ap
ap
-ap
+gp
aB
aB
aB
@@ -29183,7 +29803,7 @@ ap
ap
ap
ap
-ap
+gp
aB
aB
aB
@@ -29298,34 +29918,34 @@ 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
+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
aB
aB
aB
diff --git a/maps/tether/submaps/tether_ships.dmm b/maps/tether/submaps/tether_ships.dmm
index 16cb6c508e..3f209f234e 100644
--- a/maps/tether/submaps/tether_ships.dmm
+++ b/maps/tether/submaps/tether_ships.dmm
@@ -35,16 +35,6 @@
"et" = (
/turf/space/bluespace,
/area/space)
-"eO" = (
-/obj/effect/step_trigger/thrower{
- affect_ghosts = 1;
- direction = 2;
- name = "thrower_throwdown";
- stopper = 0;
- tiles = 0
- },
-/turf/space/sandyscroll,
-/area/space)
"fg" = (
/obj/effect/shuttle_landmark/transit{
base_area = /area/space;
@@ -177,16 +167,6 @@
icon = 'icons/turf/transit_vr.dmi'
},
/area/space)
-"hj" = (
-/obj/effect/step_trigger/thrower{
- affect_ghosts = 1;
- direction = 2;
- name = "thrower_throwdown";
- stopper = 0;
- tiles = 0
- },
-/turf/space/bluespace,
-/area/space)
"hk" = (
/obj/effect/shuttle_landmark/transit{
base_area = /area/space;
@@ -291,16 +271,6 @@
},
/turf/space/transit/south,
/area/space)
-"hD" = (
-/obj/effect/step_trigger/thrower{
- affect_ghosts = 1;
- direction = 2;
- name = "thrower_throwdown";
- stopper = 0;
- tiles = 0
- },
-/turf/space,
-/area/space)
"hG" = (
/obj/effect/step_trigger/thrower{
affect_ghosts = 1;
@@ -451,91 +421,91 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-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
"}
(2,1,1) = {"
aa
@@ -593,39 +563,37 @@ aa
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
+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
@@ -677,7 +645,9 @@ ht
ht
ht
ht
-aa
+ht
+ht
+dJ
"}
(3,1,1) = {"
aa
@@ -735,39 +705,35 @@ aa
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
+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
@@ -792,6 +758,8 @@ et
et
et
et
+et
+et
gV
dJ
ht
@@ -818,8 +786,10 @@ hp
hp
hp
hp
+hp
+hp
ht
-aa
+dJ
"}
(4,1,1) = {"
aa
@@ -877,39 +847,35 @@ aa
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
+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
@@ -934,6 +900,8 @@ et
et
et
et
+et
+et
gV
dJ
ht
@@ -960,8 +928,10 @@ hp
hp
hp
hp
+hp
+hp
ht
-aa
+dJ
"}
(5,1,1) = {"
aa
@@ -1019,39 +989,35 @@ aa
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
-eO
-eO
-eO
-eO
-eO
-eO
-gU
-gU
-dQ
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
@@ -1066,12 +1032,14 @@ et
et
et
et
-hj
-hj
-hj
-hj
-hj
-hj
+et
+et
+et
+et
+et
+et
+et
+et
et
et
et
@@ -1092,18 +1060,20 @@ hp
hp
hp
hp
-hz
-hz
-hz
-hz
-hz
-hz
+hp
+hp
+hp
+hp
+hp
+hp
+hp
+hp
hp
hp
hp
hp
ht
-aa
+dJ
"}
(6,1,1) = {"
aa
@@ -1161,61 +1131,59 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-dQ
-gU
-gU
-gU
-gU
-gU
-eO
-eO
-eO
-eO
-eO
-eO
-eO
-eO
-eO
-eO
-eO
-gU
-gU
-gU
-gU
-eO
-eO
-gU
-dQ
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
-hj
-hj
-hj
-hj
-hj
-hj
-hj
-hj
-hj
-hj
-hj
et
et
et
et
-hj
+et
+et
+et
+et
+et
+et
+et
+et
+et
+et
+et
+et
+et
+et
et
et
gV
@@ -1226,26 +1194,28 @@ hp
hp
hp
hp
-hz
-hz
-hz
-hz
-hz
-hz
-hz
-hz
-hz
-hz
-hz
hp
hp
hp
hp
-hz
-hz
+hp
+hp
+hp
+hp
+hp
+hp
+hp
+hp
+hp
+hp
+hp
+hp
+hp
+hp
+hp
hp
ht
-aa
+dJ
"}
(7,1,1) = {"
aa
@@ -1303,46 +1273,44 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-dQ
-gU
-gU
-gU
-gU
-gU
-eO
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-eO
-gU
-dQ
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
-hj
+et
+et
+et
et
et
et
@@ -1368,7 +1336,6 @@ hp
hp
hp
hp
-hz
hp
hp
hp
@@ -1384,10 +1351,13 @@ hp
hp
hp
hp
-hz
+hp
+hp
+hp
+hp
hp
ht
-aa
+dJ
"}
(8,1,1) = {"
aa
@@ -1445,46 +1415,44 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-dQ
-gU
-gU
-gU
-gU
-eO
-eO
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-eO
-gU
-dQ
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
-hj
-hj
+et
+et
+et
+et
et
et
et
@@ -1509,8 +1477,6 @@ hp
hp
hp
hp
-hz
-hz
hp
hp
hp
@@ -1526,10 +1492,14 @@ hp
hp
hp
hp
-hz
+hp
+hp
+hp
+hp
+hp
hp
ht
-aa
+dJ
"}
(9,1,1) = {"
aa
@@ -1587,45 +1557,43 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-dQ
-gU
-gU
-gU
-gU
-eO
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-eO
-gU
-dQ
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
-hj
+et
+et
+et
et
et
et
@@ -1651,7 +1619,6 @@ hp
hp
hp
hp
-hz
hp
hp
hp
@@ -1668,10 +1635,13 @@ hp
hp
hp
hp
-hz
+hp
+hp
+hp
+hp
hp
ht
-aa
+dJ
"}
(10,1,1) = {"
aa
@@ -1729,45 +1699,39 @@ aa
aa
aa
aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-dQ
-gU
-gU
-gU
-eO
-eO
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-eO
-eO
-gU
-dQ
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
-hj
-hj
et
et
et
@@ -1783,7 +1747,11 @@ et
et
et
et
-hj
+et
+et
+et
+et
+et
et
et
gV
@@ -1792,8 +1760,6 @@ ht
hp
hp
hp
-hz
-hz
hp
hp
hp
@@ -1809,11 +1775,15 @@ hp
hp
hp
hp
-hz
-hz
+hp
+hp
+hp
+hp
+hp
+hp
hp
ht
-aa
+dJ
"}
(11,1,1) = {"
aa
@@ -1867,95 +1837,95 @@ aa
aa
aa
aa
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dJ
-dQ
-gU
-gU
-gU
-eO
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-gU
-eO
-eO
-gU
-dQ
-dJ
-gV
-et
-et
-et
-hj
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-et
-hj
-et
-et
-gV
-dJ
-ht
-hp
-hp
-hp
-hz
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hp
-hz
-hz
-hp
-ht
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
+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
"}
(12,1,1) = {"
aa
@@ -2009,22 +1979,15 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
dJ
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
dQ
gU
gU
gU
-eO
gU
gU
gU
@@ -2041,16 +2004,18 @@ gU
gU
gU
gU
-eO
+gU
+gU
+gU
+gU
gU
gU
dQ
-dJ
+aa
gV
et
et
et
-hj
et
et
et
@@ -2067,7 +2032,10 @@ et
et
et
et
-hj
+et
+et
+et
+et
et
et
gV
@@ -2076,7 +2044,6 @@ ht
hp
hp
hp
-hz
hp
hp
hp
@@ -2093,11 +2060,14 @@ hp
hp
hp
hp
-hz
+hp
+hp
+hp
+hp
hp
hp
ht
-aa
+dJ
"}
(13,1,1) = {"
aa
@@ -2151,22 +2121,15 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
dJ
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
dQ
gU
gU
gU
-eO
gU
gU
gU
@@ -2183,16 +2146,18 @@ gU
gU
gU
gU
-eO
+gU
+gU
+gU
+gU
gU
gU
dQ
-dJ
+aa
gV
et
et
et
-hj
et
et
et
@@ -2209,7 +2174,10 @@ et
et
et
et
-hj
+et
+et
+et
+et
et
et
gV
@@ -2218,7 +2186,6 @@ ht
hp
hp
hp
-hz
hp
hp
hp
@@ -2235,11 +2202,14 @@ hp
hp
hp
hp
-hz
+hp
+hp
+hp
+hp
hp
hp
ht
-aa
+dJ
"}
(14,1,1) = {"
aa
@@ -2293,22 +2263,15 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
dJ
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
dQ
gU
gU
gU
-eO
gU
gU
gU
@@ -2325,16 +2288,18 @@ gU
gU
gU
gU
-eO
+gU
+gU
+gU
+gU
gU
gU
dQ
-dJ
+aa
gV
et
et
et
-hj
et
et
et
@@ -2351,7 +2316,10 @@ et
et
et
et
-hj
+et
+et
+et
+et
et
et
gV
@@ -2360,7 +2328,6 @@ ht
hp
hp
hp
-hz
hp
hp
hp
@@ -2377,11 +2344,14 @@ hp
hp
hp
hp
-hz
+hp
+hp
+hp
+hp
hp
hp
ht
-aa
+dJ
"}
(15,1,1) = {"
aa
@@ -2435,22 +2405,15 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
dJ
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
dQ
gU
gU
gU
-eO
gU
gU
gU
@@ -2467,16 +2430,18 @@ gU
gU
gU
gU
-eO
-eO
+gU
+gU
+gU
+gU
+gU
gU
dQ
-dJ
+aa
gV
et
et
et
-hj
et
et
et
@@ -2493,7 +2458,10 @@ et
et
et
et
-hj
+et
+et
+et
+et
et
et
gV
@@ -2502,7 +2470,6 @@ ht
hp
hp
hp
-hz
hp
hp
hp
@@ -2519,11 +2486,14 @@ hp
hp
hp
hp
-hz
-hz
+hp
+hp
+hp
+hp
+hp
hp
ht
-aa
+dJ
"}
(16,1,1) = {"
aa
@@ -2577,23 +2547,15 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
dJ
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
dQ
gU
gU
gU
-eO
-eO
gU
gU
gU
@@ -2609,17 +2571,19 @@ gU
gU
gU
gU
-eO
-eO
+gU
+gU
+gU
+gU
+gU
+gU
gU
dQ
-dJ
+aa
gV
et
et
et
-hj
-hj
et
et
et
@@ -2635,7 +2599,11 @@ et
et
et
et
-hj
+et
+et
+et
+et
+et
et
et
gV
@@ -2644,8 +2612,6 @@ ht
hp
hp
hp
-hz
-hz
hp
hp
hp
@@ -2661,11 +2627,15 @@ hp
hp
hp
hp
-hz
-hz
+hp
+hp
+hp
+hp
+hp
+hp
hp
ht
-aa
+dJ
"}
(17,1,1) = {"
aa
@@ -2719,23 +2689,16 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
dJ
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
dQ
gU
gU
gU
gU
-eO
gU
gU
gU
@@ -2752,16 +2715,21 @@ gU
gU
gU
gU
-eO
+gU
+gU
+gU
+gU
gU
dQ
-dJ
+aa
gV
et
et
et
et
-hj
+et
+et
+et
et
et
et
@@ -2787,7 +2755,6 @@ hp
hp
hp
hp
-hz
hp
hp
hp
@@ -2804,10 +2771,13 @@ hp
hp
hp
hp
-hz
+hp
+hp
+hp
+hp
hp
ht
-aa
+dJ
"}
(18,1,1) = {"
aa
@@ -2861,24 +2831,16 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
dJ
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
dQ
gU
gU
gU
gU
-eO
-eO
gU
gU
gU
@@ -2889,22 +2851,24 @@ gU
gU
gU
gU
-hd
gU
gU
gU
gU
-eO
+gU
+gU
+gU
+gU
+gU
+gU
gU
dQ
-dJ
+aa
gV
et
et
et
et
-hj
-hj
et
et
et
@@ -2915,7 +2879,11 @@ et
et
et
et
-fg
+et
+et
+et
+et
+et
et
et
et
@@ -2929,8 +2897,6 @@ hp
hp
hp
hp
-hz
-hz
hp
hp
hp
@@ -2941,15 +2907,19 @@ hp
hp
hp
hp
-hq
hp
hp
hp
hp
-hz
+hp
+hp
+hp
+hp
+hp
+hp
hp
ht
-aa
+dJ
"}
(19,1,1) = {"
aa
@@ -3003,24 +2973,17 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
dJ
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
dQ
gU
gU
gU
gU
gU
-eO
gU
gU
gU
@@ -3033,20 +2996,22 @@ gU
gU
gU
gU
+hd
+gU
+gU
+gU
gU
gU
gU
-eO
gU
dQ
-dJ
+aa
gV
et
et
et
et
et
-hj
et
et
et
@@ -3059,6 +3024,9 @@ et
et
et
et
+fg
+et
+et
et
et
et
@@ -3072,7 +3040,6 @@ hp
hp
hp
hp
-hz
hp
hp
hp
@@ -3085,13 +3052,16 @@ hp
hp
hp
hp
+hq
+hp
+hp
+hp
hp
hp
hp
-hz
hp
ht
-aa
+dJ
"}
(20,1,1) = {"
aa
@@ -3145,31 +3115,17 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
dJ
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
dQ
gU
gU
gU
gU
gU
-eO
-eO
-eO
-eO
-eO
-eO
-eO
-eO
gU
gU
gU
@@ -3177,25 +3133,27 @@ gU
gU
gU
gU
-eO
-eO
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
gU
dQ
-dJ
+aa
gV
et
et
et
et
et
-hj
-hj
-hj
-hj
-hj
-hj
-hj
-hj
et
et
et
@@ -3203,7 +3161,17 @@ et
et
et
et
-hj
+et
+et
+et
+et
+et
+et
+et
+et
+et
+et
+et
et
et
gV
@@ -3214,14 +3182,6 @@ hp
hp
hp
hp
-hz
-hz
-hz
-hz
-hz
-hz
-hz
-hz
hp
hp
hp
@@ -3229,11 +3189,21 @@ hp
hp
hp
hp
-hz
-hz
+hp
+hp
+hp
+hp
+hp
+hp
+hp
+hp
+hp
+hp
+hp
+hp
hp
ht
-aa
+dJ
"}
(21,1,1) = {"
aa
@@ -3287,17 +3257,11 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
dJ
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
dQ
gU
gU
@@ -3311,19 +3275,21 @@ gU
gU
gU
gU
-eO
-eO
-eO
-eO
-eO
-eO
-eO
-eO
-eO
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
+gU
gU
gU
dQ
-dJ
+aa
gV
et
et
@@ -3337,13 +3303,15 @@ et
et
et
et
-hj
-hj
-hj
-hj
-hj
-hj
-hj
+et
+et
+et
+et
+et
+et
+et
+et
+et
et
et
et
@@ -3363,19 +3331,21 @@ hp
hp
hp
hp
-hz
-hz
-hz
-hz
-hz
-hz
-hz
-hz
-hz
+hp
+hp
+hp
+hp
+hp
+hp
+hp
+hp
+hp
+hp
+hp
hp
hp
ht
-aa
+dJ
"}
(22,1,1) = {"
aa
@@ -3429,17 +3399,11 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
dJ
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
dQ
gU
gU
@@ -3464,8 +3428,10 @@ gU
gU
gU
gU
+gU
+gU
dQ
-dJ
+aa
gV
et
et
@@ -3490,6 +3456,8 @@ et
et
et
et
+et
+et
gV
dJ
ht
@@ -3516,8 +3484,10 @@ hp
hp
hp
hp
+hp
+hp
ht
-aa
+dJ
"}
(23,1,1) = {"
aa
@@ -3571,17 +3541,11 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
dJ
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
dQ
gU
gU
@@ -3606,8 +3570,10 @@ gU
gU
gU
gU
+gU
+gU
dQ
-dJ
+aa
gV
et
et
@@ -3632,6 +3598,8 @@ et
et
et
et
+et
+et
gV
dJ
ht
@@ -3658,8 +3626,10 @@ hp
hp
hp
hp
+hp
+hp
ht
-aa
+dJ
"}
(24,1,1) = {"
aa
@@ -3713,95 +3683,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
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-ht
-aa
+dJ
"}
(25,1,1) = {"
aa
@@ -3855,95 +3825,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
+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
dJ
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
+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
-dJ
-aa
"}
(26,1,1) = {"
aa
@@ -3997,95 +3967,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
-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
+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
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
@@ -4139,95 +4109,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
-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
+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
"}
(28,1,1) = {"
aa
@@ -4281,7 +4251,13 @@ aa
aa
aa
aa
-dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -4308,68 +4284,62 @@ aa
aa
aa
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
+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
-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
+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
"}
(29,1,1) = {"
aa
@@ -4423,7 +4393,13 @@ aa
aa
aa
aa
-dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -4450,16 +4426,6 @@ aa
aa
aa
dJ
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
gO
hc
hc
@@ -4476,12 +4442,14 @@ hc
hc
hc
hc
-ho
-ho
-ho
-ho
-ho
-ho
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
hc
hc
gO
@@ -4502,16 +4470,18 @@ aa
aa
aa
aa
-hD
-hD
-hD
-hD
-hD
-hD
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
hu
-aa
+dJ
"}
(30,1,1) = {"
aa
@@ -4565,7 +4535,13 @@ aa
aa
aa
aa
-dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -4592,39 +4568,31 @@ 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
-ho
-ho
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
hc
gO
dJ
@@ -4634,26 +4602,28 @@ aa
aa
aa
aa
-hD
-hD
-hD
-hD
-hD
-hD
-hD
-hD
-hD
-hD
-hD
aa
aa
aa
aa
-hD
-hD
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
hu
-aa
+dJ
"}
(31,1,1) = {"
aa
@@ -4707,7 +4677,13 @@ aa
aa
aa
aa
-dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -4734,23 +4710,12 @@ aa
aa
aa
dJ
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
gO
hc
hc
hc
hc
hc
-ho
hc
hc
hc
@@ -4766,7 +4731,10 @@ hc
hc
hc
hc
-ho
+hc
+hc
+hc
+hc
hc
gO
dJ
@@ -4776,7 +4744,6 @@ aa
aa
aa
aa
-hD
aa
aa
aa
@@ -4792,10 +4759,13 @@ aa
aa
aa
aa
-hD
+aa
+aa
+aa
+aa
aa
hu
-aa
+dJ
"}
(32,1,1) = {"
aa
@@ -4849,7 +4819,13 @@ aa
aa
aa
aa
-dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -4876,23 +4852,11 @@ aa
aa
aa
dJ
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
gO
hc
hc
hc
hc
-ho
-ho
hc
hc
hc
@@ -4908,7 +4872,11 @@ hc
hc
hc
hc
-ho
+hc
+hc
+hc
+hc
+hc
hc
gO
dJ
@@ -4917,8 +4885,6 @@ aa
aa
aa
aa
-hD
-hD
aa
aa
aa
@@ -4934,10 +4900,14 @@ aa
aa
aa
aa
-hD
+aa
+aa
+aa
+aa
+aa
aa
hu
-aa
+dJ
"}
(33,1,1) = {"
aa
@@ -4991,7 +4961,13 @@ aa
aa
aa
aa
-dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -5018,22 +4994,11 @@ aa
aa
aa
dJ
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
gO
hc
hc
hc
hc
-ho
hc
hc
hc
@@ -5050,7 +5015,10 @@ hc
hc
hc
hc
-ho
+hc
+hc
+hc
+hc
hc
gO
dJ
@@ -5059,7 +5027,6 @@ aa
aa
aa
aa
-hD
aa
aa
aa
@@ -5076,10 +5043,13 @@ aa
aa
aa
aa
-hD
+aa
+aa
+aa
+aa
aa
hu
-aa
+dJ
"}
(34,1,1) = {"
aa
@@ -5133,7 +5103,13 @@ aa
aa
aa
aa
-dJ
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
aa
aa
@@ -5160,22 +5136,10 @@ aa
aa
aa
dJ
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
gO
hc
hc
hc
-ho
-ho
hc
hc
hc
@@ -5191,8 +5155,12 @@ hc
hc
hc
hc
-ho
-ho
+hc
+hc
+hc
+hc
+hc
+hc
hc
gO
dJ
@@ -5200,8 +5168,6 @@ hu
aa
aa
aa
-hD
-hD
aa
aa
aa
@@ -5217,11 +5183,15 @@ aa
aa
aa
aa
-hD
-hD
+aa
+aa
+aa
+aa
+aa
+aa
aa
hu
-aa
+dJ
"}
(35,1,1) = {"
aa
@@ -5275,33 +5245,6 @@ 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
@@ -5312,11 +5255,33 @@ aa
aa
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
gO
hc
hc
hc
-ho
hc
hc
hc
@@ -5333,8 +5298,11 @@ hc
hc
hc
hc
-ho
-ho
+hc
+hc
+hc
+hc
+hc
hc
gO
dJ
@@ -5342,7 +5310,6 @@ hu
aa
aa
aa
-hD
aa
aa
aa
@@ -5359,11 +5326,14 @@ aa
aa
aa
aa
-hD
-hD
+aa
+aa
+aa
+aa
+aa
aa
hu
-aa
+dJ
"}
(36,1,1) = {"
aa
@@ -5443,22 +5413,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
hc
-ho
hc
hc
hc
@@ -5475,7 +5440,10 @@ hc
hc
hc
hc
-ho
+hc
+hc
+hc
+hc
hc
hc
gO
@@ -5484,7 +5452,6 @@ hu
aa
aa
aa
-hD
aa
aa
aa
@@ -5501,11 +5468,14 @@ aa
aa
aa
aa
-hD
+aa
+aa
+aa
+aa
aa
aa
hu
-aa
+dJ
"}
(37,1,1) = {"
aa
@@ -5585,22 +5555,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
hc
-ho
hc
hc
hc
@@ -5617,7 +5582,10 @@ hc
hc
hc
hc
-ho
+hc
+hc
+hc
+hc
hc
hc
gO
@@ -5626,7 +5594,6 @@ hu
aa
aa
aa
-hD
aa
aa
aa
@@ -5643,11 +5610,14 @@ aa
aa
aa
aa
-hD
+aa
+aa
+aa
+aa
aa
aa
hu
-aa
+dJ
"}
(38,1,1) = {"
aa
@@ -5727,22 +5697,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
hc
-ho
hc
hc
hc
@@ -5759,7 +5724,10 @@ hc
hc
hc
hc
-ho
+hc
+hc
+hc
+hc
hc
hc
gO
@@ -5768,7 +5736,6 @@ hu
aa
aa
aa
-hD
aa
aa
aa
@@ -5785,11 +5752,14 @@ aa
aa
aa
aa
-hD
+aa
+aa
+aa
+aa
aa
aa
hu
-aa
+dJ
"}
(39,1,1) = {"
aa
@@ -5869,22 +5839,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
hc
-ho
hc
hc
hc
@@ -5901,8 +5866,11 @@ hc
hc
hc
hc
-ho
-ho
+hc
+hc
+hc
+hc
+hc
hc
gO
dJ
@@ -5910,7 +5878,6 @@ hu
aa
aa
aa
-hD
aa
aa
aa
@@ -5927,11 +5894,14 @@ aa
aa
aa
aa
-hD
-hD
+aa
+aa
+aa
+aa
+aa
aa
hu
-aa
+dJ
"}
(40,1,1) = {"
aa
@@ -6011,23 +5981,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
hc
-ho
-ho
hc
hc
hc
@@ -6043,8 +6007,12 @@ hc
hc
hc
hc
-ho
-ho
+hc
+hc
+hc
+hc
+hc
+hc
hc
gO
dJ
@@ -6052,8 +6020,6 @@ hu
aa
aa
aa
-hD
-hD
aa
aa
aa
@@ -6069,11 +6035,15 @@ aa
aa
aa
aa
-hD
-hD
+aa
+aa
+aa
+aa
+aa
+aa
aa
hu
-aa
+dJ
"}
(41,1,1) = {"
aa
@@ -6153,23 +6123,18 @@ 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
@@ -6186,7 +6151,10 @@ hc
hc
hc
hc
-ho
+hc
+hc
+hc
+hc
hc
gO
dJ
@@ -6195,7 +6163,6 @@ aa
aa
aa
aa
-hD
aa
aa
aa
@@ -6212,10 +6179,13 @@ aa
aa
aa
aa
-hD
+aa
+aa
+aa
+aa
aa
hu
-aa
+dJ
"}
(42,1,1) = {"
aa
@@ -6295,24 +6265,18 @@ 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
@@ -6323,12 +6287,16 @@ hc
hc
hc
hc
-gP
hc
hc
hc
hc
-ho
+hc
+hc
+hc
+hc
+hc
+hc
hc
gO
dJ
@@ -6337,8 +6305,6 @@ aa
aa
aa
aa
-hD
-hD
aa
aa
aa
@@ -6349,15 +6315,19 @@ aa
aa
aa
aa
-he
aa
aa
aa
aa
-hD
+aa
+aa
+aa
+aa
+aa
+aa
aa
hu
-aa
+dJ
"}
(43,1,1) = {"
aa
@@ -6437,24 +6407,19 @@ 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
@@ -6470,7 +6435,10 @@ hc
hc
hc
hc
-ho
+hc
+hc
+hc
+hc
hc
gO
dJ
@@ -6480,7 +6448,6 @@ aa
aa
aa
aa
-hD
aa
aa
aa
@@ -6496,10 +6463,13 @@ aa
aa
aa
aa
-hD
+aa
+aa
+aa
+aa
aa
hu
-aa
+dJ
"}
(44,1,1) = {"
aa
@@ -6579,31 +6549,19 @@ 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
@@ -6611,8 +6569,18 @@ hc
hc
hc
hc
-ho
-ho
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
+hc
hc
gO
dJ
@@ -6622,14 +6590,6 @@ aa
aa
aa
aa
-hD
-hD
-hD
-hD
-hD
-hD
-hD
-hD
aa
aa
aa
@@ -6637,11 +6597,21 @@ aa
aa
aa
aa
-hD
-hD
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
aa
hu
-aa
+dJ
"}
(45,1,1) = {"
aa
@@ -6721,17 +6691,13 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
+aa
+aa
dJ
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
gO
hc
hc
@@ -6745,15 +6711,17 @@ hc
hc
hc
hc
-ho
-ho
-ho
-ho
-ho
-ho
-ho
-ho
-ho
+hc
+hc
+hc
+hc
+hc
+gP
+hc
+hc
+hc
+hc
+hc
hc
hc
gO
@@ -6771,19 +6739,21 @@ aa
aa
aa
aa
-hD
-hD
-hD
-hD
-hD
-hD
-hD
-hD
-hD
+aa
+aa
+aa
+aa
+aa
+he
+aa
+aa
+aa
+aa
+aa
aa
aa
hu
-aa
+dJ
"}
(46,1,1) = {"
aa
@@ -6863,17 +6833,13 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
+aa
+aa
dJ
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
gO
hc
hc
@@ -6898,6 +6864,8 @@ hc
hc
hc
hc
+hc
+hc
gO
dJ
hu
@@ -6924,8 +6892,10 @@ aa
aa
aa
aa
-hu
aa
+aa
+hu
+dJ
"}
(47,1,1) = {"
aa
@@ -7005,17 +6975,13 @@ aa
aa
aa
aa
+aa
+aa
+aa
+aa
+aa
+aa
dJ
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
-aa
gO
hc
hc
@@ -7040,6 +7006,8 @@ hc
hc
hc
hc
+hc
+hc
gO
dJ
hu
@@ -7066,8 +7034,10 @@ aa
aa
aa
aa
-hu
aa
+aa
+hu
+dJ
"}
(48,1,1) = {"
aa
@@ -7147,69 +7117,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
-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
+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
"}
(49,1,1) = {"
aa
@@ -7289,52 +7259,6 @@ 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
@@ -7342,6 +7266,35 @@ 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
@@ -7352,6 +7305,23 @@ 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
@@ -7431,52 +7401,6 @@ 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
@@ -7484,6 +7408,35 @@ 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
@@ -7494,6 +7447,23 @@ 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
@@ -7573,52 +7543,6 @@ 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
@@ -7626,6 +7550,35 @@ 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
@@ -7636,6 +7589,23 @@ 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
@@ -7715,52 +7685,6 @@ 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
@@ -7768,16 +7692,62 @@ 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
+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
"}
(53,1,1) = {"
aa
@@ -7857,52 +7827,6 @@ 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
@@ -7910,16 +7834,62 @@ aa
aa
aa
dJ
-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
"}
(54,1,1) = {"
aa
@@ -7999,7 +7969,6 @@ aa
aa
aa
aa
-dJ
aa
aa
aa
@@ -8051,7 +8020,8 @@ aa
aa
aa
aa
-dJ
+aa
+aa
aa
aa
aa
@@ -8141,7 +8111,6 @@ aa
aa
aa
aa
-dJ
aa
aa
aa
@@ -8193,7 +8162,8 @@ aa
aa
aa
aa
-dJ
+aa
+aa
aa
aa
aa
@@ -8283,7 +8253,6 @@ aa
aa
aa
aa
-dJ
aa
aa
aa
@@ -8335,7 +8304,8 @@ aa
aa
aa
aa
-dJ
+aa
+aa
aa
aa
aa
@@ -8425,7 +8395,6 @@ aa
aa
aa
aa
-dJ
aa
aa
aa
@@ -8477,7 +8446,8 @@ aa
aa
aa
aa
-dJ
+aa
+aa
aa
aa
aa
@@ -8567,7 +8537,6 @@ aa
aa
aa
aa
-dJ
aa
aa
aa
@@ -8619,7 +8588,8 @@ aa
aa
aa
aa
-dJ
+aa
+aa
aa
aa
aa
@@ -8709,59 +8679,59 @@ 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
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+aa
+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/tether_areas2.dm b/maps/tether/tether_areas2.dm
index 5a62b0cca4..ce4533d60f 100644
--- a/maps/tether/tether_areas2.dm
+++ b/maps/tether/tether_areas2.dm
@@ -878,6 +878,11 @@
icon_state = "shuttle2"
requires_power = 1
+/area/shuttle/blue_fo
+ name = "\improper Hybrid Shuttle"
+ icon_state = "shuttle2"
+ requires_power = 1
+
// Belter Dock
/area/quartermaster/belterdock
diff --git a/maps/tether/tether_shuttles.dm b/maps/tether/tether_shuttles.dm
index fc1846b135..65926e2c92 100644
--- a/maps/tether/tether_shuttles.dm
+++ b/maps/tether/tether_shuttles.dm
@@ -220,7 +220,7 @@
my_landmark = "tether_excursion_hangar"
radio_announce = 1
- announcer = "Excursion Shuttle"
+ announcer = "Docking System"
routes_to_make = list(
/datum/shuttle_destination/excursion/outside_tether = 0,
@@ -249,7 +249,7 @@
my_landmark = "tether_excursion_dockarm"
radio_announce = 1
- announcer = "Excursion Shuttle"
+ 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."
@@ -273,6 +273,73 @@
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()
+ 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"
+ 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
+
+/datum/shuttle_web_master/excursion/blue
+ destination_class = /datum/shuttle_destination/excursion
+ starting_destination = /datum/shuttle_destination/excursion/deepish_space
+
+/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"
diff --git a/vorestation.dme b/vorestation.dme
index 1f2987a9a5..8d249dc30e 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -1379,6 +1379,7 @@
#include "code\game\objects\structures\ghost_pods\silicon.dm"
#include "code\game\objects\structures\ghost_pods\silicon_vr.dm"
#include "code\game\objects\structures\props\alien_props.dm"
+#include "code\game\objects\structures\props\alien_props_vr.dm"
#include "code\game\objects\structures\props\beam_prism.dm"
#include "code\game\objects\structures\props\blackbox.dm"
#include "code\game\objects\structures\props\fake_ai.dm"
@@ -2189,6 +2190,7 @@
#include "code\modules\mining\ore_datum_vr.dm"
#include "code\modules\mining\resonator_vr.dm"
#include "code\modules\mining\shelter_atoms.dm"
+#include "code\modules\mining\shelter_atoms_vr.dm"
#include "code\modules\mining\shelters.dm"
#include "code\modules\mining\drilling\drill.dm"
#include "code\modules\mining\drilling\scanner.dm"
@@ -2883,6 +2885,7 @@
#include "code\modules\power\powernet.dm"
#include "code\modules\power\smes.dm"
#include "code\modules\power\smes_construction.dm"
+#include "code\modules\power\smes_vr.dm"
#include "code\modules\power\solar.dm"
#include "code\modules\power\terminal.dm"
#include "code\modules\power\tracker.dm"