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

Fixes escape shuttle not transitioning

Browse Source
This commit is contained in:
mwerezak
2014-06-23 21:53:17 -04:00
parent e17b8bffab
commit ebacf05acf
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/shuttles/shuttle.dm
View File

@@ -31,11 +31,11 @@
if (moving_status == SHUTTLE_IDLE) if (moving_status == SHUTTLE_IDLE)
return //someone cancelled the launch return //someone cancelled the launch
move(locate(departing),locate(interim)) move(departing, interim)
sleep(travel_time*10) sleep(travel_time*10)
move(locate(interim),locate(destination)) move(interim, destination)
moving_status = SHUTTLE_IDLE moving_status = SHUTTLE_IDLE
@@ -69,7 +69,7 @@
//world << "move_shuttle() called for [shuttle_tag] leaving [origin] en route to [destination]." //world << "move_shuttle() called for [shuttle_tag] leaving [origin] en route to [destination]."
//world << "area_coming_from: [area_coming_from]" //world << "area_coming_from: [origin]"
//world << "destination: [destination]" //world << "destination: [destination]"
if(origin == destination) if(origin == destination)

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

@@ -58,7 +58,7 @@
if (!at_station()) //at centcom if (!at_station()) //at centcom
supply_controller.sell() supply_controller.sell()
/datum/shuttle/ferry/emergency/long_jump(var/area/departing,var/area/destination,var/area/interim,var/travel_time) /datum/shuttle/ferry/supply/long_jump(var/area/departing,var/area/destination,var/area/interim,var/travel_time)
short_jump(departing, destination) //long jumps are disabled short_jump(departing, destination) //long jumps are disabled
// returns 1 if the supply shuttle should be prevented from moving because it contains forbidden atoms // returns 1 if the supply shuttle should be prevented from moving because it contains forbidden atoms

6
code/modules/shuttles/shuttles_multi.dm
View File

@@ -109,7 +109,7 @@
usr << "\red Ship stealth systems have been [(MS.cloaked ? "activated. The station will not" : "deactivated. The station will")] be warned of our arrival." usr << "\red Ship stealth systems have been [(MS.cloaked ? "activated. The station will not" : "deactivated. The station will")] be warned of our arrival."
if(href_list["move_multi"]) if(href_list["move_multi"])
if((MS.last_move + MS.cooldown) > world.time) if((MS.last_move + MS.cooldown*10) > world.time)
usr << "\red The ship's drive is inoperable while the engines are charging." usr << "\red The ship's drive is inoperable while the engines are charging."
return return
@@ -124,7 +124,7 @@
MS.at_origin = 0 MS.at_origin = 0
MS.long_jump(MS.last_departed,MS.destinations[choice],MS.interim,MS.move_time) MS.long_jump(MS.last_departed, MS.destinations[choice], MS.interim, MS.move_time)
MS.last_departed = MS.destinations[choice] MS.last_departed = MS.destinations[choice]
return return
@@ -132,7 +132,7 @@
MS.announce_departure() MS.announce_departure()
MS.short_jump(locate(MS.last_departed),locate(MS.destinations[choice])) MS.short_jump(MS.last_departed, MS.destinations[choice])
MS.last_departed = MS.destinations[choice] MS.last_departed = MS.destinations[choice]
updateUsrDialog() updateUsrDialog()