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

This commit is contained in:
PsiOmega
2014-11-21 10:27:56 +01:00
11 changed files with 1823 additions and 1779 deletions
+1 -1
View File
@@ -77,7 +77,7 @@
/obj/item/weapon/evidencebag/attack_self(mob/user as mob)
if(contents.len)
var/obj/item/I = stored_item
var/obj/item/I = contents[1]
user.visible_message("[user] takes [I] out of [src]", "You take [I] out of [src].",\
"You hear someone rustle around in a plastic bag, and remove something.")
overlays.Cut() //remove the overlays