Merge commit 'stash'

This commit is contained in:
Ren Erthilo
2012-03-20 17:31:49 +00:00
18 changed files with 53 additions and 22 deletions
+1
View File
@@ -3,6 +3,7 @@
desc = "A folded bag designed to contain dead things."
icon = 'bodybag.dmi'
icon_state = "bodybag_folded"
w_class = 1.0
attack_self(mob/user)
var/obj/structure/closet/body_bag/R = new /obj/structure/closet/body_bag(user.loc)
+2 -1
View File
@@ -142,7 +142,8 @@
"/obj/item/weapon/cigpacket",
"/obj/item/weapon/zippo",
"/obj/item/device/taperecorder",
"/obj/item/weapon/evidencebag"
"/obj/item/weapon/evidencebag",
"/obj/item/policetaperoll"
)
/obj/item/weapon/storage/belt/soulstone