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

Update shuttle.dm

Browse Source
This commit is contained in:
LetterJay
2017-09-30 14:23:40 -05:00
committed by GitHub
parent 7e2873cd46
commit 99319f5d4d
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/shuttle.dm
-6
View File
@@ -176,15 +176,9 @@ SUBSYSTEM_DEF(shuttle)
Good luck.") Good luck.")
return return
emergency = backup_shuttle 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) var/srd = CONFIG_GET(number/shuttle_refuel_delay)
if(world.time - SSticker.round_start_time < srd) 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.") 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 return
switch(emergency.mode) switch(emergency.mode)