cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-16 09:34:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
PsiOmega
2014-11-21 10:27:56 +01:00
parent 350273dea4 e3ef3b7347
commit 2a796f2ddd
11 changed files with 1823 additions and 1779 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/paper_bundle.dm
+2 -2
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())