From 3bd0fda1ba5161a81188b2d0d3a81f79c9137fdc Mon Sep 17 00:00:00 2001 From: LetterJay Date: Sat, 11 Nov 2017 15:53:07 -0600 Subject: [PATCH] Update unsorted.dm --- code/__HELPERS/unsorted.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 0a43acdd50..f4cb4c92b4 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1411,8 +1411,6 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) //checks if a turf is in the planet z list. /proc/turf_z_is_planet(turf/T) return GLOB.z_is_planet["[T.z]"] -<<<<<<< HEAD -======= //returns a GUID like identifier (using a mostly made up record format) //guids are not on their own suitable for access or security tokens, as most of their bits are predictable. @@ -1445,4 +1443,3 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) else return "\[[url_encode(thing.tag)]\]" return "\ref[input]" ->>>>>>> 626302c... Merge pull request #32161 from ninjanomnom/512-experimental