Skip to content

Commit

Permalink
Remove an old proc (#28041)
Browse files Browse the repository at this point in the history
  • Loading branch information
FunnyMan3595 authored Jan 25, 2025
1 parent 445e691 commit 99d18c8
Showing 1 changed file with 1 addition and 22 deletions.
23 changes: 1 addition & 22 deletions code/modules/shuttle/shuttle_manipulator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
intact for round sanity.")
else if(S)
// If successful, returns the mobile docking port
var/obj/docking_port/mobile/mdp = action_load_old(S)
var/obj/docking_port/mobile/mdp = action_load(S)
if(mdp)
usr.forceMove(get_turf(mdp))
message_admins("[key_name_admin(usr)] loaded [mdp] with the shuttle manipulator.")
Expand All @@ -207,27 +207,6 @@
message_admins("The emergency shuttle has been locked in. You can not load another shuttle.")
return

if(preview_shuttle && (loading_template != preview_template))
preview_shuttle.jumpToNullSpace()
preview_shuttle = null
preview_template = null

if(!preview_shuttle)
preview_shuttle = SSshuttle.load_template(loading_template)
preview_template = loading_template

SSshuttle.replace_shuttle(preview_shuttle)

existing_shuttle = null
preview_shuttle = null
preview_template = null
selected = null

/obj/machinery/shuttle_manipulator/proc/action_load_old(datum/map_template/shuttle/loading_template)
if(istype(loading_template, /datum/map_template/shuttle/emergency) && SSshuttle.emergency_locked_in)
message_admins("The emergency shuttle has been locked in. You can not load another shuttle.")
return

// Check for an existing preview
if(preview_shuttle && (loading_template != preview_template))
preview_shuttle.jumpToNullSpace()
Expand Down

0 comments on commit 99d18c8

Please sign in to comment.