Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refractored ERP interactions #61

Merged
merged 49 commits into from
Jan 1, 2025
Merged

Conversation

MosleyTheMalO
Copy link

@MosleyTheMalO MosleyTheMalO commented Dec 26, 2024

About The Pull Request

Refractored port of interactions, this is to help with porting them in a way that works with skyrat's already existing systems.

Things this pr adds:

  • refractors the current interaction system in a way that it supports similar integrations as our current one
  • Creates specific handling for different types of climaxing, and overrides for climax text when using an interaction
  • On this topic also ensures that the player and the target use and cum into the correct genitals/slots when orgasming from an interaction, and refractors vagina orgasms
  • Creates the interaction subsystem
  • Ports our interactions to the new system
  • Adds all of the interaction sounds used for our interactions
  • Makes climaxing actually fill the target with fluids, or otherwise create a cum decal or use the fluids system
  • Implements the messy trait for the above point
  • Refractors genital expansion fluids such as the belly and ass expansion reagents
  • Makes preferences for unsafe (extreme, harmful, unholy) interactions and other features in the game

Things still needed to complete interactions:

  • Porting our actual interactions menu ⚠️
  • Refractoring the system to extend it to /mob/living ⚠️
  • Genital fluids options and related systems (implants, quirks, etc.) ⚠️
  • Adding interaction-related systems (e.g. inflation, pregnancy, etc.)
  • Portal panties
  • simplemobs made for sex (funclaws, wolves, etc.)
  • refractor quirks related to the interactions system
  • other stuff I might've forgotten about

Why It's Good For The Game

Yippee interactions!

Proof Of Testing

Screenshots/Videos

Changelog

🆑
refactor: Refactored the interaction system to support our custom interactions
add: Added specific handling for different types of climaxing and climax text overrides
add: Added interaction subsystem
add: Added handling for correct genital/slot usage during interactions and orgasms
add: Added fluid filling system for climaxing
add: Added messy trait implementation
add: Added preferences for unsafe interactions (extreme, harmful, unholy)
add: Added new interaction sounds
add: Added various new interactions (armpit, belly, breasts, feet, etc.)
add: Added ERP status preferences and multipliers
sound: Added multiple new interaction sound effects
code: Added helper procs for checking genital states
/:cl:

@MosleyTheMalO MosleyTheMalO changed the title Erp interactions and related Refractored ERP interactions Dec 26, 2024
@MosleyTheMalO MosleyTheMalO force-pushed the erp-interactions-and-related branch 2 times, most recently from 2cd266d to e62ba19 Compare December 29, 2024 21:02
- 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 #58

And yes, cursor is generating the commit text.
It might be necessary to check the character ads too
@MosleyTheMalO MosleyTheMalO force-pushed the erp-interactions-and-related branch from e62ba19 to a661076 Compare December 29, 2024 21:13
@MosleyTheMalO MosleyTheMalO marked this pull request as ready for review December 29, 2024 21:27
@MosleyTheMalO MosleyTheMalO merged commit 0793d53 into master Jan 1, 2025
21 of 23 checks passed
github-actions bot added a commit that referenced this pull request Jan 1, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant