shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-27773

Browse Source
This commit is contained in:
LetterJay
2017-06-06 09:05:26 -05:00
committed by GitHub
parent 2feab0a411 629a417177
commit 35b56f3075
359 changed files with 404750 additions and 231336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/paperwork/paper.dm
View File

@@ -304,7 +304,6 @@
else
info += t // Oh, he wants to edit to the end of the file, let him.
updateinfolinks()
i.on_write(src,usr)
usr << browse("<HTML><HEAD><TITLE>[name]</TITLE></HEAD><BODY>[info_links]<HR>[stamps]</BODY><div align='right'style='position:fixed;bottom:0;font-style:bold;'><A href='?src=\ref[src];help=1'>\[?\]</A></div></HTML>", "window=[name]") // Update the window
update_icon()

9
code/modules/paperwork/pen.dm
View File

@@ -197,12 +197,3 @@
else
icon_state = initial(icon_state) //looks like a normal pen when off.
item_state = initial(item_state)
//Crayons path disambiguity sigh.
/obj/item/proc/on_write(obj/item/weapon/paper/P, mob/user)
return
/obj/item/weapon/pen/poison/on_write(obj/item/weapon/paper/P, mob/user)
P.contact_poison = "delayed_toxin"
P.contact_poison_volume = 10
add_logs(user,P,"used poison pen on")