shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5638 from Citadel-Station-13/upstream-merge-35775

Browse Source 
[MIRROR] [READY]Randomized Station Time + Night Shifts
This commit is contained in:
LetterJay
2018-02-24 00:24:47 -06:00
committed by GitHub
parent 4d42f68508 26240bbca4
commit 6ce5985f9f
33 changed files with 245 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/PDA/PDA.dm
+1 -1
View File
@@ -212,7 +212,7 @@ GLOBAL_LIST_EMPTY(PDAs)
dat += text("ID: <a href='?src=[REF(src)];choice=Authenticate'>[id ? "[id.registered_name], [id.assignment]" : "----------"]")
dat += text("<br><a href='?src=[REF(src)];choice=UpdateInfo'>[id ? "Update PDA Info" : ""]</A><br><br>")
dat += "[worldtime2text()]<br>" //:[world.time / 100 % 6][world.time / 100 % 10]"
dat += "[station_time_timestamp()]<br>" //:[world.time / 100 % 6][world.time / 100 % 10]"
dat += "[time2text(world.realtime, "MMM DD")] [GLOB.year_integer+540]"
dat += "<br><br>"
code/game/objects/items/toys.dm
+1 -1
View File
@@ -1072,7 +1072,7 @@
/obj/item/toy/clockwork_watch/examine(mob/user)
..()
to_chat(user, "<span class='info'>Station Time: [worldtime2text()]")
to_chat(user, "<span class='info'>Station Time: [station_time_timestamp()]")
/*
* Toy Dagger