cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6563 from mwerezak/cargo

Browse Source 
Fixes supply shuttle state when returning
This commit is contained in:
Chinsky
2014-10-01 13:39:29 +04:00
parent c3e63b1ad0 d81670edfb
commit a3dba06c0e
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@
var/max_late_time = 300 var/max_late_time = 300
/datum/shuttle/ferry/supply/short_jump(var/area/origin,var/area/destination) /datum/shuttle/ferry/supply/short_jump(var/area/origin,var/area/destination)
if(moving_status != SHUTTLE_IDLE) if(moving_status != SHUTTLE_IDLE)
return return
if(isnull(location)) if(isnull(location))
@@ -20,9 +20,6 @@
if(!origin) if(!origin)
origin = get_location_area(location) origin = get_location_area(location)
if (!at_station()) //at centcom
supply_controller.buy()
//it would be cool to play a sound here //it would be cool to play a sound here
moving_status = SHUTTLE_WARMUP moving_status = SHUTTLE_WARMUP
spawn(warmup_time*10) spawn(warmup_time*10)
@@ -34,11 +31,15 @@
moving_status = SHUTTLE_IDLE moving_status = SHUTTLE_IDLE
return return
if (!at_station()) //at centcom
supply_controller.buy()
//We pretend it's a long_jump by making the shuttle stay at centcom for the "in-transit" period. //We pretend it's a long_jump by making the shuttle stay at centcom for the "in-transit" period.
var/area/away_area = get_location_area(away_location) var/area/away_area = get_location_area(away_location)
if (origin == away_area) moving_status = SHUTTLE_INTRANSIT
moving_status = SHUTTLE_INTRANSIT //pretend
else //If we are at the away_area then we are just pretending to move, otherwise actually do the move
if (origin != away_area)
move(origin, away_area) move(origin, away_area)
//wait ETA here. //wait ETA here.