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

V7 Patches #398

Merged
merged 15 commits into from
Dec 8, 2024
Merged

V7 Patches #398

merged 15 commits into from
Dec 8, 2024

Conversation

FoxxoTrystan
Copy link
Collaborator

@FoxxoTrystan FoxxoTrystan commented Dec 8, 2024 •
edited
Loading

Description

This PR patches/fixes a bunch of things regarding V7, This PR will be merged on Stable when merged on Master.

Changelog

🆑

  • add: Add Vore Sound toggle in options.
  • add: Added Vore Pred and allow to insert yourself.
  • tweak: Vore Consent was changed to Vore Prey.
  • tweak: You can only vore others with the ability to vore.
  • fix: Fix Resomi Displacement Maps
  • fox: Fix Hypnosis for some science jobs and some .FTL changes.

@FoxxoTrystan FoxxoTrystan self-assigned this Dec 8, 2024
@FoxxoTrystan FoxxoTrystan added the Priority: 1-High Needs to be resolved as soon as possible label Dec 8, 2024
@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Localization Changes any ftl files Status: Needs Review Someone please review this Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files Changes: YML Changes any yml files labels Dec 8, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 8, 2024 •
edited
Loading

RSI Diff Bot; head commit 493efb1 merging into 33a1d1b
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Floof/Mobs/Customization/resomi_parts.rsi

State Old New Status
tail Modified
tail_feathers Modified

Resources/Textures/Floof/Mobs/Species/Resomi/displacement.rsi

State Old New Status
belt Modified
head Modified
neck Modified

Edit: diff updated after 493efb1

@Fansana Fansana merged commit d9e1f59 into Fansana:master Dec 8, 2024
11 of 12 checks passed
Floof-Station-Bot added a commit that referenced this pull request Dec 8, 2024
@Floof-Station-Bot
Automatic Changelog Update (#398)
2bc778d
@Fansana Fansana mentioned this pull request Dec 9, 2024
Merged
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

@Memeji Memeji Awaiting requested review from Memeji Memeji is a code owner

Assignees

@FoxxoTrystan FoxxoTrystan

Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files Changes: YML Changes any yml files Priority: 1-High Needs to be resolved as soon as possible Status: Needs Review Someone please review this
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@FoxxoTrystan @Fansana