Merge pull request #6346 from CHOMPStation2/upstream-merge-14992

[MIRROR] Tweaks Long Predatorial Reach (Persistence, trait panel)

code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm

@@ -143,8 +143,19 @@
 
 /datum/trait/neutral/long_vore
 	name = "Long Predatorial Reach"
-	desc = "Makes you able to use your tongue to grab creatures."
+	desc = "Makes you able to use an unspecified appendage to grab creatures."
+	tutorial = "This trait allows you to change its colour and functionality in-game as well as on the trait panel. <br> \
+	The trait panel persists between rounds, whereas the in-game modifications are temporary.<br><br> \
+	Two functionalities exist: Reach out with the appendage towards prey (default, 'Disabled' option on character setup \
+	for the 'Throw Yourself' entry), or fling yourself at the prey and devour them with a pounce! <br> \
+	Maximum range: 5 tiles<br>\
+	Governed by: Throw Vore preferences (both prey and pred must enable it!) <br> \
+	Governed by: Drop Vore (both prey and pred must enable it!) <br> \
+	Governed by: Spontaneous Pred/Prey (Both sides must have appropriate one enabled.) <br> \
+	If both sides have both pred/prey enabled, favours the character being thrown as prey."
 	cost = 0
+	has_preferences = list("appendage_color" = list(TRAIT_PREF_TYPE_COLOR, "Appendage Colour", TRAIT_VAREDIT_TARGET_MOB, "#e03997"),
+	"appendage_alt_setting" = list(TRAIT_PREF_TYPE_BOOLEAN, "Throw yourself?", TRAIT_VAREDIT_TARGET_MOB, FALSE),)
 	custom_only = FALSE
 
 /datum/trait/neutral/long_vore/apply(var/datum/species/S,var/mob/living/carbon/human/H)

code/modules/mob/living/simple_mob/subtypes/vore/vore.dm

@@ -27,8 +27,6 @@
 	permit_healbelly = client.prefs_vr.permit_healbelly
 	noisy = client.prefs_vr.noisy
 	selective_preference = client.prefs_vr.selective_preference
-	appendage_color = client.prefs_vr.appendage_color
-	appendage_alt_setting = client.prefs_vr.appendage_alt_setting
 	eating_privacy_global = client.prefs_vr.eating_privacy_global
 
 	drop_vore = client.prefs_vr.drop_vore

code/modules/vore/eating/living_vr.dm

@@ -282,8 +282,6 @@
 	P.can_be_drop_prey = src.can_be_drop_prey
 	P.can_be_drop_pred = src.can_be_drop_pred
 	P.allow_spontaneous_tf = src.allow_spontaneous_tf
-	P.appendage_color = src.appendage_color
-	P.appendage_alt_setting = src.appendage_alt_setting
 	P.step_mechanics_pref = src.step_mechanics_pref
 	P.pickup_pref = src.pickup_pref
 	P.drop_vore = src.drop_vore
@@ -341,8 +339,6 @@
 	can_be_drop_pred = P.can_be_drop_pred
 //	allow_inbelly_spawning = P.allow_inbelly_spawning //CHOMP Removal: we have vore spawning at home. Actually if this were to be enabled, it would break anyway. Just leaving this here as a reference to it.
 	allow_spontaneous_tf = P.allow_spontaneous_tf
-	appendage_color = P.appendage_color
-	appendage_alt_setting = P.appendage_alt_setting
 	step_mechanics_pref = P.step_mechanics_pref
 	pickup_pref = P.pickup_pref
 	drop_vore = P.drop_vore

code/modules/vore/eating/vore_vr.dm

@@ -80,8 +80,6 @@ V::::::V           V::::::VO:::::::OOO:::::::ORR:::::R     R:::::REE::::::EEEEEE
 	var/list/belly_prefs = list()
 	var/vore_taste = "nothing in particular"
 	var/vore_smell = "nothing in particular"
-	var/appendage_color = "#e03997" //Default pink. Used for the 'long_vore' trait.
-	var/appendage_alt_setting = 0	//Decides if appendage user is thrown at target or not.
 
 	var/selective_preference = DM_DEFAULT
 
@@ -188,8 +186,6 @@ V::::::V           V::::::VO:::::::OOO:::::::ORR:::::R     R:::::REE::::::EEEEEE
 	vore_smell = json_from_file["vore_smell"]
 	permit_healbelly = json_from_file["permit_healbelly"]
 	noisy = json_from_file["noisy"]
-	appendage_color = json_from_file["appendage_color"]
-	appendage_alt_setting = json_from_file["appendage_alt_setting"]
 	selective_preference = json_from_file["selective_preference"]
 	show_vore_fx = json_from_file["show_vore_fx"]
 	can_be_drop_prey = json_from_file["can_be_drop_prey"]
@@ -240,10 +236,6 @@ V::::::V           V::::::VO:::::::OOO:::::::ORR:::::R     R:::::REE::::::EEEEEE
 		selective_preference = DM_DEFAULT
 	if (isnull(noisy))
 		noisy = FALSE
-	if (isnull(appendage_color))
-		appendage_color = "#e03997"
-	if (isnull(appendage_alt_setting))
-		appendage_alt_setting = 0
 	if(isnull(show_vore_fx))
 		show_vore_fx = TRUE
 	if(isnull(can_be_drop_prey))
@@ -339,8 +331,6 @@ V::::::V           V::::::VO:::::::OOO:::::::ORR:::::R     R:::::REE::::::EEEEEE
 			"vore_smell"			= vore_smell,
 			"permit_healbelly"		= permit_healbelly,
 			"noisy" 				= noisy,
-			"appendage_color"		= appendage_color,
-			"appendage_alt_setting" = appendage_alt_setting,
 			"selective_preference"	= selective_preference,
 			"show_vore_fx"			= show_vore_fx,
 			"can_be_drop_prey"		= can_be_drop_prey,

code/modules/vore/eating/vorepanel_vr.dm

@@ -372,8 +372,6 @@
 		"latejoin_vore" = host.latejoin_vore, //CHOMPedit
 		"latejoin_prey" = host.latejoin_prey, //CHOMPedit
 		"allow_spontaneous_tf" = host.allow_spontaneous_tf,
-		"appendage_color" = host.appendage_color,
-		"appendage_alt_setting" = host.appendage_alt_setting,
 		"step_mechanics_active" = host.step_mechanics_pref,
 		"pickup_mechanics_active" = host.pickup_pref,
 		"noisy" = host.noisy,