cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-22 04:37:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update blank_vr.dm

Browse Source
This commit is contained in:
Razgriz
2021-04-12 12:13:32 -07:00
committed by GitHub
parent 36db9dad68
commit dcc9332d84
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/station/blank_vr.dm
-10
View File
@@ -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)