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
@@ -97,7 +97,7 @@
/mob/living/silicon/ai/proc/announcement()
var/static/announcing_vox = 0 // Stores the time of the last announcement
if(announcing_vox > world.time)
to_chat(src, "<span class='notice'>Please wait [round((announcing_vox - world.time) / 10)] seconds.</span>")
to_chat(src, "<span class='notice'>Please wait [DisplayTimeText(announcing_vox - world.time)].</span>")
return
var/message = input(src, "WARNING: Misuse of this verb can result in you being job banned. More help is available in 'Announcement Help'", "Announcement", src.last_announcement) as text