diff --git a/Resources/Changelog/ChangelogAmour.yml b/Resources/Changelog/ChangelogAmour.yml index cdac1eb607..6e353eb3dd 100644 --- a/Resources/Changelog/ChangelogAmour.yml +++ b/Resources/Changelog/ChangelogAmour.yml @@ -150,6 +150,12 @@ - author: BIG_Zi_348 changes: - message: "Добавлен немецкий акцент." - type: Fix + type: Add id: 24 time: '2024-12-29T18:00:13.0000000+00:00' +- author: BIG_Zi_348 + changes: + - message: "Добавлены особые подарки в Кинк-о-Мат." + type: Add + id: 25 + time: '2024-12-30T18:00:13.0000000+00:00' diff --git a/Resources/Prototypes/_Amour/Entities/Objects/Consumable/Food/candies.yml b/Resources/Prototypes/_Amour/Entities/Objects/Consumable/Food/candies.yml new file mode 100644 index 0000000000..c729085d73 --- /dev/null +++ b/Resources/Prototypes/_Amour/Entities/Objects/Consumable/Food/candies.yml @@ -0,0 +1,115 @@ +- type: entity + name: упакованный подарок + parent: BaseItem + id: FoodSnackLeDildoWrappedBase + description: Странного вида подарок, завёрнутый в разноцветную бумажную упаковку. + abstract: true + components: + - type: Item + size: Normal + - type: Tag + tags: + - FoodSnack + - type: SpawnItemsOnUse + items: + - id: FoodSnackLeDildo1 + sound: + path: /Audio/Effects/unwrap.ogg + - type: StaticPrice + price: 20 + +- type: entity + name: леденец странного вида + parent: FoodSnackBase + id: FoodSnackLeDildoBase + description: Проигрывает своему аналогу в долговечности. + abstract: true + components: + - type: FlavorProfile + flavors: + - sweet + - flavorLeDildo + - type: Item + size: Normal + - type: SolutionContainerManager + solutions: + food: + maxVol: 35 + reagents: + - ReagentId: Nutriment + Quantity: 30 + +- type: entity + parent: FoodSnackLeDildoWrappedBase + id: FoodSnackLeDildoWrapped1 + components: + - type: Sprite + sprite: _Amour/Objects/Consumable/Food/ledildowrapped1.rsi + state: icon + - type: Item + sprite: _Amour/Objects/Consumable/Food/ledildowrapped1.rsi + heldPrefix: null + - type: SpawnItemsOnUse + items: + - id: FoodSnackLeDildo1 + +- type: entity + parent: FoodSnackLeDildoBase + id: FoodSnackLeDildo1 + components: + - type: Sprite + sprite: _Amour/Objects/Consumable/Food/ledildo1.rsi + state: icon + - type: Item + sprite: _Amour/Objects/Consumable/Food/ledildo1.rsi + heldPrefix: null + +- type: entity + parent: FoodSnackLeDildoWrappedBase + id: FoodSnackLeDildoWrapped2 + components: + - type: Sprite + sprite: _Amour/Objects/Consumable/Food/ledildowrapped2.rsi + state: icon + - type: Item + sprite: _Amour/Objects/Consumable/Food/ledildowrapped2.rsi + heldPrefix: null + - type: SpawnItemsOnUse + items: + - id: FoodSnackLeDildo2 + +- type: entity + parent: FoodSnackLeDildoBase + id: FoodSnackLeDildo2 + components: + - type: Sprite + sprite: _Amour/Objects/Consumable/Food/ledildo2.rsi + state: icon + - type: Item + sprite: _Amour/Objects/Consumable/Food/ledildo2.rsi + heldPrefix: null + +- type: entity + parent: FoodSnackLeDildoWrappedBase + id: FoodSnackLeDildoWrapped3 + components: + - type: Sprite + sprite: _Amour/Objects/Consumable/Food/ledildowrapped3.rsi + state: icon + - type: Item + sprite: _Amour/Objects/Consumable/Food/ledildowrapped3.rsi + heldPrefix: null + - type: SpawnItemsOnUse + items: + - id: FoodSnackLeDildo3 + +- type: entity + parent: FoodSnackLeDildoBase + id: FoodSnackLeDildo3 + components: + - type: Sprite + sprite: _Amour/Objects/Consumable/Food/ledildo3.rsi + state: icon + - type: Item + sprite: _Amour/Objects/Consumable/Food/ledildo3.rsi + heldPrefix: null diff --git a/Resources/Prototypes/_Honk/Flavors/flavors.yml b/Resources/Prototypes/_Honk/Flavors/flavors.yml index 2e76d0067e..d773723df9 100644 --- a/Resources/Prototypes/_Honk/Flavors/flavors.yml +++ b/Resources/Prototypes/_Honk/Flavors/flavors.yml @@ -2,3 +2,8 @@ id: flavorhard flavorType: Complex description: жёстко + +- type: flavor + id: flavorLeDildo + flavorType: Complex + description: как прошлый год diff --git a/Resources/Prototypes/_White/Catalog/VendingMachines/Inventories/Kink.yml b/Resources/Prototypes/_White/Catalog/VendingMachines/Inventories/Kink.yml index 806b30f963..9782c7b19b 100644 --- a/Resources/Prototypes/_White/Catalog/VendingMachines/Inventories/Kink.yml +++ b/Resources/Prototypes/_White/Catalog/VendingMachines/Inventories/Kink.yml @@ -1,6 +1,9 @@ - type: vendingMachineInventory id: KinkMachineInventory startingInventory: + FoodSnackLeDildoWrapped1: 5 + FoodSnackLeDildoWrapped2: 5 + FoodSnackLeDildoWrapped3: 5 PinkHandcuffs: 3 ClothingUniformJumpskirtJanimaid: 6 ClothingMaskSexyMime: 6 diff --git a/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo1.rsi/icon.png b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo1.rsi/icon.png new file mode 100644 index 0000000000..6fa6322579 Binary files /dev/null and b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo1.rsi/icon.png differ diff --git a/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo1.rsi/inhand-left.png b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo1.rsi/inhand-left.png new file mode 100644 index 0000000000..28f81d9cbc Binary files /dev/null and b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo1.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo1.rsi/inhand-right.png b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo1.rsi/inhand-right.png new file mode 100644 index 0000000000..c75de9168d Binary files /dev/null and b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo1.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo1.rsi/meta.json b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo1.rsi/meta.json new file mode 100644 index 0000000000..e6781b7b53 --- /dev/null +++ b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo1.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by zastupnic", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo2.rsi/icon.png b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo2.rsi/icon.png new file mode 100644 index 0000000000..679d8b854c Binary files /dev/null and b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo2.rsi/icon.png differ diff --git a/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo2.rsi/inhand-left.png b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo2.rsi/inhand-left.png new file mode 100644 index 0000000000..c3ca47f4c4 Binary files /dev/null and b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo2.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo2.rsi/inhand-right.png b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo2.rsi/inhand-right.png new file mode 100644 index 0000000000..e6c8df1c2e Binary files /dev/null and b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo2.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo2.rsi/meta.json b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo2.rsi/meta.json new file mode 100644 index 0000000000..e6781b7b53 --- /dev/null +++ b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo2.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by zastupnic", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo3.rsi/icon.png b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo3.rsi/icon.png new file mode 100644 index 0000000000..74d7432631 Binary files /dev/null and b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo3.rsi/icon.png differ diff --git a/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo3.rsi/inhand-left.png b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo3.rsi/inhand-left.png new file mode 100644 index 0000000000..cf72d31114 Binary files /dev/null and b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo3.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo3.rsi/inhand-right.png b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo3.rsi/inhand-right.png new file mode 100644 index 0000000000..9bfe047121 Binary files /dev/null and b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo3.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo3.rsi/meta.json b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo3.rsi/meta.json new file mode 100644 index 0000000000..e6781b7b53 --- /dev/null +++ b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildo3.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by zastupnic", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped1.rsi/icon.png b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped1.rsi/icon.png new file mode 100644 index 0000000000..4ad2915b06 Binary files /dev/null and b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped1.rsi/icon.png differ diff --git a/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped1.rsi/inhand-left.png b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped1.rsi/inhand-left.png new file mode 100644 index 0000000000..345115e33d Binary files /dev/null and b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped1.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped1.rsi/inhand-right.png b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped1.rsi/inhand-right.png new file mode 100644 index 0000000000..dfc69b4c6a Binary files /dev/null and b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped1.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped1.rsi/meta.json b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped1.rsi/meta.json new file mode 100644 index 0000000000..e6781b7b53 --- /dev/null +++ b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped1.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by zastupnic", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped2.rsi/icon.png b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped2.rsi/icon.png new file mode 100644 index 0000000000..8222fe3cac Binary files /dev/null and b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped2.rsi/icon.png differ diff --git a/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped2.rsi/inhand-left.png b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped2.rsi/inhand-left.png new file mode 100644 index 0000000000..26a4a20a1a Binary files /dev/null and b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped2.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped2.rsi/inhand-right.png b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped2.rsi/inhand-right.png new file mode 100644 index 0000000000..0e96b1a837 Binary files /dev/null and b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped2.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped2.rsi/meta.json b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped2.rsi/meta.json new file mode 100644 index 0000000000..e6781b7b53 --- /dev/null +++ b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped2.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by zastupnic", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped3.rsi/icon.png b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped3.rsi/icon.png new file mode 100644 index 0000000000..57ff0b0e3e Binary files /dev/null and b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped3.rsi/icon.png differ diff --git a/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped3.rsi/inhand-left.png b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped3.rsi/inhand-left.png new file mode 100644 index 0000000000..b53680b3c1 Binary files /dev/null and b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped3.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped3.rsi/inhand-right.png b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped3.rsi/inhand-right.png new file mode 100644 index 0000000000..cbabc7d8c1 Binary files /dev/null and b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped3.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped3.rsi/meta.json b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped3.rsi/meta.json new file mode 100644 index 0000000000..e6781b7b53 --- /dev/null +++ b/Resources/Textures/_Amour/Objects/Consumable/Food/ledildowrapped3.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by zastupnic", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + } + ] +} \ No newline at end of file