Skip to content

Commit

Permalink
Merge branch 'master' into larva
Browse files Browse the repository at this point in the history
  • Loading branch information
Blundir authored Jun 18, 2024
2 parents 54e9169 + 43a38ff commit dca91cc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion code/datums/medal_awards.dm
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ GLOBAL_DATUM_INIT(ic_medals_panel, /datum/ic_medal_panel, new)
return
var/mob/living/carbon/human/user = ui.user
var/obj/item/card/id/card = user?.get_idcard()
if(card)
if(!card)
to_chat(user, SPAN_WARNING("You must have an authenticated ID Card to award medals."))
return

Expand Down
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-6489.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: "Diegoflores31"
delete-after: True
changes:
- bugfix: "Fixes CO being unable to award medals."

0 comments on commit dca91cc

Please sign in to comment.