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
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Resources/Audio/Floof/Lewd/vibrate.ogg
Binary file not shown.
8 changes: 8 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Crates/food.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,10 @@
amount: 2
- id: DrinkCreamCarton
amount: 2
- id: DrinkCumBottleFull # Floof
amount: 2
- id: DrinkIceJug # Floof
amount: 2

- type: entity
id: CrateFoodSoftdrinks
Expand All @@ -143,6 +147,8 @@
amount: 2
- id: DrinkFourteenLokoCan
amount: 2
- id: DrinkNNNCan # Floof
amount: 2

- type: entity
id: CrateFoodSoftdrinksLarge
Expand All @@ -163,5 +169,7 @@
- id: DrinkLemonLimeCan
amount: 4
- id: DrinkFourteenLokoCan
amount: 2
- id: DrinkNNNCan # Floof
amount: 4

116 changes: 113 additions & 3 deletions Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
- id: OxygenTankFilled
- id: FireExtinguisher
prob: 0.25

- type: entity
id: ClosetWallFireFilledRandom
parent: ClosetWallFire
Expand All @@ -102,6 +103,7 @@
- id: OxygenTankFilled
- id: FireExtinguisher
prob: 0.25

- type: entity
id: ClosetMaintenanceFilledRandom
suffix: Filled, Random
Expand Down Expand Up @@ -169,6 +171,60 @@
prob: 0.05
- id: BookRandomStory
prob: 0.1
- id: LewdWand # Floof - Start
prob: 0.02
orGroup: Lewd
- id: LewdVibeGreen
prob: 0.02
orGroup: Lewd
- id: LewdVibeTeal
prob: 0.02
orGroup: Lewd
- id: LewdVibePink
prob: 0.02
orGroup: Lewd
- id: LewdVibeRed
prob: 0.02
orGroup: Lewd
- id: LewdVibeYellow
prob: 0.02
orGroup: Lewd
- id: LewdFleshlightGreen
prob: 0.02
orGroup: Lewd
- id: LewdFleshlightTeal
prob: 0.02
orGroup: Lewd
- id: LewdFleshlightPink
prob: 0.02
orGroup: Lewd
- id: LewdFleshlightRed
prob: 0.02
orGroup: Lewd
- id: LewdFleshlightYellow
prob: 0.02
orGroup: Lewd
- id: AvianDildo
prob: 0.02
orGroup: Lewd
- id: CanineDildo
prob: 0.02
orGroup: Lewd
- id: HorseDildo
prob: 0.02
orGroup: Lewd
- id: DragonDildo
prob: 0.02
orGroup: Lewd
- id: NormalDildo
prob: 0.02
orGroup: Lewd
- id: TentacleDildo
prob: 0.02
orGroup: Lewd
- id: DoubleDildo
prob: 0.02 # Floof - End
orGroup: Lewd
# Syndicate loot
- id: null
prob: 0.95
Expand Down Expand Up @@ -200,9 +256,9 @@
#- id: ToolboxSyndicateFilled
# prob: 0.005
# orGroup: syndiemaintloot
#- id: BalloonSyn
# prob: 0.005
# orGroup: syndiemaintloot
- id: BalloonSyn
prob: 0.005
orGroup: syndiemaintloot
#- id: WeaponSniperMosin
# prob: 0.0010
# orGroup: syndiemaintloot
Expand Down Expand Up @@ -264,6 +320,60 @@
prob: 0.20
- id: ModularReceiver
prob: 0.1
- id: LewdWand # Floof - Start
prob: 0.02
orGroup: Lewd
- id: LewdVibeGreen
prob: 0.02
orGroup: Lewd
- id: LewdVibeTeal
prob: 0.02
orGroup: Lewd
- id: LewdVibePink
prob: 0.02
orGroup: Lewd
- id: LewdVibeRed
prob: 0.02
orGroup: Lewd
- id: LewdVibeYellow
prob: 0.02
orGroup: Lewd
- id: LewdFleshlightGreen
prob: 0.02
orGroup: Lewd
- id: LewdFleshlightTeal
prob: 0.02
orGroup: Lewd
- id: LewdFleshlightPink
prob: 0.02
orGroup: Lewd
- id: LewdFleshlightRed
prob: 0.02
orGroup: Lewd
- id: LewdFleshlightYellow
prob: 0.02
orGroup: Lewd
- id: AvianDildo
prob: 0.02
orGroup: Lewd
- id: CanineDildo
prob: 0.02
orGroup: Lewd
- id: HorseDildo
prob: 0.02
orGroup: Lewd
- id: DragonDildo
prob: 0.02
orGroup: Lewd
- id: NormalDildo
prob: 0.02
orGroup: Lewd
- id: TentacleDildo
prob: 0.02
orGroup: Lewd
- id: DoubleDildo
prob: 0.02 # Floof - End
orGroup: Lewd
# Syndicate loot
- id: null
prob: 0.95
Expand Down
9 changes: 9 additions & 0 deletions Resources/Prototypes/Floof/Catalog/Cargo/cargo_lewd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
- type: cargoProduct
id: LewdCrateToys
icon:
sprite: Floof/Objects/Fun/Lewd/lewd_items.rsi
state: dildo
product: CrateLewdToys
cost: 1500
category: cargoproduct-category-name-fun
group: market
34 changes: 34 additions & 0 deletions Resources/Prototypes/Floof/Catalog/Fills/Crates/lewd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
- type: entity
id: CrateLewdToys
parent: CrateLewd
name: sex toys crate
description: Improve your station's mood by introducing some fun "toys"! Careful, work may plummet and the station may become a mess.
components:
- type: StorageFill
contents:
- id: LewdWand
- id: LewdVibeGreen
- id: LewdVibeTeal
- id: LewdVibePink
- id: LewdVibeRed
- id: LewdVibeYellow
- id: LewdFleshlightGreen
- id: LewdFleshlightTeal
- id: LewdFleshlightPink
- id: LewdFleshlightRed
- id: LewdFleshlightYellow
- id: AvianDildo
- id: CanineDildo
- id: HorseDildo
- id: DragonDildo
- id: NormalDildo
- id: TentacleDildo
- id: DoubleDildo
- id: DrinkCumBottleFull
amount: 3
- id: DrinkNNNCan
amount: 3
- id: LeashBasic
amount: 2
- id: ShortLeash
amount: 2
Loading
Loading