Fix conflict

This commit is contained in:
Lzimann
2017-03-10 01:39:22 -03:00
49 changed files with 1101 additions and 800 deletions
+7 -2
View File
@@ -104,8 +104,13 @@ var/global/static/observer_default_invisibility = INVISIBILITY_OBSERVER
update_icon()
if(!T && latejoin.len)
T = pick(latejoin) //Safety in case we cannot find the body's position
if(!T)
var/list/turfs = get_area_turfs(/area/shuttle/arrival)
if(turfs.len)
T = pick(turfs)
else
T = locate(round(world.maxx/2), round(world.maxy/2), ZLEVEL_STATION) //middle of the station
loc = T
if(!name) //To prevent nameless ghosts