From 151dc45edf706b92e09e4c0267b483370f24cb78 Mon Sep 17 00:00:00 2001
From: Fruerlund <fl.fruerlund@hotmail.com>
Date: Wed, 17 May 2017 10:51:12 +0200
Subject: [PATCH] Adds defines and removes the in list

Performance related
---
 code/game/machinery/requests_console.dm | 26 ++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index c62e88afc77..9a3de587259 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -19,6 +19,14 @@
 #define RCS_SHIPPING 9	// Print Shipping Labels/Packages
 #define RCS_SHIP_LOG 10	// View Shipping Label Log
 
+//Radio list
+#define ENGI_ROLES list("Atmospherics","Mechanic","Engineering","Chief Engineer's Desk")
+#define SEC_ROLES list("Warden","Security","Brig Medbay","Head of Security's Desk")
+#define MISC_ROLES list("Bar","Chapel","Kitchen","Hydroponics","Janitorial")
+#define MED_ROLES list("Virology","Chief Medical Officer's Desk","Medbay")
+#define COM_ROLES list("Blueshield","NT Representative","Head of Personnel's Desk","Captain's Desk","Bridge")
+#define SCI_ROLES list("Robotics","Science","Research Director's Desk")
+
 var/req_console_assistance = list()
 var/req_console_supplies = list()
 var/req_console_information = list()
@@ -196,24 +204,24 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 			pass = 1
 		if(pass)
 			screen = RCS_SENTPASS
-			if(recipient in list("Atmospherics","Mechanic","Engineering","Chief Engineer's Desk"))
+			if(recipient in ENGI_ROLES)
 				radiochannel = "Engineering"
-			if(recipient in list("Warden","Security","Brig Medbay","Head of Security's Desk"))
+			if(recipient in SEC_ROLES)
 				radiochannel = "Security"
-			if(recipient in list("Bar","Chapel","Kitchen","Hydroponics","Janitorial"))
+			if(recipient in MISC_ROLES)
 				radiochannel = "Service"
-			if(recipient in list("Virology","Chief Medical Officer's Desk","Medbay",))
+			if(recipient in MED_ROLES)
 				radiochannel = "Medical"
-			if(recipient in list("Blueshield","NT Representative","Head of Personnel's Desk","Captain's Desk","Bridge"))
+			if(recipient in COM_ROLES)
 				radiochannel = "Command"
-			if(recipient == "Cargo Bay")
-				radiochannel = "Supply"
-			if(recipient in list("Robotics","Science","Research Director's Desk"))
+			if(recipient in SCI_ROLES)
 				radiochannel = "Science"
 			if(recipient == "AI")
 				radiochannel = "AI Private"
+			if(recipient == "Cargo Bay")
+				radiochannel = "Supply"
 			message_log += "<B>Message sent to [recipient] at [worldtime2text()]</B><BR>[message]"
-			Radio.autosay("Alert, a new requests console message recieved for [recipient] from [department]", null, "[radiochannel]")
+			Radio.autosay("Alert; a new requests console message received for [recipient] from [department]", null, "[radiochannel]")
 		else
 			audible_message(text("[bicon(src)] *The Requests Console beeps: '<b>NOTICE:</b> No server detected!'"),,4)