From c5109fa31affeaf94af966446a651bceb4bf71d5 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 4 Mar 2020 21:04:34 -0500 Subject: [PATCH] addresses review --- code/modules/surgery/bodyparts/bodyparts.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm index 76beea5082..085e7e8740 100644 --- a/code/modules/surgery/bodyparts/bodyparts.dm +++ b/code/modules/surgery/bodyparts/bodyparts.dm @@ -283,9 +283,9 @@ if(change_icon_to_default) if(status == BODYPART_ORGANIC) - icon = base_bp_icon ? base_bp_icon : DEFAULT_BODYPART_ICON_ORGANIC + icon = base_bp_icon || DEFAULT_BODYPART_ICON_ORGANIC else if(status == BODYPART_ROBOTIC) - icon = base_bp_icon ? base_bp_icon : DEFAULT_BODYPART_ICON_ROBOTIC + icon = base_bp_icon || DEFAULT_BODYPART_ICON_ROBOTIC if(owner) owner.updatehealth() @@ -327,7 +327,7 @@ color_src = FALSE var/datum/species/S = H.dna.species - base_bp_icon = S.icon_limbs ? S.icon_limbs : DEFAULT_BODYPART_ICON + base_bp_icon = S.icon_limbs || DEFAULT_BODYPART_ICON species_id = S.limbs_id species_flags_list = H.dna.species.species_traits @@ -375,8 +375,8 @@ if(Smark) body_markings_icon = Smark.icon if(H.dna.features["mam_body_markings"] != "None") - body_markings = Smark.icon_state ? Smark.icon_state : lowertext(H.dna.features["mam_body_markings"]) - aux_marking = Smark.icon_state ? Smark.icon_state : lowertext(H.dna.features["mam_body_markings"]) + body_markings = Smark.icon_state || lowertext(H.dna.features["mam_body_markings"]) + aux_marking = Smark.icon_state || lowertext(H.dna.features["mam_body_markings"]) else body_markings = "plain" aux_marking = "plain" @@ -466,7 +466,7 @@ should_draw_gender = FALSE if(is_organic_limb()) - limb.icon = base_bp_icon ? base_bp_icon : 'icons/mob/human_parts.dmi' + limb.icon = base_bp_icon || 'icons/mob/human_parts.dmi' if(should_draw_gender) limb.icon_state = "[species_id]_[body_zone]_[icon_gender]" else if (use_digitigrade)