Merge pull request #5745 from CHOMPStation2/upstream-merge-14498

[MIRROR] Alien slug ears and tail

code/modules/mob/new_player/sprite_accessories_ear_ch.dm

@@ -1,11 +1,11 @@
-/datum/sprite_accessory/ears/alien_slug
+/*/datum/sprite_accessory/ears/alien_slug //Is now a base vorestation feature
 	name = "Alien slug ears"
 	desc = "The ears of a slug from space"
 	icon = 'icons/mob/vore/ears_ch.dmi'
 	icon_state = "alien_slug"
 	do_colouration = 1
 	color_blend_mode = ICON_MULTIPLY
-
+*/
 /datum/sprite_accessory/ears/zorgoia
 	name = "Zorgoia"
 	desc = "Ears only the slinkiest of noodles can have!"
@@ -171,4 +171,4 @@
 	icon_state = "goatflops"
 	extra_overlay = "goatflops_horn"
 	do_colouration = 1
-	color_blend_mode = ICON_MULTIPLY
+	color_blend_mode = ICON_MULTIPLY

code/modules/mob/new_player/sprite_accessories_ear_vr.dm

@@ -32,6 +32,14 @@
 
 // Ears avaliable to anyone
 
+/datum/sprite_accessory/ears/alien_slug
+	name = "Alien slug antennae"
+	desc = ""
+	icon = 'icons/mob/vore/ears_vr.dmi'
+	icon_state = "alien_slug"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+
 /datum/sprite_accessory/ears/taj_ears
 	name = "tajaran, colorable (old)"
 	species_allowed = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_NEVREAN, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_FENNEC, SPECIES_ZORREN_HIGH, SPECIES_VULPKANIN, SPECIES_XENOCHIMERA, SPECIES_XENOHYBRID, SPECIES_VASILISSAN, SPECIES_RAPALA, SPECIES_PROTEAN, SPECIES_ALRAUNE, SPECIES_WEREBEAST, SPECIES_SHADEKIN, SPECIES_SHADEKIN_CREW, SPECIES_ALTEVIAN) //This lets all races use

code/modules/mob/new_player/sprite_accessories_tail_ch.dm

@@ -1,4 +1,4 @@
-/datum/sprite_accessory/tail/alien_slug
+/*/datum/sprite_accessory/tail/alien_slug //Is now a base vorestation feature
 	name = "Alien slug tail"
 	desc = "The tail of a slug from space"
 	icon = 'icons/mob/vore/tails_ch.dmi'
@@ -6,7 +6,7 @@
 	do_colouration = 1
 	color_blend_mode = ICON_MULTIPLY
 	extra_overlay = "alien_slug_markings"
-
+*/
 /datum/sprite_accessory/tail/snaketail_stripes
 	name = "snake tail with stripes, dual-color"
 	desc = ""

code/modules/mob/new_player/sprite_accessories_tail_vr.dm

@@ -23,6 +23,15 @@
 
 // Everyone tails
 
+/datum/sprite_accessory/tail/alien_slug
+	name = "Alien slug tail"
+	desc = ""
+	icon = 'icons/mob/vore/tails_vr.dmi'
+	icon_state = "alien_slug"
+	do_colouration = 1
+	color_blend_mode = ICON_MULTIPLY
+	extra_overlay = "alien_slug_markings"
+
 /datum/sprite_accessory/tail/invisible
 	name = "hide species-sprite tail"
 	icon = null
@@ -238,49 +247,49 @@
 	color_blend_mode = ICON_MULTIPLY
 	extra_overlay = "eboop_mark"
 
