From 587f29e5d33cb985a67e4604c96bec465dbd54f7 Mon Sep 17 00:00:00 2001 From: MagmaRam Date: Thu, 20 Nov 2014 05:08:38 -0500 Subject: [PATCH] Fixes paper bundles burning strangely with a match and burning one paper at a time, leaving a lone paperclip at the end that would eat any paper added to it and never let that paper be interacted with. Paper bundles now burn the same way (whole thing at once) no matter what you're burning it with, rather than only burning that way with a lighter. --- code/modules/paperwork/paper_bundle.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 704afe76d5..23158e5a94 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -44,7 +44,7 @@ user << "You add [(W.name == "photo") ? "the photo" : W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name]." user.drop_from_inventory(W) W.loc = src - else if(istype(W, /obj/item/weapon/flame/lighter)) + else if(istype(W, /obj/item/weapon/flame)) burnpaper(W, user) else if(istype(W, /obj/item/weapon/paper_bundle)) user.drop_from_inventory(W) @@ -69,7 +69,7 @@ return -/obj/item/weapon/paper_bundle/proc/burnpaper(obj/item/weapon/flame/lighter/P, mob/user) +/obj/item/weapon/paper_bundle/proc/burnpaper(obj/item/weapon/flame/P, mob/user) var/class = "" if(P.lit && !user.restrained())