From 7770fffdf89b9f07153f4be1fc3d8ffc6bf1b562 Mon Sep 17 00:00:00 2001 From: Markolie Date: Tue, 6 Oct 2015 01:22:50 +0200 Subject: [PATCH 1/2] Fix writing on paper --- code/game/verbs/who.dm | 2 +- code/modules/paperwork/paper.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm index c6acf4af28a..c2eda15b18a 100644 --- a/code/game/verbs/who.dm +++ b/code/game/verbs/who.dm @@ -115,5 +115,5 @@ modmsg += "\t[C] is a [C.holder.rank]\n" num_mods_online++ - msg = "Current Admins ([num_admins_online]):\n" + msg + "\n Current Mods/Mentors ([num_mods_online]):\n" + modmsg + msg = "Current Admins ([num_admins_online]):\n" + msg + "\nCurrent Mods/Mentors ([num_mods_online]):\n" + modmsg src << msg diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index a453b76a123..1520d950227 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -65,7 +65,7 @@ send_asset_list(user.client, S.assets) var/data - if(!(user.say_understands(null, all_languages["Galactic Common"]) && !forceshow) || forcestars) //assuming all paper is written in common is better than hardcoded type checks + if((!user.say_understands(null, all_languages["Galactic Common"]) && !forceshow) || forcestars) //assuming all paper is written in common is better than hardcoded type checks data = "[name][stars(info)][stamps]" if(view) usr << browse(data, "window=[name]") From 755ca6bd3af9577e75f6a41e5ebc42dd701404bd Mon Sep 17 00:00:00 2001 From: Markolie Date: Tue, 6 Oct 2015 01:31:12 +0200 Subject: [PATCH 2/2] Robopen fix, pen language fix --- code/modules/paperwork/paper.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 1520d950227..479bb429efc 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -418,10 +418,11 @@ B.update_icon() else if(istype(P, /obj/item/weapon/pen) || istype(P, /obj/item/toy/crayon)) - if ( istype(P, /obj/item/weapon/pen/robopen) && P:mode == 2 ) - P:RenamePaper(user,src) + var/obj/item/weapon/pen/robopen/RP = P + if(istype(P, /obj/item/weapon/pen/robopen) && RP.mode == 2) + RP.RenamePaper(user,src) else - show_content(user, forceshow = 1, infolinks = 1) + show_content(user, infolinks = 1) //openhelp(user) return