forked from Bubberstation/Bubberstation
-
Notifications
You must be signed in to change notification settings - Fork 22
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MosleyTheMalO
changed the title
Erp interactions and related
Refractored ERP interactions
Dec 26, 2024
MosleyTheMalO
force-pushed
the
erp-interactions-and-related
branch
2 times, most recently
from
December 29, 2024 21:02
2cd266d
to
e62ba19
Compare
- 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.
guess cursor decided to use two different files for this
MosleyTheMalO
force-pushed
the
erp-interactions-and-related
branch
from
December 29, 2024 21:13
e62ba19
to
a661076
Compare
MosleyTheMalO
requested review from
Majkl-J and
projectkepler-ru
as code owners
December 29, 2024 21:27
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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:
Things still needed to complete interactions:
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: