From 2883ac02fc577692486377df02575dd8e6ca629f Mon Sep 17 00:00:00 2001 From: Darius <5933805+LeDrascol@users.noreply.github.com> Date: Tue, 29 Oct 2024 21:57:15 -0400 Subject: [PATCH] Concubus and Breast Milk tweaks - Changes the Concubus quirk to require breast milk - Changes breast milk to be a variant of standard milk instead of a unique reagent --- .../code/lewd_chemistry/reagents/breast_milk.dm | 10 ++++++++++ .../lewd_items/code/lewd_organs/breasts.dm | 3 +++ .../chemistry/reagents/drink/drink_reagents.dm | 2 +- tgstation.dme | 2 ++ 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 modular_zzplurt/code/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/breast_milk.dm create mode 100644 modular_zzplurt/code/modules/modular_items/lewd_items/code/lewd_organs/breasts.dm diff --git a/modular_zzplurt/code/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/breast_milk.dm b/modular_zzplurt/code/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/breast_milk.dm new file mode 100644 index 0000000000000..be8c7213d30b3 --- /dev/null +++ b/modular_zzplurt/code/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/breast_milk.dm @@ -0,0 +1,10 @@ +// New implementation +/datum/reagent/consumable/milk/breast_milk + name = "breast milk" + description = "An opaque white liquid taken fresh from the source." + taste_description = "warm and creamy" + default_container = /datum/glass_style/drinking_glass/breast_milk + +// Replace glass requirement +/datum/glass_style/drinking_glass/breast_milk + required_drink_type = /datum/reagent/consumable/milk/breast_milk diff --git a/modular_zzplurt/code/modules/modular_items/lewd_items/code/lewd_organs/breasts.dm b/modular_zzplurt/code/modules/modular_items/lewd_items/code/lewd_organs/breasts.dm new file mode 100644 index 0000000000000..ca3fb5a28d3db --- /dev/null +++ b/modular_zzplurt/code/modules/modular_items/lewd_items/code/lewd_organs/breasts.dm @@ -0,0 +1,3 @@ +/obj/item/organ/external/genital/breasts + // Replace fluid with new milk type + internal_fluid_datum = /datum/reagent/consumable/milk/breast_milk diff --git a/modular_zzplurt/code/modules/reagents/chemistry/reagents/drink/drink_reagents.dm b/modular_zzplurt/code/modules/reagents/chemistry/reagents/drink/drink_reagents.dm index 70e4b6dc1b364..a4b91e06e6a8a 100644 --- a/modular_zzplurt/code/modules/reagents/chemistry/reagents/drink/drink_reagents.dm +++ b/modular_zzplurt/code/modules/reagents/chemistry/reagents/drink/drink_reagents.dm @@ -1,4 +1,4 @@ -/datum/reagent/consumable/milk/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) +/datum/reagent/consumable/milk/breast_milk/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) . = ..() // Check for Incubus quirk diff --git a/tgstation.dme b/tgstation.dme index 59dc8f046069f..ab7d7c1d3aaa5 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -9490,7 +9490,9 @@ #include "modular_zzplurt\code\modules\modular_implants\code\nifsofts\shapeshifter.dm" #include "modular_zzplurt\code\modules\modular_implants\code\nifsofts\storage_concealment.dm" #include "modular_zzplurt\code\modules\modular_implants\code\nifsofts\base_types\action_granter.dm" +#include "modular_zzplurt\code\modules\modular_items\lewd_items\code\lewd_chemistry\reagents\breast_milk.dm" #include "modular_zzplurt\code\modules\modular_items\lewd_items\code\lewd_chemistry\reagents\cum.dm" +#include "modular_zzplurt\code\modules\modular_items\lewd_items\code\lewd_organs\breasts.dm" #include "modular_zzplurt\code\modules\reagents\chemistry\machinery\chem_dispenser.dm" #include "modular_zzplurt\code\modules\reagents\chemistry\reagents\food_reagents.dm" #include "modular_zzplurt\code\modules\reagents\chemistry\reagents\other_reagents.dm"