From 63eb62d4e4c95ca391a1b0bd493de03923bcb561 Mon Sep 17 00:00:00 2001 From: Crazylemon64 Date: Tue, 23 Aug 2016 01:58:27 -0700 Subject: [PATCH] Fixes the golem runtime in a manner less likely to bite us in the butt later --- code/modules/mob/living/carbon/human/human.dm | 3 ++- code/modules/mob/living/carbon/human/inventory.dm | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 05031a4a82b..981dad22bf5 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -12,7 +12,6 @@ var/obj/item/weapon/rig/wearing_rig // This is very not good, but it's much much better than calling get_rig() every update_canmove() call. /mob/living/carbon/human/New(var/new_loc, var/new_species = null, var/delay_ready_dna = 0) - ..() if(!dna) dna = new /datum/dna(null) @@ -24,6 +23,8 @@ else set_species(delay_icon_update = 1) + ..() + if(species) real_name = species.get_random_name(gender) name = real_name diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 0aa2daa0f4f..3f7a76c0470 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -201,7 +201,8 @@ update_hair(redraw_mob) //rebuild hair update_fhair(redraw_mob) update_head_accessory(redraw_mob) - sec_hud_set_ID() + if(hud_list.len) + sec_hud_set_ID() update_inv_wear_mask(redraw_mob) if(slot_handcuffed) handcuffed = W @@ -220,7 +221,8 @@ update_inv_belt(redraw_mob) if(slot_wear_id) wear_id = W - sec_hud_set_ID() + if(!hud_list.len) + sec_hud_set_ID() update_inv_wear_id(redraw_mob) if(slot_wear_pda) wear_pda = W