From f65bfef89ecad0cf5319370388edc57acf7ef3be Mon Sep 17 00:00:00 2001 From: Twinmold Date: Sun, 31 Mar 2019 16:45:43 -0500 Subject: [PATCH] Fixes Sending Faxes Using Toner As the code currently stands, whenever you send a fax to Central Command or the Syndicate, it makes a non-existant copy of the fax using toner from your own machine. This fix removes unnecessary code and no longer requires toner to send a fax. Fixes: #11172 :cl: Twinmold Fix: No longer costs toner to send a fax to Central Command /:cl: --- code/modules/paperwork/faxmachine.dm | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index f4808f46d53..c5bb36b3dc2 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -283,34 +283,26 @@ var/global/list/fax_blacklist = list() use_power(200) - var/obj/item/rcvdcopy - if(istype(copyitem, /obj/item/paper)) - rcvdcopy = copy(copyitem) - else if(istype(copyitem, /obj/item/photo)) - rcvdcopy = photocopy(copyitem) - else if(istype(copyitem, /obj/item/paper_bundle)) - rcvdcopy = bundlecopy(copyitem) + if((istype(copyitem, /obj/item/paper))||(istype(copyitem, /obj/item/photo))||(istype(copyitem, /obj/item/paper_bundle))) else visible_message("[src] beeps, \"Error transmitting message.\"") return - rcvdcopy.loc = null //hopefully this shouldn't cause trouble - var/datum/fax/admin/A = new /datum/fax/admin() - A.name = rcvdcopy.name + A.name = copyitem.name A.from_department = department A.to_department = destination A.origin = src - A.message = rcvdcopy + A.message = copyitem A.sent_by = sender A.sent_at = world.time //message badmins that a fax has arrived switch(destination) if("Central Command") - message_admins(sender, "CENTCOM FAX", destination, rcvdcopy, "#006100") + message_admins(sender, "CENTCOM FAX", destination, copyitem, "#006100") if("Syndicate") - message_admins(sender, "SYNDICATE FAX", destination, rcvdcopy, "#DC143C") + message_admins(sender, "SYNDICATE FAX", destination, copyitem, "#DC143C") for(var/obj/machinery/photocopier/faxmachine/F in allfaxes) if(F.department == destination) F.receivefax(copyitem)