Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229

2020-02-04 03:54:52 +01:00
parent 55fa48737e 0c57a78851
commit a726f09201
631 changed files with 38158 additions and 6475 deletions
@@ -1244,7 +1244,7 @@

 /obj/item/toy/clockwork_watch/examine(mob/user)
 	. = ..()
-	. += "<span class='info'>Station Time: [STATION_TIME_TIMESTAMP("hh:mm:ss")]"
+	. += "<span class='info'>Station Time: [STATION_TIME_TIMESTAMP("hh:mm:ss", world.time)]"

 /*
 * Toy Dagger