From fffff211a0aff254f8fe2e13b65c2bc0089abd68 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Thu, 27 May 2021 20:30:12 -0400 Subject: [PATCH] powder that makes you say yes --- code/modules/paperwork/faxmachine.dm | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm index 31623ec5e5..e30bbf9fbf 100644 --- a/code/modules/paperwork/faxmachine.dm +++ b/code/modules/paperwork/faxmachine.dm @@ -216,19 +216,9 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins // Sadly, we can't use a switch statement here due to not using a constant value for the current map's centcom name. if(destination == using_map.boss_name) message_admins(sender, "[uppertext(using_map.boss_short)] FAX", rcvdcopy, "CentComFaxReply", "#006100") -<<<<<<< HEAD - else if (destination == "Solar Central Government") // YW EDIT - message_admins(sender, "Solar Central Government FAX", rcvdcopy, "CentComFaxReply", "#1F66A0") - else if (destination == "Supply") -||||||| parent of da4837903c... Merge pull request #10433 from VOREStation/upstream-merge-8085 - else if (destination == "Virgo-Prime Governmental Authority") // Vorestation Edit - message_admins(sender, "VIRGO GOVERNMENT FAX", rcvdcopy, "CentComFaxReply", "#1F66A0") - else if (destination == "Supply") -======= - else if(destination == "Virgo-Prime Governmental Authority") // Vorestation Edit - message_admins(sender, "VIRGO GOVERNMENT FAX", rcvdcopy, "CentComFaxReply", "#1F66A0") // Vorestation Edit + else if(destination == "Solar Central Government") // Vorestation Edit //CHOMPedit + message_admins(sender, "Solar Central Government FAX", rcvdcopy, "CentComFaxReply", "#1F66A0") // Vorestation Edit //CHOMPedit else if(destination == "Supply") ->>>>>>> da4837903c... Merge pull request #10433 from VOREStation/upstream-merge-8085 message_admins(sender, "[uppertext(using_map.boss_short)] SUPPLY FAX", rcvdcopy, "CentComFaxReply", "#5F4519") else message_admins(sender, "[uppertext(destination)] FAX", rcvdcopy, "UNKNOWN")