Skip to content

Commit

Permalink
Placeholder quirk ports
Browse files Browse the repository at this point in the history
Directly ports placeholder data for the following quirks:
- Thirsty
- Distant
- Headpat Slut
- Overweight
- Acute Hepatic Pharmacokinetics
  • Loading branch information
LeDrascol committed Oct 28, 2024
1 parent a8e32c6 commit c118c67
Show file tree
Hide file tree
Showing 7 changed files with 124 additions and 0 deletions.
5 changes: 5 additions & 0 deletions code/__DEFINES/~~~splurt_defines/traits/declarations.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,8 @@
#define TRAIT_TOUGH "tough"
#define TRAIT_ARACHNID "arachnid"
#define TRAIT_ASHRESISTANCE "ash_resistance"
#define TRAIT_PHARMA "hepatic_pharmacokinesis"
#define TRAIT_DISTANT "headpat_hater"

Check warning on line 38 in code/__DEFINES/~~~splurt_defines/traits/declarations.dm

View workflow job for this annotation

GitHub Actions / Run Linters

macro redefined: TRAIT_DISTANT
#define TRAIT_HEADPAT_SLUT "headpat_slut"

Check warning on line 39 in code/__DEFINES/~~~splurt_defines/traits/declarations.dm

View workflow job for this annotation

GitHub Actions / Run Linters

macro redefined: TRAIT_HEADPAT_SLUT
#define TRAIT_OVERWEIGHT "overweight"
#define TRAIT_THIRSTY "thirsty"
29 changes: 29 additions & 0 deletions modular_zzplurt/code/datums/quirks/negative_quirks/thirsty.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// UNIMPLEMENTED QUIRK!
/datum/quirk/thirsty
name = "Thirsty"
desc = "You find yourself unusually thirsty. Gotta drink twice as much as normal."
value = -1
gain_text = span_danger("You're starting to feel thirstier a lot faster.")
lose_text = span_notice("Your elevated craving for water begins dying down.")
medical_record_text = "Patient reports drinking twice as many liquids per day than usual for their species."
mob_trait = TRAIT_THIRSTY
hardcore_value = 1
icon = FA_ICON_GLASS_WATER
mail_goodies = list (
/obj/item/reagent_containers/cup/glass/waterbottle = 1
)

// 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
/datum/quirk/thirsty/remove()
var/mob/living/carbon/human/H = quirk_holder
if(H)
var/datum/physiology/P = H.physiology
P.thirst_mod /= 2
*/
28 changes: 28 additions & 0 deletions modular_zzplurt/code/datums/quirks/neutral_quirks/headpat_hater.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// UNIMPLEMENTED QUIRK!
/datum/quirk/headpat_hater
name = "Distant"
desc = "You don't seem to show much care for being touched. Whether it's because you're reserved or due to self control, others touching your head won't make you wag your tail should you possess one, and the action may even attract your ire."
value = 0
gain_text = span_danger("Others' touches begin to make your blood boil...")
lose_text = span_notice("Having your head pet doesn't sound so bad right about now...")
medical_record_text = "Patient cares little with or dislikes being touched."
mob_trait = TRAIT_DISTANT
icon = FA_ICON_HAND

// Copy pasted from old code
/*
/datum/quirk/headpat_hater/add()
var/mob/living/carbon/human/quirk_mob = quirk_holder
var/datum/action/cooldown/toggle_distant/act_toggle = new
act_toggle.Grant(quirk_mob)
/datum/quirk/headpat_hater/remove()
var/mob/living/carbon/human/quirk_mob = quirk_holder
var/datum/action/cooldown/toggle_distant/act_toggle = locate() in quirk_mob.actions
if(act_toggle)
act_toggle.Remove(quirk_mob)
*/
21 changes: 21 additions & 0 deletions modular_zzplurt/code/datums/quirks/neutral_quirks/headpat_slut.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// UNIMPLEMENTED QUIRK!
/datum/quirk/headpat_slut
name = "Headpat Slut"
desc = "You love the feeling of others touching your head! Maybe a little too much, actually... Others patting your head will provide a bigger mood boost and cause aroused reactions."
value = 0
gain_text = span_purple("You crave headpats immensely!")
lose_text = span_purple("Your headpats addiction wanes.")
medical_record_text = "Patient seems overly affectionate."
mob_trait = TRAIT_HEADPAT_SLUT
icon = FA_ICON_HAND_HOLDING_HEART

