[MIRROR] Trait Adjustments (#10514)

Co-authored-by: Cameron Lennox <killer65311@gmail.com>

code/game/objects/items/weapons/dna_injector.dm

@@ -237,7 +237,7 @@
 
 // Injectors for all original genes and some new ones
 /obj/item/dnainjector/set_trait/anxiety	// stutter
-	trait_path = /datum/trait/negative/disability_anxiety
+	trait_path = /datum/trait/negative/disability_nervousness //CHOMPStation Edit: neutral -> negative
 /obj/item/dnainjector/set_trait/anxiety/disable
 	disabling = TRUE
 
@@ -245,12 +245,12 @@
 	trait_path = /datum/trait/positive/superpower_noprints
 /obj/item/dnainjector/set_trait/noprints/disable
 	disabling = TRUE
-
+//VOREStation Note: TRAITGENETICS - tourettes Disabled on VS //CHOMPStation Edit - Enable
 /obj/item/dnainjector/set_trait/tourettes // tour
 	trait_path = /datum/trait/negative/disability_tourettes
 /obj/item/dnainjector/set_trait/tourettes/disable
 	disabling = TRUE
-
+//VOREStation Note: TRAITGENETICS - tourettes Disabled on VS //CHOMPStation Edit - Enable
 /obj/item/dnainjector/set_trait/cough // cough
 	trait_path = /datum/trait/negative/disability_cough
 /obj/item/dnainjector/set_trait/cough/disable
@@ -290,12 +290,12 @@
 	trait_path = /datum/trait/neutral/coldadapt
 /obj/item/dnainjector/set_trait/coldadapt/disable
 	disabling = TRUE
-
+//VOREStation Note: TRAITGENETICS - Disabled on VS //CHOMPStation Edit - Enable
 /obj/item/dnainjector/set_trait/xray // xraymut
 	trait_path = /datum/trait/positive/superpower_xray
 /obj/item/dnainjector/set_trait/xray/disable
 	disabling = TRUE
-
+//VOREStation Note: TRAITGENETICS - Disabled on VS //CHOMPStation Edit - Enable
 /obj/item/dnainjector/set_trait/deaf // deafmut
 	trait_path = /datum/trait/negative/disability_deaf
 /obj/item/dnainjector/set_trait/deaf/disable

code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm

@@ -381,6 +381,7 @@
 	var/mob/living/protie = src
 	if(temporary_form)
 		protie = temporary_form
+	//VOREStation Note: Catslug through Dullahan are commented out (Disabled) intentionally, as the ability to have mob icons as a protean is unwanted as of 19-3-2025. Nonetheless, the sprites have been tested and are completely functional at the current moment. If desired to re-enable downstream or at a later time, simply remove the comment tags starting at catslug and ending at Dullahan. These should honestly be split into two lists ('basic_forms' and 'advanced_forms') with a proper toggle instead of commenting it out, but that's for a later date.
 	var/list/icon_choices = list(
 			"Primary" = image(icon = 'icons/mob/species/protean/protean.dmi', icon_state = "primary"),
 			"Highlight" = image(icon = 'icons/mob/species/protean/protean.dmi', icon_state = "highlight"),

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

@@ -59,26 +59,13 @@
 	cost = -2
 	custom_only = FALSE
 
-	is_genetrait = TRUE
-	hidden = FALSE
+	is_genetrait = TRUE 	//VOREStation Note: TRAITGENETICS - Disabled on VS //CHOMPStation Edit - Enable
+	hidden = FALSE			//VOREStation Note: TRAITGENETICS - Disabled on VS //CHOMPStation Edit - Enable
 
 	disability=TOURETTES
 	activation_message="You twitch."
 	primitive_expression_messages=list("twitches and chitters.")
 
-/datum/trait/negative/disability_anxiety
-	name = "Anxiety Disorder"
-	desc = "You have extreme anxiety, often stuttering words."
-	cost = -1
-	custom_only = FALSE
-
-	is_genetrait = TRUE
-	hidden = FALSE
-
-	disability=NERVOUS
-	activation_message="You feel nervous."
-	primitive_expression_messages=list("anxiously chitters.")
-
 /* Replaced by /datum/trait/negative/blindness
 /datum/trait/negative/disability_blind
 	name = "Blinded"
@@ -175,8 +162,8 @@
 	cost = -4
 	custom_only = FALSE
 
-	is_genetrait = TRUE
-	hidden = FALSE
+	is_genetrait = TRUE	//VOREStation Note: TRAITGENETICS - Disabled on VS //CHOMPStation Edit - Enable
+	hidden = FALSE			//VOREStation Note: TRAITGENETICS - Disabled on VS //CHOMPStation Edit - Enable
 
 	disability=DETERIORATE
 	activation_message="You feel sore..."
@@ -195,19 +182,6 @@
 	activation_message="You feel bloated..."
 	primitive_expression_messages=list("shudders.","gasps.","chokes.")
 
-/datum/trait/negative/disability_censored
-	name = "Censored"
-	desc = "You are unable to speak profanity. To an excessive degree..."
-	cost = -1
-	custom_only = FALSE
-
-	is_genetrait = TRUE
-	hidden = FALSE
-
-	disability=CENSORED
-	activation_message="You feel less rude..."
-	primitive_expression_messages=list("BEEPS!")
-
 /datum/trait/negative/disability_damagedspine
 	name = "Lumbar Impairment"
 	desc = "Due to neurological damage, you are unable to use your legs. Collapsing to the ground as soon as you try to stand. You should check the loadout menu for something to assist you."

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

@@ -0,0 +1,28 @@
+//VOREStation Note: TRAITGENETICS - Originally, these were in negative_genes.dm
+//However, given their more RP centric nature, they have been moved to neutral_traits.
+//If desire is wanted to move them back to negative traits, change the 'neutral' to 'negative'
+/datum/trait/negative/disability_censored //CHOMPStation Edit - neutral -> negative
+	name = "Censored"
+	desc = "You are unable to speak profanity. To an excessive degree..."
+	cost = -1 // TRAITGENETICS - Originally was -1 //CHOMPStation Edit - 0 -> -1
+	custom_only = FALSE
+
+	is_genetrait = TRUE
+	hidden = FALSE
+
+	disability=CENSORED
+	activation_message="You feel less rude..."
+	primitive_expression_messages=list("BEEPS!")
+
+/datum/trait/negative/disability_nervousness //CHOMPStation Edit - neutral -> negative
+	name = "Nervousness"
+	desc = "You are generally nervous natured, often stuttering words."
+	cost = -1 // TRAITGENETICS - Originally was -1 //CHOMPStation Edit - 0 -> -1
+	custom_only = FALSE
+
+	is_genetrait = TRUE
+	hidden = FALSE
+
+	disability=NERVOUS
+	activation_message="You feel nervous."
+	primitive_expression_messages=list("nervously chitters.")

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

@@ -105,7 +105,7 @@
 	cost = 5
 	custom_only = FALSE
 
-	is_genetrait = TRUE
+	is_genetrait = TRUE //VOREStation Note: TRAITGENETICS - Disabled on VS //CHOMPStation Edit - Enable
 	activity_bounds = DNA_HARDER_BOUNDS
 	hidden = TRUE // Cannot start with superpowers
 

code/modules/organs/subtypes/diona.dm

@@ -213,9 +213,8 @@
 
 /obj/item/organ/internal/brain/cephalon/Initialize(mapload)
 	. = ..()
-	spawn(30 SECONDS)	// FBP Dionaea need some way to be disassembled through surgery, if absolutely necessary.
-		if(!owner.isSynthetic())
-			vital = FALSE
+	if(!owner.isSynthetic())
+		vital = FALSE
 
 /obj/item/organ/internal/brain/cephalon/robotize()
 	return

vorestation.dme

@@ -3355,6 +3355,7 @@
 #include "code\modules\mob\living\carbon\human\species\station\traits_vr\negative_genes.dm"
 #include "code\modules\mob\living\carbon\human\species\station\traits_vr\neutral.dm"
 #include "code\modules\mob\living\carbon\human\species\station\traits_vr\neutral_ch.dm"
+#include "code\modules\mob\living\carbon\human\species\station\traits_vr\neutral_genes.dm"
 #include "code\modules\mob\living\carbon\human\species\station\traits_vr\positive.dm"
 #include "code\modules\mob\living\carbon\human\species\station\traits_vr\positive_ch.dm"
 #include "code\modules\mob\living\carbon\human\species\station\traits_vr\positive_genes.dm"