cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-30 15:38:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14161 from Seris02/prometheanchanges

Browse Source 
fixes "Revert "promethean fixes and QoLs""
This commit is contained in:
Heroman3003
2022-12-03 20:34:05 +10:00
committed by GitHub
parent 78dae78bc2 dde1b61e27
commit ac352316ca
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/species_vr.dm
+2 -2
View File
@@ -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)
code/modules/mob/living/carbon/human/update_icons.dm
+2 -2
View File
@@ -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)