The gateroom area is now /area/gateway instead of /area/teleporter/gateway. This should fix wizards ending up in the teleporter room when trying to teleport to the gateroom.

Fixed a runtime where Poly would try to perch with no perch.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5211 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
johnsonmt88@gmail.com
2012-11-27 23:55:22 +00:00
parent a55b8b6ad7
commit 5bae081fdd
3 changed files with 42 additions and 42 deletions
@@ -310,7 +310,7 @@
//-----SLEEPING
if(parrot_state == PARROT_PERCH)
if(parrot_perch.loc != src.loc) //Make sure someone hasnt moved our perch on us
if(parrot_perch && parrot_perch.loc != src.loc) //Make sure someone hasnt moved our perch on us
if(parrot_perch in view(src))
parrot_state = PARROT_SWOOP | PARROT_RETURN
icon_state = "parrot_fly"