Merging pull request from caelaislinn-master

This commit is contained in:
Albert Iordache
2012-07-13 20:54:22 +03:00
parent aab476a847
commit dda09390ac
14 changed files with 614 additions and 563 deletions
+1 -1
View File
@@ -179,7 +179,7 @@
M.update_clothing()
src.add_fingerprint(usr)
return
if(over_object == usr && in_range(src, usr) || usr.contents.Find(src))
if( (over_object == usr && in_range(src, usr) || usr.contents.Find(src)) && usr.s_active)
usr.s_active.close(usr)
src.show_to(usr)
return