diff --git a/code/game/objects/items/weapons/id cards/station_ids.dm b/code/game/objects/items/weapons/id cards/station_ids.dm index 794fc4ded3..30c0a68425 100644 --- a/code/game/objects/items/weapons/id cards/station_ids.dm +++ b/code/game/objects/items/weapons/id cards/station_ids.dm @@ -73,6 +73,7 @@ /mob/living/carbon/human/set_id_info(var/obj/item/weapon/card/id/id_card) ..() id_card.age = age + id_card.sex = capitalize(name_gender()) /obj/item/weapon/card/id/tgui_data(mob/user) var/list/data = list() diff --git a/code/modules/food/kitchen/cooking_machines/container.dm b/code/modules/food/kitchen/cooking_machines/container.dm index 408835a4da..981a809fd4 100644 --- a/code/modules/food/kitchen/cooking_machines/container.dm +++ b/code/modules/food/kitchen/cooking_machines/container.dm @@ -11,7 +11,11 @@ var/list/insertable = list( /obj/item/weapon/reagent_containers/food/snacks, /obj/item/weapon/holder, - /obj/item/weapon/paper + /obj/item/weapon/paper, + /obj/item/clothing/head/wizard, + /obj/item/clothing/head/cakehat, + /obj/item/clothing/mask/gas/clown_hat, + /obj/item/clothing/head/beret ) /obj/item/weapon/reagent_containers/cooking_container/Initialize() diff --git a/code/modules/mining/machinery/machine_processing.dm b/code/modules/mining/machinery/machine_processing.dm index 4f5610d1cb..a244814d42 100644 --- a/code/modules/mining/machinery/machine_processing.dm +++ b/code/modules/mining/machinery/machine_processing.dm @@ -65,7 +65,7 @@ dat += "Claim points.
" else dat += "No ID inserted. Insert ID.
" - dat += "High-speed processing is [(machine.speed_process ? "active" : "inactive")]." + dat += "High-speed processing is [(machine.speed_process ? "active" : "inactive")]." dat += "
" for(var/ore in machine.ores_processing) diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index f8b7ad6fb2..0ccd61cc5e 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -95,6 +95,14 @@ /mob/living/carbon/human/get_gender() return identifying_gender ? identifying_gender : gender +/mob/living/carbon/human/name_gender() /// Returns proper names for gender identites + if(identifying_gender == "plural") + return "other" + if(identifying_gender == "neuter") + return "none" + else + return get_gender() + // This is the 'mechanical' check for synthetic-ness, not appearance // Returns the company that made the synthetic /mob/living/carbon/human/isSynthetic() diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index c625ecc4ba..cd211899c5 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -590,6 +590,9 @@ /mob/proc/get_gender() return gender +/mob/proc/name_gender() + return gender + /mob/proc/see(message) if(!is_active()) return 0