shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3017 from Citadel-Station-13/upstream-merge-31108

Browse Source 
[MIRROR] Corrected shuttle refuel time
This commit is contained in:
LetterJay
2017-10-01 15:07:43 -04:00
committed by GitHub
parent 490885a36f 69f354718c
commit eb24540ba3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/shuttle.dm
+1 -1
View File
@@ -178,7 +178,7 @@ SUBSYSTEM_DEF(shuttle)
emergency = backup_shuttle
var/srd = CONFIG_GET(number/shuttle_refuel_delay)
if(world.time - SSticker.round_start_time < srd)
to_chat(user, "The emergency shuttle is refueling. Please wait [DisplayTimeText((world.time - SSticker.round_start_time) - srd)] before trying again.")
to_chat(user, "The emergency shuttle is refueling. Please wait [DisplayTimeText(srd - (world.time - SSticker.round_start_time))] before trying again.")
return
switch(emergency.mode)
tgstation.dme
+1 -1
View File
@@ -2140,8 +2140,8 @@
#include "code\modules\ruins\spaceruin_code\TheDerelict.dm"
#include "code\modules\security_levels\keycard_authentication.dm"
#include "code\modules\security_levels\security_levels.dm"
#include "code\modules\server_tools\st_interface.dm"
#include "code\modules\server_tools\st_commands.dm"
#include "code\modules\server_tools\st_interface.dm"
#include "code\modules\shuttle\arrivals.dm"
#include "code\modules\shuttle\assault_pod.dm"
#include "code\modules\shuttle\computer.dm"