diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index dc954c675c..597ae56a08 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -1189,6 +1189,7 @@ var/global/BSACooldown = 0 var/location_description = "" var/special_role_description = "" var/health_description = "" + var/gender_description = "" var/turf/T = get_turf(M) //Location @@ -1211,17 +1212,23 @@ var/global/BSACooldown = 0 var/status switch (M.stat) if (0) status = "Alive" - if (1) status = "\yellow Unconscious" - if (2) status = "\red Dead" - health_description = "Status - [status]" + if (1) status = "Unconscious" + if (2) status = "Dead" + health_description = "Status = [status]" health_description += "
Oxy: [L.getOxyLoss()] - Tox: [L.getToxLoss()] - Fire: [L.getFireLoss()] - Brute: [L.getBruteLoss()] - Clone: [L.getCloneLoss()] - Brain: [L.getBrainLoss()]" else // world <<"Has no health." health_description = "This mob type has no health to speak of." + //Gener + if(M.gender in list(MALE,FEMALE)) + gender_description = "[M.gender]" + else + gender_description = "[M.gender]" + // world <<"Displaying info about the mob..." src.owner << "Info about [M.name]: " - src.owner << "Mob type = [M.type]; Damage = [health_description]" + src.owner << "Mob type = [M.type]; Gender = [gender_description] Damage = [health_description]" src.owner << "Name = [M.name]; Real_name = [M.real_name]; Mind_name = [M.mind?"[M.mind.name]":""]; Key = [M.key];" src.owner << "Location = [location_description];" src.owner << "[special_role_description]" diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index f2fd12e935..50f019642a 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -38,10 +38,12 @@ ..() + //This code is here to try to determine what causes the gender switch to plural error. Once the error is tracked down and fixed, this code should be deleted + //Also delete var/prev_gender once this is removed. if(prev_gender != gender) prev_gender = gender if(gender in list(PLURAL, NEUTER)) - message_admins("[src] ([ckey]) gender has been changed to plural or neuter. Please record what has happened recently to the person and then notify coders.") + message_admins("[src] ([ckey]) gender has been changed to plural or neuter. Please record what has happened recently to the person and then notify coders. (?) (VV) (PM) (JMP)",1,1) //The 1,1 at the end is there to make '%holder_ref%' get replaced with the actual ref object //Apparently, the person who wrote this code designed it so that //blinded get reset each cycle and then get activated later in the @@ -96,6 +98,8 @@ handle_regular_hud_updates() + gender_archive = gender + // Grabbing for(var/obj/item/weapon/grab/G in src) G.process()