From 278bad621d1264db24f7e5ee1f23925b30c1e115 Mon Sep 17 00:00:00 2001 From: Pandora Date: Sat, 5 Oct 2024 19:23:14 +0100 Subject: [PATCH] Brings back PltCo medal awarding (#493) --- code/datums/medal_awards.dm | 6 +++--- code/datums/paygrades/paygrade.dm | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/datums/medal_awards.dm b/code/datums/medal_awards.dm index d747dc08fb..a6f4753158 100644 --- a/code/datums/medal_awards.dm +++ b/code/datums/medal_awards.dm @@ -267,7 +267,7 @@ GLOBAL_LIST_INIT(human_medals, list(MARINE_CONDUCT_MEDAL)) return if(!((card.paygrade in GLOB.co_paygrades) || (card.paygrade in GLOB.platco_paygrades) || (card.paygrade in GLOB.uscm_highcom_paygrades))) - to_chat(user, SPAN_WARNING("Only a Senior Officer can award medals!")) + to_chat(user, SPAN_WARNING("Only an Officer can award medals!")) return if(!card.registered_ref) @@ -599,8 +599,8 @@ GLOBAL_DATUM_INIT(ic_medals_panel, /datum/ic_medal_panel, new) 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.uscm_highcom_paygrades))) - to_chat(user, SPAN_WARNING("Only a Senior Officer can award medals!")) + if(!((card.paygrade in GLOB.co_paygrades) || (card.paygrade in GLOB.platco_paygrades) || (card.paygrade in GLOB.uscm_highcom_paygrades))) + to_chat(user, SPAN_WARNING("Only an Officer can award medals!")) return if(!card.registered_ref) diff --git a/code/datums/paygrades/paygrade.dm b/code/datums/paygrades/paygrade.dm index 4fbb5b3bf5..512036a1ca 100644 --- a/code/datums/paygrades/paygrade.dm +++ b/code/datums/paygrades/paygrade.dm @@ -62,7 +62,7 @@ GLOBAL_LIST_INIT(co_paygrades, list( .[pg_id] = new PG GLOBAL_LIST_INIT(platco_paygrades, list( - "MO3", - "MO2", - "MO1", + PAY_SHORT_MO3, + PAY_SHORT_MO2, + PAY_SHORT_MO1, ))