From 0c1fdd7c075381a66c7a77c341532ba9d73af8d6 Mon Sep 17 00:00:00 2001
From: Darius <5933805+LeDrascol@users.noreply.github.com>
Date: Thu, 7 Nov 2024 12:47:49 -0500
Subject: [PATCH] Update disabled quirks

Updates unused, disabled, and otherwise useless quirks to use the hidden_quirk flag. Some quirks are uncommented for testing purposes.
---
 .../datums/quirks/negative_quirks/flimsy.dm    |  3 +--
 .../datums/quirks/negative_quirks/gifted.dm    |  4 ++++
 .../datums/quirks/negative_quirks/thirsty.dm   | 18 +++++++++++-------
 .../quirks/neutral_quirks/body_morpher.dm      |  3 +--
 .../quirks/neutral_quirks/buns_of_steel.dm     |  1 +
 .../datums/quirks/neutral_quirks/cum_sniff.dm  |  1 +
 .../quirks/neutral_quirks/fluid_infuser.dm     |  5 +++--
 .../datums/quirks/neutral_quirks/gargoyle.dm   |  1 +
 .../quirks/neutral_quirks/headpat_hater.dm     |  1 +
 .../quirks/neutral_quirks/hypnotic_gaze.dm     |  3 +--
 .../code/datums/quirks/neutral_quirks/messy.dm |  1 +
 .../neutral_quirks/storage_concealment.dm      |  3 +--
 .../datums/quirks/neutral_quirks/werewolf.dm   |  3 +--
 .../quirks/positive_quirks/bloodfledge.dm      |  1 +
 tgstation.dme                                  |  5 +++++
 15 files changed, 34 insertions(+), 19 deletions(-)
 create mode 100644 modular_zzplurt/code/datums/quirks/negative_quirks/gifted.dm

diff --git a/modular_zzplurt/code/datums/quirks/negative_quirks/flimsy.dm b/modular_zzplurt/code/datums/quirks/negative_quirks/flimsy.dm
index 677f5c4909015..78b2d86a741aa 100644
--- a/modular_zzplurt/code/datums/quirks/negative_quirks/flimsy.dm
+++ b/modular_zzplurt/code/datums/quirks/negative_quirks/flimsy.dm
@@ -1,5 +1,4 @@
 // REMOVED QUIRK - Use Fragility quirk instead
-/*
 /datum/quirk/flimsy
 	name = "Flimsy"
 	desc = "Your body is a little more fragile then most, decreasing total health by 20%."
@@ -10,6 +9,7 @@
 	mob_trait = TRAIT_FLIMSY
 	hardcore_value = 2
 	icon = FA_ICON_USER_INJURED
+	hidden_quirk = TRUE
 
 /datum/quirk/flimsy/add(client/client_source)
 	. = ..()
@@ -22,4 +22,3 @@
 	if(!quirk_holder)
 		return
 	quirk_holder.maxHealth *= 1.25
-*/
diff --git a/modular_zzplurt/code/datums/quirks/negative_quirks/gifted.dm b/modular_zzplurt/code/datums/quirks/negative_quirks/gifted.dm
new file mode 100644
index 0000000000000..4662052f98cd0
--- /dev/null
+++ b/modular_zzplurt/code/datums/quirks/negative_quirks/gifted.dm
@@ -0,0 +1,4 @@
+// REMOVED QUIRK - Has no actual effect
+/datum/quirk/gifted
+	value = 0
+	hidden_quirk = TRUE
diff --git a/modular_zzplurt/code/datums/quirks/negative_quirks/thirsty.dm b/modular_zzplurt/code/datums/quirks/negative_quirks/thirsty.dm
index c0ed68afc8742..f96f9eadd64be 100644
--- a/modular_zzplurt/code/datums/quirks/negative_quirks/thirsty.dm
+++ b/modular_zzplurt/code/datums/quirks/negative_quirks/thirsty.dm
@@ -12,18 +12,22 @@
 	mail_goodies = list (
 		/obj/item/reagent_containers/cup/glass/waterbottle = 1
 	)
+	hidden_quirk = TRUE
 
 // Copy pasted from old code
 // Thirst has not been implemented yet
 /*
 /datum/quirk/thirsty/add()
-	var/mob/living/carbon/human/H = quirk_holder
-	var/datum/physiology/P = H.physiology
-	P.thirst_mod *= 2
+	// Define quirk mob
+	var/mob/living/carbon/human/quirk_mob = quirk_holder
+
+	// Set hunger multiplier
+	quirk_mob.physiology?.thirst_mod *= 2
 
 /datum/quirk/thirsty/remove()
-	var/mob/living/carbon/human/H = quirk_holder
-	if(H)
-		var/datum/physiology/P = H.physiology
-		P.thirst_mod /= 2
+	// Define quirk mob
+	var/mob/living/carbon/human/quirk_mob = quirk_holder
+
+	// Revert hunger multiplier
+	quirk_mob.physiology?.thirst_mod /= 2
 */
