From 1cd074a02f94915c5363d2a7e69a89b1f25afa0f Mon Sep 17 00:00:00 2001
From: Lzimann <lzimann@users.noreply.github.com>
Date: Wed, 25 Jan 2017 18:15:46 -0200
Subject: [PATCH] A better way to do the same thing.

---
 code/modules/jobs/job_types/security.dm | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/code/modules/jobs/job_types/security.dm b/code/modules/jobs/job_types/security.dm
index 4e1240827ed..b3768635d46 100644
--- a/code/modules/jobs/job_types/security.dm
+++ b/code/modules/jobs/job_types/security.dm
@@ -188,16 +188,12 @@ var/list/available_depts = list("Engineering", "Supply", "Medical", "Science")
 	var/department
 	if(H && H.client && H.client.prefs)
 		department = H.client.prefs.prefered_security_department
-		if(LAZYLEN(available_depts))
-			if(department == "Random")
-				department = pick_n_take(available_depts)
-			else if(department != "None")
-				if(department in available_depts)
-					LAZYREMOVE(available_depts, department)
-				else
-					department = pick_n_take(available_depts)
+		if(!LAZYLEN(available_depts) || department == "None")
+			return
+		else if(department in available_depts)
+			LAZYREMOVE(available_depts, department)
 		else
-			department = "None"
+			department = pick_n_take(available_depts)
 	var/ears = null
 	var/tie = null
 	var/list/dep_access = null