Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969

[MIRROR] DisplayTimeText mk2
This commit is contained in:
LetterJay
2017-09-27 23:39:03 -04:00
committed by GitHub
54 changed files with 419 additions and 360 deletions
+1 -1
View File
@@ -178,7 +178,7 @@ SUBSYSTEM_DEF(shuttle)
emergency = backup_shuttle
if(world.time - SSticker.round_start_time < config.shuttle_refuel_delay)
to_chat(user, "The emergency shuttle is refueling. Please wait another [abs(round(((world.time - SSticker.round_start_time) - config.shuttle_refuel_delay)/600))] minutes before trying again.")
to_chat(user, "The emergency shuttle is refueling. Please wait [DisplayTimeText((world.time - SSticker.round_start_time) - config.shuttle_refuel_delay)] before trying again.")
return
switch(emergency.mode)