diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm index f330a81a6e0d2..16e33fd57795c 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -399,7 +399,7 @@ There are several things that need to be remembered: var/mutant_override = FALSE var/obj/item/bodypart/head/bodypart_head = src.get_bodypart(BODY_ZONE_HEAD) - if(worn_item.worn_icon_species && worn_item.worn_icon_species[bodypart_head.species_bodytype]) + if(worn_item.worn_icon_species?[bodypart_head.species_bodytype]) icon_file = worn_item.worn_icon_species[bodypart_head.species_bodytype] mutant_override = TRUE else if(bodypart_head.species_bodytype in icon_files_species) @@ -468,7 +468,7 @@ There are several things that need to be remembered: var/mutant_override = FALSE var/obj/item/bodypart/chest/bodypart_chest = src.get_bodypart(BODY_ZONE_CHEST) - if(worn_item.worn_icon_species && worn_item.worn_icon_species[bodypart_chest.species_bodytype]) + if(worn_item.worn_icon_species?[bodypart_chest.species_bodytype]) icon_file = worn_item.worn_icon_species[bodypart_chest.species_bodytype] mutant_override = TRUE else if(bodypart_chest.species_bodytype in icon_files_species) @@ -538,7 +538,7 @@ There are several things that need to be remembered: var/mutant_override = FALSE var/obj/item/bodypart/head/bodypart_head = src.get_bodypart(BODY_ZONE_HEAD) - if(worn_item.worn_icon_species && worn_item.worn_icon_species[bodypart_head.species_bodytype]) + if(worn_item.worn_icon_species?[bodypart_head.species_bodytype]) icon_file = worn_item.worn_icon_species[bodypart_head.species_bodytype] mutant_override = TRUE else if(bodypart_head.species_bodytype in icon_files_species) diff --git a/modular_bandastation/species/code/clothing/items.dm b/modular_bandastation/species/code/clothing/items.dm index b102841a7b2bd..26a9922107ebe 100644 --- a/modular_bandastation/species/code/clothing/items.dm +++ b/modular_bandastation/species/code/clothing/items.dm @@ -1,5 +1,5 @@ /obj/item - var/icon/worn_icon_species + var/list/worn_icon_species /obj/item/clothing/head/mod worn_icon_species = list( diff --git a/modular_bandastation/species/code/clothing/mod.dm b/modular_bandastation/species/code/clothing/mod.dm index bf8852708adb0..2a8cda44b7666 100644 --- a/modular_bandastation/species/code/clothing/mod.dm +++ b/modular_bandastation/species/code/clothing/mod.dm @@ -15,7 +15,7 @@ var/mob/living/carbon/user = usr if(istype(user)) var/obj/item/bodypart/head/bodypart_head = user.get_bodypart(BODY_ZONE_HEAD) - if(bodypart_head && worn_icon_species && worn_icon_species[bodypart_head.species_bodytype]) + if(bodypart_head && worn_icon_species?[bodypart_head.species_bodytype]) module_icon = mutable_appearance(worn_icon_species[bodypart_head.species_bodytype], used_overlay, layer = standing.layer + 0.1) if(!use_mod_colors) module_icon.appearance_flags |= RESET_COLOR