cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
MagmaRam
2014-11-20 05:08:38 -05:00
parent 72b0000f6a
commit 587f29e5d3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/paperwork/paper_bundle.dm
View File

@@ -44,7 +44,7 @@
user << "<span class='notice'>You add [(W.name == "photo") ? "the photo" : W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].</span>"
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 = "<span class='warning'>"
if(P.lit && !user.restrained())