Merge large polaris changes

This commit is contained in:
Arokha Sieyes
2017-03-02 22:44:17 -05:00
213 changed files with 18973 additions and 17252 deletions

View File

@@ -176,7 +176,7 @@
teleatom.visible_message("<span class='danger'>\The [teleatom] bounces off of the portal!</span>")
return 0
if(destination.z in config.admin_levels) //centcomm z-level
if(destination.z in using_map.admin_levels) //centcomm z-level
if(istype(teleatom, /obj/mecha))
var/obj/mecha/MM = teleatom
MM.occupant << "<span class='danger'>\The [MM] would not survive the jump to a location so far away!</span>"