cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 19:52:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5507 from mwerezak/supply-shuttle-fix

Browse Source 
Supply shuttle fixes
This commit is contained in:
Mloc
2014-07-05 23:16:42 +01:00
parent 2f798b1aae 6d0a3b864d
commit 4981d620d0
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/game/machinery/embedded_controller/docking_program.dm
View File

@@ -6,7 +6,9 @@
#define MODE_NONE 0 #define MODE_NONE 0
#define MODE_SERVER 1 #define MODE_SERVER 1
#define MODE_CLIENT 2 //The one who initiated the docking, and who can initiate the undocking. The server cannot initiate undocking. (Think server == station, client == shuttle) #define MODE_CLIENT 2 //The one who initiated the docking, and who can initiate the undocking. The server cannot initiate undocking, and is the one responsible for deciding to accept a docking request and signals when docking and undocking is complete. (Think server == station, client == shuttle)
#define MESSAGE_RESEND_TIME 5 //how long (in seconds) do we wait before resending a message
/* /*
*** STATE TABLE *** *** STATE TABLE ***
@@ -64,6 +66,7 @@
var/dock_state = STATE_UNDOCKED var/dock_state = STATE_UNDOCKED
var/control_mode = MODE_NONE var/control_mode = MODE_NONE
var/response_sent = 0 //so we don't spam confirmation messages var/response_sent = 0 //so we don't spam confirmation messages
var/resend_counter = 0 //for periodically resending confirmation messages in case they are missed
var/override_enabled = 0 //skips checks for the docking port being ready var/override_enabled = 0 //skips checks for the docking port being ready
var/received_confirm = 0 //for undocking, whether the client has recieved a confirmation from the server var/received_confirm = 0 //for undocking, whether the client has recieved a confirmation from the server
@@ -158,10 +161,12 @@
finish_undocking() finish_undocking()
reset() //server is done undocking! reset() //server is done undocking!
if (response_sent || resend_counter > 0)
resend_counter++
if (dock_state != STATE_DOCKING && dock_state != STATE_UNDOCKING) if (resend_counter >= MESSAGE_RESEND_TIME || (dock_state != STATE_DOCKING && dock_state != STATE_UNDOCKING))
response_sent = 0 response_sent = 0
resend_counter = 0
//handle invalid states //handle invalid states
if (control_mode == MODE_NONE && dock_state != STATE_UNDOCKED) if (control_mode == MODE_NONE && dock_state != STATE_UNDOCKED)

8
code/modules/shuttles/shuttle_supply.dm
View File

@@ -47,11 +47,11 @@
sleep(5) sleep(5)
if (destination != away_area) if (destination != away_area)
//late
if (prob(late_chance))
sleep(rand(0,max_late_time))
move(away_area, destination) move(away_area, destination)
//late
if (prob(late_chance))
sleep(rand(0,max_late_time))
moving_status = SHUTTLE_IDLE moving_status = SHUTTLE_IDLE