From dcc9332d84ffe70cd2c7a701b94ee237765cabd3 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Mon, 12 Apr 2021 12:13:32 -0700 Subject: [PATCH] Update blank_vr.dm --- .../living/carbon/human/species/station/blank_vr.dm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/blank_vr.dm b/code/modules/mob/living/carbon/human/species/station/blank_vr.dm index bc76da68c8..607088d65a 100644 --- a/code/modules/mob/living/carbon/human/species/station/blank_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/blank_vr.dm @@ -48,19 +48,9 @@ /datum/species/custom/get_race_key() var/datum/species/real = GLOB.all_species[base_species] return real.race_key -<<<<<<< HEAD - -/datum/species/custom/produceCopy(var/list/traits,var/mob/living/carbon/human/H,var/custom_base) - . = ..(traits, H) -||||||| parent of 0ff4f543b8... Merge pull request #10145 from Verkister/traitfixies - -/datum/species/custom/produceCopy(var/list/traits,var/mob/living/carbon/human/H,var/custom_base) - . = ..(traits, H) -======= /datum/species/custom/produceCopy(var/list/traits, var/mob/living/carbon/human/H, var/custom_base) . = ..(traits, H, custom_base) ->>>>>>> 0ff4f543b8... Merge pull request #10145 from Verkister/traitfixies if(selects_bodytype && custom_base) var/datum/species/S = GLOB.all_species[custom_base] S.copy_variables(., copy_vars)