cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-05-27 20:30:12 -04:00
committed by GitHub
parent 8ede5895c3
commit fffff211a0
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/modules/paperwork/faxmachine.dm
View File

@@ -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. // 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) if(destination == using_map.boss_name)
message_admins(sender, "[uppertext(using_map.boss_short)] FAX", rcvdcopy, "CentComFaxReply", "#006100") message_admins(sender, "[uppertext(using_map.boss_short)] FAX", rcvdcopy, "CentComFaxReply", "#006100")
<<<<<<< HEAD else if(destination == "Solar Central Government") // Vorestation Edit //CHOMPedit
else if (destination == "Solar Central Government") // YW EDIT message_admins(sender, "Solar Central Government FAX", rcvdcopy, "CentComFaxReply", "#1F66A0") // Vorestation Edit //CHOMPedit
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 == "Supply") 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") message_admins(sender, "[uppertext(using_map.boss_short)] SUPPLY FAX", rcvdcopy, "CentComFaxReply", "#5F4519")
else else
message_admins(sender, "[uppertext(destination)] FAX", rcvdcopy, "UNKNOWN") message_admins(sender, "[uppertext(destination)] FAX", rcvdcopy, "UNKNOWN")