diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index cf17c44c6d1..a8e72017260 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -1932,8 +1932,11 @@ var/target_occupation = tgui_input_text(user, "What occupation would you like to put on this card?\nNote: This will not grant any access levels.", "Agent card job assignment", assignment ? assignment : "Assistant", max_length = MAX_NAME_LEN) if(!after_input_check(user)) return TRUE - - var/new_age = tgui_input_number(user, "Choose the ID's age", "Agent card age", AGE_MIN, AGE_MAX, AGE_MIN) + var/default_age = AGE_MIN + if(ishuman(user)) + var/mob/living/carbon/human/human_user = user + default_age = human_user.age ? clamp(human_user.age, AGE_MIN, AGE_MAX) : AGE_MIN + var/new_age = tgui_input_number(user, "Choose the ID's age", "Agent card age", default_age, AGE_MAX, AGE_MIN) if(!after_input_check(user)) return TRUE diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 34136596150..5be526cfb3b 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -127,7 +127,7 @@ id_species ||= dna.species.name id_blood_type ||= get_bloodtype() - if(istype(id, /obj/item/card/id/advanced)) + else if(istype(id, /obj/item/card/id/advanced)) var/obj/item/card/id/advanced/advancedID = id id_job = advancedID.trim_assignment_override || id_job