Merge pull request #235 from frosty-dev/NewStuff

Подарки в Кинк-о-Мат

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'

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

Resources/Prototypes/_Honk/Flavors/flavors.yml

@@ -2,3 +2,8 @@
   id: flavorhard
   flavorType: Complex
   description: жёстко
+
+- type: flavor
+  id: flavorLeDildo
+  flavorType: Complex
+  description: как прошлый год

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

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
+        }
+    ]
+}

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
+        }
+    ]
+}

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
+        }
+    ]
+}

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
+        }
+    ]
+}

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
+        }
+    ]
+}

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
+        }
+    ]
+}