diff --git a/code/datums/medal_awards.dm b/code/datums/medal_awards.dm index 19df1d054130..78fec7569582 100644 --- a/code/datums/medal_awards.dm +++ b/code/datums/medal_awards.dm @@ -35,6 +35,7 @@ GLOBAL_LIST_EMPTY(jelly_awards) giver_mob = list() giver_ckey = list() +GLOBAL_LIST_INIT(human_medals, list(MARINE_CONDUCT_MEDAL, MARINE_BRONZE_HEART_MEDAL, MARINE_VALOR_MEDAL, MARINE_HEROISM_MEDAL)) /proc/give_medal_award(medal_location, as_admin = FALSE) if(as_admin && !check_rights(R_ADMIN)) @@ -52,7 +53,7 @@ GLOBAL_LIST_EMPTY(jelly_awards) return FALSE // Pick a medal - var/medal_type = tgui_input_list(usr, "What type of medal do you want to award?", "Medal Type", list(MARINE_CONDUCT_MEDAL, MARINE_BRONZE_HEART_MEDAL, MARINE_VALOR_MEDAL, MARINE_HEROISM_MEDAL)) + var/medal_type = tgui_input_list(usr, "What type of medal do you want to award?", "Medal Type", GLOB.human_medals) if(!medal_type) return FALSE diff --git a/tgui/packages/tgui/interfaces/MedalsViewer.tsx b/tgui/packages/tgui/interfaces/MedalsViewer.tsx index 5ef513b37865..5c96453352d0 100644 --- a/tgui/packages/tgui/interfaces/MedalsViewer.tsx +++ b/tgui/packages/tgui/interfaces/MedalsViewer.tsx @@ -38,7 +38,8 @@ export const MedalsViewer = (props, context) => { className={sectionType}> Issued to{' '} - {medal.recipient_name} ({medal.recipient_role}) + {medal.recipient_name}{' '} + {!medal.xeno_medal && medal.recipient_role} {' '} by {medal.giver_name} for:
{!medal.xeno_medal && (