diff --git a/code/modules/nifsoft/software/15_misc.dm b/code/modules/nifsoft/software/15_misc.dm
index 1c6bfb2e5f6..d2e07a679e7 100644
--- a/code/modules/nifsoft/software/15_misc.dm
+++ b/code/modules/nifsoft/software/15_misc.dm
@@ -188,7 +188,7 @@
/datum/nifsoft/malware/activate()
if((. = ..()))
- to_chat(nif.human,"Runtime error in 15_misc.dm, line 189.")
+ to_chat(nif.human,"Runtime error in 15_misc.dm, line 191.")
/datum/nifsoft/malware/install()
if((. = ..()))
diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm
index 96e99e9dbdd..690e03013d7 100644
--- a/code/modules/paperwork/faxmachine.dm
+++ b/code/modules/paperwork/faxmachine.dm
@@ -110,7 +110,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins
if(!authenticated)
return
-
+
switch(action)
if("send")
if(copyitem)
@@ -132,7 +132,11 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins
return TRUE
/obj/machinery/photocopier/faxmachine/attackby(obj/item/O as obj, mob/user as mob)
- if(O.is_multitool() && panel_open)
+ if(istype(O, /obj/item/weapon/card/id) && !scan)
+ user.drop_from_inventory(O)
+ O.forceMove(src)
+ scan = O
+ else if(O.is_multitool() && panel_open)
var/input = sanitize(tgui_input_text(usr, "What Department ID would you like to give this fax machine?", "Multitool-Fax Machine Interface", department))
if(!input)
to_chat(usr, "No input found. Please hang up and try your call again.")
@@ -253,7 +257,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins
var/faxid = export_fax(sent)
message_chat_admins(sender, faxname, sent, faxid, font_colour)
// VoreStation Edit End
-
+
// Webhooks don't parse the HTML on the paper, so we gotta strip them out so it's still readable.
var/summary = make_summary(sent)
summary = paper_html_to_plaintext(summary)
@@ -273,4 +277,3 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins
"body" = summary
)
)
-
\ No newline at end of file
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 07f062dc3b3..7d7fa937523 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -165,7 +165,7 @@
. += "You have to go closer if you want to read it."
/obj/item/weapon/paper/proc/show_content(var/mob/user, var/forceshow=0)
- if(!(istype(user, /mob/living/carbon/human) || istype(user, /mob/observer/dead) || istype(user, /mob/living/silicon) || user.universal_understand) && !forceshow)
+ if(!(forceshow || (istype(user, /mob/living/carbon/human) || istype(user, /mob/observer/dead) || istype(user, /mob/living/silicon) || (istype(user) && user.universal_understand))))
user << browse("[name][stars(info)][stamps]", "window=[name]")
onclose(user, "[name]")
else
@@ -434,7 +434,7 @@
var/raw = tgui_input_text(usr, "Enter what you want to write:", "Write", multiline = TRUE, prevent_enter = TRUE)
if(!raw)
return
-
+
var/t = sanitize(raw, MAX_PAPER_MESSAGE_LEN, extra = 0)
if(!t)
return
diff --git a/code/modules/research/designs/precursor.dm b/code/modules/research/designs/precursor.dm
index bb6e98353f8..24f888f7222 100644
--- a/code/modules/research/designs/precursor.dm
+++ b/code/modules/research/designs/precursor.dm
@@ -87,3 +87,7 @@
req_tech = list(TECH_MATERIAL = 7, TECH_BLUESPACE = 5, TECH_MAGNET = 6, TECH_PHORON = 3, TECH_ARCANE = 1, TECH_PRECURSOR = 2)
build_path = /obj/random/janusmodule
sort_string = "ZBBAA"
+
+/datum/design/item/precursor/janusmodule/Fabricate(var/newloc, var/fabricator)
+ var/type_to_spawn = pick(subtypesof(/obj/item/weapon/circuitboard/mecha/imperion))
+ return new type_to_spawn(newloc)
\ No newline at end of file