From ea95cd9d559e4ef98477fa672832eee50bac7b50 Mon Sep 17 00:00:00 2001
From: Mosley <93835010+MosleyTheMalO@users.noreply.github.com>
Date: Fri, 20 Dec 2024 21:42:49 -0500
Subject: [PATCH 01/43] makes the interactions subsystem
---
.../__DEFINES/~~~splurt_defines/subsystems.dm | 6 +++
.../code/interaction_component.dm | 17 ++++--
.../code/interaction_datum.dm | 20 ++++---
.../controllers/subsystem/interactions.dm | 54 +++++++++++++++++++
tgstation.dme | 2 +
5 files changed, 86 insertions(+), 13 deletions(-)
create mode 100644 code/__DEFINES/~~~splurt_defines/subsystems.dm
create mode 100644 modular_zzplurt/code/controllers/subsystem/interactions.dm
diff --git a/code/__DEFINES/~~~splurt_defines/subsystems.dm b/code/__DEFINES/~~~splurt_defines/subsystems.dm
new file mode 100644
index 0000000000000..c581df65ca656
--- /dev/null
+++ b/code/__DEFINES/~~~splurt_defines/subsystems.dm
@@ -0,0 +1,6 @@
+/*
+ * # INIT_ORDER_INTERACTIONS
+ * Used by the Interactions subsystems, used to set it's own position in the queue.
+ * This puts this last on priority, very far from other subsystems,
+*/
+#define INIT_ORDER_INTERACTIONS -150
diff --git a/modular_skyrat/modules/interaction_menu/code/interaction_component.dm b/modular_skyrat/modules/interaction_menu/code/interaction_component.dm
index b6122decd070e..177b7233a3215 100644
--- a/modular_skyrat/modules/interaction_menu/code/interaction_component.dm
+++ b/modular_skyrat/modules/interaction_menu/code/interaction_component.dm
@@ -21,13 +21,20 @@
/datum/component/interactable/proc/build_interactions_list()
interactions = list()
- for(var/iterating_interaction_id in GLOB.interaction_instances)
- var/datum/interaction/interaction = GLOB.interaction_instances[iterating_interaction_id]
+ //SPLURT EDIT - Interactions subsystem
+ if(!SSinteractions)
+ return // Can't continue, no subsystem
+ for(var/iterating_interaction_id in SSinteractions.interactions)
+ var/datum/interaction/interaction = SSinteractions.interactions[iterating_interaction_id]
+ //SPLURT EDIT END
if(interaction.lewd)
if(!self.client?.prefs?.read_preference(/datum/preference/toggle/erp))
continue
+ /*
+ SPLURT EDIT REMOVAL - Interactions
if(interaction.sexuality != "" && interaction.sexuality != self.client?.prefs?.read_preference(/datum/preference/choiced/erp_sexuality))
continue
+ */
interactions.Add(interaction)
/datum/component/interactable/RegisterWithParent()
@@ -143,11 +150,11 @@
if(params["interaction"])
var/interaction_id = params["interaction"]
- if(GLOB.interaction_instances[interaction_id])
+ if(SSinteractions.interactions[interaction_id])
var/mob/living/carbon/human/user = locate(params["userref"])
- if(!can_interact(GLOB.interaction_instances[interaction_id], user))
+ if(!can_interact(SSinteractions.interactions[interaction_id], user))
return FALSE
- GLOB.interaction_instances[interaction_id].act(user, locate(params["selfref"]))
+ SSinteractions.interactions[interaction_id].act(user, locate(params["selfref"]))
var/datum/component/interactable/interaction_component = user.GetComponent(/datum/component/interactable)
interaction_component.interact_last = world.time
interact_next = interaction_component.interact_last + INTERACTION_COOLDOWN
diff --git a/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm b/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm
index 7826e8d285047..d3e6298ded73c 100644
--- a/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm
+++ b/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm
@@ -1,5 +1,7 @@
+/* SPLURT EDIT REMOVAL - Interactions subsystem
GLOBAL_LIST_EMPTY_TYPED(interaction_instances, /datum/interaction)
+*/
/datum/interaction
/// The name to be displayed in the interaction menu for this interaction
@@ -48,8 +50,10 @@ GLOBAL_LIST_EMPTY_TYPED(interaction_instances, /datum/interaction)
var/list/interaction_requires = list()
/// What color should the interaction button be?
var/color = "blue"
+ /* SPLURT EDIT REMOVAL - Interactions
/// What sexuality preference do we display for.
var/sexuality = ""
+ */
/datum/interaction/proc/allow_act(mob/living/carbon/human/user, mob/living/carbon/human/target)
if(target == user && usage == INTERACTION_OTHER)
@@ -157,7 +161,7 @@ GLOBAL_LIST_EMPTY_TYPED(interaction_instances, /datum/interaction)
target_pleasure = sanitize_integer(json["target_pleasure"], 0, 100, 0)
target_pain = sanitize_integer(json["target_pain"], 0, 100, 0)
lewd = sanitize_integer(json["lewd"], 0, 1, 0)
- sexuality = sanitize_text(json["sexuality"])
+ // sexuality = sanitize_text(json["sexuality"]) //SPLURT EDIT REMOVAL - Interactions
return TRUE
/datum/interaction/proc/json_save(path)
@@ -187,7 +191,7 @@ GLOBAL_LIST_EMPTY_TYPED(interaction_instances, /datum/interaction)
"target_pleasure" = target_pleasure,
"target_pain" = target_pain,
"lewd" = lewd,
- "sexuality" = sexuality,
+ // "sexuality" = sexuality, //SPLURT EDIT REMOVAL - Interactions
)
var/file = file(fpath)
WRITE_FILE(file, json_encode(json))
@@ -201,7 +205,7 @@ GLOBAL_LIST_EMPTY_TYPED(interaction_instances, /datum/interaction)
/proc/populate_interaction_instances()
for(var/spath in subtypesof(/datum/interaction))
var/datum/interaction/interaction = new spath()
- GLOB.interaction_instances[interaction.name] = interaction
+ SSinteractions.interactions[interaction.name] = interaction //SPLURT EDIT - Interactions subsystem - Original: GLOB.interaction_instances[interaction.name] = interaction
populate_interaction_jsons(INTERACTION_JSON_FOLDER)
/proc/populate_interaction_jsons(directory)
@@ -214,7 +218,7 @@ GLOBAL_LIST_EMPTY_TYPED(interaction_instances, /datum/interaction)
continue
var/datum/interaction/interaction = new()
if(interaction.load_from_json(directory + file))
- GLOB.interaction_instances[interaction.name] = interaction
+ SSinteractions.interactions[interaction.name] = interaction //SPLURT EDIT - Interactions subsystem - Original: GLOB.interaction_instances[interaction.name] = interaction
else message_admins("Error loading interaction from file: '[directory + file]'. Inform coders.")
/proc/populate_interaction_jsons_master(path)
@@ -225,7 +229,7 @@ GLOBAL_LIST_EMPTY_TYPED(interaction_instances, /datum/interaction)
var/list/json = json_load(file)
for(var/iname in json)
- if(GLOB.interaction_instances[iname])
+ if(SSinteractions.interactions[iname]) //SPLURT EDIT - Interactions subsystem - Original: if(GLOB.interaction_instances[iname])
message_admins("Interaction Master '[path]' contained a duplicate interaction! '[iname]'")
continue
@@ -257,9 +261,9 @@ GLOBAL_LIST_EMPTY_TYPED(interaction_instances, /datum/interaction)
interaction.target_pleasure = sanitize_integer(ijson["target_pleasure"], 0, 100, 0)
interaction.target_pain = sanitize_integer(ijson["target_pain"], 0, 100, 0)
interaction.lewd = sanitize_integer(ijson["lewd"], 0, 1, 0)
- interaction.sexuality = sanitize_text(ijson["sexuality"])
+ // interaction.sexuality = sanitize_text(ijson["sexuality"]) //SPLURT EDIT REMOVAL - Interactions
- GLOB.interaction_instances[iname] = interaction
+ SSinteractions.interactions[iname] = interaction //SPLURT EDIT - Interactions subsystem - Original: GLOB.interaction_instances[iname] = interaction
ADMIN_VERB(reload_interactions, R_DEBUG, "Reload Interactions", "Force reload interactions.", ADMIN_CATEGORY_DEBUG)
- populate_interaction_instances()
+ SSinteractions.prepare_interactions() //SPLURT EDIT - Interactions subsystem - Original: populate_interaction_instances()
diff --git a/modular_zzplurt/code/controllers/subsystem/interactions.dm b/modular_zzplurt/code/controllers/subsystem/interactions.dm
new file mode 100644
index 0000000000000..b8567fa5a4663
--- /dev/null
+++ b/modular_zzplurt/code/controllers/subsystem/interactions.dm
@@ -0,0 +1,54 @@
+SUBSYSTEM_DEF(interactions)
+ name = "Interactions"
+ flags = SS_NO_FIRE
+ init_order = INIT_ORDER_INTERACTIONS
+ var/list/datum/interaction/interactions
+ VAR_PROTECTED/list/blacklisted_mobs = list(
+ /mob/dead,
+ /mob/dview,
+ /mob/camera,
+ /mob/living/simple_animal/pet,
+ /mob/living/simple_animal/cockroach,
+ /mob/living/simple_animal/babyKiwi,
+ /mob/living/simple_animal/butterfly,
+ /mob/living/simple_animal/chick,
+ /mob/living/simple_animal/chicken,
+ /mob/living/simple_animal/cow,
+ /mob/living/simple_animal/crab,
+ /mob/living/simple_animal/kiwi,
+ /mob/living/simple_animal/parrot,
+ /mob/living/simple_animal/sloth,
+ /mob/living/simple_animal/pickle,
+ /mob/living/simple_animal/hostile/retaliate/goat
+ )
+ VAR_PROTECTED/initialized_blacklist
+
+/datum/controller/subsystem/interactions/Initialize()
+ prepare_interactions()
+ prepare_blacklisted_mobs()
+ . = ..()
+ var/extra_info = "↳ Loaded [LAZYLEN(interactions)] interactions!"
+ to_chat(world, span_boldannounce(extra_info))
+ log_config(extra_info)
+
+/datum/controller/subsystem/interactions/stat_entry(msg)
+ msg += "|🖐:[LAZYLEN(interactions)]|"
+ msg += "🚫👨:[LAZYLEN(blacklisted_mobs)]"
+ return ..()
+
+/datum/controller/subsystem/interactions/proc/prepare_interactions()
+ QDEL_LIST(interactions)
+ QDEL_NULL(interactions)
+ interactions = list()
+ populate_interaction_instances()
+
+/datum/controller/subsystem/interactions/proc/prepare_blacklisted_mobs()
+ blacklisted_mobs = typecacheof(blacklisted_mobs)
+ initialized_blacklist = TRUE
+
+/datum/controller/subsystem/interactions/proc/is_blacklisted(mob/living/creature)
+ if(!creature || !initialized_blacklist)
+ return TRUE
+ if(is_type_in_typecache(creature, blacklisted_mobs))
+ return TRUE
+ return FALSE
diff --git a/tgstation.dme b/tgstation.dme
index 0149e98097d7a..fc3b78a1cd169 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -527,6 +527,7 @@
#include "code\__DEFINES\~~~splurt_defines\spans.dm"
#include "code\__DEFINES\~~~splurt_defines\species_clothing_paths.dm"
#include "code\__DEFINES\~~~splurt_defines\strippable.dm"
+#include "code\__DEFINES\~~~splurt_defines\subsystems.dm"
#include "code\__DEFINES\~~~splurt_defines\thirst.dm"
#include "code\__DEFINES\~~~splurt_defines\underwear.dm"
#include "code\__DEFINES\~~~splurt_defines\dcs\signals.dm"
@@ -9469,6 +9470,7 @@
#include "modular_zzplurt\code\controllers\configuration\entries\discord.dm"
#include "modular_zzplurt\code\controllers\configuration\entries\fetish_content.dm"
#include "modular_zzplurt\code\controllers\subsystem\discord.dm"
+#include "modular_zzplurt\code\controllers\subsystem\interactions.dm"
#include "modular_zzplurt\code\datums\dna.dm"
#include "modular_zzplurt\code\datums\outfit.dm"
#include "modular_zzplurt\code\datums\sprite_accessories.dm"
From 366a3a5b8ca7f4f43274a8d1b795b380cf24b6dc Mon Sep 17 00:00:00 2001
From: Mosley <93835010+MosleyTheMalO@users.noreply.github.com>
Date: Sat, 21 Dec 2024 01:56:51 -0500
Subject: [PATCH 02/43] Interaction checks (needs unholy and extreme checks)
---
.../~~~splurt_defines/interactions.dm | 16 ++++++
.../code/interaction_datum.dm | 2 +
.../lewd_items/code/lewd_helpers/human.dm | 2 +
.../interaction_menu/interaction_datum.dm | 49 +++++++++++++++++++
.../interaction_menu/lewd_helpers/human.dm | 46 +++++++++++++++++
tgstation.dme | 3 ++
6 files changed, 118 insertions(+)
create mode 100644 code/__DEFINES/~~~splurt_defines/interactions.dm
create mode 100644 modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm
create mode 100644 modular_zzplurt/code/modules/lewd/interaction_menu/lewd_helpers/human.dm
diff --git a/code/__DEFINES/~~~splurt_defines/interactions.dm b/code/__DEFINES/~~~splurt_defines/interactions.dm
new file mode 100644
index 0000000000000..f38ed8e8cbe0d
--- /dev/null
+++ b/code/__DEFINES/~~~splurt_defines/interactions.dm
@@ -0,0 +1,16 @@
+//Extra interaction checks.
+// A person needs to have mouth available to do this interaction
+#define INTERACTION_REQUIRE_SELF_MOUTH "self_mouth"
+#define INTERACTION_REQUIRE_TARGET_MOUTH "target_mouth"
+
+// A person needs to have their top clothes removed to do this interaction
+#define INTERACTION_REQUIRE_SELF_TOPLESS "self_topless"
+#define INTERACTION_REQUIRE_TARGET_TOPLESS "target_topless"
+
+// A person needs to have their bottom clothes removed to do this interaction
+#define INTERACTION_REQUIRE_SELF_BOTTOMLESS "self_bottomless"
+#define INTERACTION_REQUIRE_TARGET_BOTTOMLESS "target_bottomless"
+
+// A person needs to have their feet exposed to do this interaction
+#define INTERACTION_REQUIRE_SELF_FEET "self_feet"
+#define INTERACTION_REQUIRE_TARGET_FEET "target_feet"
diff --git a/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm b/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm
index d3e6298ded73c..408b8be0cd051 100644
--- a/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm
+++ b/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm
@@ -55,6 +55,7 @@ GLOBAL_LIST_EMPTY_TYPED(interaction_instances, /datum/interaction)
var/sexuality = ""
*/
+/* SPLURT EDIT REMOVAL - Interactions - Refractored in modular
/datum/interaction/proc/allow_act(mob/living/carbon/human/user, mob/living/carbon/human/target)
if(target == user && usage == INTERACTION_OTHER)
return FALSE
@@ -86,6 +87,7 @@ GLOBAL_LIST_EMPTY_TYPED(interaction_instances, /datum/interaction)
else
CRASH("Unimplemented interaction requirement '[requirement]'")
return TRUE
+*/ //SPLURT EDIT END
/datum/interaction/proc/act(mob/living/carbon/human/user, mob/living/carbon/human/target)
if(!allow_act(user, target))
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/human.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/human.dm
index 86b0ca58ab70e..6388a81de2ccf 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/human.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_helpers/human.dm
@@ -36,6 +36,7 @@
/mob/living/carbon/human/proc/is_head_uncovered()
return (head?.body_parts_covered & HEAD)
+/* SPLURT EDIT REMOVAL - Interactions - Refractored in modular
/// Returns true if the human has an accessible penis for the parameter. Accepts any of the `REQUIRE_GENITAL_` defines.
/mob/living/carbon/human/proc/has_penis(required_state = REQUIRE_GENITAL_ANY)
var/obj/item/organ/external/genital/genital = get_organ_slot(ORGAN_SLOT_PENIS)
@@ -117,6 +118,7 @@
return genital.visibility_preference != GENITAL_ALWAYS_SHOW && !is_bottomless()
else
return TRUE
+*/ //SPLURT EDIT END
/// Returns true if the human has a accessible feet for the parameter, returning the number of feet the human has if they do. Accepts any of the `REQUIRE_GENITAL_` defines.
/mob/living/carbon/human/proc/has_arms(required_state = REQUIRE_GENITAL_ANY)
diff --git a/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm b/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm
new file mode 100644
index 0000000000000..d299b67346ecc
--- /dev/null
+++ b/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm
@@ -0,0 +1,49 @@
+/datum/interaction/proc/allow_act(mob/living/carbon/human/user, mob/living/carbon/human/target)
+ if(target == user && usage == INTERACTION_OTHER)
+ return FALSE
+
+ if(user_required_parts.len)
+ for(var/slot in user_required_parts)
+ if(!user.has_genital(LAZYACCESS(user_required_parts, slot) || REQUIRE_GENITAL_EXPOSED, slot))
+ return FALSE
+
+ if(target_required_parts.len)
+ for(var/slot in target_required_parts)
+ if(!target.has_genital(LAZYACCESS(target_required_parts, slot) || REQUIRE_GENITAL_EXPOSED, slot))
+ return FALSE
+
+ for(var/requirement in interaction_requires)
+ switch(requirement)
+ if(INTERACTION_REQUIRE_SELF_HAND)
+ if(!user.get_active_hand())
+ return FALSE
+ if(INTERACTION_REQUIRE_TARGET_HAND)
+ if(!target.get_active_hand())
+ return FALSE
+ if(INTERACTION_REQUIRE_SELF_MOUTH)
+ if(!user.get_bodypart(BODY_ZONE_PRECISE_MOUTH) || user.is_mouth_covered())
+ return FALSE
+ if(INTERACTION_REQUIRE_TARGET_MOUTH)
+ if(!target.get_bodypart(BODY_ZONE_PRECISE_MOUTH) || target.is_mouth_covered())
+ return FALSE
+ if(INTERACTION_REQUIRE_SELF_TOPLESS)
+ if(!user.is_topless())
+ return FALSE
+ if(INTERACTION_REQUIRE_TARGET_TOPLESS)
+ if(!target.is_topless())
+ return FALSE
+ if(INTERACTION_REQUIRE_SELF_BOTTOMLESS)
+ if(!user.is_bottomless())
+ return FALSE
+ if(INTERACTION_REQUIRE_TARGET_BOTTOMLESS)
+ if(!target.is_bottomless())
+ return FALSE
+ if(INTERACTION_REQUIRE_SELF_FEET)
+ if(!(user.has_feet() >= (LAZYACCESS(user_required_parts, INTERACTION_REQUIRE_SELF_FEET) || 2))) //We prolly don't need to care if it's exposed or not
+ return FALSE
+ if(INTERACTION_REQUIRE_TARGET_FEET)
+ if(!(target.has_feet() >= (LAZYACCESS(target_required_parts, INTERACTION_REQUIRE_TARGET_FEET) || 2)))
+ return FALSE
+ else
+ CRASH("Unimplemented interaction requirement '[requirement]'")
+ return TRUE
diff --git a/modular_zzplurt/code/modules/lewd/interaction_menu/lewd_helpers/human.dm b/modular_zzplurt/code/modules/lewd/interaction_menu/lewd_helpers/human.dm
new file mode 100644
index 0000000000000..984f8d644cacb
--- /dev/null
+++ b/modular_zzplurt/code/modules/lewd/interaction_menu/lewd_helpers/human.dm
@@ -0,0 +1,46 @@
+
+/// Helper proc that checks if a human has a genital of a specific type and exposure state
+/mob/living/carbon/human/proc/has_genital(required_state = REQUIRE_GENITAL_ANY, genital_slot)
+ var/obj/item/organ/external/genital/genital = get_organ_slot(genital_slot)
+ if(!genital)
+ return FALSE
+
+ switch(required_state)
+ if(REQUIRE_GENITAL_ANY)
+ return TRUE
+ if(REQUIRE_GENITAL_EXPOSED)
+ return genital.is_exposed()
+ if(REQUIRE_GENITAL_UNEXPOSED)
+ return !genital.is_exposed()
+ else
+ return TRUE
+
+/// Returns true if the human has an accessible penis for the parameter. Accepts any of the `REQUIRE_GENITAL_` defines.
+/mob/living/carbon/human/proc/has_penis(required_state = REQUIRE_GENITAL_ANY)
+ return has_genital(required_state, ORGAN_SLOT_PENIS)
+
+/// Returns true if the human has accessible balls for the parameter. Accepts any of the `REQUIRE_GENITAL_` defines.
+/mob/living/carbon/human/proc/has_balls(required_state = REQUIRE_GENITAL_ANY)
+ return has_genital(required_state, ORGAN_SLOT_TESTICLES)
+
+/// Returns true if the human has an accessible vagina for the parameter. Accepts any of the `REQUIRE_GENITAL_` defines.
+/mob/living/carbon/human/proc/has_vagina(required_state = REQUIRE_GENITAL_ANY)
+ return has_genital(required_state, ORGAN_SLOT_VAGINA)
+
+/// Returns true if the human has accessible breasts for the parameter. Accepts any of the `REQUIRE_GENITAL_` defines.
+/mob/living/carbon/human/proc/has_breasts(required_state = REQUIRE_GENITAL_ANY)
+ return has_genital(required_state, ORGAN_SLOT_BREASTS)
+
+/// Returns true if the human has an accessible anus for the parameter. Accepts any of the `REQUIRE_GENITAL_` defines.
+/mob/living/carbon/human/proc/has_anus(required_state = REQUIRE_GENITAL_ANY)
+ if(issilicon(src))
+ return TRUE
+ return has_genital(required_state, ORGAN_SLOT_ANUS)
+
+/// Returns true if the human has an accessible butt for the parameter. Accepts any of the `REQUIRE_GENITAL_` defines.
+/mob/living/carbon/human/proc/has_butt(required_state = REQUIRE_GENITAL_ANY)
+ return has_genital(required_state, ORGAN_SLOT_BUTT)
+
+/// Returns true if the human has an accessible belly for the parameter. Accepts any of the `REQUIRE_GENITAL_` defines.
+/mob/living/carbon/human/proc/has_belly(required_state = REQUIRE_GENITAL_ANY)
+ return has_genital(required_state, ORGAN_SLOT_BELLY)
diff --git a/tgstation.dme b/tgstation.dme
index fc3b78a1cd169..64960d85ee8a2 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -520,6 +520,7 @@
#include "code\__DEFINES\~~~splurt_defines\DNA.dm"
#include "code\__DEFINES\~~~splurt_defines\hud.dm"
#include "code\__DEFINES\~~~splurt_defines\intents.dm"
+#include "code\__DEFINES\~~~splurt_defines\interactions.dm"
#include "code\__DEFINES\~~~splurt_defines\inventory.dm"
#include "code\__DEFINES\~~~splurt_defines\keybinding.dm"
#include "code\__DEFINES\~~~splurt_defines\mobs.dm"
@@ -9576,6 +9577,8 @@
#include "modular_zzplurt\code\modules\hud\screen_objects.dm"
#include "modular_zzplurt\code\modules\language\_language_holder.dm"
#include "modular_zzplurt\code\modules\language\buzzwords.dm"
+#include "modular_zzplurt\code\modules\lewd\interaction_menu\interaction_datum.dm"
+#include "modular_zzplurt\code\modules\lewd\interaction_menu\lewd_helpers\human.dm"
#include "modular_zzplurt\code\modules\mob\mob.dm"
#include "modular_zzplurt\code\modules\mob\mob_defines.dm"
#include "modular_zzplurt\code\modules\mob\mob_update_icons.dm"
From 480b29752a01c9c012920cca8a8cb14950338143 Mon Sep 17 00:00:00 2001
From: Mosley <93835010+MosleyTheMalO@users.noreply.github.com>
Date: Mon, 23 Dec 2024 01:50:58 -0500
Subject: [PATCH 03/43] Interactions climax edits
---
.../~~~splurt_defines/interactions.dm | 18 +++-
.../configuration/configuration.dm | 2 +-
.../code/interaction_datum.dm | 11 ++-
.../lewd_items/code/lewd_arousal/climax.dm | 52 +++++++++---
.../lewd_items/code/lewd_arousal/pain.dm | 4 +-
.../lewd_items/code/lewd_arousal/pleasure.dm | 4 +-
.../controllers/subsystem/interactions.dm | 26 +++---
.../interaction_menu/interaction_datum.dm | 84 +++++++++++++++++++
8 files changed, 167 insertions(+), 34 deletions(-)
diff --git a/code/__DEFINES/~~~splurt_defines/interactions.dm b/code/__DEFINES/~~~splurt_defines/interactions.dm
index f38ed8e8cbe0d..ad4907bf21b41 100644
--- a/code/__DEFINES/~~~splurt_defines/interactions.dm
+++ b/code/__DEFINES/~~~splurt_defines/interactions.dm
@@ -1,4 +1,5 @@
-//Extra interaction checks.
+/// Extra interaction checks.
+
// A person needs to have mouth available to do this interaction
#define INTERACTION_REQUIRE_SELF_MOUTH "self_mouth"
#define INTERACTION_REQUIRE_TARGET_MOUTH "target_mouth"
@@ -14,3 +15,18 @@
// A person needs to have their feet exposed to do this interaction
#define INTERACTION_REQUIRE_SELF_FEET "self_feet"
#define INTERACTION_REQUIRE_TARGET_FEET "target_feet"
+
+/// Climax definitions
+
+//Climaxing genitals
+#define CLIMAX_VAGINA "Vagina"
+#define CLIMAX_PENIS "Penis"
+#define CLIMAX_BOTH "Both"
+
+//Climaxing positions
+#define CLIMAX_POSITION_USER "climax_user"
+#define CLIMAX_POSITION_TARGET "climax_target"
+
+//Climaxing targets (use these if you're not using organ slots)
+#define CLIMAX_TARGET_MOUTH "mouth"
+#define CLIMAX_TARGET_SHEATH "sheath"
diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm
index 5af3f7b842275..4c43381d46e22 100644
--- a/code/controllers/configuration/configuration.dm
+++ b/code/controllers/configuration/configuration.dm
@@ -105,7 +105,7 @@
load_whitelist()
// SKYRAT EDIT ADDITION START
- populate_interaction_instances()
+ //populate_interaction_instances() //SPLURT EDIT REMOVAL - Interactions
remove_erp_things()
// SKYRAT EDIT ADDITION END
diff --git a/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm b/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm
index 408b8be0cd051..73c7441daf67b 100644
--- a/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm
+++ b/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm
@@ -125,12 +125,15 @@ GLOBAL_LIST_EMPTY_TYPED(interaction_instances, /datum/interaction)
SEND_SOUND(sound_cache, mob)
if(lewd)
- user.adjust_pleasure(user_pleasure)
+ user.adjust_pleasure(user_pleasure, target, src, CLIMAX_POSITION_USER) //SPLURT EDIT - Interactions
user.adjust_arousal(user_arousal)
- user.adjust_pain(user_pain)
- target.adjust_pleasure(target_pleasure)
+ user.adjust_pain(user_pain, target, src, CLIMAX_POSITION_USER) //SPLURT EDIT - Interactions
+ target.adjust_pleasure(target_pleasure, user, src, CLIMAX_POSITION_TARGET) //SPLURT EDIT - Interactions
target.adjust_arousal(target_arousal)
- target.adjust_pain(target_pain)
+ target.adjust_pain(target_pain, user, src, CLIMAX_POSITION_TARGET) //SPLURT EDIT - Interactions
+
+ post_interaction(user, target) //SPLURT EDIT - Interactions
+ return TRUE
/datum/interaction/proc/load_from_json(path)
var/fpath = path
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/climax.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/climax.dm
index e980f1c9c0f65..07ede6ca8b5aa 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/climax.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/climax.dm
@@ -1,6 +1,10 @@
+//SPLURT EDIT REMOVAL BEGIN - Interactions - Moved climax defines to global defines
+/*
#define CLIMAX_VAGINA "Vagina"
#define CLIMAX_PENIS "Penis"
#define CLIMAX_BOTH "Both"
+*/
+//SPLURT EDIT REMOVAL END
#define CLIMAX_ON_FLOOR "On the floor"
#define CLIMAX_IN_OR_ON "Climax in or on someone"
@@ -9,7 +13,7 @@
/// Used to prevent nightmare scenarios.
var/refractory_period
-/mob/living/carbon/human/proc/climax(manual = TRUE)
+/mob/living/carbon/human/proc/climax(manual = TRUE, mob/living/carbon/human/partner, datum/interaction/climax_interaction, interaction_position)
if (CONFIG_GET(flag/disable_erp_preferences))
return
@@ -39,7 +43,10 @@
else if(has_penis())
genitals.Add(CLIMAX_PENIS)
climax_choice = tgui_alert(src, "You are climaxing, choose which genitalia to climax with.", "Genitalia Preference!", genitals)
-
+ //SPLURT EDIT ADDITION BEGIN - Interactions
+ else if(climax_interaction)
+ climax_choice = climax_interaction.cum_genital[interaction_position]
+ //SPLURT EDIT ADDITION END
switch(gender)
if(MALE)
conditional_pref_sound(get_turf(src), pick('modular_skyrat/modules/modular_items/lewd_items/sounds/final_m1.ogg',
@@ -81,7 +88,7 @@
if(interactable_inrange_humans.len)
buttons += CLIMAX_IN_OR_ON
- var/penis_climax_choice = tgui_alert(src, "Choose where to shoot your load.", "Load preference!", buttons)
+ var/penis_climax_choice = climax_interaction && !manual ? CLIMAX_IN_OR_ON : tgui_alert(src, "Choose where to shoot your load.", "Load preference!", buttons) //SPLURT EDIT CHANGE - Interactions
var/create_cum_decal = FALSE
@@ -91,13 +98,13 @@
span_userlove("You shoot string after string of hot cum, hitting the floor!"))
else
- var/target_choice = tgui_input_list(src, "Choose a person to cum in or on.", "Choose target!", interactable_inrange_humans)
+ var/target_choice = climax_interaction && !manual ? partner.name : tgui_input_list(src, "Choose a person to cum in or on.", "Choose target!", interactable_inrange_humans) //SPLURT EDIT CHANGE - Interactions
if(!target_choice)
create_cum_decal = TRUE
visible_message(span_userlove("[src] shoots [self_their] sticky load onto the floor!"), \
span_userlove("You shoot string after string of hot cum, hitting the floor!"))
else
- var/mob/living/carbon/human/target_human = interactable_inrange_humans[target_choice]
+ var/mob/living/carbon/human/target_human = climax_interaction && !manual ? partner : interactable_inrange_humans[target_choice] //SPLURT EDIT CHANGE - Interactions
var/target_human_them = target_human.p_them()
var/list/target_buttons = list()
@@ -107,16 +114,28 @@
if(target_human.has_vagina(REQUIRE_GENITAL_EXPOSED))
target_buttons += ORGAN_SLOT_VAGINA
if(target_human.has_anus(REQUIRE_GENITAL_EXPOSED))
- target_buttons += "asshole"
+ target_buttons += ORGAN_SLOT_ANUS //SPLURT EDIT CHANGE - Interactions - Changed asshole to anus for consistency
if(target_human.has_penis(REQUIRE_GENITAL_EXPOSED))
var/obj/item/organ/external/genital/penis/other_penis = target_human.get_organ_slot(ORGAN_SLOT_PENIS)
if(other_penis.sheath != "None")
target_buttons += "sheath"
target_buttons += "On [target_human_them]"
- var/climax_into_choice = tgui_input_list(src, "Where on or in [target_human] do you wish to cum?", "Final frontier!", target_buttons)
+ //SPLURT EDIT CHANGE BEGIN - Interactions
+ var/climax_into_choice
+ var/interaction_inside = partner?.get_organ_slot(climax_interaction?.cum_target[interaction_position]) || target_buttons[climax_interaction?.cum_target[interaction_position]] //SPLURT EDIT CHANGE - Interactions
+
+ if(climax_interaction && !manual && interaction_inside)
+ climax_into_choice = climax_interaction.cum_target[interaction_position]
+ else if(manual)
+ climax_into_choice = tgui_input_list(src, "Where on or in [target_human] do you wish to cum?", "Final frontier!", target_buttons)
+ else
+ climax_into_choice = "On [target_human_them]"
- if(!climax_into_choice)
+ if(climax_interaction && !manual && climax_interaction.show_climax(src, target_human, interaction_position))
+ create_cum_decal = !interaction_inside
+ else if(!climax_into_choice)
+ //SPLURT EDIT CHANGE END
create_cum_decal = TRUE
visible_message(span_userlove("[src] shoots their sticky load onto the floor!"), \
span_userlove("You shoot string after string of hot cum, hitting the floor!"))
@@ -144,11 +163,14 @@
if(climax_choice == CLIMAX_VAGINA || climax_choice == CLIMAX_BOTH)
var/obj/item/organ/external/genital/vagina/vagina = get_organ_slot(ORGAN_SLOT_VAGINA)
+ var/climax_text_override = climax_interaction && !manual && climax_interaction.show_climax(src, partner, interaction_position) //SPLURT EDIT CHANGE - Interactions
if(is_bottomless() || vagina.visibility_preference == GENITAL_ALWAYS_SHOW)
- visible_message(span_userlove("[src] twitches and moans as [p_they()] climax from their vagina!"), span_userlove("You twitch and moan as you climax from your vagina!"))
+ if(!climax_text_override) //SPLURT EDIT CHANGE - Interactions
+ visible_message(span_userlove("[src] twitches and moans as [p_they()] climax from their vagina!"), span_userlove("You twitch and moan as you climax from your vagina!"))
add_cum_splatter_floor(get_turf(src), female = TRUE)
else
- visible_message(span_userlove("[src] cums in [self_their] underwear from [self_their] vagina!"), \
+ if(!climax_text_override) //SPLURT EDIT CHANGE - Interactions
+ visible_message(span_userlove("[src] cums in [self_their] underwear from [self_their] vagina!"), \
span_userlove("You cum in your underwear from your vagina! Eww."))
self_orgasm = TRUE
@@ -156,10 +178,20 @@
apply_status_effect(/datum/status_effect/climax_cooldown)
if(self_orgasm)
add_mood_event("orgasm", /datum/mood_event/climaxself)
+
+ // SPLURT EDIT ADDITION BEGIN - Interactions
+ if(climax_interaction && !manual)
+ climax_interaction.post_climax(src, partner, interaction_position)
+ //SPLURT EDIT ADDITION END
return TRUE
+//SPLURT EDIT REMOVAL BEGIN - Interactions - Moved climax defines to global defines
+/*
#undef CLIMAX_VAGINA
#undef CLIMAX_PENIS
#undef CLIMAX_BOTH
+*/
+//SPLURT EDIT REMOVAL END
+
#undef CLIMAX_ON_FLOOR
#undef CLIMAX_IN_OR_ON
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/pain.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/pain.dm
index e0d14bf01a21b..8cad6ca5087b7 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/pain.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/pain.dm
@@ -5,7 +5,7 @@
/mob/living/proc/adjust_pain(change_amount = 0)
return
-/mob/living/carbon/human/adjust_pain(change_amount = 0)
+/mob/living/carbon/human/adjust_pain(change_amount = 0, mob/living/carbon/human/partner, datum/interaction/interaction, position)
if(stat >= DEAD || !client?.prefs?.read_preference(/datum/preference/toggle/erp))
return
@@ -23,6 +23,6 @@
else if(HAS_TRAIT(src, TRAIT_MASOCHISM))
if(change_amount > 0)
adjust_arousal(change_amount)
- adjust_pleasure(change_amount / 2)
+ adjust_pleasure(change_amount / 2, partner, interaction, position)
pain = clamp(pain + change_amount, AROUSAL_MINIMUM, AROUSAL_LIMIT)
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/pleasure.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/pleasure.dm
index bcda8503d219c..59c67ce90495a 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/pleasure.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/pleasure.dm
@@ -1,8 +1,8 @@
-/mob/living/carbon/human/proc/adjust_pleasure(pleas = 0)
+/mob/living/carbon/human/proc/adjust_pleasure(pleas = 0, mob/living/carbon/human/partner, datum/interaction/interaction, position)
if(stat >= DEAD || !client?.prefs?.read_preference(/datum/preference/toggle/erp))
return
pleasure = clamp(pleasure + pleas, AROUSAL_MINIMUM, AROUSAL_LIMIT)
if(pleasure >= AROUSAL_AUTO_CLIMAX_THRESHOLD) // lets cum
- climax(manual = FALSE)
+ climax(manual = FALSE, partner = partner, climax_interaction = interaction, interaction_position = position)
diff --git a/modular_zzplurt/code/controllers/subsystem/interactions.dm b/modular_zzplurt/code/controllers/subsystem/interactions.dm
index b8567fa5a4663..5904a1ae7fed5 100644
--- a/modular_zzplurt/code/controllers/subsystem/interactions.dm
+++ b/modular_zzplurt/code/controllers/subsystem/interactions.dm
@@ -7,19 +7,17 @@ SUBSYSTEM_DEF(interactions)
/mob/dead,
/mob/dview,
/mob/camera,
- /mob/living/simple_animal/pet,
- /mob/living/simple_animal/cockroach,
- /mob/living/simple_animal/babyKiwi,
- /mob/living/simple_animal/butterfly,
- /mob/living/simple_animal/chick,
- /mob/living/simple_animal/chicken,
- /mob/living/simple_animal/cow,
- /mob/living/simple_animal/crab,
- /mob/living/simple_animal/kiwi,
- /mob/living/simple_animal/parrot,
- /mob/living/simple_animal/sloth,
- /mob/living/simple_animal/pickle,
- /mob/living/simple_animal/hostile/retaliate/goat
+ /mob/living/basic/pet,
+ /mob/living/basic/cockroach,
+ /mob/living/basic/butterfly,
+ /mob/living/basic/chick,
+ /mob/living/basic/chicken,
+ /mob/living/basic/cow,
+ /mob/living/basic/crab,
+ /mob/living/basic/kiwi,
+ /mob/living/basic/parrot,
+ /mob/living/basic/sloth,
+ /mob/living/basic/goat
)
VAR_PROTECTED/initialized_blacklist
@@ -37,7 +35,7 @@ SUBSYSTEM_DEF(interactions)
return ..()
/datum/controller/subsystem/interactions/proc/prepare_interactions()
- QDEL_LIST(interactions)
+ QDEL_LIST_ASSOC_VAL(interactions)
QDEL_NULL(interactions)
interactions = list()
populate_interaction_instances()
diff --git a/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm b/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm
index d299b67346ecc..c0a35c7904f0a 100644
--- a/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm
+++ b/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm
@@ -1,3 +1,31 @@
+/datum/interaction
+ /// Which genital the interaction cums with (must be penis, vagina or both)
+ var/list/cum_genital = list(CLIMAX_POSITION_USER = null, CLIMAX_POSITION_TARGET = null)
+ /// Where on the partner the interaction cums in? (It must match a genital's ORGAN_SLOT, mouth or sheath)
+ var/list/cum_target = list(CLIMAX_POSITION_USER = null, CLIMAX_POSITION_TARGET = null)
+ /// override of the text to display when the interaction cums (use this if you're not using a cum_target)
+ var/list/cum_message_text_overrides = list(CLIMAX_POSITION_USER = list(), CLIMAX_POSITION_TARGET = list())
+ /// override of the self message to display when the interaction cums (use this if you're not using a cum_target)
+ var/list/cum_self_text_overrides = list(CLIMAX_POSITION_USER = list(), CLIMAX_POSITION_TARGET = list())
+ /// override of the text to display to the partner when the interaction cums (use this if you're not using a cum_target)
+ var/list/cum_partner_text_overrides = list(CLIMAX_POSITION_USER = list(), CLIMAX_POSITION_TARGET = list())
+
+/datum/interaction/load_from_json(path)
+ . = ..()
+ if(!.)
+ return FALSE
+ var/list/json = json_decode(file2text(path))
+ cum_genital[CLIMAX_POSITION_USER] = sanitize_text(json["cum_genital_user"])
+ cum_genital[CLIMAX_POSITION_TARGET] = sanitize_text(json["cum_genital_target"])
+ cum_target[CLIMAX_POSITION_USER] = sanitize_text(json["cum_target_user"])
+ cum_target[CLIMAX_POSITION_TARGET] = sanitize_text(json["cum_target_target"])
+ cum_message_text_overrides[CLIMAX_POSITION_USER] = sanitize_islist(json["cum_message_text_overrides_user"], list())
+ cum_message_text_overrides[CLIMAX_POSITION_TARGET] = sanitize_islist(json["cum_message_text_overrides_target"], list())
+ cum_self_text_overrides[CLIMAX_POSITION_USER] = sanitize_islist(json["cum_self_text_overrides_user"], list())
+ cum_self_text_overrides[CLIMAX_POSITION_TARGET] = sanitize_islist(json["cum_self_text_overrides_target"], list())
+ cum_partner_text_overrides[CLIMAX_POSITION_USER] = sanitize_islist(json["cum_partner_text_overrides_user"], list())
+ cum_partner_text_overrides[CLIMAX_POSITION_TARGET] = sanitize_islist(json["cum_partner_text_overrides_target"], list())
+
/datum/interaction/proc/allow_act(mob/living/carbon/human/user, mob/living/carbon/human/target)
if(target == user && usage == INTERACTION_OTHER)
return FALSE
@@ -47,3 +75,59 @@
else
CRASH("Unimplemented interaction requirement '[requirement]'")
return TRUE
+
+/// Called when the interaction is performed
+/datum/interaction/proc/post_interaction(mob/living/carbon/human/user, mob/living/carbon/human/target)
+ return
+
+// Called when either the user or target is cumming from the interaction, makes the interaction text
+/datum/interaction/proc/show_climax(mob/living/carbon/human/cumming, mob/living/carbon/human/came_in, position)
+ var/override_check = length(cum_message_text_overrides[position]) && length(cum_self_text_overrides[position]) && length(cum_partner_text_overrides[position])
+ if(!override_check)
+ return FALSE
+
+ var/cumming_their = cumming.p_their()
+ var/cumming_them = cumming.p_them()
+ var/came_in_them = came_in.p_them()
+ var/came_in_their = came_in.p_their()
+ var/genital_used = cum_genital[position]
+ var/hole_used = cum_target[position]
+
+ if(override_check)
+ var/message = pick(cum_message_text_overrides[position])
+ message = replacetext(message, "%CUMMING%", "[cumming]")
+ message = replacetext(message, "%CUMMING_THEIR%", "[cumming_their]")
+ message = replacetext(message, "%CUMMING_THEM%", "[cumming_them]")
+ message = replacetext(message, "%CAME_IN%", "[came_in]")
+ message = replacetext(message, "%CAME_IN_THEIR%", "[came_in_their]")
+ message = replacetext(message, "%CAME_IN_THEM%", "[came_in_them]")
+ message = replacetext(message, "%CUM_GENITAL%", "[genital_used]")
+ message = replacetext(message, "%CUM_TARGET%", "[hole_used]")
+
+ var/self_message = pick(cum_self_text_overrides[position])
+ self_message = replacetext(self_message, "%CUMMING%", "[cumming]")
+ self_message = replacetext(self_message, "%CUMMING_THEIR%", "[cumming_their]")
+ self_message = replacetext(self_message, "%CUMMING_THEM%", "[cumming_them]")
+ self_message = replacetext(self_message, "%CAME_IN%", "[came_in]")
+ self_message = replacetext(self_message, "%CAME_IN_THEIR%", "[came_in_their]")
+ self_message = replacetext(self_message, "%CAME_IN_THEM%", "[came_in_them]")
+ self_message = replacetext(self_message, "%CUM_GENITAL%", "[genital_used]")
+ self_message = replacetext(self_message, "%CUM_TARGET%", "[hole_used]")
+
+ var/partner_message = pick(cum_partner_text_overrides[position])
+ partner_message = replacetext(partner_message, "%CUMMING%", "[cumming]")
+ partner_message = replacetext(partner_message, "%CUMMING_THEIR%", "[cumming_their]")
+ partner_message = replacetext(partner_message, "%CUMMING_THEM%", "[cumming_them]")
+ partner_message = replacetext(partner_message, "%CAME_IN%", "[came_in]")
+ partner_message = replacetext(partner_message, "%CAME_IN_THEIR%", "[came_in_their]")
+ partner_message = replacetext(partner_message, "%CAME_IN_THEM%", "[came_in_them]")
+ partner_message = replacetext(partner_message, "%CUM_GENITAL%", "[genital_used]")
+ partner_message = replacetext(partner_message, "%CUM_TARGET%", "[hole_used]")
+
+ cumming.visible_message(span_userlove(message), span_userlove(self_message))
+ to_chat(came_in, span_userlove(partner_message))
+ return TRUE
+
+/// Called after either the user or target cums from the interaction
+/datum/interaction/proc/post_climax(mob/living/carbon/human/cumming, mob/living/carbon/human/came_in, position)
+ return
From 0b5e3f823588b372544a1f8f076ca568ed1f1e77 Mon Sep 17 00:00:00 2001
From: Mosley <93835010+MosleyTheMalO@users.noreply.github.com>
Date: Tue, 24 Dec 2024 04:03:58 -0500
Subject: [PATCH 04/43] Add extreme, harmful, and unholy ERP preferences and
interactions
- Introduced new preferences for extreme, harmful, and unholy ERP interactions in the character directory and preferences menu.
- Updated interaction checks to respect these new preferences, ensuring users can opt-in or out of these types of interactions.
- Added corresponding UI elements for sorting and displaying these new interaction types in the character directory.
- Enhanced the interaction subsystem to handle the new unsafe types effectively.
This update improves user control over ERP interactions, enhancing the overall experience.
Code based off of the extreme interactions in https://github.com/SPLURT-Station/S.P.L.U.R.T-tg/pull/58
And yes, cursor is generating the commit text.
---
.../~~~splurt_defines/interactions.dm | 5 +
.../code/modules/mob/living/examine_tgui.dm | 10 ++
.../code/interaction_component.dm | 11 ++
.../client/verbs/character_directory.dm | 15 +++
.../client/preferences/erp_preferences.dm | 120 ++++++++++++++++++
.../interaction_menu/interaction_datum.dm | 23 ++++
.../interactions/lewd/_lewd.dm | 2 +
.../interactions/lewd/extreme.dm | 5 +
.../interactions/lewd/unholy.dm | 2 +
tgstation.dme | 4 +
.../character_preferences/splurt/genitals.tsx | 29 +++++
.../interfaces/ZubbersCharacterDirectory.jsx | 24 ++++
12 files changed, 250 insertions(+)
create mode 100644 modular_zzplurt/code/modules/client/preferences/erp_preferences.dm
create mode 100644 modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/_lewd.dm
create mode 100644 modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/extreme.dm
create mode 100644 modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/unholy.dm
diff --git a/code/__DEFINES/~~~splurt_defines/interactions.dm b/code/__DEFINES/~~~splurt_defines/interactions.dm
index ad4907bf21b41..40ff89f5faf15 100644
--- a/code/__DEFINES/~~~splurt_defines/interactions.dm
+++ b/code/__DEFINES/~~~splurt_defines/interactions.dm
@@ -30,3 +30,8 @@
//Climaxing targets (use these if you're not using organ slots)
#define CLIMAX_TARGET_MOUTH "mouth"
#define CLIMAX_TARGET_SHEATH "sheath"
+
+// Extreme types
+#define INTERACTION_EXTREME (1<<0)
+#define INTERACTION_EXTREME_HARMFUL INTERACTION_EXTREME | (1<<1)
+#define INTERACTION_UNHOLY (1<<2)
diff --git a/modular_skyrat/master_files/code/modules/mob/living/examine_tgui.dm b/modular_skyrat/master_files/code/modules/mob/living/examine_tgui.dm
index ec0dd5b9b4edc..5d7a578287510 100644
--- a/modular_skyrat/master_files/code/modules/mob/living/examine_tgui.dm
+++ b/modular_skyrat/master_files/code/modules/mob/living/examine_tgui.dm
@@ -66,10 +66,20 @@
var/e_prefs_v = preferences.read_preference(/datum/preference/choiced/erp_status_v)
var/e_prefs_nc = preferences.read_preference(/datum/preference/choiced/erp_status_nc)
var/e_prefs_mechanical = preferences.read_preference(/datum/preference/choiced/erp_status_mechanics)
+ // SPLURT EDIT ADDITION - Interaction preferences
+ var/e_prefs_extm = preferences.read_preference(/datum/preference/choiced/erp_status_extm)
+ var/e_prefs_extmharm = preferences.read_preference(/datum/preference/choiced/erp_status_extmharm)
+ var/e_prefs_unholy = preferences.read_preference(/datum/preference/choiced/erp_status_unholy)
+ // SPLURT EDIT END
ooc_notes += "ERP: [e_prefs]\n"
ooc_notes += "Hypnosis: [e_prefs_hypno]\n"
ooc_notes += "Vore: [e_prefs_v]\n"
ooc_notes += "Non-Con: [e_prefs_nc]\n"
+ // SPLURT EDIT ADDITION - Interaction preferences
+ ooc_notes += "Extreme ERP verbs: [e_prefs_extm]\n"
+ ooc_notes += "Harmful ERP verbs: [e_prefs_extmharm]\n"
+ ooc_notes += "Unholy ERP verbs: [e_prefs_unholy]\n"
+ // SPLURT EDIT END
ooc_notes += "ERP Mechanics: [e_prefs_mechanical]\n"
ooc_notes += "\n"
diff --git a/modular_skyrat/modules/interaction_menu/code/interaction_component.dm b/modular_skyrat/modules/interaction_menu/code/interaction_component.dm
index 177b7233a3215..58fb61808d58b 100644
--- a/modular_skyrat/modules/interaction_menu/code/interaction_component.dm
+++ b/modular_skyrat/modules/interaction_menu/code/interaction_component.dm
@@ -30,6 +30,17 @@
if(interaction.lewd)
if(!self.client?.prefs?.read_preference(/datum/preference/toggle/erp))
continue
+ // SPLURT EDIT ADDITION - Interaction preferences
+ if(interaction.unsafe_types & INTERACTION_EXTREME)
+ if(self.client?.prefs?.read_preference(/datum/preference/choiced/erp_status_extm) == "No")
+ continue
+ if(interaction.unsafe_types & INTERACTION_EXTREME_HARMFUL)
+ if(self.client?.prefs?.read_preference(/datum/preference/choiced/erp_status_extmharm) == "No")
+ continue
+ if(interaction.unsafe_types & INTERACTION_UNHOLY)
+ if(self.client?.prefs?.read_preference(/datum/preference/choiced/erp_status_unholy) == "No")
+ continue
+ // SPLURT EDIT END
/*
SPLURT EDIT REMOVAL - Interactions
if(interaction.sexuality != "" && interaction.sexuality != self.client?.prefs?.read_preference(/datum/preference/choiced/erp_sexuality))
diff --git a/modular_zubbers/code/modules/client/verbs/character_directory.dm b/modular_zubbers/code/modules/client/verbs/character_directory.dm
index 9e90850dae17d..ffd2d32b1e8d7 100644
--- a/modular_zubbers/code/modules/client/verbs/character_directory.dm
+++ b/modular_zubbers/code/modules/client/verbs/character_directory.dm
@@ -192,6 +192,11 @@ GLOBAL_DATUM(character_directory, /datum/character_directory)
var/vore = "Ask"
var/hypno = "Ask"
var/noncon = "Ask"
+ // SPLURT EDIT START: INTERACTION PANEL
+ var/extreme = "Ask"
+ var/extremeharm = "Ask"
+ var/unholy = "Ask"
+ // SPLURT EDIT END: INTERACTION PANEL
var/character_ad = ""
var/exploitable = ""
var/ref = REF(mob)
@@ -235,6 +240,11 @@ GLOBAL_DATUM(character_directory, /datum/character_directory)
noncon = READ_PREFS(mob, choiced/erp_status_nc)
character_ad = READ_PREFS(mob, text/character_ad)
ooc_notes = READ_PREFS(mob, text/ooc_notes)
+ // SPLURT EDIT START: INTERACTION PANEL
+ extreme = READ_PREFS(mob, choiced/erp_status_extm)
+ extremeharm = READ_PREFS(mob, choiced/erp_status_extmharm)
+ unholy = READ_PREFS(mob, choiced/erp_status_unholy)
+ // SPLURT EDIT END: INTERACTION PANEL
//If the user is an antagonist or Observer, we want them to be able to see exploitables in the Directory.
if(user.mind?.has_antag_datum(/datum/antagonist) || isobserver(user))
if(exploitable == EXPLOITABLE_DEFAULT_TEXT)
@@ -254,6 +264,11 @@ GLOBAL_DATUM(character_directory, /datum/character_directory)
"vore" = vore,
"hypno" = hypno,
"noncon" = noncon,
+ // SPLURT EDIT START: INTERACTION PANEL
+ "extreme" = extreme,
+ "extremeharm" = extremeharm,
+ "unholy" = unholy,
+ // SPLURT EDIT END: INTERACTION PANEL
"exploitable" = exploitable,
"character_ad" = character_ad,
"flavor_text" = flavor_text,
diff --git a/modular_zzplurt/code/modules/client/preferences/erp_preferences.dm b/modular_zzplurt/code/modules/client/preferences/erp_preferences.dm
new file mode 100644
index 0000000000000..d131e700c3c61
--- /dev/null
+++ b/modular_zzplurt/code/modules/client/preferences/erp_preferences.dm
@@ -0,0 +1,120 @@
+/datum/preference/choiced/erp_status_extm
+ category = PREFERENCE_CATEGORY_NON_CONTEXTUAL
+ savefile_identifier = PREFERENCE_CHARACTER
+ savefile_key = "erp_status_pref_extm"
+
+/datum/preference/choiced/erp_status_extm/init_possible_values()
+ return list("Yes - Switch", "Yes - Dom", "Yes - Sub", "Yes", "Ask (L)OOC", "Check OOC Notes", "No")
+
+/datum/preference/choiced/erp_status_extm/create_default_value()
+ return "No"
+
+/datum/preference/choiced/erp_status_extm/is_accessible(datum/preferences/preferences)
+ if (!..(preferences))
+ return FALSE
+
+ if(CONFIG_GET(flag/disable_erp_preferences))
+ return FALSE
+
+ return preferences.read_preference(/datum/preference/toggle/master_erp_preferences)
+
+/datum/preference/choiced/erp_status_extm/deserialize(input, datum/preferences/preferences)
+ if(CONFIG_GET(flag/disable_erp_preferences))
+ return "No"
+ if(!preferences.read_preference(/datum/preference/toggle/master_erp_preferences))
+ return "No"
+ . = ..()
+
+/datum/preference/choiced/erp_status_extm/apply_to_human(mob/living/carbon/human/target, value, datum/preferences/preferences)
+ return FALSE
+
+/datum/preference/choiced/erp_status_extmharm
+ category = PREFERENCE_CATEGORY_NON_CONTEXTUAL
+ savefile_identifier = PREFERENCE_CHARACTER
+ savefile_key = "erp_status_pref_extmharm"
+
+/datum/preference/choiced/erp_status_extmharm/init_possible_values()
+ return list("Yes - Switch", "Yes - Dom", "Yes - Sub", "Yes", "Ask (L)OOC", "Check OOC Notes", "No")
+
+/datum/preference/choiced/erp_status_extmharm/create_default_value()
+ return "No"
+
+/datum/preference/choiced/erp_status_extmharm/is_accessible(datum/preferences/preferences)
+ if (!..(preferences))
+ return FALSE
+
+ if(CONFIG_GET(flag/disable_erp_preferences))
+ return FALSE
+
+ return preferences.read_preference(/datum/preference/toggle/master_erp_preferences) && preferences.read_preference(/datum/preference/choiced/erp_status_extm) != "No"
+
+/datum/preference/choiced/erp_status_extmharm/deserialize(input, datum/preferences/preferences)
+ if(CONFIG_GET(flag/disable_erp_preferences))
+ return "No"
+ if(!preferences.read_preference(/datum/preference/toggle/master_erp_preferences) || !(preferences.read_preference(/datum/preference/choiced/erp_status_extm) != "Yes"))
+ return "No"
+ . = ..()
+
+/datum/preference/choiced/erp_status_extmharm/apply_to_human(mob/living/carbon/human/target, value, datum/preferences/preferences)
+ return FALSE
+
+/datum/preference/choiced/erp_status_unholy
+ category = PREFERENCE_CATEGORY_NON_CONTEXTUAL
+ savefile_identifier = PREFERENCE_CHARACTER
+ savefile_key = "erp_status_pref_unholy"
+
+/datum/preference/choiced/erp_status_unholy/init_possible_values()
+ return list("Yes - Switch", "Yes - Dom", "Yes - Sub", "Yes", "Ask (L)OOC", "Check OOC Notes", "No")
+
+/datum/preference/choiced/erp_status_unholy/create_default_value()
+ return "No"
+
+/datum/preference/choiced/erp_status_unholy/is_accessible(datum/preferences/preferences)
+ if (!..(preferences))
+ return FALSE
+
+ if(CONFIG_GET(flag/disable_erp_preferences))
+ return FALSE
+
+ return preferences.read_preference(/datum/preference/toggle/master_erp_preferences) && preferences.read_preference(/datum/preference/choiced/erp_status_extm) != "No"
+
+/datum/preference/choiced/erp_status_unholy/deserialize(input, datum/preferences/preferences)
+ if(CONFIG_GET(flag/disable_erp_preferences))
+ return "No"
+ if(!preferences.read_preference(/datum/preference/toggle/master_erp_preferences) || !(preferences.read_preference(/datum/preference/choiced/erp_status_extm) != "Yes"))
+ return "No"
+ . = ..()
+
+/datum/preference/choiced/erp_status_unholy/apply_to_human(mob/living/carbon/human/target, value, datum/preferences/preferences)
+ return FALSE
+
+/datum/preference/numeric/erp_lust_tolerance
+ category = PREFERENCE_CATEGORY_NON_CONTEXTUAL
+ savefile_key = "erp_lust_tolerance_pref"
+ savefile_identifier = PREFERENCE_CHARACTER
+
+ minimum = 75
+ maximum = 200
+
+/datum/preference/numeric/erp_lust_tolerance/apply_to_human(mob/living/carbon/human/target, value)
+ target.age = value
+
+/datum/preference/numeric/erp_lust_tolerance/create_informed_default_value(datum/preferences/preferences)
+ return 100
+
+/datum/preference/numeric/erp_lust_tolerance/is_accessible(datum/preferences/preferences)
+ if (!..(preferences))
+ return FALSE
+
+ if(CONFIG_GET(flag/disable_erp_preferences))
+ return FALSE
+
+ return preferences.read_preference(/datum/preference/toggle/master_erp_preferences)
+
+/datum/preference/numeric/erp_sexual_potency
+ category = PREFERENCE_CATEGORY_NON_CONTEXTUAL
+ savefile_key = "erp_sexual_potency_pref"
+ savefile_identifier = PREFERENCE_CHARACTER
+
+ minimum = 10
+ maximum = 25
diff --git a/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm b/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm
index c0a35c7904f0a..455e523214cab 100644
--- a/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm
+++ b/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm
@@ -9,11 +9,20 @@
var/list/cum_self_text_overrides = list(CLIMAX_POSITION_USER = list(), CLIMAX_POSITION_TARGET = list())
/// override of the text to display to the partner when the interaction cums (use this if you're not using a cum_target)
var/list/cum_partner_text_overrides = list(CLIMAX_POSITION_USER = list(), CLIMAX_POSITION_TARGET = list())
+ /// Is the interaction considered extreme/harmful/unholy?
+ var/unsafe_types = NONE
/datum/interaction/load_from_json(path)
. = ..()
if(!.)
return FALSE
+
+ var/list/unsafe_flags = list(
+ "extreme" = INTERACTION_EXTREME,
+ "extremeharm" = INTERACTION_EXTREME_HARMFUL,
+ "unholy" = INTERACTION_UNHOLY,
+ )
+
var/list/json = json_decode(file2text(path))
cum_genital[CLIMAX_POSITION_USER] = sanitize_text(json["cum_genital_user"])
cum_genital[CLIMAX_POSITION_TARGET] = sanitize_text(json["cum_genital_target"])
@@ -26,10 +35,24 @@
cum_partner_text_overrides[CLIMAX_POSITION_USER] = sanitize_islist(json["cum_partner_text_overrides_user"], list())
cum_partner_text_overrides[CLIMAX_POSITION_TARGET] = sanitize_islist(json["cum_partner_text_overrides_target"], list())
+ var/list/unsafe_list = sanitize_islist(json["unsafe_types"], list())
+ for(var/unsafe_type in unsafe_list)
+ unsafe_types |= unsafe_flags[unsafe_type]
+
/datum/interaction/proc/allow_act(mob/living/carbon/human/user, mob/living/carbon/human/target)
if(target == user && usage == INTERACTION_OTHER)
return FALSE
+ if(unsafe_types & INTERACTION_EXTREME)
+ if(!(user.client?.prefs?.read_preference(/datum/preference/choiced/erp_status_extm) != "No") || !(target.client?.prefs?.read_preference(/datum/preference/choiced/erp_status_extm) != "No"))
+ return FALSE
+ if(unsafe_types & INTERACTION_EXTREME_HARMFUL)
+ if(!(user.client?.prefs?.read_preference(/datum/preference/choiced/erp_status_extmharm) != "No") || !(target.client?.prefs?.read_preference(/datum/preference/choiced/erp_status_extmharm) != "No"))
+ return FALSE
+ if(unsafe_types & INTERACTION_UNHOLY)
+ if(!(user.client?.prefs?.read_preference(/datum/preference/choiced/erp_status_unholy) != "No") || !(target.client?.prefs?.read_preference(/datum/preference/choiced/erp_status_unholy) != "No"))
+ return FALSE
+
if(user_required_parts.len)
for(var/slot in user_required_parts)
if(!user.has_genital(LAZYACCESS(user_required_parts, slot) || REQUIRE_GENITAL_EXPOSED, slot))
diff --git a/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/_lewd.dm b/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/_lewd.dm
new file mode 100644
index 0000000000000..16e6650ae5cd3
--- /dev/null
+++ b/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/_lewd.dm
@@ -0,0 +1,2 @@
+/datum/interaction/lewd
+ lewd = TRUE
diff --git a/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/extreme.dm b/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/extreme.dm
new file mode 100644
index 0000000000000..b8b439a064e93
--- /dev/null
+++ b/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/extreme.dm
@@ -0,0 +1,5 @@
+/datum/interaction/lewd/extreme
+ unsafe_types = INTERACTION_EXTREME
+
+/datum/interaction/lewd/extreme/harmful
+ unsafe_types = INTERACTION_EXTREME_HARMFUL
diff --git a/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/unholy.dm b/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/unholy.dm
new file mode 100644
index 0000000000000..bc469afc32163
--- /dev/null
+++ b/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/unholy.dm
@@ -0,0 +1,2 @@
+/datum/interaction/lewd/extreme/unholy
+ unsafe_types = INTERACTION_UNHOLY
diff --git a/tgstation.dme b/tgstation.dme
index 64960d85ee8a2..f6dd6d40e8b45 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -9554,6 +9554,7 @@
#include "modular_zzplurt\code\modules\client\client_procs.dm"
#include "modular_zzplurt\code\modules\client\preferences\body_size.dm"
#include "modular_zzplurt\code\modules\client\preferences\clothing.dm"
+#include "modular_zzplurt\code\modules\client\preferences\erp_preferences.dm"
#include "modular_zzplurt\code\modules\client\preferences\genitals.dm"
#include "modular_zzplurt\code\modules\client\preferences\mutant_parts.dm"
#include "modular_zzplurt\code\modules\client\preferences\player_panel.dm"
@@ -9578,6 +9579,9 @@
#include "modular_zzplurt\code\modules\language\_language_holder.dm"
#include "modular_zzplurt\code\modules\language\buzzwords.dm"
#include "modular_zzplurt\code\modules\lewd\interaction_menu\interaction_datum.dm"
+#include "modular_zzplurt\code\modules\lewd\interaction_menu\interactions\lewd\_lewd.dm"
+#include "modular_zzplurt\code\modules\lewd\interaction_menu\interactions\lewd\extreme.dm"
+#include "modular_zzplurt\code\modules\lewd\interaction_menu\interactions\lewd\unholy.dm"
#include "modular_zzplurt\code\modules\lewd\interaction_menu\lewd_helpers\human.dm"
#include "modular_zzplurt\code\modules\mob\mob.dm"
#include "modular_zzplurt\code\modules\mob\mob_defines.dm"
diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/splurt/genitals.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/splurt/genitals.tsx
index 563f94534fee7..93b60203ba805 100644
--- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/splurt/genitals.tsx
+++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/splurt/genitals.tsx
@@ -1,6 +1,7 @@
import {
CheckboxInput,
Feature,
+ FeatureChoiced,
FeatureChoicedServerData,
FeatureNumberInput,
FeatureNumeric,
@@ -107,3 +108,31 @@ export const belly_emissive: Feature = {
description: 'Emissive parts glow in the dark.',
component: FeatureTriBoolInput,
};
+
+export const erp_status_pref_extm: FeatureChoiced = {
+ name: 'Extreme ERP verbs',
+ component: FeatureDropdownInput,
+};
+
+export const erp_status_pref_extmharm: FeatureChoiced = {
+ name: 'Harmful ERP verbs',
+ component: FeatureDropdownInput,
+};
+
+export const erp_status_pref_unholy: FeatureChoiced = {
+ name: 'Unholy ERP verbs',
+ component: FeatureDropdownInput,
+};
+
+export const erp_lust_tolerance_pref: FeatureNumeric = {
+ name: 'Lust tolerance',
+ description:
+ 'Set how long you can last without climaxing. \n(75 = minimum, 200 = maximum.)',
+ component: FeatureNumberInput,
+};
+
+export const erp_sexual_potency_pref: FeatureNumeric = {
+ name: 'Sexual potency',
+ description: 'Set your sexual potency. \n(10 = minimum, 25 = maximum.)',
+ component: FeatureNumberInput,
+};
diff --git a/tgui/packages/tgui/interfaces/ZubbersCharacterDirectory.jsx b/tgui/packages/tgui/interfaces/ZubbersCharacterDirectory.jsx
index 80f61aa885d3d..53b1246bbf077 100644
--- a/tgui/packages/tgui/interfaces/ZubbersCharacterDirectory.jsx
+++ b/tgui/packages/tgui/interfaces/ZubbersCharacterDirectory.jsx
@@ -236,6 +236,30 @@ const CharacterDirectoryList = (props) => {
>
Noncon
+
+ Extreme
+
+
+ Extreme Harm
+
+
+ Unholy
+
Advert
From 160f2291b3810f272812b1cc53c95c1b3c794482 Mon Sep 17 00:00:00 2001
From: Mosley <93835010+MosleyTheMalO@users.noreply.github.com>
Date: Tue, 24 Dec 2024 04:24:14 -0500
Subject: [PATCH 05/43] forgor
It might be necessary to check the character ads too
---
.../code/modules/client/preferences/erp_preferences.dm | 4 ++--
.../modules/lewd/interaction_menu/interactions/lewd/_lewd.dm | 1 +
.../lewd/interaction_menu/interactions/lewd/extreme.dm | 1 +
.../modules/lewd/interaction_menu/interactions/lewd/unholy.dm | 1 +
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/modular_zzplurt/code/modules/client/preferences/erp_preferences.dm b/modular_zzplurt/code/modules/client/preferences/erp_preferences.dm
index d131e700c3c61..1f56fc34c3b12 100644
--- a/modular_zzplurt/code/modules/client/preferences/erp_preferences.dm
+++ b/modular_zzplurt/code/modules/client/preferences/erp_preferences.dm
@@ -76,12 +76,12 @@
if(CONFIG_GET(flag/disable_erp_preferences))
return FALSE
- return preferences.read_preference(/datum/preference/toggle/master_erp_preferences) && preferences.read_preference(/datum/preference/choiced/erp_status_extm) != "No"
+ return preferences.read_preference(/datum/preference/toggle/master_erp_preferences)
/datum/preference/choiced/erp_status_unholy/deserialize(input, datum/preferences/preferences)
if(CONFIG_GET(flag/disable_erp_preferences))
return "No"
- if(!preferences.read_preference(/datum/preference/toggle/master_erp_preferences) || !(preferences.read_preference(/datum/preference/choiced/erp_status_extm) != "Yes"))
+ if(!preferences.read_preference(/datum/preference/toggle/master_erp_preferences))
return "No"
. = ..()
diff --git a/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/_lewd.dm b/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/_lewd.dm
index 16e6650ae5cd3..d54ab08080553 100644
--- a/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/_lewd.dm
+++ b/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/_lewd.dm
@@ -1,2 +1,3 @@
/datum/interaction/lewd
lewd = TRUE
+ color = "pink"
diff --git a/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/extreme.dm b/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/extreme.dm
index b8b439a064e93..5c25c3a0ca850 100644
--- a/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/extreme.dm
+++ b/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/extreme.dm
@@ -1,5 +1,6 @@
/datum/interaction/lewd/extreme
unsafe_types = INTERACTION_EXTREME
+ color = "red"
/datum/interaction/lewd/extreme/harmful
unsafe_types = INTERACTION_EXTREME_HARMFUL
diff --git a/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/unholy.dm b/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/unholy.dm
index bc469afc32163..8ab41f23162da 100644
--- a/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/unholy.dm
+++ b/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/unholy.dm
@@ -1,2 +1,3 @@
/datum/interaction/lewd/extreme/unholy
unsafe_types = INTERACTION_UNHOLY
+ color = "brown"
From c2c112260a190d93f497c2f17018fdc52ee266a2 Mon Sep 17 00:00:00 2001
From: Mosley <93835010+MosleyTheMalO@users.noreply.github.com>
Date: Tue, 24 Dec 2024 17:27:37 -0500
Subject: [PATCH 06/43] fixes unsafe interactions again
---
code/__DEFINES/~~~splurt_defines/interactions.dm | 8 +++++++-
.../interaction_menu/code/interaction_component.dm | 2 +-
.../modules/lewd/interaction_menu/interaction_datum.dm | 4 ++--
.../lewd/interaction_menu/interactions/lewd/_lewd.dm | 1 +
.../lewd/interaction_menu/interactions/lewd/extreme.dm | 4 +++-
.../lewd/interaction_menu/interactions/lewd/unholy.dm | 1 +
6 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/code/__DEFINES/~~~splurt_defines/interactions.dm b/code/__DEFINES/~~~splurt_defines/interactions.dm
index 40ff89f5faf15..b7a42d4410eb9 100644
--- a/code/__DEFINES/~~~splurt_defines/interactions.dm
+++ b/code/__DEFINES/~~~splurt_defines/interactions.dm
@@ -33,5 +33,11 @@
// Extreme types
#define INTERACTION_EXTREME (1<<0)
-#define INTERACTION_EXTREME_HARMFUL INTERACTION_EXTREME | (1<<1)
+#define INTERACTION_HARMFUL (1<<1) // If you use this on an interaction, add INTERACTION_EXTREME to it as well
#define INTERACTION_UNHOLY (1<<2)
+
+// Interaction categories
+#define INTERACTION_CAT_LEWD "lewd"
+#define INTERACTION_CAT_EXTREME "extreme"
+#define INTERACTION_CAT_HARMFUL "harmful"
+#define INTERACTION_CAT_UNHOLY "unholy"
diff --git a/modular_skyrat/modules/interaction_menu/code/interaction_component.dm b/modular_skyrat/modules/interaction_menu/code/interaction_component.dm
index 58fb61808d58b..42f54025a2d88 100644
--- a/modular_skyrat/modules/interaction_menu/code/interaction_component.dm
+++ b/modular_skyrat/modules/interaction_menu/code/interaction_component.dm
@@ -34,7 +34,7 @@
if(interaction.unsafe_types & INTERACTION_EXTREME)
if(self.client?.prefs?.read_preference(/datum/preference/choiced/erp_status_extm) == "No")
continue
- if(interaction.unsafe_types & INTERACTION_EXTREME_HARMFUL)
+ if(interaction.unsafe_types & INTERACTION_HARMFUL)
if(self.client?.prefs?.read_preference(/datum/preference/choiced/erp_status_extmharm) == "No")
continue
if(interaction.unsafe_types & INTERACTION_UNHOLY)
diff --git a/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm b/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm
index 455e523214cab..e8fef9db89ed3 100644
--- a/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm
+++ b/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm
@@ -19,7 +19,7 @@
var/list/unsafe_flags = list(
"extreme" = INTERACTION_EXTREME,
- "extremeharm" = INTERACTION_EXTREME_HARMFUL,
+ "extremeharm" = INTERACTION_EXTREME | INTERACTION_HARMFUL,
"unholy" = INTERACTION_UNHOLY,
)
@@ -46,7 +46,7 @@
if(unsafe_types & INTERACTION_EXTREME)
if(!(user.client?.prefs?.read_preference(/datum/preference/choiced/erp_status_extm) != "No") || !(target.client?.prefs?.read_preference(/datum/preference/choiced/erp_status_extm) != "No"))
return FALSE
- if(unsafe_types & INTERACTION_EXTREME_HARMFUL)
+ if(unsafe_types & INTERACTION_HARMFUL)
if(!(user.client?.prefs?.read_preference(/datum/preference/choiced/erp_status_extmharm) != "No") || !(target.client?.prefs?.read_preference(/datum/preference/choiced/erp_status_extmharm) != "No"))
return FALSE
if(unsafe_types & INTERACTION_UNHOLY)
diff --git a/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/_lewd.dm b/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/_lewd.dm
index d54ab08080553..68a5e6cc52786 100644
--- a/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/_lewd.dm
+++ b/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/_lewd.dm
@@ -1,3 +1,4 @@
/datum/interaction/lewd
lewd = TRUE
color = "pink"
+ category = INTERACTION_CAT_LEWD
diff --git a/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/extreme.dm b/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/extreme.dm
index 5c25c3a0ca850..a01855b024220 100644
--- a/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/extreme.dm
+++ b/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/extreme.dm
@@ -1,6 +1,8 @@
/datum/interaction/lewd/extreme
unsafe_types = INTERACTION_EXTREME
color = "red"
+ category = INTERACTION_CAT_EXTREME
/datum/interaction/lewd/extreme/harmful
- unsafe_types = INTERACTION_EXTREME_HARMFUL
+ unsafe_types = INTERACTION_EXTREME | INTERACTION_HARMFUL
+ category = INTERACTION_CAT_HARMFUL
diff --git a/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/unholy.dm b/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/unholy.dm
index 8ab41f23162da..5affd7ae01116 100644
--- a/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/unholy.dm
+++ b/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/unholy.dm
@@ -1,3 +1,4 @@
/datum/interaction/lewd/extreme/unholy
unsafe_types = INTERACTION_UNHOLY
color = "brown"
+ category = INTERACTION_CAT_UNHOLY
From 34628b5669965a61061362af92db90f4a2d450cd Mon Sep 17 00:00:00 2001
From: Mosley <93835010+MosleyTheMalO@users.noreply.github.com>
Date: Tue, 24 Dec 2024 20:16:19 -0500
Subject: [PATCH 07/43] refractor genital expansion reagents and adds prefs
---
.../client/preferences/erp_preferences.dm | 12 ++
.../lewd_chemistry/reagents/_aphrodisiac.dm | 195 ++++++++++++++++++
.../lewd_chemistry/reagents/belly_enlarger.dm | 78 +++++++
.../lewd_chemistry/reagents/butt_enlarger.dm | 77 +++++++
.../lewd_chemistry/reagents/camphor.dm | 32 +++
.../modules/reagents/chemistry/reagents.dm | 95 ---------
tgstation.dme | 5 +-
.../splurt/erp_preferences.tsx | 33 +++
8 files changed, 431 insertions(+), 96 deletions(-)
create mode 100644 modular_zzplurt/code/modules/lewd_chemistry/reagents/_aphrodisiac.dm
create mode 100644 modular_zzplurt/code/modules/lewd_chemistry/reagents/belly_enlarger.dm
create mode 100644 modular_zzplurt/code/modules/lewd_chemistry/reagents/butt_enlarger.dm
create mode 100644 modular_zzplurt/code/modules/lewd_chemistry/reagents/camphor.dm
delete mode 100644 modular_zzplurt/code/modules/reagents/chemistry/reagents.dm
create mode 100644 tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/splurt/erp_preferences.tsx
diff --git a/modular_zzplurt/code/modules/client/preferences/erp_preferences.dm b/modular_zzplurt/code/modules/client/preferences/erp_preferences.dm
index 1f56fc34c3b12..c5b36f31ded6d 100644
--- a/modular_zzplurt/code/modules/client/preferences/erp_preferences.dm
+++ b/modular_zzplurt/code/modules/client/preferences/erp_preferences.dm
@@ -118,3 +118,15 @@
minimum = 10
maximum = 25
+
+/datum/preference/toggle/erp/butt_enlargement
+ savefile_key = "butt_enlargement_pref"
+
+/datum/preference/toggle/erp/butt_shrinkage
+ savefile_key = "butt_shrinkage_pref"
+
+/datum/preference/toggle/erp/belly_enlargement
+ savefile_key = "belly_enlargement_pref"
+
+/datum/preference/toggle/erp/belly_shrinkage
+ savefile_key = "belly_shrinkage_pref"
diff --git a/modular_zzplurt/code/modules/lewd_chemistry/reagents/_aphrodisiac.dm b/modular_zzplurt/code/modules/lewd_chemistry/reagents/_aphrodisiac.dm
new file mode 100644
index 0000000000000..36db711263d01
--- /dev/null
+++ b/modular_zzplurt/code/modules/lewd_chemistry/reagents/_aphrodisiac.dm
@@ -0,0 +1,195 @@
+/datum/reagent/drug/aphrodisiac
+ /// Largest size the chem can make a mob's butt
+ var/butt_max_size = 8
+ /// How much the butt is increased in size each time it's run
+ var/butt_size_increase_step = 1
+ /// Smallest size the chem can make a mob's butt
+ var/butt_minimum_size = 1
+ /// How much to reduce the size of the butt each time it's run
+ var/butt_size_reduction_step = 1
+
+ /// Largest size the chem can make a mob's belly
+ var/belly_max_size = 7
+ /// How much the belly is increased in size each time it's run
+ var/belly_size_increase_step = 1
+ /// Smallest size the chem can make a mob's belly
+ var/belly_minimum_size = 1
+ /// How much to reduce the size of the belly each time it's run
+ var/belly_size_reduction_step = 1
+
+ // Blud didn't even undefine the indexes in nonmodular code 💀💀💀
+ #define GENITAL_BELLY 6
+ #define GENITAL_BUTT 7
+
+/**
+* Handle belly growth
+*
+* exposed_mob - the mob being affected by the reagent
+* suppress_chat - whether or not to display a message in chat
+* mob_belly - the belly to cause to grow
+*/
+/datum/reagent/drug/aphrodisiac/proc/grow_belly(mob/living/carbon/human/exposed_mob, suppress_chat = FALSE, obj/item/organ/external/genital/belly/mob_belly = exposed_mob?.get_organ_slot(ORGAN_SLOT_BELLY))
+ if(!mob_belly)
+ return
+
+ if(!exposed_mob.client?.prefs?.read_preference(/datum/preference/toggle/erp/belly_enlargement))
+ return
+
+ enlargement_amount += enlarger_increase_step
+
+ if(enlargement_amount >= enlargement_threshold)
+ if(mob_belly?.genital_size >= belly_max_size)
+ return
+
+ mob_belly.genital_size = min(mob_belly.genital_size + belly_size_increase_step, belly_max_size)
+ update_appearance(exposed_mob, mob_belly)
+ enlargement_amount = 0
+
+ growth_to_chat(exposed_mob, mob_belly, suppress_chat)
+
+ // Damage from being too big for clothes
+ if((mob_belly?.genital_size >= (belly_max_size - 2)) && (exposed_mob.w_uniform || exposed_mob.wear_suit))
+ if(prob(damage_chance))
+ to_chat(exposed_mob, span_danger("Your belly strains against your clothes!"))
+ exposed_mob.adjustOxyLoss(5)
+ exposed_mob.apply_damage(1, BRUTE, exposed_mob.get_bodypart(BODY_ZONE_CHEST))
+
+/**
+* Handle butt growth
+*
+* exposed_mob - the mob being affected by the reagent
+* suppress_chat - whether or not to display a message in chat
+* mob_butt - the butt to cause to grow
+*/
+/datum/reagent/drug/aphrodisiac/proc/grow_butt(mob/living/carbon/human/exposed_mob, suppress_chat = FALSE, obj/item/organ/external/genital/butt/mob_butt = exposed_mob?.get_organ_slot(ORGAN_SLOT_BUTT))
+ if(!mob_butt)
+ return
+
+ if(!exposed_mob.client?.prefs?.read_preference(/datum/preference/toggle/erp/butt_enlargement))
+ return
+
+ enlargement_amount += enlarger_increase_step
+
+ if(enlargement_amount >= enlargement_threshold)
+ if(mob_butt?.genital_size >= butt_max_size)
+ return
+
+ mob_butt.genital_size = min(mob_butt.genital_size + butt_size_increase_step, butt_max_size)
+ update_appearance(exposed_mob, mob_butt)
+ enlargement_amount = 0
+
+ growth_to_chat(exposed_mob, mob_butt, suppress_chat)
+
+ // Damage from being too big for clothes
+ if((mob_butt?.genital_size >= (butt_max_size - 2)) && (exposed_mob.w_uniform || exposed_mob.wear_suit))
+ if(prob(damage_chance))
+ to_chat(exposed_mob, span_danger("Your bottom strains against your clothes!"))
+ exposed_mob.apply_damage(1, BRUTE, exposed_mob.get_bodypart(BODY_ZONE_PRECISE_GROIN))
+
+/**
+* Handle belly creation
+*
+* exposed_mob - the mob being affected by the reagent
+* suppress_chat - whether or not to display a message in chat
+* mob_belly - the mob's belly
+*/
+/datum/reagent/drug/aphrodisiac/proc/create_belly(mob/living/carbon/human/exposed_mob, suppress_chat = FALSE, obj/item/organ/external/genital/belly/mob_belly = exposed_mob?.get_organ_slot(ORGAN_SLOT_BELLY))
+ if(mob_belly)
+ return
+
+ if(!exposed_mob.client?.prefs?.read_preference(/datum/preference/toggle/erp/new_genitalia_growth))
+ return
+
+ var/obj/item/organ/external/genital/belly/new_belly = new
+ new_belly.build_from_dna(exposed_mob.dna, ORGAN_SLOT_BELLY)
+ new_belly.Insert(exposed_mob, 0, FALSE)
+ new_belly.genital_size = belly_minimum_size
+ update_appearance(exposed_mob, new_belly)
+
+ if(!suppress_chat)
+ to_chat(exposed_mob, span_purple("Your midsection feels warm as it begins to expand outward."))
+
+/**
+* Handle butt creation
+*
+* exposed_mob - the mob being affected by the reagent
+* suppress_chat - whether or not to display a message in chat
+* mob_butt - the mob's butt
+*/
+/datum/reagent/drug/aphrodisiac/proc/create_butt(mob/living/carbon/human/exposed_mob, suppress_chat = FALSE, obj/item/organ/external/genital/butt/mob_butt = exposed_mob?.get_organ_slot(ORGAN_SLOT_BUTT))
+ if(mob_butt)
+ return
+
+ if(!exposed_mob.client?.prefs?.read_preference(/datum/preference/toggle/erp/new_genitalia_growth))
+ return
+
+ var/obj/item/organ/external/genital/butt/new_butt = new
+ new_butt.build_from_dna(exposed_mob.dna, ORGAN_SLOT_BUTT)
+ new_butt.Insert(exposed_mob, 0, FALSE)
+ new_butt.genital_size = butt_minimum_size
+ update_appearance(exposed_mob, new_butt)
+
+ if(!suppress_chat)
+ to_chat(exposed_mob, span_purple("Your bottom feels warm as it begins to expand outward."))
+
+/**
+* Handle belly shrinkage
+*
+* exposed_mob - the mob being affected by the reagent
+* suppress_chat - whether or not to display a message in chat
+* mob_belly - the belly to shrink
+* message - the message to send to chat
+*/
+/datum/reagent/drug/aphrodisiac/proc/shrink_belly(mob/living/carbon/human/exposed_mob, suppress_chat = FALSE, obj/item/organ/external/genital/belly/mob_belly = exposed_mob?.get_organ_slot(ORGAN_SLOT_BELLY))
+ if(!mob_belly)
+ return
+
+ if(!exposed_mob.client?.prefs?.read_preference(/datum/preference/toggle/erp/belly_shrinkage))
+ return
+
+ if(mob_belly.genital_size > belly_minimum_size)
+ mob_belly.genital_size = max(mob_belly.genital_size - belly_size_reduction_step, belly_minimum_size)
+ update_appearance(exposed_mob, mob_belly)
+
+ else if(mob_belly.genital_size == belly_minimum_size)
+ var/message = "Your belly has completely flattened out."
+ remove_genital(exposed_mob, mob_belly, suppress_chat, message)
+
+/**
+* Handle butt shrinkage
+*
+* exposed_mob - the mob being affected by the reagent
+* suppress_chat - whether or not to display a message in chat
+* mob_butt - the butt to shrink
+* message - the message to send to chat
+*/
+/datum/reagent/drug/aphrodisiac/proc/shrink_butt(mob/living/carbon/human/exposed_mob, suppress_chat = FALSE, obj/item/organ/external/genital/butt/mob_butt = exposed_mob?.get_organ_slot(ORGAN_SLOT_BUTT))
+ if(!mob_butt)
+ return
+
+ if(!exposed_mob.client?.prefs?.read_preference(/datum/preference/toggle/erp/butt_shrinkage))
+ return
+
+ if(mob_butt.genital_size > butt_minimum_size)
+ mob_butt.genital_size = max(mob_butt.genital_size - butt_size_reduction_step, butt_minimum_size)
+ update_appearance(exposed_mob, mob_butt)
+
+ else if(mob_butt.genital_size == butt_minimum_size)
+ var/message = "Your bottom has completely flattened out."
+ remove_genital(exposed_mob, mob_butt, suppress_chat, message)
+
+/**
+* Handle shrinkage of genitals
+*
+* exposed_mob - the mob being affected by the reagent
+* suppress_chat - whether or not to display a message in chat
+* genitals_to_shrink - the genitals to shrink
+*/
+/datum/reagent/drug/aphrodisiac/shrink_genitals(mob/living/carbon/human/exposed_mob, suppress_chat, list/genitals_to_shrink)
+ . = ..()
+ for(var/mob_genital in genitals_to_shrink)
+ switch(mob_genital)
+ if(GENITAL_BELLY)
+ shrink_belly(exposed_mob, suppress_chat)
+ if(GENITAL_BUTT)
+ shrink_butt(exposed_mob, suppress_chat)
diff --git a/modular_zzplurt/code/modules/lewd_chemistry/reagents/belly_enlarger.dm b/modular_zzplurt/code/modules/lewd_chemistry/reagents/belly_enlarger.dm
new file mode 100644
index 0000000000000..571241d817dd4
--- /dev/null
+++ b/modular_zzplurt/code/modules/lewd_chemistry/reagents/belly_enlarger.dm
@@ -0,0 +1,78 @@
+/*
+* BELLY ENLARGEMENT
+* Normal function increases the player's belly size
+* If the player's belly is near or at the maximum size and they're wearing clothing, they press against the player's clothes and causes brute damage
+*/
+
+/datum/reagent/drug/aphrodisiac/belly_enlarger
+ name = "belladine nectar"
+ description = "A volatile collodial mixture that encourages abdominal expansion via a potent gastric mix."
+ color = "#01ff63"
+ taste_description = "blueberry gum"
+ overdose_threshold = 17
+ metabolization_rate = 0.25
+ life_pref_datum = /datum/preference/toggle/erp/belly_enlargement
+ overdose_pref_datum = /datum/preference/toggle/erp
+
+ /// Words for the belly when huge
+ var/static/list/words_for_bigger = list(
+ "huge",
+ "massive",
+ "distended",
+ "bloated",
+ "swollen",
+ "rather large",
+ "jiggly",
+ "hefty"
+ )
+
+ /// Wording chosen to expand the belly, shown only to the mob
+ var/static/list/action_text_list = list(
+ "expands outward to ",
+ "swells out to ",
+ "begins to bloat, growing to ",
+ "suddenly distends to ",
+ "inflates to "
+ )
+
+ /// Wording chosen to be seen by other mobs
+ var/static/list/public_action_text_list = list(
+ "expands outward.",
+ "seems to grow larger.",
+ "appears more distended than before.",
+ "suddenly swells up."
+ )
+
+/datum/reagent/drug/aphrodisiac/belly_enlarger/life_effects(mob/living/carbon/human/exposed_mob)
+ if(!ishuman(exposed_mob))
+ return
+
+ var/obj/item/organ/external/genital/belly/mob_belly = exposed_mob.get_organ_slot(ORGAN_SLOT_BELLY)
+
+ // Create belly if they don't have one
+ if(!mob_belly)
+ create_belly(exposed_mob)
+ return
+
+ // Grow existing belly
+ grow_belly(exposed_mob)
+
+/datum/reagent/drug/aphrodisiac/belly_enlarger/growth_to_chat(mob/living/carbon/human/exposed_mob, obj/item/organ/external/genital/belly/mob_belly)
+ if(!mob_belly)
+ return
+
+ if(mob_belly.genital_size >= (belly_max_size - 2))
+ exposed_mob.visible_message(span_notice("[exposed_mob]'s [pick(words_for_bigger)] belly [pick(public_action_text_list)]"))
+ to_chat(exposed_mob, span_purple("Your [pick(words_for_bigger)] belly [pick(action_text_list)]size [mob_belly.genital_size]."))
+ else
+ exposed_mob.visible_message(span_notice("[exposed_mob]'s belly [pick(public_action_text_list)]"))
+ to_chat(exposed_mob, span_purple("Your belly [pick(action_text_list)]size [mob_belly.genital_size]."))
+
+/datum/chemical_reaction/belly_enlarger
+ results = list(/datum/reagent/drug/aphrodisiac/belly_enlarger = 8)
+ required_reagents = list(/datum/reagent/medicine/salglu_solution = 1,
+ /datum/reagent/consumable/nutriment = 3,
+ /datum/reagent/silicon = 2,
+ /datum/reagent/drug/aphrodisiac/crocin = 2)
+ mix_message = "the reaction gives off a sweet aroma."
+ erp_reaction = TRUE
diff --git a/modular_zzplurt/code/modules/lewd_chemistry/reagents/butt_enlarger.dm b/modular_zzplurt/code/modules/lewd_chemistry/reagents/butt_enlarger.dm
new file mode 100644
index 0000000000000..30d8fbbbedcbc
--- /dev/null
+++ b/modular_zzplurt/code/modules/lewd_chemistry/reagents/butt_enlarger.dm
@@ -0,0 +1,77 @@
+/*
+* BUTT ENLARGEMENT
+* Normal function increases the player's butt size
+* If the player's butt is near or at the maximum size and they're wearing clothing, they press against the player's clothes and causes brute damage
+*/
+
+/datum/reagent/drug/aphrodisiac/butt_enlarger
+ name = "denbu tincture"
+ description = "A mixture of natural vitamins and valentines plant extract, causing butt enlargement in humanoids."
+ color = "#e8ff1b"
+ taste_description = "butter with a sweet aftertaste"
+ overdose_threshold = 17
+ metabolization_rate = 0.25
+ life_pref_datum = /datum/preference/toggle/erp/butt_enlargement
+ overdose_pref_datum = /datum/preference/toggle/erp
+
+ /// Words for the butt when huge
+ var/static/list/words_for_bigger = list(
+ "huge",
+ "massive",
+ "jiggly",
+ "hefty",
+ "plump",
+ "thick",
+ "bubbling"
+ )
+
+ /// Wording chosen to expand the butt, shown only to the mob
+ var/static/list/action_text_list = list(
+ "expands outward to ",
+ "grows out to ",
+ "begins to plump up, growing to ",
+ "suddenly expands to ",
+ "swells out to "
+ )
+
+ /// Wording chosen to be seen by other mobs
+ var/static/list/public_action_text_list = list(
+ "expands outward.",
+ "seems to grow larger.",
+ "appears more plump than before.",
+ "suddenly swells up."
+ )
+
+/datum/reagent/drug/aphrodisiac/butt_enlarger/life_effects(mob/living/carbon/human/exposed_mob)
+ if(!ishuman(exposed_mob))
+ return
+
+ var/obj/item/organ/external/genital/butt/mob_butt = exposed_mob.get_organ_slot(ORGAN_SLOT_BUTT)
+
+ // Create butt if they don't have one
+ if(!mob_butt)
+ create_butt(exposed_mob)
+ return
+
+ // Grow existing butt
+ grow_butt(exposed_mob)
+
+/datum/reagent/drug/aphrodisiac/butt_enlarger/growth_to_chat(mob/living/carbon/human/exposed_mob, obj/item/organ/external/genital/butt/mob_butt)
+ if(!mob_butt)
+ return
+
+ if(mob_butt.genital_size >= (butt_max_size - 2))
+ exposed_mob.visible_message(span_notice("[exposed_mob]'s [pick(words_for_bigger)] bottom [pick(public_action_text_list)]"))
+ to_chat(exposed_mob, span_purple("Your [pick(words_for_bigger)] bottom [pick(action_text_list)]size [mob_butt.genital_size]."))
+ else
+ exposed_mob.visible_message(span_notice("[exposed_mob]'s bottom [pick(public_action_text_list)]"))
+ to_chat(exposed_mob, span_purple("Your bottom [pick(action_text_list)]size [mob_butt.genital_size]."))
+
+/datum/chemical_reaction/butt_enlarger
+ results = list(/datum/reagent/drug/aphrodisiac/butt_enlarger = 8)
+ required_reagents = list(/datum/reagent/medicine/salglu_solution = 1,
+ /datum/reagent/consumable/sugar = 2,
+ /datum/reagent/silicon = 3,
+ /datum/reagent/drug/aphrodisiac/crocin = 2)
+ mix_message = "the reaction gives off a sweet buttery aroma."
+ erp_reaction = TRUE
diff --git a/modular_zzplurt/code/modules/lewd_chemistry/reagents/camphor.dm b/modular_zzplurt/code/modules/lewd_chemistry/reagents/camphor.dm
new file mode 100644
index 0000000000000..7f6ce8bcbdba7
--- /dev/null
+++ b/modular_zzplurt/code/modules/lewd_chemistry/reagents/camphor.dm
@@ -0,0 +1,32 @@
+/datum/reagent/drug/aphrodisiac/camphor/overdose_effects(mob/living/carbon/human/exposed_mob)
+ . = ..() // Call parent to handle base genital resets
+ var/modified_genitals = FALSE
+
+ if(exposed_mob.get_organ_slot(ORGAN_SLOT_BELLY))
+ var/obj/item/organ/external/genital/belly/mob_belly = exposed_mob.get_organ_slot(ORGAN_SLOT_BELLY)
+ var/original_belly_size = exposed_mob.client?.prefs.read_preference(/datum/preference/numeric/belly_size)
+ if(original_belly_size)
+ if(mob_belly?.genital_size > original_belly_size)
+ mob_belly.genital_size -= belly_size_reduction_step
+ mob_belly.update_sprite_suffix()
+ modified_genitals = TRUE
+ if(mob_belly?.genital_size < original_belly_size)
+ mob_belly.genital_size += belly_size_increase_step
+ mob_belly.update_sprite_suffix()
+ modified_genitals = TRUE
+
+ if(exposed_mob.get_organ_slot(ORGAN_SLOT_BUTT))
+ var/obj/item/organ/external/genital/butt/mob_butt = exposed_mob.get_organ_slot(ORGAN_SLOT_BUTT)
+ var/original_butt_size = exposed_mob.client?.prefs.read_preference(/datum/preference/numeric/butt_size)
+ if(original_butt_size)
+ if(mob_butt?.genital_size > original_butt_size)
+ mob_butt.genital_size -= butt_size_reduction_step
+ mob_butt.update_sprite_suffix()
+ modified_genitals = TRUE
+ if(mob_butt?.genital_size < original_butt_size)
+ mob_butt.genital_size += butt_size_increase_step
+ mob_butt.update_sprite_suffix()
+ modified_genitals = TRUE
+
+ if(modified_genitals)
+ exposed_mob.update_body()
diff --git a/modular_zzplurt/code/modules/reagents/chemistry/reagents.dm b/modular_zzplurt/code/modules/reagents/chemistry/reagents.dm
deleted file mode 100644
index 05a65ce5c1060..0000000000000
--- a/modular_zzplurt/code/modules/reagents/chemistry/reagents.dm
+++ /dev/null
@@ -1,95 +0,0 @@
-//Own stuff
-
-//Belly inflator yes
-/datum/reagent/belly_inflator
- name = "Belladine nectar"
- description = "It will give you the lewdest tummy ache you've ever had"
- color = "#01ff63"
- taste_description = "blueberry gum"
- overdose_threshold = 17
-
-/datum/reagent/belly_inflator/on_mob_life(mob/living/carbon/M)
- . = ..()
- if(!ishuman(M))
- return ..()
-
- var/mob/living/carbon/human/H = M
- var/obj/item/organ/external/genital/belly/B = H.get_organ_slot(ORGAN_SLOT_BELLY)
- if(!B)
- B = new
- B.build_from_dna(H.dna, ORGAN_SLOT_BELLY)
- B.Insert(M)
- to_chat(M, span_warning("You feel your midsection get warmer... bubbling softly as it seems to start distending"))
- M.reagents.remove_reagent(type, 5)
-
- //If they have, increase size.
- if(B.genital_size < 16) //just in case
- B.set_size(B.genital_size + 0.1)
- ..()
-
-/datum/reagent/GEsmaller_hypo
- name = "Super Antacid"
- color = "#fca3d4"
- taste_description = "Milky strawberries"
- description = "A medicine used to treat a patient's heavily bloated stomach"
- metabolization_rate = 0.5
-
-/datum/reagent/GEsmaller_hypo/on_mob_life(mob/living/carbon/M)
- var/obj/item/organ/external/genital/belly/B = M.get_organ_slot(ORGAN_SLOT_BELLY)
- if(!B)
- return ..()
- var/optimal_size = M.dna.features["belly_size"]
- if(!optimal_size)//Fast fix for those who don't want it.
- B.set_size(B.genital_size-0.2)
- else if(B.genital_size > optimal_size)
- B.set_size(B.genital_size-0.1)
- else if(B.genital_size < optimal_size)
- B.set_size(B.genital_size + 0.1)
- return ..()
-
-
-///Ass enhancer
-/datum/reagent/butt_enlarger
- name = "Denbu Tincture" //on Hyper it was 'Denbu Draft' but this makes it more consistent with the rectifying chemical down below.
- description = "A mixture of natural vitamins and valentines plant extract, causing butt enlargement in humanoids."
- color = "#e8ff1b"
- taste_description = "butter with a sweet aftertaste" //pass me the butter, OM NOM
- overdose_threshold = 17
-
-/datum/reagent/butt_enlarger/on_mob_life(mob/living/carbon/M) //Increases butt size
- if(!ishuman(M))
- return ..()
- var/mob/living/carbon/human/H = M
- var/obj/item/organ/external/genital/butt/B =M.get_organ_slot(ORGAN_SLOT_BUTT)
- if(!B) //If they don't have a butt. Give them one!
- B = new
- B.build_from_dna(H.dna, ORGAN_SLOT_BUTT)
- B.Insert(M)
- to_chat(M, "Your ass cheeks bulge outwards and feel more plush.")
- M.reagents.remove_reagent(type, 5)
-
- //If they have, increase size.
- if(B.genital_size < BUTT_MAX_SIZE) //just in case
- B.set_size(B.genital_size + 0.05)
- ..()
-
-/datum/reagent/AEsmaller_hypo //"BEsmaller" already exists so using "AE" instead, A is for ass.
- name = "Rectify tincture"
- color = "#e8ff1b"
- taste_description = "butter"
- description = "A medicine used to treat organomegaly in a patient's ass."
- metabolization_rate = 0.5
-
-/datum/reagent/AEsmaller_hypo/on_mob_life(mob/living/carbon/M)
- var/obj/item/organ/external/genital/butt/B = M.get_organ_slot(ORGAN_SLOT_BUTT)
- if(!B)
- return ..()
-
- var/optimal_size = M.dna.features["butt_size"]
- if(!optimal_size)//Fast fix for those who don't want it.
- B.set_size(B.genital_size -0.2)
- else if(B.genital_size > optimal_size)
- B.set_size(B.genital_size - 0.1)
- else if(B.genital_size < optimal_size)
- B.set_size(B.genital_size + 0.1)
- return ..()
diff --git a/tgstation.dme b/tgstation.dme
index f6dd6d40e8b45..2ad8090f977cf 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -9583,6 +9583,10 @@
#include "modular_zzplurt\code\modules\lewd\interaction_menu\interactions\lewd\extreme.dm"
#include "modular_zzplurt\code\modules\lewd\interaction_menu\interactions\lewd\unholy.dm"
#include "modular_zzplurt\code\modules\lewd\interaction_menu\lewd_helpers\human.dm"
+#include "modular_zzplurt\code\modules\lewd_chemistry\reagents\camphor.dm"
+#include "modular_zzplurt\code\modules\lewd_chemistry\reagents\_aphrodisiac.dm"
+#include "modular_zzplurt\code\modules\lewd_chemistry\reagents\belly_enlarger.dm"
+#include "modular_zzplurt\code\modules\lewd_chemistry\reagents\butt_enlarger.dm"
#include "modular_zzplurt\code\modules\mob\mob.dm"
#include "modular_zzplurt\code\modules\mob\mob_defines.dm"
#include "modular_zzplurt\code\modules\mob\mob_update_icons.dm"
@@ -9629,7 +9633,6 @@
#include "modular_zzplurt\code\modules\modular_items\lewd_items\code\lewd_chemistry\reagents\cum.dm"
#include "modular_zzplurt\code\modules\movespeed\modifiers\components.dm"
#include "modular_zzplurt\code\modules\movespeed\modifiers\innate.dm"
-#include "modular_zzplurt\code\modules\reagents\chemistry\reagents.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"
diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/splurt/erp_preferences.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/splurt/erp_preferences.tsx
new file mode 100644
index 0000000000000..638f3099355dd
--- /dev/null
+++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/splurt/erp_preferences.tsx
@@ -0,0 +1,33 @@
+import { CheckboxInput, FeatureToggle } from '../../base';
+
+export const butt_enlargement_pref: FeatureToggle = {
+ name: 'Butt enlargement',
+ category: 'ERP',
+ description:
+ 'Determines if you wish to receive the effects of butt enlargement chemicals.',
+ component: CheckboxInput,
+};
+
+export const butt_shrinkage_pref: FeatureToggle = {
+ name: 'Butt shrinkage',
+ category: 'ERP',
+ description:
+ 'Determines if you wish to receive the effects of butt shrinkage chemicals.',
+ component: CheckboxInput,
+};
+
+export const belly_enlargement_pref: FeatureToggle = {
+ name: 'Belly enlargement',
+ category: 'ERP',
+ description:
+ 'Determines if you wish to receive the effects of belly enlargement chemicals.',
+ component: CheckboxInput,
+};
+
+export const belly_shrinkage_pref: FeatureToggle = {
+ name: 'Belly shrinkage',
+ category: 'ERP',
+ description:
+ 'Determines if you wish to receive the effects of belly shrinkage chemicals.',
+ component: CheckboxInput,
+};
From fb7700f3dbb04feb1a04816c226ac7e86123182e Mon Sep 17 00:00:00 2001
From: Mosley <93835010+MosleyTheMalO@users.noreply.github.com>
Date: Tue, 24 Dec 2024 22:13:23 -0500
Subject: [PATCH 08/43] no
---
.../code/lewd_chemistry/reagents/pentacamphor.dm | 2 +-
.../code/modules/client/preferences/erp_preferences.dm | 3 +++
.../features/game_preferences/splurt/erp_preferences.tsx | 8 ++++++++
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/pentacamphor.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/pentacamphor.dm
index 8816143570445..114c3c3f4f8ee 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/pentacamphor.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_chemistry/reagents/pentacamphor.dm
@@ -25,7 +25,7 @@
to_chat(exposed_mob, span_notice("Your mind is free. Your thoughts are pure and innocent once more."))
REMOVE_TRAIT(exposed_mob, TRAIT_BIMBO, TRAIT_LEWDCHEM)
return
- if(!HAS_TRAIT(exposed_mob, TRAIT_NEVERBONER))
+ if(!HAS_TRAIT(exposed_mob, TRAIT_NEVERBONER) && !exposed_mob.client?.prefs?.read_preference(/datum/preference/toggle/erp/forced_neverboner)) // SPLURT EDIT - Added a preference to force neverboner
to_chat(exposed_mob, span_notice("You feel like you'll never feel aroused again..."))
ADD_TRAIT(exposed_mob, TRAIT_NEVERBONER, TRAIT_LEWDCHEM)
diff --git a/modular_zzplurt/code/modules/client/preferences/erp_preferences.dm b/modular_zzplurt/code/modules/client/preferences/erp_preferences.dm
index c5b36f31ded6d..205afe9f68355 100644
--- a/modular_zzplurt/code/modules/client/preferences/erp_preferences.dm
+++ b/modular_zzplurt/code/modules/client/preferences/erp_preferences.dm
@@ -130,3 +130,6 @@
/datum/preference/toggle/erp/belly_shrinkage
savefile_key = "belly_shrinkage_pref"
+
+/datum/preference/toggle/erp/forced_neverboner
+ savefile_key = "forced_neverboner_pref"
diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/splurt/erp_preferences.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/splurt/erp_preferences.tsx
index 638f3099355dd..f551924fb794b 100644
--- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/splurt/erp_preferences.tsx
+++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/splurt/erp_preferences.tsx
@@ -31,3 +31,11 @@ export const belly_shrinkage_pref: FeatureToggle = {
'Determines if you wish to receive the effects of belly shrinkage chemicals.',
component: CheckboxInput,
};
+
+export const forced_neverboner_pref: FeatureToggle = {
+ name: 'Forced neverboner',
+ category: 'ERP',
+ description:
+ 'Determines if you wish to receive the effects of forced neverboner chemicals.',
+ component: CheckboxInput,
+};
From e660f459e0d6f9b46bd8ef9aaaf213ddb94f35e9 Mon Sep 17 00:00:00 2001
From: Mosley <93835010+MosleyTheMalO@users.noreply.github.com>
Date: Wed, 25 Dec 2024 17:16:49 -0500
Subject: [PATCH 09/43] ugh
---
.../code/modules/client/preferences/erp_preferences.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modular_zzplurt/code/modules/client/preferences/erp_preferences.dm b/modular_zzplurt/code/modules/client/preferences/erp_preferences.dm
index 205afe9f68355..c140304e5c127 100644
--- a/modular_zzplurt/code/modules/client/preferences/erp_preferences.dm
+++ b/modular_zzplurt/code/modules/client/preferences/erp_preferences.dm
@@ -51,7 +51,7 @@
/datum/preference/choiced/erp_status_extmharm/deserialize(input, datum/preferences/preferences)
if(CONFIG_GET(flag/disable_erp_preferences))
return "No"
- if(!preferences.read_preference(/datum/preference/toggle/master_erp_preferences) || !(preferences.read_preference(/datum/preference/choiced/erp_status_extm) != "Yes"))
+ if(!preferences.read_preference(/datum/preference/toggle/master_erp_preferences) || !(preferences.read_preference(/datum/preference/choiced/erp_status_extm) != "No"))
return "No"
. = ..()
From 23f6c0bb6f8201d19c122086e8c06e27e00aa42a Mon Sep 17 00:00:00 2001
From: Mosley <93835010+MosleyTheMalO@users.noreply.github.com>
Date: Thu, 26 Dec 2024 04:17:09 -0500
Subject: [PATCH 10/43] Fixes some stuff + fluids system + proper vagina climax
handling
---
.../~~~splurt_defines/interactions.dm | 6 +-
.../code/interaction_datum.dm | 11 +-
.../lewd_items/code/lewd_arousal/climax.dm | 131 ++++++++++++++++--
.../datums/quirks/neutral_quirks/messy.dm | 1 -
.../interaction_menu/interaction_datum.dm | 8 +-
5 files changed, 136 insertions(+), 21 deletions(-)
diff --git a/code/__DEFINES/~~~splurt_defines/interactions.dm b/code/__DEFINES/~~~splurt_defines/interactions.dm
index b7a42d4410eb9..67ecd98f3266d 100644
--- a/code/__DEFINES/~~~splurt_defines/interactions.dm
+++ b/code/__DEFINES/~~~splurt_defines/interactions.dm
@@ -19,9 +19,9 @@
/// Climax definitions
//Climaxing genitals
-#define CLIMAX_VAGINA "Vagina"
-#define CLIMAX_PENIS "Penis"
-#define CLIMAX_BOTH "Both"
+#define CLIMAX_VAGINA "vagina"
+#define CLIMAX_PENIS "penis"
+#define CLIMAX_BOTH "both"
//Climaxing positions
#define CLIMAX_POSITION_USER "climax_user"
diff --git a/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm b/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm
index 73c7441daf67b..7dc1a5f8bc794 100644
--- a/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm
+++ b/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm
@@ -128,9 +128,10 @@ GLOBAL_LIST_EMPTY_TYPED(interaction_instances, /datum/interaction)
user.adjust_pleasure(user_pleasure, target, src, CLIMAX_POSITION_USER) //SPLURT EDIT - Interactions
user.adjust_arousal(user_arousal)
user.adjust_pain(user_pain, target, src, CLIMAX_POSITION_USER) //SPLURT EDIT - Interactions
- target.adjust_pleasure(target_pleasure, user, src, CLIMAX_POSITION_TARGET) //SPLURT EDIT - Interactions
- target.adjust_arousal(target_arousal)
- target.adjust_pain(target_pain, user, src, CLIMAX_POSITION_TARGET) //SPLURT EDIT - Interactions
+ if(usage == INTERACTION_OTHER) //SPLURT EDIT - Interactions
+ target.adjust_pleasure(target_pleasure, user, src, CLIMAX_POSITION_TARGET) //SPLURT EDIT - Interactions
+ target.adjust_arousal(target_arousal)
+ target.adjust_pain(target_pain, user, src, CLIMAX_POSITION_TARGET) //SPLURT EDIT - Interactions
post_interaction(user, target) //SPLURT EDIT - Interactions
return TRUE
@@ -210,6 +211,10 @@ GLOBAL_LIST_EMPTY_TYPED(interaction_instances, /datum/interaction)
/proc/populate_interaction_instances()
for(var/spath in subtypesof(/datum/interaction))
var/datum/interaction/interaction = new spath()
+ //SPLURT EDIT - Interactions
+ if(interaction.name == /datum/interaction::name || interaction.description == /datum/interaction::description)
+ continue
+ //SPLURT EDIT END
SSinteractions.interactions[interaction.name] = interaction //SPLURT EDIT - Interactions subsystem - Original: GLOB.interaction_instances[interaction.name] = interaction
populate_interaction_jsons(INTERACTION_JSON_FOLDER)
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/climax.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/climax.dm
index 07ede6ca8b5aa..def3683f8bc67 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/climax.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/climax.dm
@@ -116,6 +116,7 @@
if(target_human.has_anus(REQUIRE_GENITAL_EXPOSED))
target_buttons += ORGAN_SLOT_ANUS //SPLURT EDIT CHANGE - Interactions - Changed asshole to anus for consistency
if(target_human.has_penis(REQUIRE_GENITAL_EXPOSED))
+ target_buttons += ORGAN_SLOT_PENIS
var/obj/item/organ/external/genital/penis/other_penis = target_human.get_organ_slot(ORGAN_SLOT_PENIS)
if(other_penis.sheath != "None")
target_buttons += "sheath"
@@ -149,9 +150,32 @@
to_chat(target_human, span_userlove("Your [climax_into_choice] fills with warm cum as [src] shoots [self_their] load into it."))
var/obj/item/organ/external/genital/testicles/testicles = get_organ_slot(ORGAN_SLOT_TESTICLES)
- testicles.transfer_internal_fluid(null, testicles.internal_fluid_count * 0.6) // yep. we are sending semen to nullspace
if(create_cum_decal)
- add_cum_splatter_floor(get_turf(src))
+ //SPLURT EDIT CHANGE BEGIN - Interactions
+ if(HAS_TRAIT(src, TRAIT_MESSY))
+ // Transfer reagents to the turf using liquids system
+ var/datum/reagents/R = new(testicles.internal_fluid_maximum)
+ testicles.transfer_internal_fluid(R, testicles.internal_fluid_count * 0.6)
+ if(partner && partner != src)
+ // Get turf between src and partner for directional splatter
+ var/turf/T = get_turf(partner)
+ T.add_liquid_from_reagents(R, FALSE, 1, get_turf(src), partner)
+ else
+ var/turf/T = get_turf(src)
+ T.add_liquid_from_reagents(R, FALSE, 1)
+ qdel(R)
+ else
+ testicles.transfer_internal_fluid(null, testicles.internal_fluid_count * 0.6)
+ add_cum_splatter_floor(get_turf(src))
+ else if(partner)
+ // Transfer reagents directly to partner
+ var/datum/reagents/R = new(testicles.internal_fluid_maximum)
+ testicles.transfer_internal_fluid(R, testicles.internal_fluid_count * 0.6)
+ R.trans_to(partner, R.total_volume)
+ qdel(R)
+ else
+ testicles.transfer_internal_fluid(null, testicles.internal_fluid_count * 0.6)
+ //SPLURT EDIT CHANGE END
try_lewd_autoemote("moan")
if(climax_choice == CLIMAX_PENIS)
@@ -163,17 +187,102 @@
if(climax_choice == CLIMAX_VAGINA || climax_choice == CLIMAX_BOTH)
var/obj/item/organ/external/genital/vagina/vagina = get_organ_slot(ORGAN_SLOT_VAGINA)
- var/climax_text_override = climax_interaction && !manual && climax_interaction.show_climax(src, partner, interaction_position) //SPLURT EDIT CHANGE - Interactions
- if(is_bottomless() || vagina.visibility_preference == GENITAL_ALWAYS_SHOW)
- if(!climax_text_override) //SPLURT EDIT CHANGE - Interactions
- visible_message(span_userlove("[src] twitches and moans as [p_they()] climax from their vagina!"), span_userlove("You twitch and moan as you climax from your vagina!"))
- add_cum_splatter_floor(get_turf(src), female = TRUE)
- else
- if(!climax_text_override) //SPLURT EDIT CHANGE - Interactions
- visible_message(span_userlove("[src] cums in [self_their] underwear from [self_their] vagina!"), \
- span_userlove("You cum in your underwear from your vagina! Eww."))
+ //SPLURT EDIT CHANGE BEGIN - Interactions
+ if(!is_bottomless() && vagina.visibility_preference != GENITAL_ALWAYS_SHOW)
+ visible_message(span_userlove("[src] cums in [self_their] underwear from [self_their] vagina!"), \
+ span_userlove("You cum in your underwear from your vagina! Eww."))
self_orgasm = TRUE
+ else
+ var/list/interactable_inrange_humans = list()
+ for(var/mob/living/carbon/human/iterating_human in (view(1, src) - src))
+ interactable_inrange_humans[iterating_human.name] = iterating_human
+
+ var/list/buttons = list(CLIMAX_ON_FLOOR)
+ if(interactable_inrange_humans.len)
+ buttons += CLIMAX_IN_OR_ON
+
+ var/vagina_climax_choice = climax_interaction && !manual ? CLIMAX_IN_OR_ON : tgui_alert(src, "Choose where to squirt.", "Squirt preference!", buttons)
+
+ var/create_cum_decal = FALSE
+
+ if(!vagina_climax_choice || vagina_climax_choice == CLIMAX_ON_FLOOR)
+ create_cum_decal = TRUE
+ visible_message(span_userlove("[src] twitches and moans as [p_they()] squirt on the floor!"), \
+ span_userlove("You twitch and moan as you squirt on the floor!"))
+
+ else
+ var/target_choice = climax_interaction && !manual ? partner.name : tgui_input_list(src, "Choose who to squirt on.", "Choose target!", interactable_inrange_humans)
+ if(!target_choice)
+ create_cum_decal = TRUE
+ visible_message(span_userlove("[src] twitches and moans as [p_they()] squirt on the floor!"), \
+ span_userlove("You twitch and moan as you squirt on the floor!"))
+ else
+ var/mob/living/carbon/human/target_human = climax_interaction && !manual ? partner : interactable_inrange_humans[target_choice]
+ var/target_human_them = target_human.p_them()
+
+ var/list/target_buttons = list()
+
+ if(!target_human.wear_mask)
+ target_buttons += "mouth"
+ if(target_human.has_vagina(REQUIRE_GENITAL_EXPOSED))
+ target_buttons += ORGAN_SLOT_VAGINA
+ if(target_human.has_anus(REQUIRE_GENITAL_EXPOSED))
+ target_buttons += ORGAN_SLOT_ANUS
+ if(target_human.has_penis(REQUIRE_GENITAL_EXPOSED))
+ target_buttons += ORGAN_SLOT_PENIS
+ var/obj/item/organ/external/genital/penis/other_penis = target_human.get_organ_slot(ORGAN_SLOT_PENIS)
+ if(other_penis.sheath != "None")
+ target_buttons += "sheath"
+ target_buttons += "On [target_human_them]"
+
+ var/climax_into_choice
+ var/interaction_inside = partner?.get_organ_slot(climax_interaction?.cum_target[interaction_position]) || target_buttons[climax_interaction?.cum_target[interaction_position]]
+
+ if(climax_interaction && !manual && interaction_inside)
+ climax_into_choice = climax_interaction.cum_target[interaction_position]
+ else if(manual)
+ climax_into_choice = tgui_input_list(src, "Where on or in [target_human] do you wish to squirt?", "Final frontier!", target_buttons)
+ else
+ climax_into_choice = "On [target_human_them]"
+
+ if(climax_interaction && !manual && climax_interaction.show_climax(src, target_human, interaction_position))
+ create_cum_decal = !interaction_inside
+ else if(!climax_into_choice)
+ create_cum_decal = TRUE
+ visible_message(span_userlove("[src] squirts on the floor!"), \
+ span_userlove("You squirt on the floor!"))
+ else if(climax_into_choice == "On [target_human_them]")
+ create_cum_decal = TRUE
+ visible_message(span_userlove("[src] squirts all over [target_human]!"), \
+ span_userlove("You squirt all over [target_human]!"))
+ else
+ visible_message(span_userlove("[src] squirts into [target_human]'s [climax_into_choice]!"), \
+ span_userlove("You squirt into [target_human]'s [climax_into_choice]!"))
+ to_chat(target_human, span_userlove("Your [climax_into_choice] fills with [src]'s fluids."))
+
+ if(create_cum_decal)
+ if(HAS_TRAIT(src, TRAIT_MESSY))
+ var/datum/reagents/R = new(vagina.internal_fluid_maximum)
+ vagina.transfer_internal_fluid(R, vagina.internal_fluid_count)
+ if(partner && partner != src)
+ var/turf/T = get_turf(partner)
+ T.add_liquid_from_reagents(R, FALSE, 1, get_turf(src), partner)
+ else
+ var/turf/T = get_turf(src)
+ T.add_liquid_from_reagents(R, FALSE, 1)
+ qdel(R)
+ else
+ vagina.transfer_internal_fluid(null, vagina.internal_fluid_count)
+ add_cum_splatter_floor(get_turf(src), female = TRUE)
+ else if(partner)
+ var/datum/reagents/R = new(vagina.internal_fluid_maximum)
+ vagina.transfer_internal_fluid(R, vagina.internal_fluid_count)
+ R.trans_to(partner, R.total_volume)
+ qdel(R)
+ else
+ vagina.transfer_internal_fluid(null, vagina.internal_fluid_count)
+ //SPLURT EDIT CHANGE END
apply_status_effect(/datum/status_effect/climax)
apply_status_effect(/datum/status_effect/climax_cooldown)
if(self_orgasm)
diff --git a/modular_zzplurt/code/datums/quirks/neutral_quirks/messy.dm b/modular_zzplurt/code/datums/quirks/neutral_quirks/messy.dm
index dcd68645b844b..c34c20da269d6 100644
--- a/modular_zzplurt/code/datums/quirks/neutral_quirks/messy.dm
+++ b/modular_zzplurt/code/datums/quirks/neutral_quirks/messy.dm
@@ -11,4 +11,3 @@
mail_goodies = list (
/obj/item/mop = 1 // Clean this mess up!
)
- hidden_quirk = TRUE
diff --git a/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm b/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm
index e8fef9db89ed3..f5d845a7dcc33 100644
--- a/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm
+++ b/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm
@@ -105,7 +105,7 @@
// Called when either the user or target is cumming from the interaction, makes the interaction text
/datum/interaction/proc/show_climax(mob/living/carbon/human/cumming, mob/living/carbon/human/came_in, position)
- var/override_check = length(cum_message_text_overrides[position]) && length(cum_self_text_overrides[position]) && length(cum_partner_text_overrides[position])
+ var/override_check = length(cum_message_text_overrides[position]) && length(cum_self_text_overrides[position]) && (length(cum_partner_text_overrides[position]) || usage == INTERACTION_SELF)
if(!override_check)
return FALSE
@@ -137,6 +137,9 @@
self_message = replacetext(self_message, "%CUM_GENITAL%", "[genital_used]")
self_message = replacetext(self_message, "%CUM_TARGET%", "[hole_used]")
+ cumming.visible_message(span_userlove(message), span_userlove(self_message))
+
+ if(usage == INTERACTION_OTHER)
var/partner_message = pick(cum_partner_text_overrides[position])
partner_message = replacetext(partner_message, "%CUMMING%", "[cumming]")
partner_message = replacetext(partner_message, "%CUMMING_THEIR%", "[cumming_their]")
@@ -147,8 +150,7 @@
partner_message = replacetext(partner_message, "%CUM_GENITAL%", "[genital_used]")
partner_message = replacetext(partner_message, "%CUM_TARGET%", "[hole_used]")
- cumming.visible_message(span_userlove(message), span_userlove(self_message))
- to_chat(came_in, span_userlove(partner_message))
+ to_chat(came_in, span_userlove(partner_message))
return TRUE
/// Called after either the user or target cums from the interaction
From c7b283ef3dc459d1f54a0158031fcfd0393d57ef Mon Sep 17 00:00:00 2001
From: Mosley <93835010+MosleyTheMalO@users.noreply.github.com>
Date: Thu, 26 Dec 2024 04:34:08 -0500
Subject: [PATCH 11/43] implements sexual potency and lust tolerance
---
.../code/interaction_datum.dm | 4 +--
.../lewd_items/code/lewd_arousal/pleasure.dm | 2 +-
.../client/preferences/erp_preferences.dm | 29 +++++++++++++++----
.../character_preferences/splurt/genitals.tsx | 9 +++---
4 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm b/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm
index 7dc1a5f8bc794..57e60809cd7c7 100644
--- a/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm
+++ b/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm
@@ -125,11 +125,11 @@ GLOBAL_LIST_EMPTY_TYPED(interaction_instances, /datum/interaction)
SEND_SOUND(sound_cache, mob)
if(lewd)
- user.adjust_pleasure(user_pleasure, target, src, CLIMAX_POSITION_USER) //SPLURT EDIT - Interactions
+ user.adjust_pleasure(user_pleasure * (target.dna.features["sexual_potency"] || 1), target, src, CLIMAX_POSITION_USER) //SPLURT EDIT - Interactions
user.adjust_arousal(user_arousal)
user.adjust_pain(user_pain, target, src, CLIMAX_POSITION_USER) //SPLURT EDIT - Interactions
if(usage == INTERACTION_OTHER) //SPLURT EDIT - Interactions
- target.adjust_pleasure(target_pleasure, user, src, CLIMAX_POSITION_TARGET) //SPLURT EDIT - Interactions
+ target.adjust_pleasure(target_pleasure * (user.dna.features["sexual_potency"] || 1), user, src, CLIMAX_POSITION_TARGET) //SPLURT EDIT - Interactions
target.adjust_arousal(target_arousal)
target.adjust_pain(target_pain, user, src, CLIMAX_POSITION_TARGET) //SPLURT EDIT - Interactions
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/pleasure.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/pleasure.dm
index 59c67ce90495a..0387df6e6939d 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/pleasure.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_arousal/pleasure.dm
@@ -4,5 +4,5 @@
pleasure = clamp(pleasure + pleas, AROUSAL_MINIMUM, AROUSAL_LIMIT)
- if(pleasure >= AROUSAL_AUTO_CLIMAX_THRESHOLD) // lets cum
+ if(pleasure >= AROUSAL_AUTO_CLIMAX_THRESHOLD * (dna.features["lust_tolerance"] || 1)) // lets cum
climax(manual = FALSE, partner = partner, climax_interaction = interaction, interaction_position = position)
diff --git a/modular_zzplurt/code/modules/client/preferences/erp_preferences.dm b/modular_zzplurt/code/modules/client/preferences/erp_preferences.dm
index c140304e5c127..cf20deef15c49 100644
--- a/modular_zzplurt/code/modules/client/preferences/erp_preferences.dm
+++ b/modular_zzplurt/code/modules/client/preferences/erp_preferences.dm
@@ -93,14 +93,15 @@
savefile_key = "erp_lust_tolerance_pref"
savefile_identifier = PREFERENCE_CHARACTER
- minimum = 75
- maximum = 200
+ minimum = 0.5
+ maximum = 2.0
+ step = 0.01
/datum/preference/numeric/erp_lust_tolerance/apply_to_human(mob/living/carbon/human/target, value)
- target.age = value
+ target.dna.features["lust_tolerance"] = value
/datum/preference/numeric/erp_lust_tolerance/create_informed_default_value(datum/preferences/preferences)
- return 100
+ return 1.0
/datum/preference/numeric/erp_lust_tolerance/is_accessible(datum/preferences/preferences)
if (!..(preferences))
@@ -116,8 +117,24 @@
savefile_key = "erp_sexual_potency_pref"
savefile_identifier = PREFERENCE_CHARACTER
- minimum = 10
- maximum = 25
+ minimum = 0.5
+ maximum = 2.0
+ step = 0.01
+
+/datum/preference/numeric/erp_sexual_potency/apply_to_human(mob/living/carbon/human/target, value)
+ target.dna.features["sexual_potency"] = value
+
+/datum/preference/numeric/erp_sexual_potency/create_informed_default_value(datum/preferences/preferences)
+ return 1.0
+
+/datum/preference/numeric/erp_sexual_potency/is_accessible(datum/preferences/preferences)
+ if (!..(preferences))
+ return FALSE
+
+ if(CONFIG_GET(flag/disable_erp_preferences))
+ return FALSE
+
+ return preferences.read_preference(/datum/preference/toggle/master_erp_preferences)
/datum/preference/toggle/erp/butt_enlargement
savefile_key = "butt_enlargement_pref"
diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/splurt/genitals.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/splurt/genitals.tsx
index 93b60203ba805..059f3e1b74305 100644
--- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/splurt/genitals.tsx
+++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/splurt/genitals.tsx
@@ -125,14 +125,15 @@ export const erp_status_pref_unholy: FeatureChoiced = {
};
export const erp_lust_tolerance_pref: FeatureNumeric = {
- name: 'Lust tolerance',
+ name: 'Lust tolerance multiplier',
description:
- 'Set how long you can last without climaxing. \n(75 = minimum, 200 = maximum.)',
+ 'Set your lust tolerance multiplier. \n(0.5 = half tolerance, 2 = double tolerance)',
component: FeatureNumberInput,
};
export const erp_sexual_potency_pref: FeatureNumeric = {
- name: 'Sexual potency',
- description: 'Set your sexual potency. \n(10 = minimum, 25 = maximum.)',
+ name: 'Sexual potency multiplier',
+ description:
+ 'Set your sexual potency multiplier. \n(0.5 = half potency, 2 = double potency)',
component: FeatureNumberInput,
};
From d9adcad12be9e0b0129ba64a41c7c5b3475ec72f Mon Sep 17 00:00:00 2001
From: Mosley <93835010+MosleyTheMalO@users.noreply.github.com>
Date: Thu, 26 Dec 2024 05:19:57 -0500
Subject: [PATCH 12/43] fuck interactions - needs sounds
---
.../interaction_menu/interaction_datum.dm | 9 +
.../interactions/lewd/fuck.dm | 183 ++++++++++++++++++
2 files changed, 192 insertions(+)
create mode 100644 modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/fuck.dm
diff --git a/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm b/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm
index f5d845a7dcc33..e56e415e42133 100644
--- a/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm
+++ b/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm
@@ -12,6 +12,15 @@
/// Is the interaction considered extreme/harmful/unholy?
var/unsafe_types = NONE
+/datum/interaction/New()
+ cum_message_text_overrides[CLIMAX_POSITION_USER] = sanitize_islist(cum_message_text_overrides[CLIMAX_POSITION_USER], list())
+ cum_self_text_overrides[CLIMAX_POSITION_USER] = sanitize_islist(cum_self_text_overrides[CLIMAX_POSITION_USER], list())
+ cum_partner_text_overrides[CLIMAX_POSITION_USER] = sanitize_islist(cum_partner_text_overrides[CLIMAX_POSITION_USER], list())
+ cum_message_text_overrides[CLIMAX_POSITION_TARGET] = sanitize_islist(cum_message_text_overrides[CLIMAX_POSITION_TARGET], list())
+ cum_self_text_overrides[CLIMAX_POSITION_TARGET] = sanitize_islist(cum_self_text_overrides[CLIMAX_POSITION_TARGET], list())
+ cum_partner_text_overrides[CLIMAX_POSITION_TARGET] = sanitize_islist(cum_partner_text_overrides[CLIMAX_POSITION_TARGET], list())
+ . = ..()
+
/datum/interaction/load_from_json(path)
. = ..()
if(!.)
diff --git a/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/fuck.dm b/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/fuck.dm
new file mode 100644
index 0000000000000..a09af7d45f6a3
--- /dev/null
+++ b/modular_zzplurt/code/modules/lewd/interaction_menu/interactions/lewd/fuck.dm
@@ -0,0 +1,183 @@
+/datum/interaction/lewd/fuck
+ name = "Fuck"
+ description = "Fuck their pussy."
+ user_required_parts = list(ORGAN_SLOT_PENIS = REQUIRE_GENITAL_EXPOSED)
+ target_required_parts = list(ORGAN_SLOT_VAGINA = REQUIRE_GENITAL_EXPOSED)
+ cum_genital = list(CLIMAX_POSITION_USER = CLIMAX_PENIS, CLIMAX_POSITION_TARGET = CLIMAX_VAGINA)
+ cum_target = list(CLIMAX_POSITION_USER = ORGAN_SLOT_VAGINA, CLIMAX_POSITION_TARGET = ORGAN_SLOT_PENIS)
+ message = list(
+ "pounds %TARGET%'s pussy.",
+ "shoves their cock deep into %TARGET%'s pussy.",
+ "thrusts in and out of %TARGET%'s cunt.",
+ "goes balls deep into %TARGET%'s pussy over and over again."
+ )
+ sound_possible = list(
+ 'modular_zzplurt/sound/interactions/champ1.ogg',
+ 'modular_zzplurt/sound/interactions/champ2.ogg'
+ )
+ sound_range = 1
+ sound_use = TRUE
+ user_pleasure = 15
+ target_pleasure = 15
+
+/datum/interaction/lewd/fuck/anal
+ name = "Anal Fuck"
+ description = "Fuck their ass."
+ target_required_parts = list(ORGAN_SLOT_ANUS = REQUIRE_GENITAL_EXPOSED)
+ cum_genital = list(CLIMAX_POSITION_USER = CLIMAX_PENIS, CLIMAX_POSITION_TARGET = CLIMAX_BOTH)
+ cum_target = list(CLIMAX_POSITION_USER = ORGAN_SLOT_ANUS, CLIMAX_POSITION_TARGET = ORGAN_SLOT_PENIS)
+ message = list(
+ "thrusts in and out of %TARGET%'s ass.",
+ "pounds %TARGET%'s ass.",
+ "slams their hips up against %TARGET%'s ass hard.",
+ "goes balls deep into %TARGET%'s ass over and over again."
+ )
+ sound_possible = list(
+ 'modular_zzplurt/sound/interactions/bang1.ogg',
+ 'modular_zzplurt/sound/interactions/bang2.ogg',
+ 'modular_zzplurt/sound/interactions/bang3.ogg'
+ )
+ user_pleasure = 15
+ target_pleasure = 10
+
+/datum/interaction/lewd/breastfuck
+ name = "Breast Fuck"
+ description = "Fuck their breasts."
+ user_required_parts = list(ORGAN_SLOT_PENIS = REQUIRE_GENITAL_EXPOSED)
+ target_required_parts = list(ORGAN_SLOT_BREASTS = REQUIRE_GENITAL_EXPOSED)
+ cum_genital = list(CLIMAX_POSITION_USER = CLIMAX_PENIS)
+ cum_target = list(CLIMAX_POSITION_USER = ORGAN_SLOT_BREASTS)
+ message = list(
+ "fucks %TARGET%'s breasts.",
+ "grinds their cock between %TARGET%'s boobs.",
+ "thrusts into %TARGET%'s tits.",
+ "grabs %TARGET%'s breasts together and presses their cock between them."
+ )
+ sound_possible = list(
+ 'modular_zzplurt/sound/interactions/bang1.ogg',
+ 'modular_zzplurt/sound/interactions/bang2.ogg',
+ 'modular_zzplurt/sound/interactions/bang3.ogg'
+ )
+ sound_range = 1
+ sound_use = TRUE
+ user_pleasure = 10
+ target_pleasure = 0
+
+/datum/interaction/lewd/footfuck
+ name = "Foot Fuck"
+ description = "Rub your cock on their foot."
+ user_required_parts = list(ORGAN_SLOT_PENIS = REQUIRE_GENITAL_EXPOSED)
+ interaction_requires = list(INTERACTION_REQUIRE_TARGET_FEET)
+ cum_genital = list(CLIMAX_POSITION_USER = CLIMAX_PENIS)
+ cum_message_text_overrides = list(
+ CLIMAX_POSITION_USER = list(
+ "cums all over %TARGET%'s foot.",
+ "shoots their load on %TARGET%'s sole.",
+ "covers %TARGET%'s toes in cum."
+ ),
+ CLIMAX_POSITION_TARGET = list()
+ )
+ cum_self_text_overrides = list(
+ CLIMAX_POSITION_USER = list(
+ "you cum all over %TARGET%'s foot.",
+ "you shoot your load on %TARGET%'s sole.",
+ "you cover %TARGET%'s toes in cum."
+ ),
+ CLIMAX_POSITION_TARGET = list()
+ )
+ cum_partner_text_overrides = list(
+ CLIMAX_POSITION_USER = list(
+ "%USER% cums all over your foot.",
+ "%USER% shoots their load on your sole.",
+ "%USER% covers your toes in cum."
+ ),
+ CLIMAX_POSITION_TARGET = list()
+ )
+ message = list(
+ "fucks %TARGET%'s foot.",
+ "rubs their cock on %TARGET%'s foot.",
+ "grinds their cock on %TARGET%'s foot."
+ )
+ sound_possible = list(
+ 'modular_zzplurt/sound/interactions/foot_dry1.ogg',
+ 'modular_zzplurt/sound/interactions/foot_dry3.ogg',
+ 'modular_zzplurt/sound/interactions/foot_wet1.ogg',
+ 'modular_zzplurt/sound/interactions/foot_wet2.ogg'
+ )
+ sound_range = 1
+ sound_use = TRUE
+ user_pleasure = 10
+ target_pleasure = 0
+
+/datum/interaction/lewd/footfuck/double
+ name = "Double Foot Fuck"
+ description = "Rub your cock between their feet."
+ interaction_requires = list(INTERACTION_REQUIRE_TARGET_FEET)
+ cum_message_text_overrides = list(
+ CLIMAX_POSITION_USER = list(
+ "cums all over %TARGET%'s feet.",
+ "shoots their load on %TARGET%'s soles.",
+ "covers %TARGET%'s toes in cum."
+ ),
+ CLIMAX_POSITION_TARGET = list()
+ )
+ cum_self_text_overrides = list(
+ CLIMAX_POSITION_USER = list(
+ "you cum all over %TARGET%'s feet.",
+ "you shoot your load on %TARGET%'s soles.",
+ "you cover %TARGET%'s toes in cum."
+ ),
+ CLIMAX_POSITION_TARGET = list()
+ )
+ cum_partner_text_overrides = list(
+ CLIMAX_POSITION_USER = list(
+ "%USER% cums all over your feet.",
+ "%USER% shoots their load on your soles.",
+ "%USER% covers your toes in cum."
+ ),
+ CLIMAX_POSITION_TARGET = list()
+ )
+ message = list(
+ "fucks %TARGET%'s feet.",
+ "rubs their cock between %TARGET%'s feet.",
+ "thrusts their cock between %TARGET%'s feet.",
+ "grinds their cock between %TARGET%'s feet."
+ )
+
+/datum/interaction/lewd/footfuck/vag
+ name = "Vaginal Foot Grind"
+ description = "Rub your vagina on their foot."
+ user_required_parts = list(ORGAN_SLOT_VAGINA = REQUIRE_GENITAL_EXPOSED)
+ cum_genital = list(CLIMAX_POSITION_USER = CLIMAX_VAGINA)
+ cum_message_text_overrides = list(
+ CLIMAX_POSITION_USER = list(
+ "squirts all over %TARGET%'s foot.",
+ "orgasms on %TARGET%'s sole.",
+ "coats %TARGET%'s toes with their juices."
+ ),
+ CLIMAX_POSITION_TARGET = list()
+ )
+ cum_self_text_overrides = list(
+ CLIMAX_POSITION_USER = list(
+ "you squirt all over %TARGET%'s foot.",
+ "you orgasm on %TARGET%'s sole.",
+ "you coat %TARGET%'s toes with your juices."
+ ),
+ CLIMAX_POSITION_TARGET = list()
+ )
+ cum_partner_text_overrides = list(
+ CLIMAX_POSITION_USER = list(
+ "%USER% squirts all over your foot.",
+ "%USER% orgasms on your sole.",
+ "%USER% coats your toes with their juices."
+ ),
+ CLIMAX_POSITION_TARGET = list()
+ )
+ message = list(
+ "grinds their pussy against %TARGET%'s foot.",
+ "rubs their clit on %TARGET%'s foot.",
+ "ruts on %TARGET%'s foot."
+ )
+ user_pleasure = 15
+ target_pleasure = 0
+
From 77ea364180806db6afb98b9b092dd387721405d0 Mon Sep 17 00:00:00 2001
From: Mosley <93835010+MosleyTheMalO@users.noreply.github.com>
Date: Thu, 26 Dec 2024 16:45:50 -0500
Subject: [PATCH 13/43] bruh
---
.../interaction_menu/interaction_datum.dm | 22 +++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm b/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm
index e56e415e42133..dc7457b569e42 100644
--- a/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm
+++ b/modular_zzplurt/code/modules/lewd/interaction_menu/interaction_datum.dm
@@ -149,17 +149,17 @@
cumming.visible_message(span_userlove(message), span_userlove(self_message))
if(usage == INTERACTION_OTHER)
- var/partner_message = pick(cum_partner_text_overrides[position])
- partner_message = replacetext(partner_message, "%CUMMING%", "[cumming]")
- partner_message = replacetext(partner_message, "%CUMMING_THEIR%", "[cumming_their]")
- partner_message = replacetext(partner_message, "%CUMMING_THEM%", "[cumming_them]")
- partner_message = replacetext(partner_message, "%CAME_IN%", "[came_in]")
- partner_message = replacetext(partner_message, "%CAME_IN_THEIR%", "[came_in_their]")
- partner_message = replacetext(partner_message, "%CAME_IN_THEM%", "[came_in_them]")
- partner_message = replacetext(partner_message, "%CUM_GENITAL%", "[genital_used]")
- partner_message = replacetext(partner_message, "%CUM_TARGET%", "[hole_used]")
-
- to_chat(came_in, span_userlove(partner_message))
+ var/partner_message = pick(cum_partner_text_overrides[position])
+ partner_message = replacetext(partner_message, "%CUMMING%", "[cumming]")
+ partner_message = replacetext(partner_message, "%CUMMING_THEIR%", "[cumming_their]")
+ partner_message = replacetext(partner_message, "%CUMMING_THEM%", "[cumming_them]")
+ partner_message = replacetext(partner_message, "%CAME_IN%", "[came_in]")
+ partner_message = replacetext(partner_message, "%CAME_IN_THEIR%", "[came_in_their]")
+ partner_message = replacetext(partner_message, "%CAME_IN_THEM%", "[came_in_them]")
+ partner_message = replacetext(partner_message, "%CUM_GENITAL%", "[genital_used]")
+ partner_message = replacetext(partner_message, "%CUM_TARGET%", "[hole_used]")
+
+ to_chat(came_in, span_userlove(partner_message))
return TRUE
/// Called after either the user or target cums from the interaction
From e7a4e073c9081e2df3a811153dea2cc6b7bc851e Mon Sep 17 00:00:00 2001
From: Mosley <93835010+MosleyTheMalO@users.noreply.github.com>
Date: Thu, 26 Dec 2024 17:03:24 -0500
Subject: [PATCH 14/43] tgstation.dme
---
tgstation.dme | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tgstation.dme b/tgstation.dme
index 2ad8090f977cf..5e9e066236ec8 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -9583,10 +9583,10 @@
#include "modular_zzplurt\code\modules\lewd\interaction_menu\interactions\lewd\extreme.dm"
#include "modular_zzplurt\code\modules\lewd\interaction_menu\interactions\lewd\unholy.dm"
#include "modular_zzplurt\code\modules\lewd\interaction_menu\lewd_helpers\human.dm"
-#include "modular_zzplurt\code\modules\lewd_chemistry\reagents\camphor.dm"
#include "modular_zzplurt\code\modules\lewd_chemistry\reagents\_aphrodisiac.dm"
#include "modular_zzplurt\code\modules\lewd_chemistry\reagents\belly_enlarger.dm"
#include "modular_zzplurt\code\modules\lewd_chemistry\reagents\butt_enlarger.dm"
+#include "modular_zzplurt\code\modules\lewd_chemistry\reagents\camphor.dm"
#include "modular_zzplurt\code\modules\mob\mob.dm"
#include "modular_zzplurt\code\modules\mob\mob_defines.dm"
#include "modular_zzplurt\code\modules\mob\mob_update_icons.dm"
From b9c3780c0df50332e48ba03d73844b4c2e27c27a Mon Sep 17 00:00:00 2001
From: Mosley <93835010+MosleyTheMalO@users.noreply.github.com>
Date: Thu, 26 Dec 2024 17:39:22 -0500
Subject: [PATCH 15/43] Interaction sounds (modular_sand)
---
sound/interactions/bang1.ogg | Bin 0 -> 11155 bytes
sound/interactions/bang2.ogg | Bin 0 -> 16988 bytes
sound/interactions/bang3.ogg | Bin 0 -> 15764 bytes
sound/interactions/bang4.ogg | Bin 0 -> 16937 bytes
sound/interactions/bang5.ogg | Bin 0 -> 14468 bytes
sound/interactions/bang6.ogg | Bin 0 -> 17243 bytes
sound/interactions/bj1.ogg | Bin 0 -> 69287 bytes
sound/interactions/bj10.ogg | Bin 0 -> 17808 bytes
sound/interactions/bj11.ogg | Bin 0 -> 19284 bytes
sound/interactions/bj2.ogg | Bin 0 -> 27620 bytes
sound/interactions/bj3.ogg | Bin 0 -> 23313 bytes
sound/interactions/bj4.ogg | Bin 0 -> 29257 bytes
sound/interactions/bj5.ogg | Bin 0 -> 15407 bytes
sound/interactions/bj6.ogg | Bin 0 -> 21739 bytes
sound/interactions/bj7.ogg | Bin 0 -> 25063 bytes
sound/interactions/bj8.ogg | Bin 0 -> 20834 bytes
sound/interactions/bj9.ogg | Bin 0 -> 23987 bytes
sound/interactions/champ1.ogg | Bin 0 -> 18868 bytes
sound/interactions/champ2.ogg | Bin 0 -> 19303 bytes
sound/interactions/champ_fingering.ogg | Bin 0 -> 25107 bytes
sound/interactions/clawcum1.ogg | Bin 0 -> 22886 bytes
sound/interactions/clawcum2.ogg | Bin 0 -> 27077 bytes
sound/interactions/final_f1.ogg | Bin 0 -> 17355 bytes
sound/interactions/final_f2.ogg | Bin 0 -> 31021 bytes
sound/interactions/final_f3.ogg | Bin 0 -> 21472 bytes
sound/interactions/final_m1.ogg | Bin 0 -> 14557 bytes
sound/interactions/final_m2.ogg | Bin 0 -> 25951 bytes
sound/interactions/final_m3.ogg | Bin 0 -> 16729 bytes
sound/interactions/final_m4.ogg | Bin 0 -> 25951 bytes
sound/interactions/final_m5.ogg | Bin 0 -> 16729 bytes
sound/interactions/foot_dry1.ogg | Bin 0 -> 11882 bytes
sound/interactions/foot_dry2.ogg | Bin 0 -> 10688 bytes
sound/interactions/foot_dry3.ogg | Bin 0 -> 15499 bytes
sound/interactions/foot_dry4.ogg | Bin 0 -> 11221 bytes
sound/interactions/foot_wet1.ogg | Bin 0 -> 12170 bytes
sound/interactions/foot_wet2.ogg | Bin 0 -> 8586 bytes
sound/interactions/foot_wet3.ogg | Bin 0 -> 9043 bytes
sound/interactions/hug.ogg | Bin 0 -> 8834 bytes
sound/interactions/kiss1.ogg | Bin 0 -> 10554 bytes
sound/interactions/kiss2.ogg | Bin 0 -> 10954 bytes
sound/interactions/kiss3.ogg | Bin 0 -> 8821 bytes
sound/interactions/kiss4.ogg | Bin 0 -> 6874 bytes
sound/interactions/kiss5.ogg | Bin 0 -> 13879 bytes
sound/interactions/moan_f1.ogg | Bin 0 -> 24893 bytes
sound/interactions/moan_f2.ogg | Bin 0 -> 13416 bytes
sound/interactions/moan_f3.ogg | Bin 0 -> 18168 bytes
sound/interactions/moan_f4.ogg | Bin 0 -> 39195 bytes
sound/interactions/moan_f5.ogg | Bin 0 -> 34693 bytes
sound/interactions/moan_f6.ogg | Bin 0 -> 32698 bytes
sound/interactions/moan_f7.ogg | Bin 0 -> 18884 bytes
sound/interactions/moan_m0.ogg | Bin 0 -> 11144 bytes
sound/interactions/moan_m1.ogg | Bin 0 -> 14557 bytes
sound/interactions/moan_m12.ogg | Bin 0 -> 12632 bytes
sound/interactions/moan_m2.ogg | Bin 0 -> 25951 bytes
sound/interactions/moan_m3.ogg | Bin 0 -> 16729 bytes
sound/interactions/moan_m4.ogg | Bin 0 -> 14872 bytes
sound/interactions/moan_m5.ogg | Bin 0 -> 13625 bytes
sound/interactions/moan_m6.ogg | Bin 0 -> 13264 bytes
sound/interactions/moan_m7.ogg | Bin 0 -> 10288 bytes
sound/interactions/oral1.ogg | Bin 0 -> 21941 bytes
sound/interactions/oral2.ogg | Bin 0 -> 12814 bytes
sound/interactions/purr1.ogg | Bin 0 -> 34965 bytes
sound/interactions/purr2.ogg | Bin 0 -> 316658 bytes
sound/interactions/purr3.ogg | Bin 0 -> 147158 bytes
sound/interactions/slap.ogg | Bin 0 -> 7827 bytes
sound/interactions/squelch1.ogg | Bin 0 -> 9956 bytes
sound/interactions/squelch2.ogg | Bin 0 -> 9389 bytes
sound/interactions/squelch3.ogg | Bin 0 -> 18754 bytes
sound/interactions/swallow.ogg | Bin 0 -> 19756 bytes
sound/interactions/under_moan_f1.ogg | Bin 0 -> 14759 bytes
sound/interactions/under_moan_f2.ogg | Bin 0 -> 12484 bytes
sound/interactions/under_moan_f3.ogg | Bin 0 -> 12661 bytes
sound/interactions/under_moan_f4.ogg | Bin 0 -> 10331 bytes
73 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 sound/interactions/bang1.ogg
create mode 100644 sound/interactions/bang2.ogg
create mode 100644 sound/interactions/bang3.ogg
create mode 100644 sound/interactions/bang4.ogg
create mode 100644 sound/interactions/bang5.ogg
create mode 100644 sound/interactions/bang6.ogg
create mode 100644 sound/interactions/bj1.ogg
create mode 100644 sound/interactions/bj10.ogg
create mode 100644 sound/interactions/bj11.ogg
create mode 100644 sound/interactions/bj2.ogg
create mode 100644 sound/interactions/bj3.ogg
create mode 100644 sound/interactions/bj4.ogg
create mode 100644 sound/interactions/bj5.ogg
create mode 100644 sound/interactions/bj6.ogg
create mode 100644 sound/interactions/bj7.ogg
create mode 100644 sound/interactions/bj8.ogg
create mode 100644 sound/interactions/bj9.ogg
create mode 100644 sound/interactions/champ1.ogg
create mode 100644 sound/interactions/champ2.ogg
create mode 100644 sound/interactions/champ_fingering.ogg
create mode 100644 sound/interactions/clawcum1.ogg
create mode 100644 sound/interactions/clawcum2.ogg
create mode 100644 sound/interactions/final_f1.ogg
create mode 100644 sound/interactions/final_f2.ogg
create mode 100644 sound/interactions/final_f3.ogg
create mode 100644 sound/interactions/final_m1.ogg
create mode 100644 sound/interactions/final_m2.ogg
create mode 100644 sound/interactions/final_m3.ogg
create mode 100644 sound/interactions/final_m4.ogg
create mode 100644 sound/interactions/final_m5.ogg
create mode 100644 sound/interactions/foot_dry1.ogg
create mode 100644 sound/interactions/foot_dry2.ogg
create mode 100644 sound/interactions/foot_dry3.ogg
create mode 100644 sound/interactions/foot_dry4.ogg
create mode 100644 sound/interactions/foot_wet1.ogg
create mode 100644 sound/interactions/foot_wet2.ogg
create mode 100644 sound/interactions/foot_wet3.ogg
create mode 100644 sound/interactions/hug.ogg
create mode 100644 sound/interactions/kiss1.ogg
create mode 100644 sound/interactions/kiss2.ogg
create mode 100644 sound/interactions/kiss3.ogg
create mode 100644 sound/interactions/kiss4.ogg
create mode 100644 sound/interactions/kiss5.ogg
create mode 100644 sound/interactions/moan_f1.ogg
create mode 100644 sound/interactions/moan_f2.ogg
create mode 100644 sound/interactions/moan_f3.ogg
create mode 100644 sound/interactions/moan_f4.ogg
create mode 100644 sound/interactions/moan_f5.ogg
create mode 100644 sound/interactions/moan_f6.ogg
create mode 100644 sound/interactions/moan_f7.ogg
create mode 100644 sound/interactions/moan_m0.ogg
create mode 100644 sound/interactions/moan_m1.ogg
create mode 100644 sound/interactions/moan_m12.ogg
create mode 100644 sound/interactions/moan_m2.ogg
create mode 100644 sound/interactions/moan_m3.ogg
create mode 100644 sound/interactions/moan_m4.ogg
create mode 100644 sound/interactions/moan_m5.ogg
create mode 100644 sound/interactions/moan_m6.ogg
create mode 100644 sound/interactions/moan_m7.ogg
create mode 100644 sound/interactions/oral1.ogg
create mode 100644 sound/interactions/oral2.ogg
create mode 100644 sound/interactions/purr1.ogg
create mode 100644 sound/interactions/purr2.ogg
create mode 100644 sound/interactions/purr3.ogg
create mode 100644 sound/interactions/slap.ogg
create mode 100644 sound/interactions/squelch1.ogg
create mode 100644 sound/interactions/squelch2.ogg
create mode 100644 sound/interactions/squelch3.ogg
create mode 100644 sound/interactions/swallow.ogg
create mode 100644 sound/interactions/under_moan_f1.ogg
create mode 100644 sound/interactions/under_moan_f2.ogg
create mode 100644 sound/interactions/under_moan_f3.ogg
create mode 100644 sound/interactions/under_moan_f4.ogg
diff --git a/sound/interactions/bang1.ogg b/sound/interactions/bang1.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..d0b8abafa7d60fb3066e717bd719916670f27500
GIT binary patch
literal 11155
zcmdUVYgkiP+UVNJCL|DOLNE;&J)00P(cmNy7^pg5z<>~gLIfM3_6Z3nH(LZ{>NtI#
z4FVGaQZA8+4E94VQ4u)70^zu2@s%`D`8#`lXzRT%(cTn4&^W)6l
z^RoBa>-w&Dy|?wQ6?X35zY8(Y6KH;YB@?N;&BE4Vm9LhYiz?_UhIU}3rhnASiCV^LY*#+~K+iP9qTZZCc!jfhq%W0VQX1R5RY
zv(kA(($?J=VndBeFPkK(XpJ8K|1#=u@LI~
zRS4loBhv+q%Glsr+t2>g>8c*)~7(orDKl{+3^o?(Dsro34{bumkq^z(SFR
z9ah6Lq=wZ7dlR!Y%;_-C%FlF`&&sEXW8CN&;+Q`A%if-*7rq*JYyJiQsF7<)+~LWf
zT?b+pmn(R)vOc>(Ctpb#Rc^L-9R$#l#0tr8PGr-VZE|O4IXC*j%CZPV!ZOixb8yg>_lI8`JG}Si&z?`m
z4tSSNV5loRq2rFc+Z;M{=Y@Wsnz{i7%BNY<#d$MqeRpJW_r0Pw?;rW`@%45AG2%2e
zsH>>M`F}n8_OuuLzaLHE%zC5&UQQpBZZk-e4btgyg|C;xGYDj=F({@C>gkHj+YV``
z59!lRWL-Y-(%k4v0Z)ZMiya}2Ks{wpOt&g_#>8gt+LE0WyRd7^LRR)a0aadofrVhF
z_Bo14c1-IYFIz}J%d6t<;;zgD9a3BFO6yzO47vnv>y-4I9dbv4+qT7C7X2tjI>&AO
zLgsBvYiym8oiot=>}~5}FE2sviMXNPp61qdQD25aF0HAR6?N+)XstKcWeK<5{29J~
zblIOv@(#PW+*Y#1n+xf&|9jexsOa46iuz~}A`dRge%Iah;I{|s%ANAm_4dd^ueSEw
zO}IQb@=50_mlDqWVb}aW?sisGdsj{%^iwT1Si|Z>jBVbe|b%7lKsHAat;j_+>*lqGtD@4yH-0xhmC=e?OC^)t(%RN}2*O&1i~J?g99ZH8rL1}A&6(pUXd0AM+p!E?jn
zv>U+pHJQNrpomOCEcE;*9$@SVghD`n62E`BMitbynB$*PXiH#+vHm2l4X*g8VMdf>
zOWW9O@e7$$o(+CsANzvDvLPgTGVj|hl}%y$FS1YR9`v%n?cpdBAy%3sO?vs!=I-h5
z6jwj5-~1eT_sHhs_tW0o_T6i1QQBW$Tbtgtx#j+KHEbVPAiTn)(_tGJWITo%3XZIu
zd$hUr?h$o*aG0&#S-*CtAh{#brp=7a>u7f#kz83RUeC(wcvIF9>B-7=p6h?<#mca`
zH`md{z20Jb*c_NWc#-sueKz$Kb^V(~m()?|P>k$=;*oABZpnnPXZ!WLvd{H@ed#b=
z>^}Fb2(+cXxsUE#)FFSQ_0-699s5^`g+W_9HATPaen59V+1+o*zFGVAZ@Rsx>YXb^
z*kG?|uOF`O?ti4sF0c*xWiLSSNOynGmh6a*e!uKh+1c$UonJ?%-~6I~$bXM8{b{ie
ziZ@|jS^@HG$Au5odw(x~cVqV9f_M50JBH|D5fo4CeP;-q1m=rKB$(9z3o%lLP{Ze`
zt-!_U7U`8oo14PZI_@2jUcLbA%-aKeyr#Y?NG|NSUoW9|KIA8cPw6$gQQSoh$kGQL}et?|mLNm6e_sxIjiaRK3_vM-D#&@XO+O*sDZ|>q4@Hc|Dxx
z*OE^aid0!uQ;tj>I9;`lc9*HT!oiXDw4%XLVT>FSOGMvDd(PLrBM=arv@e=V1`%>G
zec|;#?OoSegpM^EY$~@yn<{sUDt1VEgDs5-+xSp-zq7}_e#%iXpQ$@x{xIRbtWO91
zD(nWg$ns$V%-N{ACkDq1#YXV^mPS=1LT4!q5mZXc6;4XEU%(y?>SdsK@$?1tmG89I
z)e+OfiWNr99aPNGHG6*#o9O+MPT5=_g)=%tFcGO@h2?XTW<)hS+C%b!5K`WT{mqmVB2(u_pk_aWL=%n*o-XZN
zl2!GfxA&u*TAqb2j_#AY345!dB;C@OD2wP@>X4rTo|LHKPQ2h7*0*Rboj+;N=?15k
zI%E3m_MC>{g#9H@G+HX=@7WEuVfVexT|>a@L6AUxX_Pz1A88895ZdI*J6zM&JxqbP
z80ZK>%?6!nN@Up~?*oph&e#nQ6FGM2fbYQ1Gr)J%y-r9#4D*nH81B>k+?^{$*m&sT
z{mu${7z8B@TESN*$E_1_*3)a`fy{rw=qp_c}dp?>xpuUdXAP1PZ>*q^ncAQmeXud9w|el&ULWvMDJUduHW|Z
z;Ub0_4X`v=6$F4aJY63w7YOqT&aML%RIG?FNfz>B1JHE&Sp(31BjG;rMAQ&EJV8ZE
z-k|%jfep&()dp_@3j1^fu)(0?tV{`Y5T*t_>z6@CFi$9ei9oT#U~))cr~N5DI?|!X
zda*zQ#LZ98(+E~tb>4}fn6ZNXSp!}4PV|(F(;!c{zkDA;OGqjnpEjU`QsjVBp
z(GBoNmR>JPIth7}>$7v8&h?Wzdg}j=icdI?E%~etB(Donf(-jZc84DPoFkGndljY#
z1M3Eb5!($p#i}vCu=`@KVlRktYnm&rC4jOo7B>w4IuMv@Z_Q~`EiP~J1*sT72SY6n
zW9vY0=SD@A;};)`w)&p7x0?q>7hgL1EiHkPD7V8h|H1doiR(a}EmubuKRepk*Be|h
zFuZ6i`F6`#kfC@Ga)YDae|EG%4p^>?KK|tBw;%K^mNyQ&U#j@#gYRFiXc%7TEE!68
z{MpfOx44&o^Yz7hInd?%H%kUDe*aksdy`IG}9KyVX!giO^;
zq#;*5oK*}i%U=0P`iuV{{++XCI3%Q8zA7ex|JT%jQ6s0a(C3%0VP1zxa^ZMttY{iu
z^h+p;8Z&OMwI8#akFSYNO{^bvazpNREwsN-%Qgq)%GYd7No&ysdc66)rm2{OXawKZKy@uz!2>zW*0}N!nXUMZ+1g
zD;w-}-B~a1S+8H8Yl!q&vW%}C_{FxwqSHp1VfS#M->fimWOQ_NcyzqdHXA(dcDq@t
z6_xtB0kEv-X*MAJ=H|=?q2g*x9A=wGVxcJ{&%__r1z*
znvxQSjbqlSwf?&|gx0UVZ6s^Uf@}iBx@0ynnwTV$f${2*q{XV_5>^BsAyA4;T*PIP
z6Nm>f;e9qmVu;DDv--GEGi?c2m$p7A!#;=Q2Q}-Gx$jDTQTE@rq?T)|j#PbpH8SK4
zIHK;7$?MCzGn~D=wGo+yApWeqUgiqldL+Nd-hL%RCOyCA;nd6LN7W~U{_kgGDbAnG
zPzYxYiY0T&RPj`?&xR@6f^DIAG-tSaFsV0~AZrj_mC6=Ix-7=2Ls4^~TI=
zA-b)ReZhWH&)W*Rj0&NxHtF;ya-m)5x5u^IFy$u;R+yegYmaQc&^v?D6r3;(VvffP
zk1^5bh)GDu3^C7zn3(8yN_Ha;5oW9&M}eq{oKi`_UnoW5trUmXj!Z%IT1j9kP>OJ*
zUNluQ3JX`4C^up1kxd)&W!jXm*?p(=zXFlJa$0<$)F5ury~Xx4Va`wadnB!ExE|$0
zQLO5r$hm5h34JtFcKadyHoaAB)r-L$r38SJq8Pg2QP&{eUkOz@i
zgnZGs5skwQh?_iUqT-pzgivDzy3KB6g8u@uM4z1N-jNxJH~wSCs>8PEFw=**5t3Cs
zBb{cj>(JTtJsBgGUp!uhH}dGi(dn1z_U#p=nZ+a*I^?a@{4ujR7j$2wnCST-N
ziMcRJNJeaL7Y8;+QWQ^1Q3%3ov|Yn$i~$Z&RTDh!gpwk*LUklM#(^*tp?Kvyo6Uy3
z8wi8WNCVb|)HhOY=SwW5Q!}IQ9q2tyUDmpnY%L|fes6=ec1ET>-K&?`-!-39T<%Uf
z874?CV2mn<&;^?zfE@p!r9jVZs%;!)Fd
zacCviGs2AgbLktdaY`NL@|jTU57ulFQbI&Y#m$765l<_=8f<
zfiv+;cY^P2uw*#1GWe(rNu_j)7j7f;A1OUUmu%1Fa}H3is=r!4@OMr7HP(O4<|^LS
z-)dFlx3{;|-YB=#UWn-XqCV-gH0DC*jpzFcX4^Am?ebUCY*{`}oo(}4q2@f!;^AEgQj{2%9xn|5)DS(Y3duNSE5hqm91BLX)(cKL>hd-=<0QUMx3!VMG^
zCl(*2x=rbf8sRnmrEzy$6A{+dbj{4IjUZ>>(x4Q$JAjP*91|RXwTyZ)DPEIm#4mLj
zJIV1(ZVUTQc#uAcEz?m92B*PCNtPkL6*VwLTZub}S8tTmYl(4Of*}Q5PBX;r+gdRT
zv0ziU&4o+ccmkE(rg(@$=5a)#YK)d86E$r`&C2*df*S}u#fU+Hd~pV!hw6|^1f$j=
z#ci%=Kb3%#^Y9{V5Ryvj*`^>4k`S#3$AVh$R7E86cTfz|1qW3fCec%7l~#i*xp^+U
zlbpJZTgfRi#|T6nGaTSM
zNrGZC2`;I;q=A|=#FJLh8YuNTwrbiSLX*Sk0)Z6FJ4w>_J|8(-wv&@5KX-Re{P=X_ey2
z^wMp0cPB%fB_VRs{BdW*Hbd9}Q_T*Qa81U9q@p!@jiy?M+ITq_I|?M!2<$IoX;5c)
znN-W_4ByYDM5?=uut~E~LfKtz{QVl5k!<=QaVsw7(Zz7e>)9bkOV3*cUu0!-5U5&n
zGY^YrFnp^C4zfu|DVAEzFEgV?6@pk0egcu;Xa^$^r7`GVRqA1rXk-(lhRw5r%flH2
zC>l6KuTKP=4Cn)S4gBHs9PsOv2s7b85JoV{0V8Xro^AtR!1@ALRtw}`;u#F(P
z9`GZ?K^nMnqUpqt*N~75=>bhM4wWo;34}=aYM7zul=q9e;6@k#wn`Da0OX|i3h9+SL&Wb@$@-z4un`#H3R189@$KiAjY#6q=yixIlS8ub)sp
zFUUou%5;H;Ql?XCuF|zvkjtC^8w=nnp*-PssnS;)xgK>XHy6_M37m^OLP~j4iI@Uz
zu4fVMRY#`O>3U^)+x*2dSJXATTXyiSeYp1z*P0xEp4q#1w$b(Jxa8Y#N8vJ{Y;r;ha|6z+k&_8#P=FSi0KwZ@34Z(
zHOFY(SQTnU&3qJ{A5CIh7CM#ElPUG#fQ8|LpJ2h2Y#jD4Z
z^DP)gU>3wB4-yb~A57`Fj#9gfYMUgrE1t2gZU#h(VV{HL;2KNUs_{9Ry#{5-$)>zT6c>LMTi_
z*N}7vm=!b}^A06w){yW%H4)HIMAv!M5YiQd1k5E`=|Vhh2V&?(Mm4UXQG|O(fzcx?
zUPGg!HxFjaVVX43DjJ&!de8va;p%|S5p?n+SU>pVt2n{|Q6oXBjl+T{0a8Q5OYF3zL?J-^H5z?-qC#V
z_4$J_@_L!1m15}yN)?y**UJ5s0ea9`Y7#dhrK(h=7FX6+08xI=jdkNaPrF}d+!~NmL4?oQQ@WVH7D`8;@
z6y*-Ys-$ql?D6++2picRxl2iod@4*U-*HV$q{^%$I9ZgMiX*XA6^M%y7`}mst>wlm
z-63K8GEEW)qOL}q5RK-Mhd!J9tvR`yo1BGfw-g<#be;ngBX|u
zmED2KyWZEslBN-$3^7bdL(X_TJebVWp%{}^c`g_Wt@%#|
zc}IAY6&q8UR@$IMD`FBG@n8l9&FCa}X)|IHkRX~|Hf)-6Pi9I!^
zCzR3K9jd1bKmq+j1WQZjHIS@;mj)PxkconX#8PQ8f0gpxuci)kWMtg3sK4FyiId}V
z;`Qx*sm(3cRlB(7$sF#(h3wU_3ZtIS*N$&of7WN*oT+*-Yh0~zVFGZfbiiDdw_H_Z
z5=GWwPEKWG)1e(3o%K~kB9XKHcs;b4ES82r%)MM)WHK$GxG|Q<0ejC_WJz`2vdD><
z5V?wiBffrMx5DJ(A`9a7f8SUdZaEVZAkZrz7Ag_B)p{i`^}V})b}vss)rh~dNMv$2
zDu<6%ZzO|Msak5h>IxmbD*Ch)K{b%?wE>{{iILFp6Q6`YN8`03?}!?@AL2?)
zFaUr;qC7Aj#AHB9dewKO0n(MZ@s)D5hWEhlL72?{X|wJLX}?Noh&*!!FN!&PN|mEd
z*b@WD)mK#=EM0waxpVy1H+f6r8(B*#y+^74IJT6caB5Pi
zdgyS}`JAsRD!Jf1K9~n)P?R%lo~rh7A#(5vt}sTy8MD}DCj4<{PcFpl3TIW3gDfKR
za-y7h4rhJd(BK-SvQ$5z4$up7S5wLWwAy3TbM?8*)e~x0EQRMP^-86~Wa+5mI62h7
z*qkz86A4FWy{AUia{WU~&Q{{k6kF(smhAV*;F?6W-1o3l1ppiJ_&tnPM;bCV3
z5cl+3rTrTelnzvdjG@wmN#Nx(p
zWi_hqYH%w!VLnDym?)AjO4af-3=YB*A+kmy3ogAxtK;p|8a6F&8rYM(=9t^yzBM&g
zvFJWmL_j62TX!Ke2!}ueyjUs&oSEB7X{=N;Gn|EHu=sMfl^4RZa7iFUf=QHt2&nY}
zPI|X-IxvNRrjgAdS7zc>@mUPojC@gGV+CBGY7k09EQZoVq!M6)(2Ld*3^^bLjfH}V
z&Urg(;E2f}DD-3wy7q}mAvl2Y=rWSRN9ql#S8Al*S~tYi-VB^{TQr0>OCM0dw7LMr
zie+%sP@_>JE}K3~!o(Sn!0*OzfX4{v1pH`*iYHS7J`=QqJ!t693MCNZLpxc0jrp!d
ziX(jOp$ek*R)9V6kAi2pij;k)N1AydkJ!$SEfQPa=x~l6o8%syT)S=G8(mv{JWU@w
zHU@aiH=72ByM(!$#^RjT1+(ATv!S~iiX6h+)#r!(iXB2v2KW3_@$m9ePFBGAE886wKor^T|4~dmZs0Gu?I?{Y>qmKb1Hap1dwE+=Eg0TLW=>Vqr1C0)alBz8Ke4v
zbisuBzxbyt?<)5C2JY<^#|N%?ccbUfseslkNjDFluC9UqdJKo~B0g!71HS@TgPDb*
zOvNNaAB0!UR9OZ4J4t4bO6hZ`I=>kgsASbi(rX-zTIeG^b@|Rr{I>b}7_ByNvL*h0
zXAI7m=Y>QEQW%y%NXqYYHpg4U3H!w){1~DUCv3~tYPg8kd|ASdJU-v0G({#~Xl8EB
zpJZ2w_zm-2ZPHUIW?|YoUWyb>s1+y>Zxlt(C%{jOR?#5>F%y|WXPcB6Qm%1V#RrwA
zWJo0;_$jx>kw)NF>tsloX(mKPrlHHdZxw1xp#fx|qS}pYXE4oUy3|?
z6vEoH$Wy(d;AY&+I4RG4i*paN(T5`uhcl>>v
zt(~cYy-z!7WtK6j^ZCKY@~=CrwMxMQg?1fjQa#|lkOl}_fU`x1{NMOzRrx?T@%^Bq-JUvqqJs;0D)XP#M42c>2
zgd~g~9`w%HEXk~WeWtxEayB^PtO6^Cz!Be=nbj@h^WPy(SZB2LFC}KWF%IHX!C{}k
qf;iOzK3FA{|2{3oI&iF4qO(EkRN`^pdi
literal 0
HcmV?d00001
diff --git a/sound/interactions/bang2.ogg b/sound/interactions/bang2.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..ff07de966650207df3f9bc7f28ae7b1b07321a16
GIT binary patch
literal 16988
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
bR4P`KZD$zddg042lj{i&Km6c>4`}~4aT9D(
literal 0
HcmV?d00001
diff --git a/sound/interactions/bang4.ogg b/sound/interactions/bang4.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..4d9d9da8051ce8cd228decdc02f55347952bcc5d
GIT binary patch
literal 16937
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