diff --git a/code/modules/overmap/sectors.dm b/code/modules/overmap/sectors.dm index 74ba3b2bdfc..a52c8766ba9 100644 --- a/code/modules/overmap/sectors.dm +++ b/code/modules/overmap/sectors.dm @@ -78,24 +78,7 @@ 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) - 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) + move_to_starting_location() update_name() @@ -128,6 +111,26 @@ 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 65c023bde02..a6a964183c3 100644 --- a/code/modules/overmap/ships/landable.dm +++ b/code/modules/overmap/ships/landable.dm @@ -7,6 +7,8 @@ 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 @@ -35,24 +37,22 @@ // We autobuild our z levels. /obj/effect/overmap/visitable/ship/landable/find_z_levels() - for(var/i = 0 to multiz) - world.maxz++ - map_z += world.maxz - SEND_GLOBAL_SIGNAL(COMSIG_GLOB_NEW_Z, world.maxz) + 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) - var/turf/center_loc = locate(round(world.maxx/2), round(world.maxy/2), world.maxz) - landmark = new (center_loc, shuttle) - add_landmark(landmark, shuttle) + if(multiz) + new /obj/effect/landmark/map_data(locate(1, 1, world.maxz), (multiz + 1)) + else + ..() - 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/move_to_starting_location() + if(!use_mapped_z_levels) + return + else + ..() // this picks a random turf /obj/effect/overmap/visitable/ship/landable/get_areas() var/datum/shuttle/shuttle_datum = SSshuttle.shuttles[shuttle] @@ -63,8 +63,34 @@ /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) @@ -81,8 +107,9 @@ var/list/visitors // landmark -> visiting shuttle stationed there /obj/effect/shuttle_landmark/ship/Initialize(mapload, shuttle_name) - landmark_tag += "_[shuttle_name]" - src.shuttle_name = shuttle_name + if(!mapload) + landmark_tag += "_[shuttle_name]" + src.shuttle_name = shuttle_name . = ..() /obj/effect/shuttle_landmark/ship/Destroy() diff --git a/html/changelogs/RustingWithYou - emptysectorx24.yml b/html/changelogs/RustingWithYou - emptysectorx24.yml new file mode 100644 index 00000000000..34b3b6b608e --- /dev/null +++ b/html/changelogs/RustingWithYou - emptysectorx24.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: RustingWithYou + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Overmap shuttles can now be mapped directly onto their open space z-level, without the need for empty sectors." diff --git a/maps/away/ships/konyang/air_konyang/air_konyang.dm b/maps/away/ships/konyang/air_konyang/air_konyang.dm index 307e7f95aa1..e69c648fe35 100644 --- a/maps/away/ships/konyang/air_konyang/air_konyang.dm +++ b/maps/away/ships/konyang/air_konyang/air_konyang.dm @@ -16,14 +16,6 @@ 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 @@ -42,6 +34,7 @@ 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")]" @@ -63,14 +56,10 @@ logging_home_tag = "nav_air_konyang_start" defer_initialisation = TRUE -/obj/effect/shuttle_landmark/air_konyang/start - name = "Empty Space" +/obj/effect/shuttle_landmark/ship/air_konyang 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 + base_turf = /turf/space/transit/north diff --git a/maps/away/ships/konyang/air_konyang/air_konyang.dmm b/maps/away/ships/konyang/air_konyang/air_konyang.dmm index 7c1c3858242..2f455fdc178 100644 --- a/maps/away/ships/konyang/air_konyang/air_konyang.dmm +++ b/maps/away/ships/konyang/air_konyang/air_konyang.dmm @@ -248,10 +248,7 @@ /turf/simulated/wall/shuttle/space_ship, /area/shuttle/air_konyang/atmos) "gP" = ( -/obj/effect/shuttle_landmark/air_konyang/transit{ - dir = 1 - }, -/turf/space, +/turf/space/transit/north, /area/space) "gQ" = ( /obj/effect/floor_decal/corner/dark_blue, @@ -281,7 +278,7 @@ /turf/simulated/floor/plating, /area/shuttle/air_konyang/mainroom) "hm" = ( -/obj/effect/shuttle_landmark/air_konyang/start{ +/obj/effect/shuttle_landmark/ship/air_konyang{ dir = 1 }, /turf/template_noop, @@ -666,7 +663,7 @@ /area/shuttle/air_konyang/mainroom) "rU" = ( /obj/effect/step_trigger/teleporter, -/turf/space, +/turf/space/transit/north, /area/space) "sa" = ( /turf/simulated/floor/carpet/brown, @@ -1322,7 +1319,10 @@ /turf/simulated/floor/airless, /area/shuttle/air_konyang/bridge) "HQ" = ( -/turf/space, +/obj/effect/shuttle_landmark/air_konyang_transit{ + dir = 1 + }, +/turf/space/transit/north, /area/space) "HY" = ( /obj/effect/map_effect/window_spawner/full/borosilicate/reinforced/firedoor, @@ -1767,10 +1767,6 @@ /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; @@ -2101,46 +2097,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (2,1,1) = {" VJ @@ -2263,46 +2259,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (3,1,1) = {" VJ @@ -2425,46 +2421,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (4,1,1) = {" VJ @@ -2587,46 +2583,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (5,1,1) = {" VJ @@ -2749,46 +2745,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (6,1,1) = {" VJ @@ -2911,46 +2907,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (7,1,1) = {" VJ @@ -3073,46 +3069,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (8,1,1) = {" VJ @@ -3235,46 +3231,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (9,1,1) = {" VJ @@ -3397,46 +3393,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (10,1,1) = {" VJ @@ -3559,46 +3555,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +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) = {" VJ @@ -3721,46 +3717,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (12,1,1) = {" VJ @@ -3883,46 +3879,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (13,1,1) = {" VJ @@ -4045,46 +4041,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +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 @@ -4207,46 +4203,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (15,1,1) = {" VJ @@ -4369,46 +4365,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (16,1,1) = {" VJ @@ -4531,46 +4527,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (17,1,1) = {" VJ @@ -4693,46 +4689,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (18,1,1) = {" VJ @@ -4855,46 +4851,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (19,1,1) = {" VJ @@ -5017,46 +5013,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (20,1,1) = {" VJ @@ -5179,46 +5175,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (21,1,1) = {" VJ @@ -5341,46 +5337,46 @@ VJ VJ VJ rU +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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (22,1,1) = {" VJ @@ -5503,46 +5499,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (23,1,1) = {" VJ @@ -5665,46 +5661,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (24,1,1) = {" VJ @@ -5827,46 +5823,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (25,1,1) = {" VJ @@ -5989,46 +5985,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +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 @@ -6151,46 +6147,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +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 @@ -6313,46 +6309,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +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 @@ -6475,46 +6471,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (29,1,1) = {" VJ @@ -6637,46 +6633,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (30,1,1) = {" VJ @@ -6799,46 +6795,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (31,1,1) = {" VJ @@ -6961,46 +6957,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (32,1,1) = {" VJ @@ -7123,46 +7119,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (33,1,1) = {" VJ @@ -7285,46 +7281,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (34,1,1) = {" VJ @@ -7447,46 +7443,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (35,1,1) = {" VJ @@ -7609,46 +7605,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (36,1,1) = {" VJ @@ -7771,46 +7767,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (37,1,1) = {" VJ @@ -7933,46 +7929,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (38,1,1) = {" VJ @@ -8095,46 +8091,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (39,1,1) = {" VJ @@ -8257,46 +8253,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (40,1,1) = {" VJ @@ -8419,46 +8415,46 @@ 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 +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP +gP "} (41,1,1) = {" VJ @@ -15800,7 +15796,7 @@ VJ VJ VJ VJ -TY +VJ 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 848951c5977..d7d29449576 100644 --- a/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dm +++ b/maps/away/ships/konyang/einstein_shuttle/einstein_shuttle.dm @@ -17,14 +17,6 @@ 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" @@ -88,6 +80,7 @@ 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" @@ -105,14 +98,10 @@ logging_home_tag = "nav_start_einstein" defer_initialisation = TRUE -/obj/effect/shuttle_landmark/einstein_shuttle/start - name = "Empty Space" +/obj/effect/shuttle_landmark/ship/einstein_shuttle 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 221f8e9525a..448360c328f 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, +/turf/space/transit/north, /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/einstein_shuttle/start{ +/obj/effect/shuttle_landmark/ship/einstein_shuttle{ dir = 1 }, /turf/template_noop, @@ -1322,10 +1322,6 @@ /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, @@ -1598,7 +1594,7 @@ /area/shuttle/einstein_shuttle/conference) "Pp" = ( /obj/effect/step_trigger/teleporter, -/turf/space, +/turf/space/transit/north, /area/space) "Pq" = ( /obj/structure/bed, @@ -1636,10 +1632,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, +/turf/space/transit/north, /area/space) "QI" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ @@ -6984,7 +6980,7 @@ NW NW NW NW -FL +NW 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 003c7863466..98055a0b4ce 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 = "empty sector" + name = "Izharshan Shuttle" id = "unathi_pirate" - description = "An empty sector." + description = "A shuttle belonging to the Unahi pirates of Izharshan's Raiders." prefix = "ships/unathi_pirate/izharshan/" suffixes = list("unathi_pirate_izharshan.dmm") @@ -12,18 +12,11 @@ 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 = "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") - ) + map = "Izharshan Shuttle" + descriptor = "A shuttle belonging to the Unahi pirates of Izharshan's Raiders." /area/shuttle/unathi_pirate_izharshan name = "Izharshan Freighter" @@ -91,6 +84,8 @@ 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") @@ -108,20 +103,16 @@ 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_start_unathi_pirate_izharshan" + current_location = "nav_izharshan_space" dock_target = "unathi_pirate_izharshan" - landmark_transition = "nav_transit_unathi_pirate_izharshan" - logging_home_tag = "nav_start_unathi_pirate_izharshan" + landmark_transition = "nav_izharshan_transit" + logging_home_tag = "nav_izharshan_space" defer_initialisation = TRUE -/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/ship/unathi_pirate_izharshan + landmark_tag = "nav_izharshan_space" -/obj/effect/shuttle_landmark/unathi_pirate_izharshan/transit +/obj/effect/shuttle_landmark/izharshan_transit name = "In transit" - landmark_tag = "nav_transit_unathi_pirate_izharshan" + landmark_tag = "nav_izharshan_transit" 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 2bf62ee0ef1..71789e2cd0a 100644 --- a/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm +++ b/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm @@ -422,7 +422,9 @@ dir = 8; level = 2 }, -/obj/machinery/alarm/east, +/obj/machinery/alarm/east{ + req_one_access = list(210) + }, /obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled/dark, /area/shuttle/unathi_pirate_izharshan/dorms) @@ -454,7 +456,9 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/unathi_pirate_izharshan/dorms) "re" = ( -/obj/machinery/power/apc/high/south, +/obj/machinery/power/apc/high/south{ + req_access = list(210) + }, /obj/structure/cable/green, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8; @@ -544,7 +548,7 @@ }, /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/alarm/west{ - pixel_x = -32 + req_one_access = list(210) }, /turf/simulated/floor/tiled/dark/full, /area/shuttle/unathi_pirate_izharshan/operations) @@ -562,7 +566,9 @@ /turf/simulated/floor/tiled/dark, /area/shuttle/unathi_pirate_izharshan/dorms) "sZ" = ( -/obj/effect/shuttle_landmark/unathi_pirate_izharshan/transit, +/obj/effect/shuttle_landmark/izharshan_transit{ + dir = 1 + }, /turf/space/transit/north, /area/space) "tB" = ( @@ -604,7 +610,7 @@ /area/shuttle/unathi_pirate_izharshan/dorms) "uK" = ( /obj/machinery/alarm/west{ - pixel_x = -28 + req_one_access = list(210) }, /turf/simulated/floor/shuttle/black, /area/shuttle/unathi_pirate_izharshan/helm) @@ -1190,10 +1196,6 @@ /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; @@ -1317,7 +1319,9 @@ /turf/simulated/floor, /area/shuttle/unathi_pirate_izharshan/operations) "Ti" = ( -/obj/effect/shuttle_landmark/unathi_pirate_izharshan/start, +/obj/effect/shuttle_landmark/ship/unathi_pirate_izharshan{ + dir = 1 + }, /turf/template_noop, /area/space) "Tt" = ( @@ -13665,7 +13669,7 @@ RS cg RS RS -sZ +RS RS RS RS @@ -13929,7 +13933,7 @@ RS RS RS RS -RS +sZ RS RS RS @@ -33145,7 +33149,7 @@ yN yN yN yN -Ob +yN yN yN yN