Merge remote-tracking branch 'upstream/master' into dev

This commit is contained in:
Segrain
2013-10-11 12:44:44 +03:00
8 changed files with 13 additions and 11 deletions

View File

@@ -27,6 +27,7 @@
/obj/item/weapon/storage/fancy/examine()
set src in oview(1)
..()
if(contents.len <= 0)
usr << "There are no [src.icon_type]s left in the box."
else if(contents.len == 1)