From 8bde8b299f193cc28ba94f1c5df9dd430f7ee772 Mon Sep 17 00:00:00 2001
From: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com>
Date: Sun, 8 May 2022 14:21:28 -0400
Subject: [PATCH] Making cocoons a positive trait

Also fixed a found issue that prevented custom species from generating a list of wings/tails/ears.
---
 .../human/species/station/traits_vr/neutral.dm       | 12 +-----------
 .../human/species/station/traits_vr/positive.dm      | 10 ++++++++++
 code/modules/tgui/modules/appearance_changer.dm      |  2 +-
 code/modules/tgui/modules/appearance_changer_vr.dm   |  2 ++
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
index 34ffe8fb4b6..8a906462e52 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
@@ -527,14 +527,4 @@
 
 /datum/trait/neutral/submit_to_prey/apply(var/datum/species/S,var/mob/living/carbon/human/H)
 	..(S,H)
-	H.verbs |= /mob/living/proc/lend_prey_control
-
-/datum/trait/neutral/cocoon_tf
-	name = "Cocoon Spinner"
-	desc = "Allows you to build a cocoon around yourself, using it to transform your body if you desire."
-	cost = 0
-	custom_only = FALSE
-
-/datum/trait/neutral/cocoon_tf/apply(var/datum/species/S,var/mob/living/carbon/human/H)
-	..(S,H)
-	H.verbs |= /mob/living/carbon/human/proc/enter_cocoon
\ No newline at end of file
+	H.verbs |= /mob/living/proc/lend_prey_control
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
index 92f09ad2aba..b024c9291b9 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
@@ -166,3 +166,13 @@
 	desc = "You can breathe under water."
 	cost = 1
 	var_changes = list("water_breather" = 1)
+
+/datum/trait/positive/cocoon_tf
+	name = "Cocoon Spinner"
+	desc = "Allows you to build a cocoon around yourself, using it to transform your body if you desire."
+	cost = 1
+	//custom_only = FALSE
+
+/datum/trait/positive/cocoon_tf/apply(var/datum/species/S,var/mob/living/carbon/human/H)
+	..(S,H)
+	H.verbs |= /mob/living/carbon/human/proc/enter_cocoon
\ No newline at end of file
diff --git a/code/modules/tgui/modules/appearance_changer.dm b/code/modules/tgui/modules/appearance_changer.dm
index 5675a4bd318..37a7231b978 100644
--- a/code/modules/tgui/modules/appearance_changer.dm
+++ b/code/modules/tgui/modules/appearance_changer.dm
@@ -551,7 +551,7 @@
 
 // VOREStation Add - Ears/Tails/Wings
 /datum/tgui_module/appearance_changer/proc/can_use_sprite(datum/sprite_accessory/X, mob/living/carbon/human/target, mob/user)
-	if(!isnull(X.species_allowed) && !(target.species.name in X.species_allowed))
+	if(!isnull(X.species_allowed) && !(target.species.name in X.species_allowed) && (!istype(target.species, /datum/species/custom))) // Letting custom species access wings/ears/tails.
 		return FALSE
 
 	if(LAZYLEN(X.ckeys_allowed) && !(user?.ckey in X.ckeys_allowed) && !(target.ckey in X.ckeys_allowed))
diff --git a/code/modules/tgui/modules/appearance_changer_vr.dm b/code/modules/tgui/modules/appearance_changer_vr.dm
index 8ae0ffe9bf3..fc77d8663c0 100644
--- a/code/modules/tgui/modules/appearance_changer_vr.dm
+++ b/code/modules/tgui/modules/appearance_changer_vr.dm
@@ -47,6 +47,8 @@
 // Cocoon Stuff
 /datum/tgui_module/appearance_changer/cocoon
 	name ="Appearance Editor (Cocoon)"
+	flags = APPEARANCE_ALL_HAIR
+	customize_usr = TRUE
 
 /datum/tgui_module/appearance_changer/cocoon/tgui_status(mob/user, datum/tgui_state/state)
 	//if(!istype(owner.loc, /obj/item/weapon/storage/vore_egg/bugcocoon))