Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into gun_fixes

This commit is contained in:
Ccomp5950
2014-01-22 22:39:16 -06:00
+1 -1
View File
@@ -215,7 +215,7 @@
//world << "[href] ; [href_list[href]]"
if (!istype(src.loc, /turf) || istype(usr, /mob/living/silicon/ai))
if (!istype(src.loc, /turf) && !istype(usr, /mob/living/silicon/))
return 0 // Do not update ui
if( href_list["cmode"] )