From dde1b61e27d707687cc79a727d69363cb0e136e7 Mon Sep 17 00:00:00 2001 From: Seris02 Date: Sat, 3 Dec 2022 11:44:54 +0800 Subject: [PATCH] woops big fix time --- code/modules/mob/living/carbon/human/species/species_vr.dm | 4 ++-- code/modules/mob/living/carbon/human/update_icons.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/species_vr.dm b/code/modules/mob/living/carbon/human/species/species_vr.dm index 1685f4673f5..330f5a52033 100644 --- a/code/modules/mob/living/carbon/human/species/species_vr.dm +++ b/code/modules/mob/living/carbon/human/species/species_vr.dm @@ -60,8 +60,8 @@ ASSERT(istype(H)) var/datum/species/new_copy = new src.type() new_copy.race_key = race_key - new_copy.base_species = custom_base - if (custom_base) + if (selects_bodytype && custom_base) + new_copy.base_species = custom_base if(selects_bodytype == SELECTS_BODYTYPE_CUSTOM) //If race selects a bodytype, retrieve the custom_base species and copy needed variables. var/datum/species/S = GLOB.all_species[custom_base] S.copy_variables(new_copy, copy_vars) diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 98ea93cc212..82133e9e876 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -264,8 +264,8 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon() var/obj/item/organ/external/head/head = organs_by_name[BP_HEAD] if(head) if(!istype(head, /obj/item/organ/external/stump)) - if (species.selects_bodytype != SELECTS_BODYTYPE_FALSE && dna.base_species) - var/headtype = GLOB.all_species[dna.base_species]?.has_limbs[BP_HEAD] + if (species.selects_bodytype != SELECTS_BODYTYPE_FALSE) + var/headtype = GLOB.all_species[species.base_species]?.has_limbs[BP_HEAD] var/obj/item/organ/external/head/headtypepath = headtype["path"] if (headtypepath) head.eye_icon = initial(headtypepath.eye_icon)