// Copy pasted from old code
/*
/datum/quirk/headpat_slut/add()
. = ..()
quirk_holder.AddElement(/datum/element/wuv/headpat, null, null, /datum/mood_event/pet_animal)
/datum/quirk/headpat_slut/remove()
. = ..()
quirk_holder.RemoveElement(/datum/element/wuv/headpat)
*/
19 changes: 19 additions & 0 deletions modular_zzplurt/code/datums/quirks/neutral_quirks/overweight.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// UNIMPLEMENTED QUIRK!
/datum/quirk/overweight
name = "Overweight"
desc = "You're particularly fond of food, and join the shift being overweight."
value = 0
gain_text = span_notice("You feel a bit chubby!")
lose_text = span_notice("UNIMPLEMENTED - OVERWEIGHT")
medical_record_text = "UNIMPLEMENTED - OVERWEIGHT"
mob_trait = TRAIT_OVERWEIGHT
icon = FA_ICON_BURGER

// Copy pasted from old code
/*
/datum/quirk/overweight/on_spawn()
var/mob/living/M = quirk_holder
M.nutrition = rand(NUTRITION_LEVEL_FAT + NUTRITION_LEVEL_START_MIN, NUTRITION_LEVEL_FAT + NUTRITION_LEVEL_START_MAX)
M.overeatduration = 100
ADD_TRAIT(M, TRAIT_FAT, OBESITY)
*/
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// UNIMPLEMENTED QUIRK!
/datum/quirk/pharmacokinetics
name = "Acute Hepatic Pharmacokinetics"
desc = "You have a genetic disorder that causes Incubus Draft and Succubus Milk to be absorbed by your liver instead."
value = 0
gain_text = span_notice("UNIMPLEMENTED - PHARMACOKINETICS")
lose_text = span_notice("Your liver feels... different, somehow.")
medical_record_text = "UNIMPLEMENTED - PHARMACOKINETICS"
mob_trait = TRAIT_PHARMA
icon = FA_ICON_FILE_MEDICAL

// Copy pasted from old code
/*
var/active = FALSE
var/power = 0
var/cachedmoveCalc = 1
*/
5 changes: 5 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -9388,6 +9388,7 @@
#include "modular_zzplurt\code\datums\keybinding\living.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\thirsty.dm"
#include "modular_zzplurt\code\datums\quirks\neutral_quirks\body_morpher.dm"
#include "modular_zzplurt\code\datums\quirks\neutral_quirks\buns_of_steel.dm"
#include "modular_zzplurt\code\datums\quirks\neutral_quirks\choke_slut.dm"
Expand All @@ -9398,6 +9399,8 @@
#include "modular_zzplurt\code\datums\quirks\neutral_quirks\excitable.dm"
#include "modular_zzplurt\code\datums\quirks\neutral_quirks\fluid_infuser.dm"
#include "modular_zzplurt\code\datums\quirks\neutral_quirks\gargoyle.dm"
#include "modular_zzplurt\code\datums\quirks\neutral_quirks\headpat_hater.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\incubus.dm"
#include "modular_zzplurt\code\datums\quirks\neutral_quirks\jiggly_ass.dm"
Expand All @@ -9406,6 +9409,8 @@
#include "modular_zzplurt\code\datums\quirks\neutral_quirks\messy.dm"
#include "modular_zzplurt\code\datums\quirks\neutral_quirks\modularlimbs.dm"
#include "modular_zzplurt\code\datums\quirks\neutral_quirks\nudist.dm"
#include "modular_zzplurt\code\datums\quirks\neutral_quirks\overweight.dm"
#include "modular_zzplurt\code\datums\quirks\neutral_quirks\pharmacokinetics.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\succubus.dm"
Expand Down

0 comments on commit c118c67

Please sign in to comment.