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.

Sign up for GitHub

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

Jump to bottom

The CUM Update - First Iteration. #49

Merged
merged 9 commits into from
Aug 5, 2024
Merged

The CUM Update - First Iteration. #49

merged 9 commits into from
Aug 5, 2024

Conversation

Memeji
Copy link
Collaborator

@Memeji Memeji commented Jul 21, 2024 •
edited
Loading

Description

This update adds two traits (Cock, Boobs) and ways to make cum and milk using them.

TODO

  • Check for suit (except loincloth) to prevent action.
  • Be able to cum/milk w/o a container in hand.
  • Better text for actions.
  • Clean the code
  • "Pussy" trait and components with mechanics.

Changelog

🆑

  • add: "Cock" trait, fill containers with your essence!
  • add: "Boobs" trait, fill containers using your mommy milkers!
  • add: LewdTrait system.
  • tweak: Changed hunger/thirst values for cum to not satiate as much. (No cum meta)
  • changed: "Penis" component to "CumProducer" component.
  • changed: "Boobs" component to "MilkProducer" component.

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files labels Jul 21, 2024
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jul 21, 2024
@Floof-Station-Bot Floof-Station-Bot changed the title The CUM update - First iteration. The CUM Update - First Iteration. Jul 21, 2024
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jul 21, 2024
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Jul 21, 2024
@FoxxoTrystan FoxxoTrystan added Priority: 2-Medium Needs to be resolved at some point Status: Needs Review Someone please review this and removed Status: Needs Review Someone please review this labels Jul 21, 2024
FoxxoTrystan
FoxxoTrystan reviewed Jul 21, 2024
View reviewed changes
Copy link
Collaborator

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

HasBoobs and HasCock as just the same system, just add 2 component but they use the same system to CockComponent use "LewdSystem" or i dunno how you wana call it but avoid using 2 Systems thats are mostly copy and paste, i recomend also using .yml so instead you also do only 1 Component and System just regrouping them under 1, look how languages are listed by example.

I will fully review this later so for now this is a comment and not requested changes.

@Fansana
Copy link
Owner

Fansana commented Jul 22, 2024

I'm unsure if one component can handle all the things we want in the future. For one thing the functionality will be different between each. Breasts will be drinkable but cock not. Cocks will have the cum verb attached which allows them to eject special content.

@Memeji
Copy link
Collaborator Author

Memeji commented Jul 22, 2024

Lemme know how you'd like to move forward with this. As well as how I would make those changes to this PR!

@FoxxoTrystan
Copy link
Collaborator

Il give it a proper review tomorrow.

FoxxoTrystan
FoxxoTrystan requested changes Jul 23, 2024
View reviewed changes
Copy link
Collaborator

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

HasBoobsSystem and HasPenisSystem just compleatly does the same thing, this need to be regrouped into one system, by using multiple component or .yml files.

Im willing to assist or make some commits if you need asisstance.

Theres also some functions that are outated but i will point those issues out later after the main issue is fixed.

@FoxxoTrystan FoxxoTrystan added Status: Awaiting Changes Do not merge due to requested changes and removed Status: Needs Review Someone please review this labels Jul 23, 2024
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jul 27, 2024
@Memeji Memeji requested a review from FoxxoTrystan August 5, 2024 17:55
@github-actions github-actions bot added Status: Needs Review Someone please review this and removed Status: Awaiting Changes Do not merge due to requested changes labels Aug 5, 2024
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Aug 5, 2024
FoxxoTrystan
FoxxoTrystan requested changes Aug 5, 2024
View reviewed changes
Copy link
Collaborator

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I fixed merge conflicts but now test are failing due to some component not being valid, this need to be fixed.

@FoxxoTrystan FoxxoTrystan added Status: Awaiting Changes Do not merge due to requested changes and removed Status: Needs Review Someone please review this labels Aug 5, 2024
@Memeji Memeji requested a review from FoxxoTrystan August 5, 2024 19:42
@github-actions github-actions bot added Status: Needs Review Someone please review this and removed Status: Awaiting Changes Do not merge due to requested changes labels Aug 5, 2024
@FoxxoTrystan FoxxoTrystan added Status: Awaiting Changes Do not merge due to requested changes and removed Status: Needs Review Someone please review this labels Aug 5, 2024
FoxxoTrystan
FoxxoTrystan approved these changes Aug 5, 2024
View reviewed changes
Copy link
Collaborator

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Honestly, this will need updates, refractors, ect... to be improved but so far, right now.

This is fine.

@FoxxoTrystan FoxxoTrystan merged commit a9cb0ad into master Aug 5, 2024
9 of 10 checks passed
Floof-Station-Bot added a commit that referenced this pull request Aug 5, 2024
@Floof-Station-Bot
Automatic Changelog Update (#49)
d561321
ShatteredSwords pushed a commit to ShatteredSwords/floofstation1 that referenced this pull request Aug 14, 2024
@VMSolidus
CPR Remake (#487)
aed3bab 
# Description

This is a re implementation and complete rewrite of the original
Nyanotrasen CPR feature, this time as its own completely standalone
system. Unlike the original CPR, this system requires no modification of
base game code, and can be toggled on and off via CVars while the server
is running.

Fixes #473
Fixes Fansana#49

# Changelog
:cl:
- add: CPR has been added to the game. People with CPR training can now
perform CPR on anyone who is in either crit or dead states.
- add: CPR Training has been added to the game as a new positive trait.
All medical staff start with this trait for free.

---------

Signed-off-by: VMSolidus <[email protected]>
@Leviathan21
Copy link

every dya we strafe further from god

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Fansana Fansana Fansana approved these changes

@FoxxoTrystan FoxxoTrystan FoxxoTrystan approved these changes

Assignees

@Memeji Memeji

Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: YML Changes any yml files Priority: 2-Medium Needs to be resolved at some point Status: Awaiting Changes Do not merge due to requested changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Memeji @Fansana @FoxxoTrystan @Leviathan21