mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-29 16:18:01 +01:00
Massive shuttle refactor and arrivals system change (#4572)
* FIRST!! * aaaa * Update floor.dm * aaaaaaaa * aaaaaaaaaaaaaaaaaaaaaa * aaaaaaaaaaa * Update CentCom_skyrat_z2.dmm * Update MetaStation_skyrat.dmm * aaaaaaaaaaaaaaaaaaaaa * crashing this shuttle with no survivors * aaaaaaaaaaaaaaaaaaaaaa * aaaaaaaa * aaaaaaaa * Update emergency.dm * aaaaa * Update emergency_skyrat.dmm * Update emergency_skyrat.dmm * aaaaa * a
This commit is contained in:
@@ -2,6 +2,9 @@
|
||||
/obj/docking_port/mobile/proc/initiate_docking(obj/docking_port/stationary/new_dock, movement_direction, force=FALSE)
|
||||
// Crashing this ship with NO SURVIVORS
|
||||
|
||||
if(admin_forced)
|
||||
force = admin_forced
|
||||
|
||||
if(new_dock.get_docked() == src)
|
||||
remove_ripples()
|
||||
return DOCKING_SUCCESS
|
||||
|
||||
@@ -505,6 +505,7 @@
|
||||
setTimer(SSshuttle.emergencyEscapeTime * engine_coeff)
|
||||
priority_announce("The Emergency Shuttle has left the station. Estimate [timeLeft(600)] minutes until the shuttle docks at Central Command.", null, ANNOUNCER_SHUTTLELEFT, "Priority") //SKYRAT EDIT CHANGE - ANNOUNCER_SHUTTLELEFT
|
||||
INVOKE_ASYNC(SSticker, /datum/controller/subsystem/ticker.proc/poll_hearts)
|
||||
bolt_all_doors() //SKYRAT EDIT ADDITION
|
||||
SSmapping.mapvote() //If no map vote has been run yet, start one.
|
||||
|
||||
if(SHUTTLE_STRANDED, SHUTTLE_DISABLED)
|
||||
@@ -548,6 +549,7 @@
|
||||
supervisor.", "SYSTEM ERROR:", alert=TRUE)
|
||||
|
||||
dock_id(destination_dock)
|
||||
unbolt_all_doors() //SKYRAT EDIT ADDITION
|
||||
mode = SHUTTLE_ENDGAME
|
||||
timer = 0
|
||||
|
||||
|
||||
@@ -365,6 +365,11 @@
|
||||
var/can_move_docking_ports = FALSE
|
||||
var/list/hidden_turfs = list()
|
||||
|
||||
///Can this shuttle be called while it's in transit? (Prevents people recalling it once it's already enroute)
|
||||
var/can_be_called_in_transit = TRUE //SKYRAT EDIT ADDITION
|
||||
|
||||
var/admin_forced = FALSE //SKYRAT EDIT ADDITION
|
||||
|
||||
/obj/docking_port/mobile/register(replace = FALSE)
|
||||
. = ..()
|
||||
if(!id)
|
||||
@@ -493,6 +498,7 @@
|
||||
/obj/docking_port/mobile/proc/transit_failure()
|
||||
message_admins("Shuttle [src] repeatedly failed to create transit zone.")
|
||||
|
||||
/* SKYRAT EDIT REMOVAL - MOVED TO MODULAR
|
||||
//call the shuttle to destination S
|
||||
/obj/docking_port/mobile/proc/request(obj/docking_port/stationary/S)
|
||||
if(!check_dock(S))
|
||||
@@ -522,6 +528,8 @@
|
||||
mode = SHUTTLE_IGNITING
|
||||
setTimer(ignitionTime)
|
||||
|
||||
*/ //SKYRAT EDIT END
|
||||
|
||||
//recall the shuttle to where it was previously
|
||||
/obj/docking_port/mobile/proc/cancel()
|
||||
if(mode != SHUTTLE_CALL)
|
||||
@@ -672,6 +680,7 @@
|
||||
return
|
||||
if(rechargeTime)
|
||||
mode = SHUTTLE_RECHARGING
|
||||
unbolt_all_doors() //SKYRAT EDIT ADDITION
|
||||
setTimer(rechargeTime)
|
||||
return
|
||||
if(SHUTTLE_RECALL)
|
||||
@@ -688,6 +697,8 @@
|
||||
enterTransit()
|
||||
return
|
||||
|
||||
admin_forced = FALSE //SKYRAT EDIT ADDITION
|
||||
unbolt_all_doors() //SKYRAT EDIT ADDITION
|
||||
mode = SHUTTLE_IDLE
|
||||
timer = 0
|
||||
destination = null
|
||||
|
||||
Reference in New Issue
Block a user