diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 7ff7638995f..f8601403819 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -27,6 +27,12 @@ simulated = TRUE // delete_me = 1 return + //VOREStation Add end + if("Observer-Start") // Ghosts are the only thing that use the latejoin list afaik and it complains if there's nothing in the list. + latejoin += src + simulated = TRUE + return + //VOREStation Add end if("JoinLateGateway") latejoin_gateway += loc delete_me = 1 diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm index 0d8755eaf9d..73a4d0f8292 100644 --- a/maps/tether/tether-02-surface2.dmm +++ b/maps/tether/tether-02-surface2.dmm @@ -10301,7 +10301,7 @@ /obj/machinery/light/small{ dir = 1 }, -/mob/living/simple_mob/animal/passive/snake/noodle, +/mob/living/simple_mob/animal/passive/snake/python/noodle, /turf/simulated/floor/grass, /area/chapel/main) "aqi" = ( diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index a59d0fd7fc4..61c83972d16 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -5794,7 +5794,6 @@ }, /obj/machinery/door/firedoor/glass/hidden/shuttle, /obj/machinery/door/blast/shuttle/open{ - dir = 1; id = "medivac blast"; name = "Shuttle Blast Doors" }, @@ -14065,7 +14064,9 @@ /area/engineering/foyer) "beU" = ( /turf/simulated/wall/fancy_shuttle/nondense{ - fancy_shuttle_tag = "medbus" + fancy_shuttle_tag = "medbus"; + nitrogen = 0; + oxygen = 0 }, /area/shuttle/medivac/general) "beY" = ( @@ -14573,7 +14574,9 @@ dir = 1 }, /turf/simulated/wall/fancy_shuttle/low{ - fancy_shuttle_tag = "medbus" + fancy_shuttle_tag = "medbus"; + nitrogen = 0; + oxygen = 0 }, /area/shuttle/medivac/engines) "btr" = ( @@ -15926,7 +15929,9 @@ dir = 1 }, /turf/simulated/wall/fancy_shuttle/low{ - fancy_shuttle_tag = "secbus" + fancy_shuttle_tag = "secbus"; + nitrogen = 0; + oxygen = 0 }, /area/shuttle/securiship/engines) "cnB" = ( @@ -17393,7 +17398,9 @@ dir = 1 }, /turf/simulated/wall/fancy_shuttle/nondense{ - fancy_shuttle_tag = "secbus" + fancy_shuttle_tag = "secbus"; + nitrogen = 0; + oxygen = 0 }, /area/shuttle/securiship/engines) "dDo" = ( @@ -18056,7 +18063,9 @@ /area/shuttle/excursion/general) "ewT" = ( /turf/simulated/wall/fancy_shuttle/low{ - fancy_shuttle_tag = "medbus" + fancy_shuttle_tag = "medbus"; + nitrogen = 0; + oxygen = 0 }, /area/shuttle/medivac/engines) "exi" = ( @@ -18466,7 +18475,9 @@ dir = 6 }, /turf/simulated/wall/fancy_shuttle/low{ - fancy_shuttle_tag = "secbus" + fancy_shuttle_tag = "secbus"; + nitrogen = 0; + oxygen = 0 }, /area/shuttle/securiship/engines) "eVP" = ( @@ -19670,7 +19681,9 @@ /area/maintenance/station/eng_lower) "gio" = ( /turf/simulated/wall/fancy_shuttle/low{ - fancy_shuttle_tag = "medbus" + fancy_shuttle_tag = "medbus"; + nitrogen = 0; + oxygen = 0 }, /area/shuttle/medivac/general) "gjd" = ( @@ -23464,7 +23477,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/door/firedoor/glass/hidden/shuttle, /obj/machinery/door/blast/shuttle/open{ - dir = 1; id = "medivac blast"; name = "Shuttle Blast Doors" }, @@ -24424,7 +24436,6 @@ }, /obj/machinery/door/firedoor/glass/hidden/shuttle, /obj/machinery/door/blast/shuttle/open{ - dir = 1; id = "securiship blast"; name = "Shuttle Blast Doors" }, @@ -24730,7 +24741,9 @@ /area/storage/tools) "kKY" = ( /turf/simulated/wall/fancy_shuttle/nondense{ - fancy_shuttle_tag = "secbus" + fancy_shuttle_tag = "secbus"; + nitrogen = 0; + oxygen = 0 }, /area/shuttle/securiship/engines) "kLG" = ( @@ -27351,7 +27364,9 @@ /area/storage/tools) "mRq" = ( /turf/simulated/wall/fancy_shuttle/low{ - fancy_shuttle_tag = "secbus" + fancy_shuttle_tag = "secbus"; + nitrogen = 0; + oxygen = 0 }, /area/shuttle/securiship/general) "mRU" = ( @@ -27948,7 +27963,9 @@ }, /obj/effect/map_helper/airlock/atmos/pump_out_external, /turf/simulated/wall/fancy_shuttle/low{ - fancy_shuttle_tag = "secbus" + fancy_shuttle_tag = "secbus"; + nitrogen = 0; + oxygen = 0 }, /area/shuttle/securiship/engines) "nvu" = ( @@ -28036,7 +28053,9 @@ dir = 10 }, /turf/simulated/wall/fancy_shuttle/low{ - fancy_shuttle_tag = "secbus" + fancy_shuttle_tag = "secbus"; + nitrogen = 0; + oxygen = 0 }, /area/shuttle/securiship/engines) "nAx" = ( @@ -29410,7 +29429,9 @@ /area/tether/station/dock_one) "psE" = ( /turf/simulated/wall/fancy_shuttle/low{ - fancy_shuttle_tag = "secbus" + fancy_shuttle_tag = "secbus"; + nitrogen = 0; + oxygen = 0 }, /area/shuttle/securiship/engines) "ptc" = ( @@ -30850,7 +30871,6 @@ }, /obj/machinery/door/firedoor/glass/hidden/shuttle, /obj/machinery/door/blast/shuttle/open{ - dir = 1; id = "medivac blast"; name = "Shuttle Blast Doors" }, @@ -31534,7 +31554,6 @@ }, /obj/machinery/door/firedoor/glass/hidden/shuttle, /obj/machinery/door/blast/shuttle/open{ - dir = 1; id = "securiship blast"; name = "Shuttle Blast Doors" }, @@ -31665,7 +31684,9 @@ /area/engineering/hallway) "sbe" = ( /turf/simulated/wall/fancy_shuttle/nondense{ - fancy_shuttle_tag = "medbus" + fancy_shuttle_tag = "medbus"; + nitrogen = 0; + oxygen = 0 }, /area/shuttle/medivac/engines) "scu" = ( @@ -32400,7 +32421,9 @@ dir = 1 }, /turf/simulated/wall/fancy_shuttle/nondense{ - fancy_shuttle_tag = "medbus" + fancy_shuttle_tag = "medbus"; + nitrogen = 0; + oxygen = 0 }, /area/shuttle/medivac/engines) "sUY" = ( @@ -32875,7 +32898,9 @@ /area/maintenance/cargo) "tqu" = ( /turf/simulated/wall/fancy_shuttle/nondense{ - fancy_shuttle_tag = "secbus" + fancy_shuttle_tag = "secbus"; + nitrogen = 0; + oxygen = 0 }, /area/shuttle/securiship/general) "trn" = ( @@ -33694,7 +33719,9 @@ /area/storage/tools) "ujC" = ( /turf/simulated/wall/fancy_shuttle/nondense{ - fancy_shuttle_tag = "medbus" + fancy_shuttle_tag = "medbus"; + nitrogen = 0; + oxygen = 0 }, /area/shuttle/medivac/cockpit) "ujK" = ( @@ -33801,7 +33828,9 @@ "uqU" = ( /obj/machinery/shipsensors/fancy_shuttle, /turf/simulated/wall/fancy_shuttle/nondense{ - fancy_shuttle_tag = "medbus" + fancy_shuttle_tag = "medbus"; + nitrogen = 0; + oxygen = 0 }, /area/shuttle/medivac/cockpit) "usX" = ( @@ -34914,7 +34943,9 @@ }, /obj/effect/map_helper/airlock/atmos/pump_out_external, /turf/simulated/wall/fancy_shuttle/low{ - fancy_shuttle_tag = "medbus" + fancy_shuttle_tag = "medbus"; + nitrogen = 0; + oxygen = 0 }, /area/shuttle/medivac/engines) "vFn" = ( diff --git a/maps/tether/tether_defines.dm b/maps/tether/tether_defines.dm index 52cd831e75f..369b95a774e 100644 --- a/maps/tether/tether_defines.dm +++ b/maps/tether/tether_defines.dm @@ -21,6 +21,7 @@ #define Z_LEVEL_DEBRISFIELD 19 #define Z_LEVEL_FUELDEPOT 20 #define Z_LEVEL_GATEWAY 21 +#define Z_LEVEL_OM_ADVENTURE 22 //Camera networks #define NETWORK_TETHER "Tether" diff --git a/vorestation.dme b/vorestation.dme index fafd0417d94..e1116dadbe2 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -4091,7 +4091,6 @@ #include "maps\southern_cross\loadout\loadout_suit.dm" #include "maps\southern_cross\loadout\loadout_uniform.dm" #include "maps\southern_cross\loadout\loadout_vr.dm" -#include "maps\stellardelight\stellar_delight.dm" #include "maps\submaps\_helpers.dm" #include "maps\submaps\_readme.dm" #include "maps\submaps\engine_submaps\engine.dm" @@ -4101,5 +4100,6 @@ #include "maps\submaps\space_submaps\debrisfield\debrisfield.dm" #include "maps\submaps\surface_submaps\wilderness\wilderness.dm" #include "maps\submaps\surface_submaps\wilderness\wilderness_areas.dm" +#include "maps\tether\tether.dm" #include "maps\~map_system\maps.dm" // END_INCLUDE