diff --git a/modular_zzplurt/code/datums/quirks/neutral_quirks/body_morpher.dm b/modular_zzplurt/code/datums/quirks/neutral_quirks/body_morpher.dm
index 10d90d84f76ce..12951dbe39eb5 100644
--- a/modular_zzplurt/code/datums/quirks/neutral_quirks/body_morpher.dm
+++ b/modular_zzplurt/code/datums/quirks/neutral_quirks/body_morpher.dm
@@ -1,5 +1,4 @@
 // REMOVED QUIRK - Disabled in favor of new NIFSoft method
-/*
 /datum/quirk/body_morpher
 	name = "Body Morpher"
 	desc = "You have the ability to morph and shift your body, like a slimeperson can."
@@ -12,6 +11,7 @@
 	mail_goodies = list (
 		/obj/item/toy/foamblade = 1 // Fake changeling
 	)
+	hidden_quirk = TRUE
 	var/datum/action/innate/alter_form/alter_form_action
 
 /datum/quirk/body_morpher/add(client/client_source)
@@ -33,4 +33,3 @@
 	// Remove quirk ability action datum
 	alter_form_action.Remove(quirk_mob)
 	QDEL_NULL(alter_form_action)
-*/
diff --git a/modular_zzplurt/code/datums/quirks/neutral_quirks/buns_of_steel.dm b/modular_zzplurt/code/datums/quirks/neutral_quirks/buns_of_steel.dm
index b2c60a71c36da..fa42894374c81 100644
--- a/modular_zzplurt/code/datums/quirks/neutral_quirks/buns_of_steel.dm
+++ b/modular_zzplurt/code/datums/quirks/neutral_quirks/buns_of_steel.dm
@@ -9,4 +9,5 @@
 	medical_record_text = "Patient's posterior displays incredible resilience."
 	mob_trait = TRAIT_STEEL_ASS
 	icon = FA_ICON_HAND
+	hidden_quirk = TRUE
 */
diff --git a/modular_zzplurt/code/datums/quirks/neutral_quirks/cum_sniff.dm b/modular_zzplurt/code/datums/quirks/neutral_quirks/cum_sniff.dm
index d4bdb31806ab1..3482fcd073e74 100644
--- a/modular_zzplurt/code/datums/quirks/neutral_quirks/cum_sniff.dm
+++ b/modular_zzplurt/code/datums/quirks/neutral_quirks/cum_sniff.dm
@@ -9,3 +9,4 @@
 	medical_record_text = "Patient has exemplary olfactory capability for specific body regions."
 	icon = FA_ICON_SOCCER_BALL
 	erp_quirk = TRUE
+	hidden_quirk = TRUE
diff --git a/modular_zzplurt/code/datums/quirks/neutral_quirks/fluid_infuser.dm b/modular_zzplurt/code/datums/quirks/neutral_quirks/fluid_infuser.dm
index cf11e238e3692..9809859da8912 100644
--- a/modular_zzplurt/code/datums/quirks/neutral_quirks/fluid_infuser.dm
+++ b/modular_zzplurt/code/datums/quirks/neutral_quirks/fluid_infuser.dm
@@ -10,9 +10,10 @@
 	// No mob trait
 	icon = FA_ICON_BOTTLE_DROPLET
 	erp_quirk = TRUE
-
+	hidden_quirk = TRUE
 */
