From db89670d3b3cf566b80bbf3a44d293f14c1ae405 Mon Sep 17 00:00:00 2001
From: Fikou <23585223+Fikou@users.noreply.github.com>
Date: Sun, 17 Apr 2022 07:22:30 +0200
Subject: [PATCH] makes modsuit locks a bit more clear (#66190)

---
 code/modules/mod/mod_control.dm          |  4 ++--
 code/modules/mod/mod_types.dm            | 12 +++++++++---
 code/modules/mod/mod_ui.dm               |  2 +-
 tgui/packages/tgui/interfaces/MODsuit.js |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm
index 204946dbbee..6db9420979a 100644
--- a/code/modules/mod/mod_control.dm
+++ b/code/modules/mod/mod_control.dm
@@ -201,7 +201,7 @@
 		. += span_notice("You could close the cover with a <b>screwdriver</b>.")
 		. += span_notice("You could use <b>modules</b> on it to install them.")
 		. += span_notice("You could remove modules with a <b>crowbar</b>.")
-		. += span_notice("You could update the access with an <b>ID</b>.")
+		. += span_notice("You could update the access lock with an <b>ID</b>.")
 		. += span_notice("You could access the wire panel with a <b>wire tool</b>.")
 		if(core)
 			. += span_notice("You could remove [core] with a <b>wrench</b>.")
@@ -388,7 +388,7 @@
 
 /obj/item/mod/control/emag_act(mob/user)
 	locked = !locked
-	balloon_alert(user, "[locked ? "locked" : "unlocked"]")
+	balloon_alert(user, "suit access [locked ? "locked" : "unlocked"]")
 
 /obj/item/mod/control/emp_act(severity)
 	. = ..()
diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm
index 520667efeb9..bc26a4ab898 100644
--- a/code/modules/mod/mod_types.dm
+++ b/code/modules/mod/mod_types.dm
@@ -156,6 +156,7 @@
 /obj/item/mod/control/pre_equipped/nuclear
 	theme = /datum/mod_theme/syndicate
 	applied_cell = /obj/item/stock_parts/cell/hyper
+	req_access = list(ACCESS_SYNDICATE)
 	initial_modules = list(
 		/obj/item/mod/module/storage/syndicate,
 		/obj/item/mod/module/magnetic_harness,
@@ -166,6 +167,7 @@
 /obj/item/mod/control/pre_equipped/elite
 	theme = /datum/mod_theme/elite
 	applied_cell = /obj/item/stock_parts/cell/bluespace
+	req_access = list(ACCESS_SYNDICATE)
 	initial_modules = list(
 		/obj/item/mod/module/storage/syndicate,
 		/obj/item/mod/module/emp_shield,
@@ -196,6 +198,7 @@
 
 /obj/item/mod/control/pre_equipped/prototype
 	theme = /datum/mod_theme/prototype
+	req_access = list(ACCESS_AWAY_GENERAL)
 	initial_modules = list(
 		/obj/item/mod/module/storage,
 		/obj/item/mod/module/welding,
@@ -207,6 +210,7 @@
 /obj/item/mod/control/pre_equipped/responsory
 	theme = /datum/mod_theme/responsory
 	applied_cell = /obj/item/stock_parts/cell/hyper
+	req_access = list(ACCESS_CENT_GENERAL)
 	initial_modules = list(
 		/obj/item/mod/module/storage/large_capacity,
 		/obj/item/mod/module/welding,
@@ -282,6 +286,7 @@
 /obj/item/mod/control/pre_equipped/apocryphal
 	theme = /datum/mod_theme/apocryphal
 	applied_cell = /obj/item/stock_parts/cell/bluespace
+	req_access = list(ACCESS_CENT_SPECOPS)
 	initial_modules = list(
 		/obj/item/mod/module/storage/bluespace,
 		/obj/item/mod/module/welding,
@@ -293,6 +298,7 @@
 /obj/item/mod/control/pre_equipped/corporate
 	theme = /datum/mod_theme/corporate
 	applied_core = /obj/item/mod/core/infinite
+	req_access = list(ACCESS_CENT_SPECOPS)
 	initial_modules = list(
 		/obj/item/mod/module/storage/bluespace,
 		/obj/item/mod/module/hat_stabilizer,
@@ -340,10 +346,10 @@
 /obj/item/mod/control/pre_equipped/syndicate_empty
 	theme = /datum/mod_theme/syndicate
 
+/obj/item/mod/control/pre_equipped/syndicate_empty/honkerative
+	applied_skin = "honkerative"
+
 /obj/item/mod/control/pre_equipped/syndicate_empty/elite
 	theme = /datum/mod_theme/elite
 
 INITIALIZE_IMMEDIATE(/obj/item/mod/control/pre_equipped/syndicate_empty)
-
-/obj/item/mod/control/pre_equipped/syndicate_empty/honkerative
-	applied_skin = "honkerative"
diff --git a/code/modules/mod/mod_ui.dm b/code/modules/mod/mod_ui.dm
index 4cfa09f5fb1..9d70bef64d6 100644
--- a/code/modules/mod/mod_ui.dm
+++ b/code/modules/mod/mod_ui.dm
@@ -55,7 +55,7 @@
 	. = ..()
 	if(.)
 		return
-	if(!allowed(usr) && locked)
+	if(locked && !allowed(usr))
 		balloon_alert(usr, "insufficient access!")
 		playsound(src, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
 		return
diff --git a/tgui/packages/tgui/interfaces/MODsuit.js b/tgui/packages/tgui/interfaces/MODsuit.js
index 4275d052bcd..76c7f927d7c 100644
--- a/tgui/packages/tgui/interfaces/MODsuit.js
+++ b/tgui/packages/tgui/interfaces/MODsuit.js
@@ -311,7 +311,7 @@ const ParametersSection = (props, context) => {
           {status}
         </LabeledList.Item>
         <LabeledList.Item
-          label="Lock"
+          label="ID Lock"
           buttons={
             <Button
               icon={locked ? "lock-open" : "lock"}