Merge pull request #214 from frosty-dev/NewItems

Повязки

Resources/Changelog/ChangelogAmour.yml

@@ -119,13 +119,19 @@
   time: '2024-11-28T18:00:13.0000000+00:00'
 - author: BIG_Zi_348
   changes:
-  - message: "Добавленно обозначение антагониста ивентовому-подрывнику для окошка телепорта призраков"
+  - message: "Добавленно обозначение антагониста ивентовому-подрывнику для окошка телепорта призраков."
     type: Add
   id: 19
   time: '2024-12-12T18:00:13.0000000+00:00'
 - author: BIG_Zi_348
   changes:
-  - message: "Добавлена новая заставка в лобби. Спасибо waggier"
+  - message: "Добавлена новая заставка в лобби. Спасибо waggier."
     type: Add
   id: 20
   time: '2024-12-13T18:00:13.0000000+00:00'
+- author: BIG_Zi_348
+  changes:
+  - message: "Добавлены новые повязки на глаза в Кинк-о-Мат."
+    type: Add
+  id: 21
+  time: '2024-12-15T18:00:13.0000000+00:00'

Resources/Locale/ru-RU/_amour/misc.ftl

@@ -1,2 +1,36 @@
 ent-VendingMachineKink = Кинк-о-Мат
     .desc = Торговый автомат для всех ваших сокровенных желаний.
+
+ent-ClothingEyesBlindfoldDarkblue = { ent-ClothingEyesBlindfold }
+    .suffix = Темно-Синяя
+    .desc = { ent-ClothingEyesBlindfold.desc }
+ent-ClothingEyesBlindfoldDarkpink = { ent-ClothingEyesBlindfold }
+    .suffix = Темно-Розовая
+    .desc = { ent-ClothingEyesBlindfold.desc }
+ent-ClothingEyesBlindfoldGreen = { ent-ClothingEyesBlindfold }
+    .suffix = Зелёная
+    .desc = { ent-ClothingEyesBlindfold.desc }
+ent-ClothingEyesBlindfoldGrey = { ent-ClothingEyesBlindfold }
+    .suffix = Серая
+    .desc = { ent-ClothingEyesBlindfold.desc }
+ent-ClothingEyesBlindfoldLightblue = { ent-ClothingEyesBlindfold }
+    .suffix = Светло-Синяя
+    .desc = { ent-ClothingEyesBlindfold.desc }
+ent-ClothingEyesBlindfoldOrange = { ent-ClothingEyesBlindfold }
+    .suffix = Оранжевая
+    .desc = { ent-ClothingEyesBlindfold.desc }
+ent-ClothingEyesBlindfoldPink = { ent-ClothingEyesBlindfold }
+    .suffix = Розовая
+    .desc = { ent-ClothingEyesBlindfold.desc }
+ent-ClothingEyesBlindfoldPurple = { ent-ClothingEyesBlindfold }
+    .suffix = Фиолетовая
+    .desc = { ent-ClothingEyesBlindfold.desc }
+ent-ClothingEyesBlindfoldRed = { ent-ClothingEyesBlindfold }
+    .suffix = Красная
+    .desc = { ent-ClothingEyesBlindfold.desc }
+ent-ClothingEyesBlindfoldWhite = { ent-ClothingEyesBlindfold }
+    .suffix = Белая
+    .desc = { ent-ClothingEyesBlindfold.desc }
+ent-ClothingEyesBlindfoldYellow = { ent-ClothingEyesBlindfold }
+    .suffix = Жёлтая
+    .desc = { ent-ClothingEyesBlindfold.desc }

Resources/Prototypes/_Amour/Entities/Clothing/Eyes/misc.yml

