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

SEX TOYS #154

Merged
merged 11 commits into from
Aug 27, 2024
Merged

SEX TOYS #154

merged 11 commits into from
Aug 27, 2024

Conversation

Memeji
Copy link
Collaborator

@Memeji Memeji commented Aug 25, 2024

Description

This PR adds several vibrators, fleshlights, and dildos to the station. These can even be bought in the cargo catalogue for 1500 spessos!


Changelog

🆑

  • add: added Dildos
  • add: added Fleshlights
  • add: added Vibrators

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

You made the linter unhappy with "ammount" instead of "amount"

Copy link
Contributor

github-actions bot commented Aug 25, 2024

RSI Diff Bot; head commit 11e9b5d merging into 3ccc228
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 Added
buttplug Added
buttplug_green_big Added
buttplug_green_medium Added
buttplug_green_small Added
buttplug_metal_big Added
buttplug_metal_medium Added
buttplug_metal_small Added
buttplug_pink_big Added
buttplug_pink_medium Added
buttplug_pink_small Added
buttplug_tail_big Added
buttplug_tail_medium Added
buttplug_tail_small Added
buttplug_teal_big Added
buttplug_teal_medium Added
buttplug_teal_small Added
buttplug_yellow_big Added
buttplug_yellow_medium Added
buttplug_yellow_small Added
candle Added
candle_pink_lit Added
candle_pink_off Added
candle_teal_lit Added
candle_teal_off Added
clamps Added
collar_key Added
collar_key_black Added
collar_key_blue Added
collar_key_green Added
collar_key_latex Added
collar_key_orange Added
collar_key_purple Added
collar_key_red Added
collar_key_tealblack Added
collar_key_white Added
collar_key_yellow Added
condom_pack Added
condom_pack_pink Added
condom_pack_teal Added
condom_pink_broken Added
condom_pink_dirty Added
condom_pink_unused Added
condom_pink_used Added
condom_teal_broken Added
condom_teal_dirty Added
condom_teal_unused Added
condom_teal_used Added
dildo Added
dildo_avian Added
dildo_canine Added
dildo_double Added
dildo_dragon Added
dildo_equine Added
dildo_human Added
dildo_tentacle Added
eggvib Added
eggvib_pink_hard Added
eggvib_pink_low Added
eggvib_pink_medium Added
eggvib_pink_off Added
eggvib_teal_hard Added
eggvib_teal_low Added
eggvib_teal_medium Added
eggvib_teal_off Added
feather Added
filter Added
filter_pink Added
filter_teal Added
fleshlight Added
fleshlight_green Added
fleshlight_pink Added
fleshlight_red Added
fleshlight_teal Added
fleshlight_yellow Added
leather Added
leather_crotch_pink_hard Added
leather_crotch_pink_weak Added
leather_crotch_teal_hard Added
leather_crotch_teal_weak Added
leather_whip_pink_hard Added
leather_whip_pink_weak Added
leather_whip_teal_hard Added
leather_whip_teal_weak Added
lewdapron_green Added
lewdapron_pink Added
lewdapron_red Added
lewdapron_teal Added
lewdapron_yellow Added
lustwish_discount Added
lustwish_refill Added
magicwand Added
magicwand_hard Added
magicwand_low Added
magicwand_medium Added
magicwand_off Added
mindcontroller Added
pillow Added
pillow_pink_round Added
pillow_pink_square Added
pillow_teal_round Added
pillow_teal_square Added
pinkcuffs Added
polydildo Added
polydildo_big Added
polydildo_medium Added
polydildo_small Added
serviette_clean Added
serviette_dirty Added
serviettepack Added
serviettepack_0 Added
serviettepack_1 Added
serviettepack_2 Added
serviettepack_3 Added
serviettepack_4 Added
shocker Added
shocker_off Added
shocker_on Added
signalvib Added
signalvib_pink_hard_off Added
signalvib_pink_hard_on Added
signalvib_pink_low_off Added
signalvib_pink_low_on Added
signalvib_pink_medium_off Added
signalvib_pink_medium_on Added
signalvib_teal_hard_off Added
signalvib_teal_hard_on Added
signalvib_teal_low_off Added
signalvib_teal_low_on Added
signalvib_teal_medium_off Added
signalvib_teal_medium_on Added
spankpad Added
spankpad_pink Added
spankpad_teal Added
strapon Added
strapon_avian Added
strapon_canine Added
strapon_dragon Added
strapon_equine Added
strapon_human Added
vibrator Added
vibrator_green_hard Added
vibrator_green_low Added
vibrator_green_medium Added
vibrator_green_off Added
vibrator_pink_hard Added
vibrator_pink_low Added
vibrator_pink_medium Added
vibrator_pink_off Added
vibrator_red_hard Added
vibrator_red_low Added
vibrator_red_medium Added
vibrator_red_off Added
vibrator_teal_hard Added
vibrator_teal_low Added
vibrator_teal_medium Added
vibrator_teal_off Added
vibrator_yellow_hard Added
vibrator_yellow_low Added
vibrator_yellow_medium Added
vibrator_yellow_off Added
vibroring Added
vibroring_pink_off Added
vibroring_pink_on Added
vibroring_teal_off Added
vibroring_teal_on Added

Resources/Textures/Floof/Structures/lewdcrate.rsi

State Old New Status
base Added
closed Added
icon Added
open Added
sparking Added
welded Added

Edit: diff updated after 11e9b5d

@FoxxoTrystan FoxxoTrystan added the Priority: 1-High Needs to be resolved as soon as possible label Aug 25, 2024
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.

Tests fails are valid.

@FoxxoTrystan FoxxoTrystan self-requested a review August 26, 2024 18:32
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.

Test fails are still valid.

@Memeji
Copy link
Collaborator Author

Memeji commented Aug 26, 2024

Test fails are still valid.

Yes, I am still in the process of finding where they hard-coded the limit.
If you have any ideas, lemme know.

@FoxxoTrystan FoxxoTrystan self-requested a review August 26, 2024 19:26
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.

Test fails are still valid.

1 too much item.

@FoxxoTrystan FoxxoTrystan merged commit d113501 into Fansana:master Aug 27, 2024
14 checks passed
Floof-Station-Bot added a commit that referenced this pull request Aug 27, 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 Priority: 1-High Needs to be resolved as soon as possible Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants