diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml index c29ed46a54e..ace97052a11 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/misc.yml @@ -210,6 +210,9 @@ - id: CanineDildo prob: 0.02 orGroup: Lewd + - id: CanineDildoRed + prob: 0.02 + orGroup: Lewd - id: HorseDildo prob: 0.02 orGroup: Lewd @@ -378,6 +381,9 @@ - id: CanineDildo prob: 0.02 orGroup: Lewd + - id: CanineDildoRed + prob: 0.02 + orGroup: Lewd - id: HorseDildo prob: 0.02 orGroup: Lewd diff --git a/Resources/Prototypes/Floof/Catalog/Cargo/cargo_lewd.yml b/Resources/Prototypes/Floof/Catalog/Cargo/cargo_lewd.yml index e871e57d546..f22e4a4734c 100644 --- a/Resources/Prototypes/Floof/Catalog/Cargo/cargo_lewd.yml +++ b/Resources/Prototypes/Floof/Catalog/Cargo/cargo_lewd.yml @@ -4,6 +4,6 @@ sprite: Floof/Objects/Fun/Lewd/lewd_icons.rsi state: dildo product: CrateLewdToys - cost: 1500 + cost: 2000 category: cargoproduct-category-name-fun group: market diff --git a/Resources/Prototypes/Floof/Catalog/Fills/Crates/lewd.yml b/Resources/Prototypes/Floof/Catalog/Fills/Crates/lewd.yml index bbcf58e98d8..559626a760d 100644 --- a/Resources/Prototypes/Floof/Catalog/Fills/Crates/lewd.yml +++ b/Resources/Prototypes/Floof/Catalog/Fills/Crates/lewd.yml @@ -19,6 +19,9 @@ - id: LewdFleshlightYellow - id: AvianDildo - id: CanineDildo + orGroup: canine + - id: CanineDildoRed + orGroup: canine - id: HorseDildo - id: DragonDildo - id: NormalDildo diff --git a/Resources/Prototypes/Floof/Entities/Objects/Lewd/dildos.yml b/Resources/Prototypes/Floof/Entities/Objects/Lewd/dildos.yml index 3eca3afc7ab..453c93a8571 100644 --- a/Resources/Prototypes/Floof/Entities/Objects/Lewd/dildos.yml +++ b/Resources/Prototypes/Floof/Entities/Objects/Lewd/dildos.yml @@ -1,5 +1,16 @@ - type: entity parent: BaseItem + id: BaseDildo + abstract: true + components: + - type: PhysicalComposition + materialComposition: + Plastic: 100 + - type: StaticPrice + price: 75 + +- type: entity + parent: BaseDildo id: AvianDildo name: avian dildo description: A dildo in the shape of a bird's "caw-k". @@ -9,7 +20,7 @@ state: icon - type: entity - parent: BaseItem + parent: BaseDildo id: CanineDildo name: canine dildo description: A dildo of a green rocket. @@ -19,7 +30,17 @@ state: icon - type: entity - parent: BaseItem + parent: BaseDildo + id: CanineDildoRed + name: red canine dildo + description: You'll be seeing stars when you ride THIS red rocket. + components: + - type: Sprite + sprite: Floof/Objects/Fun/Lewd/Toys/Dildos/dildo_canine_red.rsi + state: icon + +- type: entity + parent: BaseDildo id: HorseDildo name: horse dildo description: A large dildo of a horse... Wow it's big... @@ -29,7 +50,7 @@ state: icon - type: entity - parent: BaseItem + parent: BaseDildo id: DragonDildo name: dragon dildo description: A large red dildo of a dragon... Woof... @@ -39,7 +60,7 @@ state: icon - type: entity - parent: BaseItem + parent: BaseDildo id: NormalDildo name: dildo description: A simple pink dildo. @@ -49,7 +70,7 @@ state: icon - type: entity - parent: BaseItem + parent: BaseDildo id: TentacleDildo name: tentacle dildo description: A floppy tentacle dildo... Is it slimey? @@ -59,7 +80,7 @@ state: icon - type: entity - parent: BaseItem + parent: BaseDildo id: DoubleDildo name: double-sided dildo description: A long dildo with two ends. Bring a friend! diff --git a/Resources/Prototypes/Floof/Entities/Objects/Lewd/fleshlights.yml b/Resources/Prototypes/Floof/Entities/Objects/Lewd/fleshlights.yml index 411566dd3aa..7c4282f8663 100644 --- a/Resources/Prototypes/Floof/Entities/Objects/Lewd/fleshlights.yml +++ b/Resources/Prototypes/Floof/Entities/Objects/Lewd/fleshlights.yml @@ -3,6 +3,11 @@ id: BaseFleshlight abstract: true components: + - type: PhysicalComposition + materialComposition: + Plastic: 100 + - type: StaticPrice + price: 75 - type: Drink solution: fleshlight ignoreEmpty: true diff --git a/Resources/Prototypes/Floof/Entities/Objects/Lewd/vibes.yml b/Resources/Prototypes/Floof/Entities/Objects/Lewd/vibes.yml index 8cfafc2c074..a1d786f7c16 100644 --- a/Resources/Prototypes/Floof/Entities/Objects/Lewd/vibes.yml +++ b/Resources/Prototypes/Floof/Entities/Objects/Lewd/vibes.yml @@ -3,6 +3,12 @@ id: BaseVibe abstract: true components: + - type: PhysicalComposition + materialComposition: + Plastic: 75 + Steel: 25 + - type: StaticPrice + price: 100 - type: ItemToggle predictable: false soundActivate: diff --git a/Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Dildos/dildo_canine_red.rsi/icon.png b/Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Dildos/dildo_canine_red.rsi/icon.png new file mode 100644 index 00000000000..7b61b3ef1ec Binary files /dev/null and b/Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Dildos/dildo_canine_red.rsi/icon.png differ diff --git a/Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Dildos/dildo_canine_red.rsi/inhand-left.png b/Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Dildos/dildo_canine_red.rsi/inhand-left.png new file mode 100644 index 00000000000..68784d18b88 Binary files /dev/null and b/Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Dildos/dildo_canine_red.rsi/inhand-left.png differ diff --git a/Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Dildos/dildo_canine_red.rsi/inhand-right.png b/Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Dildos/dildo_canine_red.rsi/inhand-right.png new file mode 100644 index 00000000000..e1ed1e4672d Binary files /dev/null and b/Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Dildos/dildo_canine_red.rsi/inhand-right.png differ diff --git a/Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Dildos/dildo_canine_red.rsi/meta.json b/Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Dildos/dildo_canine_red.rsi/meta.json new file mode 100644 index 00000000000..10d531ab7d3 --- /dev/null +++ b/Resources/Textures/Floof/Objects/Fun/Lewd/Toys/Dildos/dildo_canine_red.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Splurtstation (https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13). Edited by Memeji", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}