Skip to content

Commit

Permalink
Brings back PltCo medal awarding (#493)
Browse files Browse the repository at this point in the history
  • Loading branch information
BonniePandora authored Oct 5, 2024
1 parent c63286b commit 278bad6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions code/datums/medal_awards.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions code/datums/paygrades/paygrade.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
))

0 comments on commit 278bad6

Please sign in to comment.