From 7e10d6425271daf5fef22058d2f0c07cf3dbbf5d Mon Sep 17 00:00:00 2001 From: Hubblenaut Date: Fri, 23 May 2014 22:50:34 +0200 Subject: [PATCH] Attack paper bundles with paper bundles --- code/modules/paperwork/paper_bundle.dm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 3fc2c8c75f..a1bd5b52f9 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -46,6 +46,13 @@ W.loc = src else if(istype(W, /obj/item/weapon/lighter)) burnpaper(W, user) + else if(istype(W, /obj/item/weapon/paper_bundle)) + user.drop_from_inventory(W) + for(var/obj/O in W) + O.loc = src + O.add_fingerprint(usr) + user << "You add \the [W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name]." + del(W) else if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/toy/crayon)) usr << browse("", "window=[name]") //Closes the dialog @@ -199,6 +206,7 @@ for(var/obj/O in src) O.loc = usr.loc O.layer = initial(O.layer) + O.add_fingerprint(usr) usr.drop_from_inventory(src) del(src) return