Skip to content

Commit

Permalink
Update disabled quirks
Browse files Browse the repository at this point in the history
Updates unused, disabled, and otherwise useless quirks to use the hidden_quirk flag. Some quirks are uncommented for testing purposes.
  • Loading branch information
LeDrascol committed Nov 7, 2024
1 parent c50e4d0 commit 0c1fdd7
Show file tree
Hide file tree
Showing 15 changed files with 34 additions and 19 deletions.
3 changes: 1 addition & 2 deletions modular_zzplurt/code/datums/quirks/negative_quirks/flimsy.dm
Original file line number Diff line number Diff line change
@@ -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%."
Expand All @@ -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)
. = ..()
Expand All @@ -22,4 +22,3 @@
if(!quirk_holder)
return
quirk_holder.maxHealth *= 1.25
*/
4 changes: 4 additions & 0 deletions modular_zzplurt/code/datums/quirks/negative_quirks/gifted.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// REMOVED QUIRK - Has no actual effect
/datum/quirk/gifted
value = 0
hidden_quirk = TRUE
18 changes: 11 additions & 7 deletions modular_zzplurt/code/datums/quirks/negative_quirks/thirsty.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Original file line number Diff line number Diff line change
@@ -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."
Expand All @@ -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)
Expand All @@ -33,4 +33,3 @@
// Remove quirk ability action datum
alter_form_action.Remove(quirk_mob)
QDEL_NULL(alter_form_action)
*/
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
. = ..()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions modular_zzplurt/code/datums/quirks/neutral_quirks/messy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@
mail_goodies = list (
/obj/item/mop = 1 // Clean this mess up!
)
hidden_quirk = TRUE
Original file line number Diff line number Diff line change
@@ -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."
Expand All @@ -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
Expand Down Expand Up @@ -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
*/
Original file line number Diff line number Diff line change
@@ -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."
Expand All @@ -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
Expand All @@ -24,7 +24,6 @@

// Revoke quirk action
quirk_action.Remove(quirk_holder)
*/

//
// Quirk Abilities
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
mob_trait = TRAIT_BLOODFLEDGE
hardcore_value = -2
icon = FA_ICON_WINE_GLASS
hidden_quirk = TRUE

/*
/datum/quirk/bloodfledge/add()
Expand Down
5 changes: 5 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -9398,16 +9398,20 @@
#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"
#include "modular_zzplurt\code\datums\quirks\neutral_quirks\cum_plus.dm"
#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"
Expand All @@ -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"
Expand Down

0 comments on commit 0c1fdd7

Please sign in to comment.