Merge remote-tracking branch 'refs/remotes/VOREStation/master'

code/modules/mob/living/carbon/human/update_icons.dm

@@ -991,9 +991,14 @@ var/global/list/damage_icon_parts = list()
 	if(!tail_icon)
 		//generate a new one
 		var/species_tail_anim = species.get_tail_animation(src)
+		if(species.icobase_tail) species_tail_anim = species.icobase //VOREStation Code
 		if(!species_tail_anim) species_tail_anim = 'icons/effects/species.dmi'
 		tail_icon = new/icon(species_tail_anim)
-		tail_icon.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD)
+		//VOREStation Code Start
+		if(species.color_mult)
+			tail_icon.Blend(rgb(r_skin, g_skin, b_skin), ICON_MULTIPLY)
+		else
+			tail_icon.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD)
 		// The following will not work with animated tails.
 		var/use_species_tail = species.get_tail_hair(src)
 		if(use_species_tail)

code/modules/mob/new_player/preferences_setup.dm

@@ -272,7 +272,12 @@
 			"icon" = (current_species.icobase_tail ? current_species.icobase : 'icons/effects/species.dmi'),
 			"icon_state" = "[current_species.tail]_s")
 		if(current_species && (current_species.appearance_flags & HAS_SKIN_COLOR))
-			temp.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD)
+			//VOREStation Code Start
+			if(current_species.color_mult)
+				temp.Blend(rgb(r_skin, g_skin, b_skin), ICON_MULTIPLY)
+			else
+				temp.Blend(rgb(r_skin, g_skin, b_skin), ICON_ADD)
+			//VOREStation Code End
 		if(current_species && (current_species.appearance_flags & HAS_SKIN_TONE))
 			if (s_tone >= 0)
 				temp.Blend(rgb(s_tone, s_tone, s_tone), ICON_ADD)

code/modules/mob/new_player/sprite_accessories_vr.dm

@@ -10,17 +10,17 @@
 		icon_state = "serg_plain"
 		species_allowed = list("Sergal")
 
-	sergal_plain
+	sergal_medicore
 		name = "Sergal Medicore"
 		icon_state = "serg_medicore"
 		species_allowed = list("Sergal")
 
-	sergal_plain
+	sergal_tapered
 		name = "Sergal Tapered"
 		icon_state = "serg_tapered"
 		species_allowed = list("Sergal")
 
-	sergal_plain
+	sergal_fairytail
 		name = "Sergal Fairytail"
 		icon_state = "serg_fairytail"
 		species_allowed = list("Sergal")

code/modules/organs/organ_icon.dm

@@ -147,7 +147,10 @@ var/global/list/limb_icon_cache = list()
 		else
 			applying.Blend(rgb(-s_tone,  -s_tone,  -s_tone), ICON_SUBTRACT)
 	else if(s_col && s_col.len >= 3)
-		applying.Blend(rgb(s_col[1], s_col[2], s_col[3]), ICON_ADD)
+		if(species && species.color_mult)
+			applying.Blend(rgb(s_col[1], s_col[2], s_col[3]), ICON_MULTIPLY)
+		else
+			applying.Blend(rgb(s_col[1], s_col[2], s_col[3]), ICON_ADD)
 
 	// Translucency.
 	if(nonsolid) applying += rgb(,,,180) // SO INTUITIVE TY BYOND