From 00a0972bfc8fd071b27a1f1b36aff4449ae68c46 Mon Sep 17 00:00:00 2001
From: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
Date: Mon, 18 Jul 2022 16:53:30 +0100
Subject: [PATCH] removes genpop redundant (#15008)

---
 code/__DEFINES/access.dm                      |  5 -----
 .../master_files/code/datums/id_trim/jobs.dm  | 21 +++----------------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm
index 2ae897a0b5d..2a1aaa74047 100644
--- a/code/__DEFINES/access.dm
+++ b/code/__DEFINES/access.dm
@@ -56,11 +56,6 @@
 #define ACCESS_EXTERNAL_AIRLOCKS "external airlocks"
 #define ACCESS_CE "ce"
 
-// SKYRAT EDIT: Start - Modular Access (See Blueshield module for theirs)
-#define ACCESS_ENTER_GENPOP "enter_genpop"
-#define ACCESS_LEAVE_GENPOP "leave_genpop"
-// SKYRAT EDIT: End - Modular Access
-
 /// Medical general access
 #define ACCESS_MEDICAL "medical"
 #define ACCESS_MORGUE "morgue"
diff --git a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm
index be79f387bf6..31b2e78b2be 100644
--- a/modular_skyrat/master_files/code/datums/id_trim/jobs.dm
+++ b/modular_skyrat/master_files/code/datums/id_trim/jobs.dm
@@ -9,20 +9,6 @@
 /datum/id_trim/job/security_officer
 	trim_icon = 'modular_skyrat/master_files/icons/obj/card.dmi'
 
-/datum/id_trim/job/head_of_security/New()
-	. = ..()
-
-	minimal_access |= list(ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP)
-
-/datum/id_trim/job/warden/New()
-	. = ..()
-
-	minimal_access |= list(ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP)
-
-/datum/id_trim/job/security_officer/New()
-	. = ..()
-
-	minimal_access |= list(ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP)
 
 /datum/id_trim/job/chief_engineer/New()
 	. = ..()
@@ -58,7 +44,7 @@
 	extra_access = list(ACCESS_SECURITY, ACCESS_BRIG, ACCESS_COURT, ACCESS_CARGO, ACCESS_GATEWAY) // Someone needs to come back and order these alphabetically, this is a nightmare
 	minimal_access = list(
 		ACCESS_DETECTIVE, ACCESS_BRIG_ENTRANCE, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_ENGINEERING, ACCESS_MAINT_TUNNELS, ACCESS_RESEARCH,
-		ACCESS_RC_ANNOUNCE, ACCESS_COMMAND, ACCESS_WEAPONS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP
+		ACCESS_RC_ANNOUNCE, ACCESS_COMMAND, ACCESS_WEAPONS,
 		)
 	minimal_wildcard_access = list(ACCESS_CAPTAIN)
 	template_access = list(ACCESS_CAPTAIN, ACCESS_CHANGE_IDS)
@@ -85,8 +71,7 @@
 	trim_state = "trim_securitymedic"
 	sechud_icon_state = SECHUD_SECURITY_MEDIC
 	extra_access = list(ACCESS_DETECTIVE)
-	minimal_access = list(ACCESS_SECURITY, ACCESS_BRIG_ENTRANCE, ACCESS_BRIG, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MECH_SECURITY, ACCESS_MINERAL_STOREROOM,
-	ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP, ACCESS_MAINT_TUNNELS)
+	minimal_access = list(ACCESS_SECURITY, ACCESS_BRIG_ENTRANCE, ACCESS_BRIG, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_MECH_SECURITY, ACCESS_MINERAL_STOREROOM, ACCESS_MAINT_TUNNELS)
 	template_access = list(ACCESS_CAPTAIN, ACCESS_HOS, ACCESS_CHANGE_IDS)
 
 /datum/id_trim/job/security_medic/New()
@@ -112,7 +97,7 @@
 	sechud_icon_state = SECHUD_CORRECTIONS_OFFICER
 	extra_access = list()
 	minimal_access = list(ACCESS_SECURITY, ACCESS_BRIG_ENTRANCE, ACCESS_BRIG, ACCESS_COURT,
-				ACCESS_MAINT_TUNNELS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP, ACCESS_WEAPONS)
+				ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS)
 	template_access = list(ACCESS_CAPTAIN, ACCESS_HOS, ACCESS_CHANGE_IDS)
 	job = /datum/job/brigoff