Some Golden Arrow changes (cmss13-devs#242)

kirieee · Jun 1, 2024 · c531c79 · c531c79
1 parent dbb7325
commit c531c79
Show file tree

Hide file tree

Showing 5 changed files with 29,821 additions and 28,957 deletions.
diff --git a/code/datums/medal_awards.dm b/code/datums/medal_awards.dm
@@ -165,7 +165,7 @@ GLOBAL_LIST_EMPTY(jelly_awards)
 		to_chat(user, SPAN_WARNING("You must have an authenticated ID Card to award medals."))
 		return
 
-	if(!((card.paygrade in GLOB.co_paygrades) || (card.paygrade in GLOB.highcom_paygrades)))
+	if(!((card.paygrade in GLOB.co_paygrades) || (card.paygrade in GLOB.platco_paygrades) || (card.paygrade in GLOB.highcom_paygrades)))
 		to_chat(user, SPAN_WARNING("Only a Senior Officer can award medals!"))
 		return
 

diff --git a/code/datums/paygrades/paygrade.dm b/code/datums/paygrades/paygrade.dm
@@ -51,7 +51,13 @@ GLOBAL_LIST_INIT(co_paygrades, list(
 	"MO6E",
 	"MO6C",
 	"MO5",
-	"MO4"
+	"MO4",
+))
+
+GLOBAL_LIST_INIT(platco_paygrades, list(
+	"MO3",
+	"MO2",
+	"MO1",
 ))
 
 GLOBAL_LIST_INIT(wy_paygrades, list(

diff --git a/code/game/machinery/ARES/ARES_procs.dm b/code/game/machinery/ARES/ARES_procs.dm
@@ -174,6 +174,8 @@ GLOBAL_LIST_INIT(maintenance_categories, list(
 		return ARES_ACCESS_HIGH
 	if(card.paygrade in GLOB.co_paygrades)
 		return ARES_ACCESS_CO
+	if(card.paygrade in GLOB.platco_paygrades)
+		return ARES_ACCESS_COMMAND
 	if(ACCESS_MARINE_SENIOR in card.access)
 		return ARES_ACCESS_SENIOR
 	if(ACCESS_WY_GENERAL in card.access)

diff --git a/code/game/machinery/doors/brig_system.dm b/code/game/machinery/doors/brig_system.dm
@@ -279,7 +279,7 @@
 		var/obj/item/card/id/id_card = human.get_idcard()
 
 		if (id_card)
-			if ((id_card.paygrade in GLOB.co_paygrades) || (id_card.paygrade in GLOB.highcom_paygrades) || (id_card.paygrade == "PvI"))
+			if ((id_card.paygrade in GLOB.co_paygrades) || ((id_card.paygrade in GLOB.platco_paygrades)) || (id_card.paygrade in GLOB.highcom_paygrades) || (id_card.paygrade == "PvI"))
 				return TRUE
 
 	return FALSE