From 98170b60dcc2d14a8b6558648ddaa10da456ab27 Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Wed, 17 Apr 2024 23:00:29 +0200 Subject: [PATCH] Revert "Overmap shuttles no longer need empty sectors (#18898)" This reverts commit 1c0318a7f4087d69fe0333995805d0b4d2c11bb3. --- code/modules/overmap/sectors.dm | 39 +- code/modules/overmap/ships/landable.dm | 67 +- .../ships/konyang/air_konyang/air_konyang.dm | 19 +- .../ships/konyang/air_konyang/air_konyang.dmm | 3336 +++++++++-------- .../einstein_shuttle/einstein_shuttle.dm | 17 +- .../einstein_shuttle/einstein_shuttle.dmm | 16 +- .../izharshan/unathi_pirate_izharshan.dm | 37 +- .../izharshan/unathi_pirate_izharshan.dmm | 30 +- 8 files changed, 1783 insertions(+), 1778 deletions(-) diff --git a/code/modules/overmap/sectors.dm b/code/modules/overmap/sectors.dm index a52c8766ba9..74ba3b2bdfc 100644 --- a/code/modules/overmap/sectors.dm +++ b/code/modules/overmap/sectors.dm @@ -78,7 +78,24 @@ var/global/area/overmap/map_overmap // Global object used to locate the overmap initial_generic_waypoints = flatten_list(initial_generic_waypoints) tracked_dock_tags = flatten_list(tracked_dock_tags) - move_to_starting_location() + var/map_low = OVERMAP_EDGE + var/map_high = SSatlas.current_map.overmap_size - OVERMAP_EDGE + var/turf/home + if (place_near_main) + var/obj/effect/overmap/visitable/main = GLOB.map_sectors["1"] ? GLOB.map_sectors["1"] : GLOB.map_sectors[GLOB.map_sectors[1]] + if(islist(place_near_main)) + place_near_main = Roundm(Frand(place_near_main[1], place_near_main[2]), 0.1) + home = CircularRandomTurfAround(main, abs(place_near_main), map_low, map_low, map_high, map_high) + start_x = home.x + start_y = home.y + LOG_DEBUG("place_near_main moving [src] near [main] ([main.x],[main.y]) with radius [place_near_main], got ([home.x],[home.y])") + else + start_x = start_x || rand(map_low, map_high) + start_y = start_y || rand(map_low, map_high) + home = locate(start_x, start_y, SSatlas.current_map.overmap_z) + + if(!invisible_until_ghostrole_spawn) + forceMove(home) update_name() @@ -111,26 +128,6 @@ var/global/area/overmap/map_overmap // Global object used to locate the overmap STOP_PROCESSING(SSovermap, src) . = ..() -/obj/effect/overmap/visitable/proc/move_to_starting_location() - var/map_low = OVERMAP_EDGE - var/map_high = SSatlas.current_map.overmap_size - OVERMAP_EDGE - var/turf/home - if (place_near_main) - var/obj/effect/overmap/visitable/main = GLOB.map_sectors["1"] ? GLOB.map_sectors["1"] : GLOB.map_sectors[GLOB.map_sectors[1]] - if(islist(place_near_main)) - place_near_main = Roundm(Frand(place_near_main[1], place_near_main[2]), 0.1) - home = CircularRandomTurfAround(main, abs(place_near_main), map_low, map_low, map_high, map_high) - start_x = home.x - start_y = home.y - LOG_DEBUG("place_near_main moving [src] near [main] ([main.x],[main.y]) with radius [place_near_main], got ([home.x],[home.y])") - else - start_x = start_x || rand(map_low, map_high) - start_y = start_y || rand(map_low, map_high) - home = locate(start_x, start_y, SSatlas.current_map.overmap_z) - - if(!invisible_until_ghostrole_spawn) - forceMove(home) - //This is called later in the init order by SSshuttle to populate sector objects. Importantly for subtypes, shuttles will be created by then. /obj/effect/overmap/visitable/proc/populate_sector_objects() for(var/obj/machinery/hologram/holopad/H as anything in SSmachinery.all_holopads) diff --git a/code/modules/overmap/ships/landable.dm b/code/modules/overmap/ships/landable.dm index a6a964183c3..65c023bde02 100644 --- a/code/modules/overmap/ships/landable.dm +++ b/code/modules/overmap/ships/landable.dm @@ -7,8 +7,6 @@ var/obj/effect/shuttle_landmark/ship/landmark // Record our open space landmark for easy reference. var/multiz = 0 // Index of multi-z levels, starts at 0 var/status = SHIP_STATUS_LANDED - ///If true, it will use the z-level it's mapped on as the "Open Space" level, if false it will create a new level for that. - var/use_mapped_z_levels = FALSE //If you use this, use /obj/effect/shuttle_landmark/ship as the landmark (set the landmark_tag to match on the shuttle, no other setup needed) icon_state = "shuttle" moving_state = "shuttle_moving" layer = OVERMAP_SHUTTLE_LAYER @@ -37,22 +35,24 @@ // We autobuild our z levels. /obj/effect/overmap/visitable/ship/landable/find_z_levels() - if(!use_mapped_z_levels) - for(var/i = 0 to multiz) - world.maxz++ - map_z += world.maxz - SEND_GLOBAL_SIGNAL(COMSIG_GLOB_NEW_Z, world.maxz) - - if(multiz) - new /obj/effect/landmark/map_data(locate(1, 1, world.maxz), (multiz + 1)) - else - ..() - -/obj/effect/overmap/visitable/ship/landable/move_to_starting_location() - if(!use_mapped_z_levels) - return - else - ..() // this picks a random turf + for(var/i = 0 to multiz) + world.maxz++ + map_z += world.maxz + SEND_GLOBAL_SIGNAL(COMSIG_GLOB_NEW_Z, world.maxz) + + var/turf/center_loc = locate(round(world.maxx/2), round(world.maxy/2), world.maxz) + landmark = new (center_loc, shuttle) + add_landmark(landmark, shuttle) + + var/visitor_dir = fore_dir + for(var/landmark_name in list("FORE", "PORT", "AFT", "STARBOARD")) + var/turf/visitor_turf = get_ranged_target_turf(center_loc, visitor_dir, round(min(world.maxx/4, world.maxy/4))) + var/obj/effect/shuttle_landmark/visiting_shuttle/visitor_landmark = new (visitor_turf, landmark, landmark_name) + add_landmark(visitor_landmark) + visitor_dir = turn(visitor_dir, 90) + + if(multiz) + new /obj/effect/landmark/map_data(center_loc, (multiz + 1)) /obj/effect/overmap/visitable/ship/landable/get_areas() var/datum/shuttle/shuttle_datum = SSshuttle.shuttles[shuttle] @@ -63,34 +63,8 @@ /obj/effect/overmap/visitable/ship/landable/populate_sector_objects() ..() var/datum/shuttle/shuttle_datum = SSshuttle.shuttles[shuttle] - //Finish open space setup - if(!use_mapped_z_levels) - var/turf/center_loc = locate(round(world.maxx/2), round(world.maxy/2), world.maxz) - landmark = new (center_loc, shuttle) - add_landmark(landmark, shuttle) - else - var/obj/effect/shuttle_landmark/ship/ship_landmark = shuttle_datum.current_location - if(!istype(ship_landmark)) - stack_trace("Landable ship [src] with shuttle [shuttle] was mapped with a starting landmark type [ship_landmark.type], but should be /obj/effect/shuttle_landmark/ship.") - ship_landmark = new(ship_landmark.loc, shuttle) - qdel(shuttle_datum.current_location) - shuttle_datum.current_location = ship_landmark - landmark = ship_landmark - landmark.shuttle_name = shuttle - LAZYDISTINCTADD(initial_generic_waypoints, landmark.landmark_tag) // this is us being user-friendly: it means we register it properly regardless of whether the mapper put the tag in initial_restricted_waypoints - - var/visitor_dir = fore_dir - for(var/landmark_name in list("FORE", "PORT", "AFT", "STARBOARD")) - var/turf/visitor_turf = get_ranged_target_turf(get_turf(landmark), visitor_dir, round(min(world.maxx/4, world.maxy/4))) - var/obj/effect/shuttle_landmark/visiting_shuttle/visitor_landmark = new (visitor_turf, landmark, landmark_name) - add_landmark(visitor_landmark) - visitor_dir = turn(visitor_dir, 90) - - //Configure shuttle datum GLOB.shuttle_moved_event.register(shuttle_datum, src, PROC_REF(on_shuttle_jump)) on_landing(landmark, shuttle_datum.current_location) // We "land" at round start to properly place ourselves on the overmap. - if(landmark == shuttle_datum.current_location) - status = SHIP_STATUS_OVERMAP var/obj/effect/overmap/visitable/mothership = GLOB.map_sectors["[shuttle_datum.current_location.z]"] if(mothership) @@ -107,9 +81,8 @@ var/list/visitors // landmark -> visiting shuttle stationed there /obj/effect/shuttle_landmark/ship/Initialize(mapload, shuttle_name) - if(!mapload) - landmark_tag += "_[shuttle_name]" - src.shuttle_name = shuttle_name + landmark_tag += "_[shuttle_name]" + src.shuttle_name = shuttle_name . = ..() /obj/effect/shuttle_landmark/ship/Destroy() diff --git a/maps/away/ships/konyang/air_konyang/air_konyang.dm b/maps/away/ships/konyang/air_konyang/air_konyang.dm index e69c648fe35..307e7f95aa1 100644 --- a/maps/away/ships/konyang/air_konyang/air_konyang.dm +++ b/maps/away/ships/konyang/air_konyang/air_konyang.dm @@ -16,6 +16,14 @@ map = "Air Konyang" descriptor = "Air Konyang civilian transport." +/obj/effect/overmap/visitable/sector/air_konyang_spawn + name = "empty sector" + desc = "An empty sector." + icon_state = null //this away site only exists so the shuttle can spawn and doesn't need to be seen. Invisible var causes issues when used for this purpose. + initial_restricted_waypoints = list( + "Air Konyang Transport" = list("nav_air_konyang_start") + ) + /obj/effect/overmap/visitable/ship/landable/air_konyang name = "Air Konyang Transport" class = "AKPV" //Air Konyang Passenger Vessel @@ -34,7 +42,6 @@ fore_dir = SOUTH vessel_size = SHIP_SIZE_SMALL shuttle = "Air Konyang Transport" - use_mapped_z_levels = TRUE /obj/effect/overmap/visitable/ship/landable/air_konyang/New() designation = "[pick("Qianlima", "Senrima", "Cheollima", "Chollima")]" @@ -56,10 +63,14 @@ logging_home_tag = "nav_air_konyang_start" defer_initialisation = TRUE -/obj/effect/shuttle_landmark/ship/air_konyang +/obj/effect/shuttle_landmark/air_konyang/start + name = "Empty Space" landmark_tag = "nav_air_konyang_start" + base_area = /area/space + base_turf = /turf/space + movable_flags = MOVABLE_FLAG_EFFECTMOVE -/obj/effect/shuttle_landmark/air_konyang_transit +/obj/effect/shuttle_landmark/air_konyang/transit name = "In transit" landmark_tag = "nav_air_konyang_transit" - base_turf = /turf/space/transit/north + base_turf = /turf/space/transit diff --git a/maps/away/ships/konyang/air_konyang/air_konyang.dmm b/maps/away/ships/konyang/air_konyang/air_konyang.dmm index 2f455fdc178..7c1c3858242 100644 --- a/maps/away/ships/konyang/air_konyang/air_konyang.dmm +++ b/maps/away/ships/konyang/air_konyang/air_konyang.dmm @@ -248,7 +248,10 @@ /turf/simulated/wall/shuttle/space_ship, /area/shuttle/air_konyang/atmos) "gP" = ( -/turf/space/transit/north, +/obj/effect/shuttle_landmark/air_konyang/transit{ + dir = 1 + }, +/turf/space, /area/space) "gQ" = ( /obj/effect/floor_decal/corner/dark_blue, @@ -278,7 +281,7 @@ /turf/simulated/floor/plating, /area/shuttle/air_konyang/mainroom) "hm" = ( -/obj/effect/shuttle_landmark/ship/air_konyang{ +/obj/effect/shuttle_landmark/air_konyang/start{ dir = 1 }, /turf/template_noop, @@ -663,7 +666,7 @@ /area/shuttle/air_konyang/mainroom) "rU" = ( /obj/effect/step_trigger/teleporter, -/turf/space/transit/north, +/turf/space, /area/space) "sa" = ( /turf/simulated/floor/carpet/brown, @@ -1319,10 +1322,7 @@ /turf/simulated/floor/airless, /area/shuttle/air_konyang/bridge) "HQ" = ( -/obj/effect/shuttle_landmark/air_konyang_transit{ - dir = 1 - }, -/turf/space/transit/north, +/turf/space, /area/space) "HY" = ( /obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor, @@ -1767,6 +1767,10 @@ /obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor, /turf/simulated/floor/plating, /area/shuttle/air_konyang/bridge) +"TY" = ( +/obj/effect/overmap/visitable/sector/air_konyang_spawn, +/turf/template_noop, +/area/space) "Ur" = ( /obj/structure/cable/green{ d1 = 1; @@ -2097,46 +2101,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (2,1,1) = {" VJ @@ -2259,46 +2263,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (3,1,1) = {" VJ @@ -2421,46 +2425,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (4,1,1) = {" VJ @@ -2583,46 +2587,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (5,1,1) = {" VJ @@ -2745,46 +2749,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (6,1,1) = {" VJ @@ -2907,46 +2911,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (7,1,1) = {" VJ @@ -3069,46 +3073,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (8,1,1) = {" VJ @@ -3231,46 +3235,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (9,1,1) = {" VJ @@ -3393,46 +3397,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (10,1,1) = {" VJ @@ -3555,48 +3559,48 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -"} -(11,1,1) = {" +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +"} +(11,1,1) = {" VJ VJ VJ @@ -3717,46 +3721,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (12,1,1) = {" VJ @@ -3879,46 +3883,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (13,1,1) = {" VJ @@ -4041,60 +4045,60 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -"} -(14,1,1) = {" -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +"} +(14,1,1) = {" +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ VJ VJ VJ @@ -4203,46 +4207,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (15,1,1) = {" VJ @@ -4365,46 +4369,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (16,1,1) = {" VJ @@ -4527,46 +4531,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (17,1,1) = {" VJ @@ -4689,46 +4693,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (18,1,1) = {" VJ @@ -4851,46 +4855,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (19,1,1) = {" VJ @@ -5000,59 +5004,59 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ -rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +rU +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (20,1,1) = {" VJ @@ -5175,46 +5179,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (21,1,1) = {" VJ @@ -5337,46 +5341,46 @@ VJ VJ VJ rU -gP -gP -gP HQ -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 -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (22,1,1) = {" VJ @@ -5493,52 +5497,52 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +VJ +VJ +VJ +VJ +VJ +rU +HQ +HQ gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (23,1,1) = {" VJ @@ -5661,46 +5665,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (24,1,1) = {" VJ @@ -5823,46 +5827,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (25,1,1) = {" VJ @@ -5984,57 +5988,49 @@ VJ VJ VJ VJ -rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -"} -(26,1,1) = {" -VJ -VJ -VJ -VJ -VJ -VJ -VJ -VJ +rU +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +"} +(26,1,1) = {" VJ VJ VJ @@ -6146,49 +6142,6 @@ VJ VJ VJ VJ -rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -"} -(27,1,1) = {" VJ VJ VJ @@ -6197,6 +6150,49 @@ VJ VJ VJ VJ +rU +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +"} +(27,1,1) = {" VJ VJ VJ @@ -6308,49 +6304,6 @@ VJ VJ VJ VJ -rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -"} -(28,1,1) = {" VJ VJ VJ @@ -6359,6 +6312,49 @@ VJ VJ VJ VJ +rU +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +"} +(28,1,1) = {" VJ VJ VJ @@ -6470,47 +6466,55 @@ VJ VJ VJ VJ -rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +VJ +VJ +VJ +VJ +VJ +VJ +VJ +VJ +rU +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (29,1,1) = {" VJ @@ -6633,46 +6637,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (30,1,1) = {" VJ @@ -6795,46 +6799,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (31,1,1) = {" VJ @@ -6950,53 +6954,53 @@ VJ VJ VJ VJ -VJ -VJ -VJ -VJ -VJ -VJ -rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +VJ +VJ +VJ +VJ +VJ +VJ +rU +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (32,1,1) = {" VJ @@ -7119,46 +7123,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (33,1,1) = {" VJ @@ -7281,46 +7285,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (34,1,1) = {" VJ @@ -7443,46 +7447,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (35,1,1) = {" VJ @@ -7605,46 +7609,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (36,1,1) = {" VJ @@ -7767,46 +7771,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (37,1,1) = {" VJ @@ -7929,46 +7933,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (38,1,1) = {" VJ @@ -8091,46 +8095,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (39,1,1) = {" VJ @@ -8253,46 +8257,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (40,1,1) = {" VJ @@ -8415,46 +8419,46 @@ VJ VJ VJ rU -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 -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP -gP +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ +HQ "} (41,1,1) = {" VJ @@ -15796,7 +15800,7 @@ VJ VJ VJ VJ -VJ +TY VJ VJ VJ diff --git a/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dm b/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dm index d7d29449576..848951c5977 100644 --- a/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dm +++ b/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dm @@ -17,6 +17,14 @@ map = "Einstein Engines Shuttle" descriptor = "An Einstein Engines transport shuttle." +/obj/effect/overmap/visitable/sector/einstein_shuttle + name = "empty sector" + desc = "An empty sector." + icon_state = null //this away site only exists so the shuttle can spawn and doesn't need to be seen. Invisible var causes issues when used for this purpose. + initial_restricted_waypoints = list( + "Einstein Shuttle" = list("nav_start_einstein") + ) + //Areas /area/shuttle/einstein_shuttle name = "Einstein Engines Transport Shuttle" @@ -80,7 +88,6 @@ vessel_mass = 3000 vessel_size = SHIP_SIZE_SMALL fore_dir = SOUTH - use_mapped_z_levels = TRUE /obj/machinery/computer/shuttle_control/explore/einstein_shuttle name = "shuttle control console" @@ -98,10 +105,14 @@ logging_home_tag = "nav_start_einstein" defer_initialisation = TRUE -/obj/effect/shuttle_landmark/ship/einstein_shuttle +/obj/effect/shuttle_landmark/einstein_shuttle/start + name = "Empty Space" landmark_tag = "nav_start_einstein" + base_area = /area/space + base_turf = /turf/space + movable_flags = MOVABLE_FLAG_EFFECTMOVE -/obj/effect/shuttle_landmark/einstein_shuttle_transit +/obj/effect/shuttle_landmark/einstein_shuttle/transit name = "In transit" landmark_tag = "nav_transit_einstein" base_turf = /turf/space/transit/north diff --git a/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dmm b/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dmm index 448360c328f..221f8e9525a 100644 --- a/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dmm +++ b/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dmm @@ -100,7 +100,7 @@ /turf/simulated/floor/carpet/brown, /area/shuttle/einstein_shuttle/main) "cW" = ( -/turf/space/transit/north, +/turf/space, /area/space) "do" = ( /obj/structure/sink{ @@ -211,7 +211,7 @@ /turf/simulated/floor/carpet/brown, /area/shuttle/einstein_shuttle/main) "fW" = ( -/obj/effect/shuttle_landmark/ship/einstein_shuttle{ +/obj/effect/shuttle_landmark/einstein_shuttle/start{ dir = 1 }, /turf/template_noop, @@ -1322,6 +1322,10 @@ /obj/machinery/computer/ship/sensors, /turf/simulated/floor/tiled/dark, /area/shuttle/einstein_shuttle/helm) +"FL" = ( +/obj/effect/overmap/visitable/sector/einstein_shuttle, +/turf/template_noop, +/area/space) "FT" = ( /obj/structure/table/standard, /obj/item/paper_bin, @@ -1594,7 +1598,7 @@ /area/shuttle/einstein_shuttle/conference) "Pp" = ( /obj/effect/step_trigger/teleporter, -/turf/space/transit/north, +/turf/space, /area/space) "Pq" = ( /obj/structure/bed, @@ -1632,10 +1636,10 @@ /turf/simulated/floor/plating, /area/shuttle/einstein_shuttle/starbeng) "Qi" = ( -/obj/effect/shuttle_landmark/einstein_shuttle_transit{ +/obj/effect/shuttle_landmark/einstein_shuttle/transit{ dir = 1 }, -/turf/space/transit/north, +/turf/space, /area/space) "QI" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ @@ -6980,7 +6984,7 @@ NW NW NW NW -NW +FL NW fW Kx diff --git a/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dm b/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dm index 98055a0b4ce..003c7863466 100644 --- a/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dm +++ b/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dm @@ -1,7 +1,7 @@ /datum/map_template/ruin/away_site/unathi_pirate_izharshan - name = "Izharshan Shuttle" + name = "empty sector" id = "unathi_pirate" - description = "A shuttle belonging to the Unahi pirates of Izharshan's Raiders." + description = "An empty sector." prefix = "ships/unathi_pirate/izharshan/" suffixes = list("unathi_pirate_izharshan.dmm") @@ -12,11 +12,18 @@ sectors = list(SECTOR_NRRAHRAHUL, SECTOR_BADLANDS, SECTOR_GAKAL, SECTOR_UUEOAESA) unit_test_groups = list(1) - template_flags = TEMPLATE_FLAG_SPAWN_GUARANTEED /singleton/submap_archetype/unathi_pirate_izharshan - map = "Izharshan Shuttle" - descriptor = "A shuttle belonging to the Unahi pirates of Izharshan's Raiders." + map = "empty sector" + descriptor = "An empty sector." + +/obj/effect/overmap/visitable/sector/unathi_pirate_izharshan + name = "empty sector" + desc = "An empty sector." + icon_state = null //this away site only exists so the shuttle can spawn and doesn't need to be seen. Invisible var causes issues when used for this purpose. + initial_restricted_waypoints = list( + "Izharshan Freighter" = list("nav_start_unathi_pirate_izharshan") + ) /area/shuttle/unathi_pirate_izharshan name = "Izharshan Freighter" @@ -84,8 +91,6 @@ vessel_size = SHIP_SIZE_SMALL fore_dir = SOUTH comms_name = "modified" - use_mapped_z_levels = TRUE - invisible_until_ghostrole_spawn = TRUE /obj/effect/overmap/visitable/ship/landable/unathi_pirate_izharshan/get_skybox_representation() var/image/skybox_image = image('icons/skybox/subcapital_ships.dmi', "unathi_freighter1") @@ -103,16 +108,20 @@ range = 2 fuel_consumption = 6 shuttle_area = list(/area/shuttle/unathi_pirate_izharshan/operations, /area/shuttle/unathi_pirate_izharshan/dorms, /area/shuttle/unathi_pirate_izharshan/helm) - current_location = "nav_izharshan_space" + current_location = "nav_start_unathi_pirate_izharshan" dock_target = "unathi_pirate_izharshan" - landmark_transition = "nav_izharshan_transit" - logging_home_tag = "nav_izharshan_space" + landmark_transition = "nav_transit_unathi_pirate_izharshan" + logging_home_tag = "nav_start_unathi_pirate_izharshan" defer_initialisation = TRUE -/obj/effect/shuttle_landmark/ship/unathi_pirate_izharshan - landmark_tag = "nav_izharshan_space" +/obj/effect/shuttle_landmark/unathi_pirate_izharshan/start + name = "Empty Space" + landmark_tag = "nav_start_unathi_pirate_izharshan" + base_area = /area/space + base_turf = /turf/space + movable_flags = MOVABLE_FLAG_EFFECTMOVE -/obj/effect/shuttle_landmark/izharshan_transit +/obj/effect/shuttle_landmark/unathi_pirate_izharshan/transit name = "In transit" - landmark_tag = "nav_izharshan_transit" + landmark_tag = "nav_transit_unathi_pirate_izharshan" base_turf = /turf/space diff --git a/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm b/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm index 38ea338ec7b..dab777ad0e9 100644 --- a/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm +++ b/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm @@ -422,9 +422,7 @@ dir = 8; level = 2 }, -/obj/machinery/alarm/east{ - req_one_access = list(210) - }, +/obj/machinery/alarm/east, /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled/dark, /area/shuttle/unathi_pirate_izharshan/dorms) @@ -456,9 +454,7 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/unathi_pirate_izharshan/dorms) "re" = ( -/obj/machinery/power/apc/high/south{ - req_access = list(210) - }, +/obj/machinery/power/apc/high/south, /obj/structure/cable/green, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8; @@ -548,7 +544,7 @@ }, /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/alarm/west{ - req_one_access = list(210) + pixel_x = -32 }, /turf/simulated/floor/tiled/dark/full, /area/shuttle/unathi_pirate_izharshan/operations) @@ -566,9 +562,7 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/unathi_pirate_izharshan/dorms) "sZ" = ( -/obj/effect/shuttle_landmark/izharshan_transit{ - dir = 1 - }, +/obj/effect/shuttle_landmark/unathi_pirate_izharshan/transit, /turf/space/transit/north, /area/space) "tB" = ( @@ -610,7 +604,7 @@ /area/shuttle/unathi_pirate_izharshan/dorms) "uK" = ( /obj/machinery/alarm/west{ - req_one_access = list(210) + pixel_x = -28 }, /turf/simulated/floor/shuttle/black, /area/shuttle/unathi_pirate_izharshan/helm) @@ -1199,6 +1193,10 @@ /obj/structure/bed/handrail, /turf/simulated/floor/tiled/dark, /area/shuttle/unathi_pirate_izharshan/helm) +"Ob" = ( +/obj/effect/overmap/visitable/sector/unathi_pirate_izharshan, +/turf/template_noop, +/area/space) "Ol" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5; @@ -1322,9 +1320,7 @@ /turf/simulated/floor, /area/shuttle/unathi_pirate_izharshan/operations) "Ti" = ( -/obj/effect/shuttle_landmark/ship/unathi_pirate_izharshan{ - dir = 1 - }, +/obj/effect/shuttle_landmark/unathi_pirate_izharshan/start, /turf/template_noop, /area/space) "Tt" = ( @@ -13672,7 +13668,7 @@ RS cg RS RS -RS +sZ RS RS RS @@ -13936,7 +13932,7 @@ RS RS RS RS -sZ +RS RS RS RS @@ -33152,7 +33148,7 @@ yN yN yN yN -yN +Ob yN yN yN