Merge pull request #10779 from Ghommie/Ghommie-cit538

added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP.
2020-02-02 16:31:59 -07:00
parent c24c83c1bd dba9fdd2b0
commit 2393dc26eb
23 changed files with 32 additions and 32 deletions
--- a/code/modules/mining/machine_silo.dm
+++ b/code/modules/mining/machine_silo.dm
@@ -197,7 +197,7 @@ GLOBAL_LIST_EMPTY(silo_access_logs)
 	var/list/materials

 /datum/ore_silo_log/New(obj/machinery/M, _action, _amount, _noun, list/mats=list())
-	timestamp = STATION_TIME_TIMESTAMP("hh:mm:ss")
+	timestamp = STATION_TIME_TIMESTAMP("hh:mm:ss", world.time)
 	machine_name = M.name
 	area_name = get_area_name(M, TRUE)
 	action = _action