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

Fixes supply shuttle state when returning

Browse Source 
When returning to centcom, the supply shuttle's state was not being set
to INTRANSIT.
This commit is contained in:
mwerezak
2014-10-01 00:48:16 -04:00
parent 6eea41bcc1
commit d81670edfb
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
/datum/shuttle/ferry/supply/short_jump(var/area/origin,var/area/destination)
if(moving_status != SHUTTLE_IDLE)
if(moving_status != SHUTTLE_IDLE)
return
if(isnull(location))
@@ -20,9 +20,6 @@
if(!origin)
origin = get_location_area(location)
if (!at_station()) //at centcom
supply_controller.buy()
//it would be cool to play a sound here
moving_status = SHUTTLE_WARMUP
spawn(warmup_time*10)
@@ -34,11 +31,15 @@
moving_status = SHUTTLE_IDLE
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.
var/area/away_area = get_location_area(away_location)
if (origin == away_area)
moving_status = SHUTTLE_INTRANSIT //pretend
else
moving_status = SHUTTLE_INTRANSIT
//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)
//wait ETA here.