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

Merge pull request #10779 from Ghommie/Ghommie-cit538

Browse Source 
added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP.
This commit is contained in:
kevinz000
2020-02-02 16:31:59 -07:00
committed by GitHub
parent c24c83c1bd dba9fdd2b0
commit 2393dc26eb
23 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/mecha/mecha.dm
+1 -1
View File
@@ -1030,7 +1030,7 @@
/obj/mecha/log_message(message as text, message_type=LOG_GAME, color=null, log_globally)
log.len++
log[log.len] = list("time"="[STATION_TIME_TIMESTAMP("hh:mm:ss")]","date","year"="[GLOB.year_integer]","message"="[color?"<font color='[color]'>":null][message][color?"</font>":null]")
log[log.len] = list("time"="[STATION_TIME_TIMESTAMP("hh:mm:ss", world.time)]","date","year"="[GLOB.year_integer]","message"="[color?"<font color='[color]'>":null][message][color?"</font>":null]")
..()
return log.len