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

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

Browse Source 
[MIRROR] DisplayTimeText mk2
This commit is contained in:
LetterJay
2017-09-27 23:39:03 -04:00
committed by GitHub
parent 50f139eb8d f3da8a48a0
commit d8de375ada
54 changed files with 419 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/shuttle/syndicate.dm
+1 -1
View File
@@ -20,7 +20,7 @@
if(href_list["move"])
var/obj/item/circuitboard/computer/syndicate_shuttle/board = circuit
if(board.challenge && world.time < SYNDICATE_CHALLENGE_TIMER)
to_chat(usr, "<span class='warning'>You've issued a combat challenge to the station! You've got to give them at least [round(((SYNDICATE_CHALLENGE_TIMER - world.time) / 10) / 60)] more minutes to allow them to prepare.</span>")
to_chat(usr, "<span class='warning'>You've issued a combat challenge to the station! You've got to give them at least [DisplayTimeText(SYNDICATE_CHALLENGE_TIMER - world.time)] more to allow them to prepare.</span>")
return 0
board.moved = TRUE
..()