cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-25 13:09:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/WorkInProgress/kilakk/fax.dm
	code/modules/paperwork/faxmachine.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paper_bundle.dm
	code/modules/paperwork/photocopier.dm
	maps/tgstation2.dmm
This commit is contained in:
mwerezak
2014-11-20 14:57:35 -05:00
parent 8a975fec06 af6a262a2c
commit 348c9d19f7
595 changed files with 7780 additions and 7624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/paperwork/paper_bundle.dm
+4 -8
View File
@@ -93,15 +93,11 @@
else
user << "\red You must hold \the [P] steady to burn \the [src]."
/obj/item/weapon/paper_bundle/examine()
set src in oview(1)
usr << desc
if(in_range(usr, src))
src.show_content(usr)
/obj/item/weapon/paper_bundle/examine(mob/user)
if(..(user, 1))
src.show_content(user)
else
usr << "<span class='notice'>It is too far away.</span>"
user << "<span class='notice'>It is too far away.</span>"
return
/obj/item/weapon/paper_bundle/proc/show_content(mob/user as mob)