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

Corrected shuttle refuel time

Browse Source
This commit is contained in:
ShizCalev
2017-09-30 01:58:40 -04:00
committed by CitadelStationBot
parent 7d31aa7538
commit 7e2873cd46
2 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/shuttle.dm
+6
View File
@@ -176,9 +176,15 @@ SUBSYSTEM_DEF(shuttle)
Good luck.")
return
emergency = backup_shuttle
<<<<<<< HEAD
if(world.time - SSticker.round_start_time < config.shuttle_refuel_delay)
to_chat(user, "The emergency shuttle is refueling. Please wait [DisplayTimeText((world.time - SSticker.round_start_time) - config.shuttle_refuel_delay)] before trying again.")
=======
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(srd - (world.time - SSticker.round_start_time))] before trying again.")
>>>>>>> ced1e24... Corrected shuttle refuel time (#31108)
return
switch(emergency.mode)