cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 03:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adjusts how undocking signals are used

Browse Source 
Now both server and client will to undock concurrently. It looks much
more natural.

Conflicts:
	code/game/machinery/embedded_controller/docking_program.dm
	code/game/machinery/embedded_controller/simple_docking_controller.dm
This commit is contained in:
mwerezak
2014-06-12 23:11:51 -04:00
committed by ZomgPonies
parent cd540fe56d
commit cdabebba3e
5 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttles/shuttle_console.dm
+4 -4
View File
@@ -95,7 +95,7 @@
process_state = WAIT_ARRIVE
/datum/shuttle/ferry/proc/cancel_launch()
/datum/shuttle/ferry/proc/cancel_launch(var/obj/machinery/computer/shuttle_control/user)
if (!can_cancel()) return
moving_status = SHUTTLE_IDLE
@@ -119,9 +119,9 @@
return 1
/datum/shuttle/ferry/proc/can_force()
if (moving_status != SHUTTLE_IDLE && process_state == WAIT_LAUNCH)
return 0
return 1
if (moving_status == SHUTTLE_IDLE && process_state == WAIT_LAUNCH)
return 1
return 0
/datum/shuttle/ferry/proc/can_cancel()
if (moving_status == SHUTTLE_WARMUP || process_state == WAIT_LAUNCH)