merge conflict fix, transparent instead of nonsolid

code/modules/organs/organ_icon.dm

@@ -180,7 +180,6 @@ var/global/list/limb_icon_cache = list()
 				mob_icon.Blend(mark_s, ICON_OVERLAY) //So when it's on your body, it has icons
 				icon_cache_key += "[M][markings[M]["color"]]"
 
-<<<<<<< HEAD
 		if(body_hair && islist(h_col) && h_col.len >= 3)
 			var/cache_key = "[body_hair]-[icon_name]-[h_col[1]][h_col[2]][h_col[3]]"
 			if(!limb_icon_cache[cache_key])
@@ -189,10 +188,9 @@ var/global/list/limb_icon_cache = list()
 				limb_icon_cache[cache_key] = I
 			mob_icon.Blend(limb_icon_cache[cache_key], ICON_OVERLAY)
 		// VOREStation edit ends here
-=======
-	if (nonsolid && !istype(src,/obj/item/organ/external/head) && can_apply_transparency && should_apply_transparency)
+
+	if (transparent && !istype(src,/obj/item/organ/external/head) && can_apply_transparency && should_apply_transparency) //VORESTATION EDIT: transparent instead of nonsolid
 		mob_icon += rgb(,,,180) //do it here so any markings become transparent as well
->>>>>>> 5632af32c9a... reworks handling of transparent limbs (#8947)
 
 	dir = EAST
 	icon = mob_icon
@@ -228,12 +226,6 @@ var/global/list/limb_icon_cache = list()
 			icon_cache_key += "_color_[s_col[1]]_[s_col[2]]_[s_col[3]]_[ICON_ADD]"
 		//VOREStation Edit End
 
-<<<<<<< HEAD
-	// Translucency.
-	if(transparent) applying += rgb(,,,180) // SO INTUITIVE TY BYOND //VOREStation Edit
-
-=======
->>>>>>> 5632af32c9a... reworks handling of transparent limbs (#8947)
 	return applying
 
 /obj/item/organ/external/var/icon_cache_key

code/modules/organs/subtypes/standard.dm

@@ -400,7 +400,7 @@
 
 	add_overlay(get_hair_icon())
 
-	if (nonsolid && can_apply_transparency)
+	if (transparent && can_apply_transparency) //VOREStation Edit: transparent instead of nonsolid
 		mob_icon += rgb(,,,180) //do it here so any markings become transparent as well
 
 	return mob_icon