-/* Commented until we have the genital fluid options
+// Implant currently not implemented
+/*
 /datum/quirk/fluid_infuser/on_spawn()
 	. = ..()
 	var/obj/item/implant/genital_fluid/put_in = new
diff --git a/modular_zzplurt/code/datums/quirks/neutral_quirks/gargoyle.dm b/modular_zzplurt/code/datums/quirks/neutral_quirks/gargoyle.dm
index 6166e14529a3b..a302f762d17d3 100644
--- a/modular_zzplurt/code/datums/quirks/neutral_quirks/gargoyle.dm
+++ b/modular_zzplurt/code/datums/quirks/neutral_quirks/gargoyle.dm
@@ -19,6 +19,7 @@
 	var/paused = 0
 	var/turf/position
 	var/obj/structure/statue/gargoyle/current = null
+	hidden_quirk = TRUE
 
 /datum/quirk/gargoyle/add(client/client_source)
 	. = ..()
diff --git a/modular_zzplurt/code/datums/quirks/neutral_quirks/headpat_hater.dm b/modular_zzplurt/code/datums/quirks/neutral_quirks/headpat_hater.dm
index 3bd6c2ce64a76..3091f756dbcd3 100644
--- a/modular_zzplurt/code/datums/quirks/neutral_quirks/headpat_hater.dm
+++ b/modular_zzplurt/code/datums/quirks/neutral_quirks/headpat_hater.dm
@@ -9,6 +9,7 @@
 	medical_record_text = "Patient cares little with or dislikes having their head touched."
 	mob_trait = TRAIT_DISTANT
 	icon = FA_ICON_HAND
+	hidden_quirk = TRUE
 
 /datum/quirk/headpat_hater/post_add()
 	// Add status effect
diff --git a/modular_zzplurt/code/datums/quirks/neutral_quirks/hypnotic_gaze.dm b/modular_zzplurt/code/datums/quirks/neutral_quirks/hypnotic_gaze.dm
index 0ead322bd8fba..269b0da2367a3 100644
--- a/modular_zzplurt/code/datums/quirks/neutral_quirks/hypnotic_gaze.dm
+++ b/modular_zzplurt/code/datums/quirks/neutral_quirks/hypnotic_gaze.dm
@@ -6,7 +6,6 @@
 
 // REMOVED QUIRK - Disabled in favor of new NIFSoft method
 // This file still contains the action
-/*
 /datum/quirk/Hypnotic_gaze
 	name = "Hypnotic Gaze"
 	desc = "Prolonged eye contact with you can place a viewer into a highly-suggestible hypnotic trance."
@@ -17,6 +16,7 @@
 	mob_trait = TRAIT_HYPNOTIC_GAZE
 	icon = FA_ICON_ARROWS_TO_EYE
 	erp_quirk = TRUE
+	hidden_quirk = TRUE
 
 /datum/quirk/Hypnotic_gaze/add()
 	// Define quirk mob
@@ -49,7 +49,6 @@
 // Set effect examine text
 /datum/status_effect/quirk_hypnotic_gaze/get_examine_text()
 	return span_purple("[owner.p_Their()] eyes glimmer with an entrancing power.")
-*/
 
 //
 // Actions
diff --git a/modular_zzplurt/code/datums/quirks/neutral_quirks/messy.dm b/modular_zzplurt/code/datums/quirks/neutral_quirks/messy.dm
index c204f64614a7e..d969d8e71291e 100644
--- a/modular_zzplurt/code/datums/quirks/neutral_quirks/messy.dm
+++ b/modular_zzplurt/code/datums/quirks/neutral_quirks/messy.dm
@@ -11,3 +11,4 @@
 	mail_goodies = list (
 		/obj/item/mop = 1 // Clean this mess up!
 	)
+	hidden_quirk = TRUE
diff --git a/modular_zzplurt/code/datums/quirks/neutral_quirks/storage_concealment.dm b/modular_zzplurt/code/datums/quirks/neutral_quirks/storage_concealment.dm
index a5f5fcb8a9425..8e65701a1b944 100644
--- a/modular_zzplurt/code/datums/quirks/neutral_quirks/storage_concealment.dm
+++ b/modular_zzplurt/code/datums/quirks/neutral_quirks/storage_concealment.dm
@@ -1,5 +1,4 @@
 // REMOVED QUIRK - Disabled in favor of new NIFSoft method
-/*
 /datum/quirk/storage_concealment
 	name = "Dorsualiphobic Augmentation"
 	desc = "You despise the idea of being seen wearing any type of back-mounted storage apparatus! A new technology shields you from the immense shame you may experience, by hiding your equipped backpack."
@@ -8,6 +7,7 @@
 	lose_text = span_notice("Your Chameleon Storage Concealment Implant encounters a critical error.")
 	medical_record_text = "Patient has exhibited concerns about being seen wearing a backpack."
 	icon = FA_ICON_BRIEFCASE
+	hidden_quirk = TRUE
 
 	// UNUSED: Enable by setting these values to TRUE
 	// The shame is unbearable
@@ -41,4 +41,3 @@
 /datum/mood_event/dorsualiphobic_mood_negative
 	description = span_warning("I can't let anyone find out if I'm wearing a backpack or not!")
 	mood_change = -4
-*/
diff --git a/modular_zzplurt/code/datums/quirks/neutral_quirks/werewolf.dm b/modular_zzplurt/code/datums/quirks/neutral_quirks/werewolf.dm
index 4ac92c3beddc0..e16bf611e59ce 100644
--- a/modular_zzplurt/code/datums/quirks/neutral_quirks/werewolf.dm
+++ b/modular_zzplurt/code/datums/quirks/neutral_quirks/werewolf.dm
@@ -1,6 +1,5 @@
 // UNIMPLEMENTED QUIRK!
 // Currently disabled due to appearance change issues
