diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm
index f20830e5cc2..c90a935b6df 100644
--- a/code/__HELPERS/time.dm
+++ b/code/__HELPERS/time.dm
@@ -10,6 +10,9 @@ proc/worldtime2text(time = world.time)
 	if(!roundstart_hour) roundstart_hour = pick(2,7,12,17)
 	return "[round(time / 36000)+roundstart_hour]:[(time / 600 % 60) < 10 ? add_zero(time / 600 % 60, 1) : time / 600 % 60]"
 
+proc/worlddate2text()
+	return num2text((text2num(time2text(world.timeofday, "YYYY"))+544)) + "-" + time2text(world.timeofday, "MM-DD")
+	
 proc/time_stamp()
 	return time2text(world.timeofday, "hh:mm:ss")
 
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 143b00e6231..9c9fe2e639e 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -210,6 +210,8 @@
 	t = replacetext(t, "\[/i\]", "</I>")
 	t = replacetext(t, "\[u\]", "<U>")
 	t = replacetext(t, "\[/u\]", "</U>")
+	t = replacetext(t, "\[time\]", "[worldtime2text()]")
+	t = replacetext(t, "\[date\]", "[worlddate2text()]")
 	t = replacetext(t, "\[large\]", "<font size=\"4\">")
 	t = replacetext(t, "\[/large\]", "</font>")
 	t = replacetext(t, "\[sign\]", "<font face=\"[signfont]\"><i>[get_signature(P, user)]</i></font>")