")
+ t = replacetext(t, "\[cell\]", "| ")
+ return t
+
//Used for applying byonds text macros to strings that are loaded at runtime
/proc/apply_text_macros(string)
var/next_backslash = findtext(string, "\\")
diff --git a/code/controllers/subsystem/communications.dm b/code/controllers/subsystem/communications.dm
index 2c8cee1ff5..63d90c7d48 100644
--- a/code/controllers/subsystem/communications.dm
+++ b/code/controllers/subsystem/communications.dm
@@ -32,10 +32,10 @@ SUBSYSTEM_DEF(communications)
if(user.gender == FEMALE && J.f_title)
used_title = J.f_title
priority_announce(html_decode(user.treat_message(input)), "The [used_title] Speaks", 'sound/misc/bell.ogg', "Captain")
- nonsilicon_message_cooldown = world.time + 5 SECONDS
+ nonsilicon_message_cooldown = world.time + 10 MINUTES
else
priority_announce(html_decode(user.treat_message(input)), "Someone Speaks", 'sound/misc/bell.ogg', "Captain")
- nonsilicon_message_cooldown = world.time + 5 SECONDS
+ nonsilicon_message_cooldown = world.time + 10 MINUTES
user.log_talk(input, LOG_SAY, tag="priority announcement")
message_admins("[ADMIN_LOOKUPFLW(user)] has made a priority announcement.")
diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm
index e30b06a3a4..19ff578da5 100644
--- a/code/game/objects/structures/fluff.dm
+++ b/code/game/objects/structures/fluff.dm
@@ -756,6 +756,76 @@
destroy_sound = 'sound/combat/hits/onwood/destroyfurniture.ogg'
attacked_sound = list('sound/combat/hits/onwood/woodimpact (1).ogg','sound/combat/hits/onwood/woodimpact (2).ogg')
+/obj/structure/fluff/paperpress
+ name = "mechanical press"
+ desc = "A machine used to press wood with water into parchment. Strange."
+ icon = 'icons/roguetown/misc/structure.dmi'
+ icon_state = "paperpress"
+ density = TRUE
+ anchored = TRUE
+ layer = BELOW_OBJ_LAYER
+ blade_dulling = DULLING_BASHCHOP
+ max_integrity = 150
+ destroy_sound = 'sound/combat/hits/onwood/destroyfurniture.ogg'
+ attacked_sound = list('sound/combat/hits/onwood/woodimpact (1).ogg','sound/combat/hits/onwood/woodimpact (2).ogg')
+
+/obj/structure/fluff/inkpress
+ name = "inking press"
+ desc = "A machine used to press engravings covered with ink onto parchment to quickly produce written works. An amazing piece of technology."
+ icon = 'icons/roguetown/misc/structure.dmi'
+ icon_state = "newspress"
+ density = TRUE
+ anchored = TRUE
+ layer = BELOW_OBJ_LAYER
+ blade_dulling = DULLING_BASHCHOP
+ max_integrity = 500 // I havent yet decided if this should be craftable so I'll just make it hard to destroy, but theoretically you could censor the whole town with destroying this if you want to.
+ destroy_sound = 'sound/combat/hits/onwood/destroyfurniture.ogg'
+ attacked_sound = list('sound/combat/hits/onwood/woodimpact (1).ogg','sound/combat/hits/onwood/woodimpact (2).ogg')
+ var/obj/item/paper/P = null // paper to ink
+ var/info = "" // what to put on paper
+
+/obj/structure/fluff/inkpress/attackby(obj/item/I, mob/living/user, params)
+ if(istype(I, /obj/item/paper))
+ var/obj/item/paper/PA = I
+ if(PA.info)
+ to_chat(user, "I can't put it there, that thing still has verba on it. That will just muddy it all up.")
+ return
+ playsound(loc, 'sound/foley/dropsound/paper_drop.ogg', 100, FALSE, -1)
+ PA.forceMove(src)
+ P = I
+ return
+ return ..()
+
+/obj/structure/fluff/inkpress/attack_hand(mob/user)
+ . = ..()
+ var/inputty = stripped_multiline_input(user, "Enter the verba you wish to mass-produce.", "ROGUETOWN", info, no_trim=TRUE)
+ if(inputty)
+ src.visible_message("[user] replaces the letters in \the [src].")
+ playsound(loc, 'sound/foley/cartadd.ogg', 100, FALSE, -1)
+ info = inputty
+
+/obj/structure/fluff/inkpress/rmb_self(mob/user)
+ attack_right(user)
+ return
+
+/obj/structure/fluff/inkpress/attack_right(mob/user)
+ . = ..()
+ if(!P)
+ visible_message("[user] stamps \the [src] even though there is nothing inside.")
+ playsound(loc, 'sound/foley/chairfall.ogg', 100, FALSE)
+ return
+ to_chat(user, "I begin stamping the parchment with the ink.")
+ if(do_after(user, 3 SECONDS, TRUE, src))
+ playsound(loc, 'sound/foley/chairfall.ogg', 100, FALSE)
+ flick("newspress-anim",src)
+ sleep(13) // length of animation
+ var/buffer
+ buffer = P.parsepencode(info, /obj/item/pen, usr, FALSE) // Encode everything from pencode to html
+ P.info = buffer
+ P.update_icon()
+ P.forceMove(loc)
+ P.dropped(user, TRUE)
+ P = null
/obj/structure/fluff/statue
name = "statue"
diff --git a/code/game/turfs/open/water.dm b/code/game/turfs/open/water.dm
index c979bc6b1a..4727a58532 100644
--- a/code/game/turfs/open/water.dm
+++ b/code/game/turfs/open/water.dm
@@ -184,6 +184,20 @@
water_volume = clamp(water_volume + C.reagents.total_volume, 1, water_maximum)
to_chat(user, "I pour the contents of [C] into [src].")
return
+ if(istype(C, /obj/item/paper))
+ var/obj/item/paper/PA = C
+ if(!PA.info)
+ return
+ to_chat(user, "I begin trying to wash the ink off of \the [PA].")
+ if(do_after(user, 8, target = src))
+ if(prob(25))
+ to_chat(user, "The parchment is ruined.")
+ qdel(PA)
+ return
+ PA.info = null
+ PA.update_icon()
+ to_chat(user, "I succeed.")
+ return
. = ..()
/turf/open/water/attack_right(mob/user)
diff --git a/code/modules/jobs/job_types/roguetown/nobility/archivist.dm b/code/modules/jobs/job_types/roguetown/nobility/archivist.dm
index 2db8cde4fb..e70875f7fc 100644
--- a/code/modules/jobs/job_types/roguetown/nobility/archivist.dm
+++ b/code/modules/jobs/job_types/roguetown/nobility/archivist.dm
@@ -1,6 +1,6 @@
/datum/job/roguetown/archivist
title = "Archivist"
- tutorial = "The Archivist meticulously preserves and organizes ancient scrolls and tomes, safeguarding the collective knowledge of the realm for generations to come. Nobles and Peasants alike often seek the Archivists expertise on matters of history and fact."
+ tutorial = "The Archivist is a master of recollecting infomation, archiving olden works and scrolls preserving them for yils to come. He is also the master of the mystical ink press, giving the less fortunate the blessing of knowledge."
flag = ARCHIVIST
department_flag = NOBLEMEN
faction = "Station"
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index f9eaa7417e..61d69abc05 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -289,12 +289,10 @@
update_icon_state()
-/obj/item/paper/proc/parsepencode(t, obj/item/P, mob/user, iscrayon = 0)
+/obj/item/paper/proc/parsepencode(t, obj/item/pen/P, mob/user, iscrayon)
if(length(t) < 1) //No input means nothing needs to be parsed
return
- t = parsemarkdown(t, user, iscrayon)
-
if(!iscrayon)
if(istype(P, /obj/item/pen))
var/obj/item/pen/J = P
@@ -308,7 +306,10 @@
var/obj/item/toy/crayon/C = P
t = "[t]"
- // Count the fields
+ t = parsemarkdown(t, user, iscrayon) // lets try and use both, TG and bay markdown (pencode). i hope nothing will go wrong..? technically they cant overlap
+ t = pencode2html(t)
+
+ //Count the fields
var/laststart = 1
while(fields < 15)
var/i = findtext(t, "", laststart)
@@ -420,6 +421,18 @@
dat += " |