Merge pull request #7340 from Zuhayr/dev-freeze

Dev-freeze fixes.
This commit is contained in:
Ccomp5950
2014-12-09 11:48:33 -05:00
21 changed files with 106 additions and 210 deletions
+1 -1
View File
@@ -59,7 +59,7 @@
if(!proximity) return
if(disabled && !isrobot(user))
return 0
if(istype(A,/area/shuttle)||istype(A,/turf/space/transit))
if(istype(get_area(A),/area/shuttle)||istype(get_area(A),/turf/space/transit))
return 0
return alter_turf(A,user,(mode == 3))