@@ -0,0 +1,175 @@
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesBlindfoldDarkblue
+  name: blindfold
+  suffix: Dark Blue
+  description: The bind leading the blind.
+  components:
+  - type: Sprite
+    sprite: White/_Amour/Clothing/Eyes/Misc/blindfold.rsi
+    state: darkblueicon
+  - type: Clothing
+    sprite: White/_Amour/Clothing/Eyes/Misc/blindfold.rsi
+    equippedPrefix: darkblue
+  - type: Blindfold
+  - type: FlashImmunity
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesBlindfoldDarkpink
+  name: blindfold
+  suffix: Dark Pink
+  description: The bind leading the blind.
+  components:
+  - type: Sprite
+    sprite: White/_Amour/Clothing/Eyes/Misc/blindfold.rsi
+    state: darkpinkicon
+  - type: Clothing
+    sprite: White/_Amour/Clothing/Eyes/Misc/blindfold.rsi
+    equippedPrefix: darkpink
+  - type: Blindfold
+  - type: FlashImmunity
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesBlindfoldGreen
+  name: blindfold
+  suffix: Green
+  description: The bind leading the blind.
+  components:
+  - type: Sprite
+    sprite: White/_Amour/Clothing/Eyes/Misc/blindfold.rsi
+    state: greenicon
+  - type: Clothing
+    sprite: White/_Amour/Clothing/Eyes/Misc/blindfold.rsi
+    equippedPrefix: green
+  - type: Blindfold
+  - type: FlashImmunity
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesBlindfoldGrey
+  name: blindfold
+  suffix: Grey
+  description: The bind leading the blind.
+  components:
+  - type: Sprite
+    sprite: White/_Amour/Clothing/Eyes/Misc/blindfold.rsi
+    state: greyicon
+  - type: Clothing
+    sprite: White/_Amour/Clothing/Eyes/Misc/blindfold.rsi
+    equippedPrefix: grey
+  - type: Blindfold
+  - type: FlashImmunity
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesBlindfoldLightblue
+  name: blindfold
+  suffix: Light Blue
+  description: The bind leading the blind.
+  components:
+  - type: Sprite
+    sprite: White/_Amour/Clothing/Eyes/Misc/blindfold.rsi
+    state: lightblueicon
+  - type: Clothing
+    sprite: White/_Amour/Clothing/Eyes/Misc/blindfold.rsi
+    equippedPrefix: lightblue
+  - type: Blindfold
+  - type: FlashImmunity
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesBlindfoldOrange
+  name: blindfold
+  suffix: Orange
+  description: The bind leading the blind.
+  components:
+  - type: Sprite
+    sprite: White/_Amour/Clothing/Eyes/Misc/blindfold.rsi
+    state: orangeicon
+  - type: Clothing
+    sprite: White/_Amour/Clothing/Eyes/Misc/blindfold.rsi
+    equippedPrefix: orange
+  - type: Blindfold
+  - type: FlashImmunity
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesBlindfoldPink
+  name: blindfold
+  suffix: Pink
+  description: The bind leading the blind.
+  components:
+  - type: Sprite
+    sprite: White/_Amour/Clothing/Eyes/Misc/blindfold.rsi
+    state: pinkicon
+  - type: Clothing
+    sprite: White/_Amour/Clothing/Eyes/Misc/blindfold.rsi
+    equippedPrefix: pink
+  - type: Blindfold
+  - type: FlashImmunity
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesBlindfoldPurple
+  name: blindfold
+  suffix: Purple
+  description: The bind leading the blind.
+  components:
+  - type: Sprite
+    sprite: White/_Amour/Clothing/Eyes/Misc/blindfold.rsi
+    state: purpleicon
+  - type: Clothing
+    sprite: White/_Amour/Clothing/Eyes/Misc/blindfold.rsi
+    equippedPrefix: purple
+  - type: Blindfold
+  - type: FlashImmunity
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesBlindfoldRed
+  name: blindfold
+  suffix: Red
+  description: The bind leading the blind.
+  components:
+  - type: Sprite
+    sprite: White/_Amour/Clothing/Eyes/Misc/blindfold.rsi
+    state: redicon
+  - type: Clothing
+    sprite: White/_Amour/Clothing/Eyes/Misc/blindfold.rsi
+    equippedPrefix: red
+  - type: Blindfold
+  - type: FlashImmunity
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesBlindfoldWhite
+  name: blindfold
+  suffix: White
+  description: The bind leading the blind.
+  components:
+  - type: Sprite
+    sprite: White/_Amour/Clothing/Eyes/Misc/blindfold.rsi
+    state: whiteicon
+  - type: Clothing
+    sprite: White/_Amour/Clothing/Eyes/Misc/blindfold.rsi
+    equippedPrefix: white
+  - type: Blindfold
+  - type: FlashImmunity
+
+- type: entity
+  parent: ClothingEyesBase
+  id: ClothingEyesBlindfoldYellow
+  name: blindfold
+  suffix: Yellow
+  description: The bind leading the blind.
+  components:
+  - type: Sprite
+    sprite: White/_Amour/Clothing/Eyes/Misc/blindfold.rsi
+    state: yellowicon
+  - type: Clothing
+    sprite: White/_Amour/Clothing/Eyes/Misc/blindfold.rsi
+    equippedPrefix: yellow
+  - type: Blindfold
+  - type: FlashImmunity

Resources/Prototypes/_White/Catalog/VendingMachines/Inventories/Kink.yml

@@ -6,7 +6,18 @@
     ClothingMaskSexyMime: 6
     ClothingMaskSexyClown: 6
     ClothingMaskMuzzle: 6
-    ClothingEyesBlindfold: 6
+    ClothingEyesBlindfold: 2
+    ClothingEyesBlindfoldDarkblue: 1
+    ClothingEyesBlindfoldDarkpink: 1
+    ClothingEyesBlindfoldGreen: 1
+    ClothingEyesBlindfoldGrey: 1
+    ClothingEyesBlindfoldLightblue: 1
+    ClothingEyesBlindfoldOrange: 1
+    ClothingEyesBlindfoldPink: 1
+    ClothingEyesBlindfoldPurple: 1
+    ClothingEyesBlindfoldRed: 1
+    ClothingEyesBlindfoldWhite: 1
+    ClothingEyesBlindfoldYellow: 1
     ClothingHeadHatCatEars: 6
     ClothingHeadHatBunny: 6
     DildoHuman: 3

Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/meta.json

@@ -0,0 +1,88 @@
+{
+    "version": "0.0.1",
+    "license": "CC-BY-SA 3.0",
+    "copyright": "Blindfolds by @Kilath",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "darkblueicon"
+        },
+        {
+            "name": "darkpinkicon"
+        },
+        {
+            "name": "greenicon"
+        },
+        {
+            "name": "greyicon"
+        },
+        {
+            "name": "lightblueicon"
+        },
+        {
+            "name": "orangeicon"
+        },
+        {
+            "name": "pinkicon"
+        },
+        {
+            "name": "purpleicon"
+        },
+        {
+            "name": "redicon"
+        },
+        {
+            "name": "whiteicon"
+        },
+        {
+            "name": "yellowicon"
+        },
+        {
+            "name": "darkblue-equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "darkpink-equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "green-equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "grey-equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "lightblue-equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "orange-equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "pink-equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "purple-equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "red-equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "white-equipped-EYES",
+            "directions": 4
+        },
+        {
+            "name": "yellow-equipped-EYES",
+            "directions": 4
+        }
+    ]
+}