diff --git a/code/controllers/subsystem/shuttles.dm b/code/controllers/subsystem/shuttles.dm index 57bc2348935..2d0fbec144d 100644 --- a/code/controllers/subsystem/shuttles.dm +++ b/code/controllers/subsystem/shuttles.dm @@ -262,6 +262,8 @@ var/datum/subsystem/shuttle/SSshuttle // Because of shuttle rotation, the "width" of the shuttle is not // always x. var/travel_dir = M.preferred_direction + // Remember, the direction is the direction we appear to be + // coming from var/dock_angle = dir2angle(M.preferred_direction) + M.port_angle + 180 var/dock_dir = angle2dir(dock_angle) @@ -308,17 +310,17 @@ var/datum/subsystem/shuttle/SSshuttle continue base if(!(T.flags & UNUSED_TRANSIT_TURF)) continue base - world << "[COORD(topleft)] and [COORD(bottomright)]" + //world << "[COORD(topleft)] and [COORD(bottomright)]" break base if((!proposed_zone) || (!proposed_zone.len)) return FALSE var/turf/topleft = proposed_zone[1] - world << "[COORD(topleft)] is TOPLEFT" + //world << "[COORD(topleft)] is TOPLEFT" // Then create a transit docking port in the middle var/coords = M.return_coords(0, 0, dock_dir) - world << json_encode(coords) + //world << json_encode(coords) /* 0------2 | | | | diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 5f957e88dd6..2add316105b 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -148,7 +148,8 @@ var/list/admin_verbs_debug = list( /client/proc/debug_huds, /client/proc/map_template_load, /client/proc/map_template_upload, - /client/proc/jump_to_ruin + /client/proc/jump_to_ruin, + /client/proc/clear_dynamic_transit ) var/list/admin_verbs_possess = list( /proc/possess, diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index ec8efdbf1df..fd6ada6a51d 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -630,7 +630,6 @@ var/global/list/g_fancy_list_of_types = null log_admin("[key_name(usr)] changed the equipment of [key_name(M)] to [dresscode].") message_admins("[key_name_admin(usr)] changed the equipment of [key_name_admin(M)] to [dresscode]..") - return /client/proc/startSinglo() @@ -766,4 +765,16 @@ var/global/list/g_fancy_list_of_types = null var/datum/map_template/ruin/template = landmark.ruin_template usr.forceMove(get_turf(landmark)) usr << "[template.name]" - usr << "[template.description]" \ No newline at end of file + usr << "[template.description]" + +/client/proc/clear_dynamic_transit() + set category = "Debug" + set name = "Clear Dynamic Transit" + set desc = "Deallocates all transit space, restoring it to round start \ + conditions." + if(!holder) + return + SSshuttle.clear_transit = TRUE + message_admins("[key_name_admin(src)] cleared dynamic transit space.") + feedback_add_details("admin_verb","CDT") // If... + log_admin("[key_name(src)] cleared dynamic transit space.")