-/datum/sprite_accessory/tail/molenar_kitsune
+/*/datum/sprite_accessory/tail/molenar_kitsune //CHOMP Remove
 	name = "quintail kitsune tails (Molenar)"
 	desc = ""
 	icon_state = "molenar-kitsune"
 	ckeys_allowed = list("molenar")
 
-/datum/sprite_accessory/tail/miria_fluffdragon
+/datum/sprite_accessory/tail/miria_fluffdragon //CHOMP Remove
 	name = "fluffdragon tail (Miria Masters)"
 	desc = ""
 	icon_state = "miria-fluffdragontail"
 	ckeys_allowed = list("miriamasters")
 
-/datum/sprite_accessory/tail/miria_kitsune
+/datum/sprite_accessory/tail/miria_kitsune //CHOMP Remove
 	name = "Black kitsune tails (Miria Masters)"
 	desc = ""
 	icon_state = "miria-kitsunetail"
 	ckeys_allowed = list("miriamasters")
 
-/datum/sprite_accessory/tail/molenar_deathclaw
+/datum/sprite_accessory/tail/molenar_deathclaw //CHOMP Remove
 	name = "deathclaw bits (Molenar)"
 	desc = ""
 	icon_state = "molenar-deathclaw"
 	ckeys_allowed = list("molenar","silvertalismen","jertheace")
 
-/datum/sprite_accessory/tail/runac
+/datum/sprite_accessory/tail/runac //CHOMP Remove
 	name = "fennecsune tails (Runac)"
 	desc = ""
 	icon_state = "runac"
 	ckeys_allowed = list("rebcom1807")
 
-/datum/sprite_accessory/tail/reika //Leaving this since it was too hard to split the wings from the tail.
+/datum/sprite_accessory/tail/reika //Leaving this since it was too hard to split the wings from the tail. //CHOMP Remove
 	name = "fox tail (+ beewings) (Reika)"
 	desc = ""
 	icon_state = "reika"
 	ckeys_allowed = list("rikaru19xjenkins")
 
-/datum/sprite_accessory/tail/rosey
+/datum/sprite_accessory/tail/rosey //CHOMP Remove
 	name = "tritail kitsune tails (Rosey)"
 	desc = ""
 	icon_state = "rosey_three"
 	ckeys_allowed = list("joey4298")
 
-/datum/sprite_accessory/tail/rosey2
+/datum/sprite_accessory/tail/rosey2 //CHOMP Remove
 	name = "pentatail kitsune tails (Rosey)" //I predict seven tails next. ~CK
 	desc = ""
 	icon_state = "rosey_five"
@@ -288,31 +297,31 @@
 	color_blend_mode = ICON_MULTIPLY
 	ckeys_allowed = list("joey4298")
 
-/datum/sprite_accessory/tail/scree
+/datum/sprite_accessory/tail/scree //CHOMP Remove
 	name = "green taj tail (Scree)"
 	desc = ""
 	icon_state = "scree"
 	ckeys_allowed = list("scree")
 
-/datum/sprite_accessory/tail/aronai
+/datum/sprite_accessory/tail/aronai //CHOMP Remove
 	name = "aronai tail (Aronai)"
 	desc = ""
 	icon_state = "aronai"
 	ckeys_allowed = list("arokha")
 
-/datum/sprite_accessory/tail/cabletail
+/datum/sprite_accessory/tail/cabletail //CHOMP Remove
     name = "cabletail"
     desc = "cabletail"
     icon_state = "cabletail"
     ckeys_allowed = list("tucker0666")
 
-/datum/sprite_accessory/tail/featherfluff_tail
+/datum/sprite_accessory/tail/featherfluff_tail //CHOMP Remove
     name = "featherfluff_tail"
     desc = ""
     icon_state = "featherfluff_tail"
     ckeys_allowed = list("tucker0666")
-
-/datum/sprite_accessory/tail/ketrai_wag
+*/  //CHOMP Remove end
+/datum/sprite_accessory/tail/ketrai_wag //CHOMP Remove
 	name = "fennix tail (vwag)"
 	desc = ""
 	icon_state = "ketraitail"
@@ -338,12 +347,12 @@
 	color_blend_mode = ICON_MULTIPLY
 	extra_overlay = "ringtail_mark"
 
-/datum/sprite_accessory/tail/holly
+/*/datum/sprite_accessory/tail/holly  //CHOMP Remove
 	name = "tigress tail (Holly)"
 	desc = ""
 	icon_state = "tigresstail"
 	ckeys_allowed = list("hoodoo")
-
+*/  //CHOMP Remove end
 /datum/sprite_accessory/tail/satyr
 	name = "goat legs, colorable"
 	desc = ""
@@ -1160,7 +1169,7 @@
 	do_colouration = 1
 	color_blend_mode = ICON_MULTIPLY
 
-/datum/sprite_accessory/tail/peacocktail_red //this is ckey locked for now, but prettiebyrd wants these tails to be unlocked at a later date
+/*/datum/sprite_accessory/tail/peacocktail_red //this is ckey locked for now, but prettiebyrd wants these tails to be unlocked at a later date //CHOMP Remove and now it'll never be unlocked
 	name = "Peacock tail (vwag)"
 	desc = ""
 	icon = 'icons/mob/vore/tails_vr.dmi'
@@ -1177,7 +1186,7 @@
 	do_colouration = 1
 	color_blend_mode = ICON_MULTIPLY
 	ckeys_allowed = list("prettiebyrd")
-
+*/  //CHOMP Remove end
 /datum/sprite_accessory/tail/altevian
 	name = "Altevian Tail"
 	icon = 'icons/mob/vore/tails_vr.dmi'
@@ -1201,13 +1210,13 @@
 	ani_state = "tentacle_w"
 	do_colouration = 1
 	color_blend_mode = ICON_MULTIPLY
-	
-/datum/sprite_accessory/tail/perrin_tentacles
-	name = "octopus tentacles (Perrin Kade)"
+
+/*/datum/sprite_accessory/tail/perrin_tentacles  //CHOMP Remove
+	name = "octopus tentacles"
 	desc = ""
 	icon_state = "perrintentacles"
-	ckeys_allowed = list("codeme")
-	
+	ckeys_allowed = list("codeme", "siennaathens")
+*/
 /datum/sprite_accessory/tail/teshbeethorax
 	name = "Teshari bee thorax"
 	desc = ""
@@ -1301,7 +1310,7 @@
 	do_colouration = 1
 	color_blend_mode = ICON_MULTIPLY
 	extra_overlay = "teshfatfirefly_markings"
-	
+
 /datum/sprite_accessory/tail/synthetic_stilt_legs
 	name = "synthetic stilt-legs, colorable"
 	desc = ""