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

Update unsorted.dm

Browse Source
This commit is contained in:
LetterJay
2017-11-09 03:17:35 -06:00
committed by GitHub
parent b44e31951d
commit 2230c79af3
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/unsorted.dm
-5
View File
@@ -1440,10 +1440,6 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
var/time_low = num2hex(world.time, 3)
var/time_clock = num2hex(TICK_DELTA_TO_MS(world.tick_usage), 3)
<<<<<<< HEAD
return "{[time_high]-[time_mid]-[GUID_VERSION][time_low]-[GUID_VARIANT][time_clock]-[node_id]}"
=======
return "{[time_high]-[time_mid]-[GUID_VERSION][time_low]-[GUID_VARIANT][time_clock]-[node_id]}"
// \ref behaviour got changed in 512 so this is necesary to replicate old behaviour.
@@ -1459,4 +1455,3 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
else
return "\[[url_encode(thing.tag)]\]"
return "\ref[input]"
>>>>>>> 4edd802... Weak references + Cameras now use them (#32504)