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

Structure and Whips #160

Merged
merged 2 commits into from
Aug 31, 2024
Merged

Structure and Whips #160

merged 2 commits into from
Aug 31, 2024

Conversation

Memeji
Copy link
Collaborator

@Memeji Memeji commented Aug 30, 2024

Description

This PR adds whips and paddles in pink and teal varieties along with holding sprites for current lewd toys.
It also removes any sprites not yet used and structures the items in a better format. This reduces clutter and makes it a lot easier to read and edit.


Changelog

🆑

  • add: Whips and Paddles
  • add: Holding sprites for all lewd items.

@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: Audio Changes any ogg files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Aug 30, 2024
Copy link
Contributor

RSI Diff Bot; head commit 8acadd6 merging into ef6331b
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Floof/Objects/Fun/Lewd/lewd_items.rsi

State Old New Status
NEXT_ICONS_USED_ONLY_FOR_VENDOMAT_DONT_TOUCH Removed
buttplug Removed
buttplug_green_big Removed
buttplug_green_medium Removed
buttplug_green_small Removed
buttplug_metal_big Removed
buttplug_metal_medium Removed
buttplug_metal_small Removed
buttplug_pink_big Removed
buttplug_pink_medium Removed
buttplug_pink_small Removed
buttplug_tail_big Removed
buttplug_tail_medium Removed
buttplug_tail_small Removed
buttplug_teal_big Removed
buttplug_teal_medium Removed
buttplug_teal_small Removed
buttplug_yellow_big Removed
buttplug_yellow_medium Removed
buttplug_yellow_small Removed
candle Removed
candle_pink_lit Removed
candle_pink_off Removed
candle_teal_lit Removed
candle_teal_off Removed
clamps Removed
collar_key Removed
collar_key_black Removed
collar_key_blue Removed
collar_key_green Removed
collar_key_latex Removed
collar_key_orange Removed
collar_key_purple Removed
collar_key_red Removed
collar_key_tealblack Removed
collar_key_white Removed
collar_key_yellow Removed
condom_pack Removed
condom_pack_pink Removed
condom_pack_teal Removed
condom_pink_broken Removed
condom_pink_dirty Removed
condom_pink_unused Removed
condom_pink_used Removed
condom_teal_broken Removed
condom_teal_dirty Removed
condom_teal_unused Removed
condom_teal_used Removed
eggvib Removed
eggvib_pink_hard Removed
eggvib_pink_low Removed
eggvib_pink_medium Removed
eggvib_pink_off Removed
eggvib_teal_hard Removed
eggvib_teal_low Removed
eggvib_teal_medium Removed
eggvib_teal_off Removed
feather Removed
filter Removed
filter_pink Removed
filter_teal Removed
fleshlight_pink Removed
leather_crotch_pink_hard Removed
leather_crotch_teal_hard Removed
leather_whip_pink_hard Removed
leather_whip_pink_weak Removed
leather_whip_teal_weak Removed
lewdapron_green Removed
lewdapron_pink Removed
lewdapron_red Removed
lewdapron_teal Removed
lewdapron_yellow Removed
lustwish_discount Removed
lustwish_refill Removed
magicwand Removed
mindcontroller Removed
pillow Removed
pillow_pink_round Removed
pillow_pink_square Removed
pillow_teal_round Removed
pillow_teal_square Removed
pinkcuffs Removed
polydildo Removed
polydildo_big Removed
polydildo_medium Removed
polydildo_small Removed
serviette_clean Removed
serviette_dirty Removed
serviettepack Removed
serviettepack_0 Removed
serviettepack_1 Removed
serviettepack_2 Removed
serviettepack_3 Removed
serviettepack_4 Removed
shocker Removed
shocker_off Removed
shocker_on Removed
signalvib Removed
signalvib_pink_hard_off Removed
signalvib_pink_hard_on Removed
signalvib_pink_low_off Removed
signalvib_pink_low_on Removed
signalvib_pink_medium_off Removed
signalvib_pink_medium_on Removed
signalvib_teal_hard_off Removed
signalvib_teal_hard_on Removed
signalvib_teal_low_off Removed
signalvib_teal_low_on Removed
signalvib_teal_medium_off Removed
signalvib_teal_medium_on Removed
spankpad_pink Removed
strapon Removed
strapon_avian Removed
strapon_canine Removed
strapon_dragon Removed
strapon_equine Removed
strapon_human Removed
vibrator Removed
vibroring Removed
vibroring_pink_off Removed
vibroring_pink_on Removed
vibroring_teal_off Removed
vibroring_teal_on Removed

Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Dildos/dildo_avian.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Dildos/dildo_canine.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Dildos/dildo_double.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Dildos/dildo_dragon.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Dildos/dildo_equine.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Dildos/dildo_human.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Dildos/dildo_tentacle.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Fleshlights/fleshlight_green.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Fleshlights/fleshlight_pink.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Fleshlights/fleshlight_red.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Fleshlights/fleshlight_teal.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Fleshlights/fleshlight_yellow.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Vibes/magic_wand.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Vibes/vibrator_green.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Vibes/vibrator_pink.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Vibes/vibrator_red.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Vibes/vibrator_teal.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Vibes/vibrator_yellow.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Fun/Lewd/Weapons/crotch_pink.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Fun/Lewd/Weapons/crotch_teal.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Fun/Lewd/Weapons/spank_pink.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Fun/Lewd/Weapons/spank_teal.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Fun/Lewd/Weapons/whip_pink.rsi

State Old New Status
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Fun/Lewd/Weapons/whip_teal.rsi

State Old New Status
inhand-left Added
inhand-right Added

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.

This is cursed...

Why i have to review this, Approved!

@FoxxoTrystan FoxxoTrystan merged commit 19e606a into Fansana:master Aug 31, 2024
15 checks passed
Floof-Station-Bot added a commit that referenced this pull request Aug 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Audio Changes any ogg files Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants