Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

# Conflicts: # icons/obj/toy.dmi
2026-08-26 13:37:58 +01:00 · 2019-05-03 18:31:45 +02:00
parent ba0f6abb02 e5355a13d9
commit 35b1cee88b
149 changed files with 4031 additions and 1043 deletions
@@ -981,6 +981,7 @@ var/list/slot_equipment_priority = list( \
 			stat("CPU:", "[world.cpu]")
 			stat("Instances:", "[num2text(world.contents.len, 10)]")
 			GLOB.stat_entry()
+			stat("Server Time:", time_stamp())
 			stat(null)
 			if(Master)
 				Master.stat_entry()