Merge pull request #200 from Skies-Of-Blue/I'll-be-eel-with-you

Fixes Several Fish-Based Tails

code/datums/sprite_accessories.dm

@@ -1747,35 +1747,6 @@
 	/// Describes which tail spine sprites to use, if any.
 	var/spine_key = NONE
 
-///Used for fish-infused tails, which come in different flavors.
-/datum/sprite_accessory/tails/fish
-	icon = 'icons/mob/human/fish_features.dmi'
-	color_src = TRUE
-
-/datum/sprite_accessory/tails/fish/simple
-	name = "Simple"
-	icon_state = "simple"
-
-/datum/sprite_accessory/tails/fish/crescent
-	name = "Crescent"
-	icon_state = "crescent"
-
-/datum/sprite_accessory/tails/fish/long
-	name = "Long"
-	icon_state = "long"
-	center = TRUE
-	dimension_x = 38
-
-/datum/sprite_accessory/tails/fish/shark
-	name = "Shark"
-	icon_state = "shark"
-
-/datum/sprite_accessory/tails/fish/chonky
-	name = "Chonky"
-	icon_state = "chonky"
-	center = TRUE
-	dimension_x = 36
-
 /datum/sprite_accessory/tails/lizard
 	icon = 'icons/mob/human/species/lizard/lizard_tails.dmi'
 	spine_key = SPINE_KEY_LIZARD
@@ -1812,6 +1783,35 @@
 	icon_state = "default"
 	color_src = HAIR_COLOR
 
+///Used for fish-infused tails, which come in different flavors.
+/datum/sprite_accessory/tails/fish
+	icon = 'icons/mob/human/fish_features.dmi'
+	color_src = USE_ONE_COLOR
+
+/datum/sprite_accessory/tails/fish/chonky
+	name = "Chonky Fish"
+	icon_state = "chonky"
+	center = TRUE
+	dimension_x = 36
+
+/datum/sprite_accessory/tails/fish/crescent
+	name = "Crescent Fish"
+	icon_state = "crescent"
+
+/datum/sprite_accessory/tails/fish/long
+	name = "Long Fish"
+	icon_state = "long"
+	center = TRUE
+	dimension_x = 38
+/datum/sprite_accessory/tails/fish/simple
+	name = "Simple Fish"
+	icon_state = "simple"
+
+/datum/sprite_accessory/tails/fish/shark
+	name = "Shark Alt" // IRIS EDIT: Allows this to co-exist with the Akula shark tail
+	icon_state = "shark"
+
+
 /datum/sprite_accessory/tails/monkey
 
 /datum/sprite_accessory/tails/monkey/none

code/game/machinery/dna_infuser/organ_sets/fish_organs.dm

@@ -228,14 +228,14 @@
 		source.add_traits(list(TRAIT_OFF_BALANCE_TACKLER, TRAIT_NO_STAGGER, TRAIT_NO_THROW_HITPUSH), type)
 
 /datum/bodypart_overlay/mutant/tail/fish
-	feature_key = "fish_tail"
+	feature_key = "tail" // IRIS EDIT: changed feature key to be consistent with other selectable tails
 	color_source = ORGAN_COLOR_OVERRIDE
 
 /datum/bodypart_overlay/mutant/tail/fish/on_mob_insert(obj/item/organ/parent, mob/living/carbon/receiver)
 	//Initialize the related dna feature block if we don't have any so it doesn't error out.
 	//This isn't tied to any species, but I kinda want it to be mutable instead of having a fixed sprite accessory.
-	if(imprint_on_next_insertion && !receiver.dna.features["fish_tail"])
-		receiver.dna.features["fish_tail"] = pick(SSaccessories.tails_list_fish)
+	if(imprint_on_next_insertion && !receiver.dna.features["tail"])
+		receiver.dna.features["tail"] = pick(SSaccessories.tails_list_fish)
 		receiver.dna.update_uf_block(DNA_FISH_TAIL_BLOCK)
 
 	return ..()
@@ -248,7 +248,7 @@
 		return pick("#B4B8DD", "#85C7D0", "#67BBEE", "#2F4450", "#55CCBB", "#999FD0", "#345066", "#585B69", "#7381A0", "#B6DDE5", "#4E4E50")
 
 /datum/bodypart_overlay/mutant/tail/fish/get_global_feature_list()
-	return SSaccessories.tails_list_fish
+	return SSaccessories.sprite_accessories["tail"] // IRIS EDIT: changed feature key to be consistent with other selectable tails
 
 
 ///Lungs that replace the need of oxygen with water vapor or being wet