diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm index a4b9d572154..23b33e8fbb3 100644 --- a/code/__HELPERS/time.dm +++ b/code/__HELPERS/time.dm @@ -61,6 +61,12 @@ /proc/station_time_timestamp(format = "hh:mm:ss", time=world.time) return time2text(station_time(time, TRUE), format) +/proc/all_timestamps() + var/real_time = time_stamp() + var/station_time = station_time_timestamp() + var/all = "[real_time] ST[station_time]" + return all + /* Returns 1 if it is the selected month and day */ /proc/isDay(month, day) if(isnum(month) && isnum(day)) diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 8e941dfd4bb..7102c6e8e32 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -643,7 +643,7 @@ //Add the list if it does not exist. if(!fingerprintshidden) fingerprintshidden = list() - fingerprintshidden += text("\[[time_stamp()]\] (Wearing gloves). Real name: [], Key: []", H.real_name, H.key) + fingerprintshidden += text("\[[all_timestamps()]\] (Wearing gloves). Real name: [], Key: []", H.real_name, H.key) fingerprintslast = H.ckey return FALSE if(!fingerprints) @@ -651,7 +651,7 @@ //Add the list if it does not exist. if(!fingerprintshidden) fingerprintshidden = list() - fingerprintshidden += text("\[[time_stamp()]\] Real name: [], Key: []", H.real_name, H.key) + fingerprintshidden += text("\[[all_timestamps()]\] Real name: [], Key: []", H.real_name, H.key) fingerprintslast = H.ckey return TRUE else @@ -659,7 +659,7 @@ //Add the list if it does not exist. if(!fingerprintshidden) fingerprintshidden = list() - fingerprintshidden += text("\[[time_stamp()]\] Real name: [], Key: []", M.real_name, M.key) + fingerprintshidden += text("\[[all_timestamps()]\] Real name: [], Key: []", M.real_name, M.key) fingerprintslast = M.ckey return @@ -702,14 +702,14 @@ if(!ignoregloves) if(H.gloves && H.gloves != src) if(fingerprintslast != H.ckey) - fingerprintshidden += text("\[[]\](Wearing gloves). Real name: [], Key: []", time_stamp(), H.real_name, H.key) + fingerprintshidden += text("\[[all_timestamps()]\] (Wearing gloves). Real name: [], Key: []", H.real_name, H.key) fingerprintslast = H.ckey H.gloves.add_fingerprint(M) return FALSE //More adminstuffz if(fingerprintslast != H.ckey) - fingerprintshidden += text("\[[]\]Real name: [], Key: []", time_stamp(), H.real_name, H.key) + fingerprintshidden += text("\[[all_timestamps()]\] Real name: [], Key: []", H.real_name, H.key) fingerprintslast = H.ckey //Make the list if it does not exist. @@ -726,7 +726,7 @@ else //Smudge up dem prints some if(fingerprintslast != M.ckey) - fingerprintshidden += text("\[[]\]Real name: [], Key: []", time_stamp(), M.real_name, M.key) + fingerprintshidden += text("\[[all_timestamps()]\] Real name: [], Key: []", M.real_name, M.key) fingerprintslast = M.ckey return diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 9d6f100ad6c..644c6c9ae3b 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -283,10 +283,10 @@ GLOBAL_LIST_EMPTY(airlock_emissive_underlays) electrified_until = 0 else if(duration) //electrify door for the given duration seconds if(user) - shockedby += text("\[[time_stamp()]\] - [user](ckey:[user.ckey])") + shockedby += text("\[[all_timestamps()]\] - [user](ckey:[user.ckey])") add_attack_logs(user, src, "Electrified [ADMIN_COORDJMP(src)]", ATKLOG_ALL) else - shockedby += text("\[[time_stamp()]\] - EMP)") + shockedby += text("\[[all_timestamps()]\] - EMP)") message = "The door is now electrified [duration == -1 ? "permanently" : "for [duration] second\s"]." electrified_until = duration == -1 ? -1 : world.time + duration SECONDS if(duration != -1) @@ -1419,7 +1419,7 @@ GLOBAL_LIST_EMPTY(airlock_emissive_underlays) lock() //Bolt it! electrified_until = -1 //Shock it! if(origin) - shockedby += "\[[time_stamp()]\][origin](ckey:[origin.ckey])" + shockedby += "\[[all_timestamps()]\][origin](ckey:[origin.ckey])" /obj/machinery/door/airlock/disable_lockdown() // Must be powered and have working AI wire. diff --git a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm index 2aa386438a8..5bc74bc0b10 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/gibber.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/gibber.dm @@ -279,7 +279,7 @@ occupant.emote("scream") playsound(get_turf(src), 'sound/goonstation/effects/gib.ogg', 50, 1) - victims += "\[[time_stamp()]\] [key_name(occupant)] killed by [UserOverride ? "Autogibbing" : "[key_name(user)]"]" //have to do this before ghostizing + victims += "\[[all_timestamps()]\] [key_name(occupant)] killed by [UserOverride ? "Autogibbing" : "[key_name(user)]"]" //have to do this before ghostizing occupant.death(1) occupant.ghostize()