From c98f303a89e32a226eebe74265a59853deb2e82f Mon Sep 17 00:00:00 2001 From: Mars Date: Mon, 19 Mar 2018 16:11:56 +0100 Subject: [PATCH 1/3] Makes physical admin fax machines possible If there is a fax machine that's named like one of the admin departments, which require mapping/admin varedits, it will also recive the faxes send to admins. --- code/modules/paperwork/faxmachine.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 14925d9752f..c5dcffd447a 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -304,6 +304,9 @@ var/list/alldepartments = list() message_admins(sender, "CENTCOM FAX", destination, rcvdcopy, "#006100") if("Syndicate") message_admins(sender, "SYNDICATE FAX", destination, rcvdcopy, "#DC143C") + for(var/obj/machinery/photocopier/faxmachine/F in allfaxes) + if( F.department == destination ) + F.receivefax(copyitem) sendcooldown = cooldown_time spawn(50) visible_message("[src] beeps, \"Message transmitted successfully.\"") From 8fe94f3c3e1ccb87f259ca341a917b20388f7a42 Mon Sep 17 00:00:00 2001 From: Mars Date: Mon, 19 Mar 2018 16:20:01 +0100 Subject: [PATCH 2/3] Stops unset departments from being a department for faxes. Blocks the standard "Unknown" department from being assigned as a department, and allows updating the departments to the list when wanted per proc-call, without needing to call New() --- code/modules/paperwork/faxmachine.dm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index c5dcffd447a..38a2add57db 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -30,9 +30,12 @@ var/list/alldepartments = list() /obj/machinery/photocopier/faxmachine/New() ..() allfaxes += src + update_network() - if( !(("[department]" in alldepartments) || ("[department]" in admin_departments)) ) - alldepartments |= department +/obj/machinery/photocopier/faxmachine/proc/update_network() + if(department != "Unknown") + if( !(("[department]" in alldepartments) || ("[department]" in admin_departments) || ("[department]" in hidden_admin_departments)) ) + alldepartments |= department /obj/machinery/photocopier/faxmachine/longrange name = "long range fax machine" From a83b8023928f2f70c2918050eee839a67f0a4672 Mon Sep 17 00:00:00 2001 From: Mars Date: Thu, 22 Mar 2018 09:55:48 +0100 Subject: [PATCH 3/3] Better spacing --- code/modules/paperwork/faxmachine.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 38a2add57db..a4fbaf2551c 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -34,7 +34,7 @@ var/list/alldepartments = list() /obj/machinery/photocopier/faxmachine/proc/update_network() if(department != "Unknown") - if( !(("[department]" in alldepartments) || ("[department]" in admin_departments) || ("[department]" in hidden_admin_departments)) ) + if(!(("[department]" in alldepartments) || ("[department]" in admin_departments) || ("[department]" in hidden_admin_departments))) alldepartments |= department /obj/machinery/photocopier/faxmachine/longrange @@ -227,7 +227,7 @@ var/list/alldepartments = list() var/success = 0 for(var/obj/machinery/photocopier/faxmachine/F in allfaxes) - if( F.department == destination ) + if(F.department == destination) success = F.receivefax(copyitem) if(success) @@ -308,7 +308,7 @@ var/list/alldepartments = list() if("Syndicate") message_admins(sender, "SYNDICATE FAX", destination, rcvdcopy, "#DC143C") for(var/obj/machinery/photocopier/faxmachine/F in allfaxes) - if( F.department == destination ) + if(F.department == destination) F.receivefax(copyitem) sendcooldown = cooldown_time spawn(50)