Merge remote-tracking branch 'Upstream/master' into TGUI-3.0

2020-07-13 16:20:54 +03:00
parent d1b3990875 fbbb5f7ea8
commit 5f9364c5f8
177 changed files with 3628 additions and 2948 deletions
@@ -169,6 +169,12 @@
 	. = replacetext(html, "<!--customheadhtml-->", assets.css_tag())


+/obj/item/paper/examine_more(mob/user)
+	ui_interact(user)
+
+/obj/item/paper/proc/show_content(mob/user)
+	user.examinate(src)
+
 /obj/item/paper/verb/rename()
 	set name = "Rename paper"
 	set category = "Object"