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

4
code/modules/modular_computers/NTNet/NTNRC/conversation.dm
View File

@@ -25,12 +25,12 @@
return ..()
/datum/ntnet_conversation/proc/add_message(message, username)
message = "[STATION_TIME_TIMESTAMP("hh:mm:ss")] [username]: [message]"
message = "[STATION_TIME_TIMESTAMP("hh:mm:ss", world.time)] [username]: [message]"
messages.Add(message)
trim_message_list()
/datum/ntnet_conversation/proc/add_status_message(message)
messages.Add("[STATION_TIME_TIMESTAMP("hh:mm:ss")] -!- [message]")
messages.Add("[STATION_TIME_TIMESTAMP("hh:mm:ss", world.time)] -!- [message]")
trim_message_list()
/datum/ntnet_conversation/proc/trim_message_list()

2
code/modules/modular_computers/computers/item/computer.dm
View File

@@ -348,7 +348,7 @@
data["PC_programheaders"] = program_headers
data["PC_stationtime"] = STATION_TIME_TIMESTAMP("hh:mm:ss")
data["PC_stationtime"] = STATION_TIME_TIMESTAMP("hh:mm:ss", world.time)
data["PC_hasheader"] = 1
data["PC_showexitprogram"] = active_program ? 1 : 0 // Hides "Exit Program" button on mainscreen
return data

2
code/modules/modular_computers/file_system/programs/card.dm
View File

@@ -159,7 +159,7 @@
<br>
[GLOB.data_core ? GLOB.data_core.get_manifest(0) : ""]
"}
if(!printer.print_text(contents,text("crew manifest ([])", STATION_TIME_TIMESTAMP("hh:mm:ss"))))
if(!printer.print_text(contents,text("crew manifest ([])", STATION_TIME_TIMESTAMP("hh:mm:ss", world.time))))
to_chat(usr, "<span class='notice'>Hardware error: Printer was unable to print the file. It may be out of paper.</span>")
return
else

2
code/modules/modular_computers/file_system/programs/file_browser.dm
View File

@@ -145,7 +145,7 @@
t = replacetext(t, "\[/i\]", "</I>")
t = replacetext(t, "\[u\]", "<U>")
t = replacetext(t, "\[/u\]", "</U>")
t = replacetext(t, "\[time\]", "[STATION_TIME_TIMESTAMP("hh:mm:ss")]")
t = replacetext(t, "\[time\]", "[STATION_TIME_TIMESTAMP("hh:mm:ss", world.time)]")
t = replacetext(t, "\[date\]", "[time2text(world.realtime, "MMM DD")] [GLOB.year_integer]")
t = replacetext(t, "\[large\]", "<font size=\"4\">")
t = replacetext(t, "\[/large\]", "</font>")