Revert "Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade"

This reverts commit 6bb5409349, reversing
changes made to f6a83d5ee0.
This commit is contained in:
SinTwo
2016-08-15 12:58:00 -04:00
parent 6bb5409349
commit eabefc538a
325 changed files with 3375 additions and 41824 deletions

View File

@@ -1538,7 +1538,6 @@
where = "onfloor"
if ( where == "inmarked" )
var/marked_datum = marked_datum()
if ( !marked_datum )
usr << "You don't have any object marked. Abandoning spawn."
return
@@ -1556,7 +1555,7 @@
if ("relative")
target = locate(loc.x + X,loc.y + Y,loc.z + Z)
if ( "inmarked" )
target = marked_datum()
target = marked_datum
if(target)
for (var/path in paths)