-/*
 /datum/quirk/werewolf
 	name = "Werewolf"
 	desc = "A beastly affliction allows you to shape-shift into a large anthropomorphic canine at will."
@@ -10,6 +9,7 @@
 	medical_record_text = "Patient has been reported howling at the night sky."
 	mob_trait = TRAIT_WEREWOLF
 	icon = FA_ICON_MOON
+	hidden_quirk = TRUE
 
 /datum/quirk/werewolf/post_add()
 	// Define quirk action
@@ -24,7 +24,6 @@
 
 	// Revoke quirk action
 	quirk_action.Remove(quirk_holder)
-*/
 
 //
 // Quirk Abilities
diff --git a/modular_zzplurt/code/datums/quirks/positive_quirks/bloodfledge.dm b/modular_zzplurt/code/datums/quirks/positive_quirks/bloodfledge.dm
index 87bcca30ff1ad..f9060c1d4b7cc 100644
--- a/modular_zzplurt/code/datums/quirks/positive_quirks/bloodfledge.dm
+++ b/modular_zzplurt/code/datums/quirks/positive_quirks/bloodfledge.dm
@@ -9,6 +9,7 @@
 	mob_trait = TRAIT_BLOODFLEDGE
 	hardcore_value = -2
 	icon = FA_ICON_WINE_GLASS
+	hidden_quirk = TRUE
 
 /*
 /datum/quirk/bloodfledge/add()
diff --git a/tgstation.dme b/tgstation.dme
index 0ab13db5a383f..e0241b176c1ce 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -9398,9 +9398,12 @@
 #include "modular_zzplurt\code\datums\mutations\body.dm"
 #include "modular_zzplurt\code\datums\quirks\negative_quirks\bad_touch.dm"
 #include "modular_zzplurt\code\datums\quirks\negative_quirks\dumb_for_cum.dm"
+#include "modular_zzplurt\code\datums\quirks\negative_quirks\flimsy.dm"
+#include "modular_zzplurt\code\datums\quirks\negative_quirks\gifted.dm"
 #include "modular_zzplurt\code\datums\quirks\negative_quirks\obese.dm"
 #include "modular_zzplurt\code\datums\quirks\negative_quirks\overweight.dm"
 #include "modular_zzplurt\code\datums\quirks\negative_quirks\thirsty.dm"
+#include "modular_zzplurt\code\datums\quirks\neutral_quirks\body_morpher.dm"
 #include "modular_zzplurt\code\datums\quirks\neutral_quirks\choke_slut.dm"
 #include "modular_zzplurt\code\datums\quirks\neutral_quirks\concubus.dm"
 #include "modular_zzplurt\code\datums\quirks\neutral_quirks\cosglow.dm"
@@ -9408,6 +9411,7 @@
 #include "modular_zzplurt\code\datums\quirks\neutral_quirks\cum_sniff.dm"
 #include "modular_zzplurt\code\datums\quirks\neutral_quirks\cursed_blood.dm"
 #include "modular_zzplurt\code\datums\quirks\neutral_quirks\excitable.dm"
+#include "modular_zzplurt\code\datums\quirks\neutral_quirks\gargoyle.dm"
 #include "modular_zzplurt\code\datums\quirks\neutral_quirks\headpat_slut.dm"
 #include "modular_zzplurt\code\datums\quirks\neutral_quirks\hypnotic_gaze.dm"
 #include "modular_zzplurt\code\datums\quirks\neutral_quirks\jiggly_ass.dm"
@@ -9418,6 +9422,7 @@
 #include "modular_zzplurt\code\datums\quirks\neutral_quirks\nudist.dm"
 #include "modular_zzplurt\code\datums\quirks\neutral_quirks\personalspace.dm"
 #include "modular_zzplurt\code\datums\quirks\neutral_quirks\sodiumsensetivity.dm"
+#include "modular_zzplurt\code\datums\quirks\neutral_quirks\storage_concealment.dm"
 #include "modular_zzplurt\code\datums\quirks\neutral_quirks\undead.dm"
 #include "modular_zzplurt\code\datums\quirks\neutral_quirks\werewolf.dm"
 #include "modular_zzplurt\code\datums\quirks\positive_quirks\arachnid.dm"