diff --git a/Resources/Changelog/ChangelogAmour.yml b/Resources/Changelog/ChangelogAmour.yml index 571d16c7ec..a5c0cdb8be 100644 --- a/Resources/Changelog/ChangelogAmour.yml +++ b/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' diff --git a/Resources/Locale/ru-RU/_honk/klmg.ftl b/Resources/Locale/ru-RU/_amour/klmg.ftl similarity index 100% rename from Resources/Locale/ru-RU/_honk/klmg.ftl rename to Resources/Locale/ru-RU/_amour/klmg.ftl diff --git a/Resources/Locale/ru-RU/_amour/misc.ftl b/Resources/Locale/ru-RU/_amour/misc.ftl new file mode 100644 index 0000000000..d3d4547c48 --- /dev/null +++ b/Resources/Locale/ru-RU/_amour/misc.ftl @@ -0,0 +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 } diff --git a/Resources/Locale/ru-RU/_honk/reagents/cunt.ftl b/Resources/Locale/ru-RU/_amour/reagents/cunt.ftl similarity index 100% rename from Resources/Locale/ru-RU/_honk/reagents/cunt.ftl rename to Resources/Locale/ru-RU/_amour/reagents/cunt.ftl diff --git a/Resources/Locale/ru-RU/_honk/misc.ftl b/Resources/Locale/ru-RU/_honk/misc.ftl deleted file mode 100644 index 07e769f479..0000000000 --- a/Resources/Locale/ru-RU/_honk/misc.ftl +++ /dev/null @@ -1,2 +0,0 @@ -ent-VendingMachineKink = Кинк-о-Мат - .desc = Торговый автомат для всех ваших сокровенных желаний. diff --git a/Resources/Prototypes/_Amour/Entities/Clothing/Eyes/misc.yml b/Resources/Prototypes/_Amour/Entities/Clothing/Eyes/misc.yml new file mode 100644 index 0000000000..e9c346a75f --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/_White/Catalog/VendingMachines/Inventories/Kink.yml b/Resources/Prototypes/_White/Catalog/VendingMachines/Inventories/Kink.yml index eb815d22eb..69eecfaeb6 100644 --- a/Resources/Prototypes/_White/Catalog/VendingMachines/Inventories/Kink.yml +++ b/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 diff --git a/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/darkblue-equipped-EYES.png b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/darkblue-equipped-EYES.png new file mode 100644 index 0000000000..8081e54c0d Binary files /dev/null and b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/darkblue-equipped-EYES.png differ diff --git a/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/darkblueicon.png b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/darkblueicon.png new file mode 100644 index 0000000000..48423977ac Binary files /dev/null and b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/darkblueicon.png differ diff --git a/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/darkpink-equipped-EYES.png b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/darkpink-equipped-EYES.png new file mode 100644 index 0000000000..0026bfc37a Binary files /dev/null and b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/darkpink-equipped-EYES.png differ diff --git a/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/darkpinkicon.png b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/darkpinkicon.png new file mode 100644 index 0000000000..23e3d46126 Binary files /dev/null and b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/darkpinkicon.png differ diff --git a/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/green-equipped-EYES.png b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/green-equipped-EYES.png new file mode 100644 index 0000000000..12e06f85c3 Binary files /dev/null and b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/green-equipped-EYES.png differ diff --git a/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/greenicon.png b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/greenicon.png new file mode 100644 index 0000000000..833ab94f60 Binary files /dev/null and b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/greenicon.png differ diff --git a/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/grey-equipped-EYES.png b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/grey-equipped-EYES.png new file mode 100644 index 0000000000..0c66fdf9bb Binary files /dev/null and b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/grey-equipped-EYES.png differ diff --git a/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/greyicon.png b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/greyicon.png new file mode 100644 index 0000000000..da2e886e05 Binary files /dev/null and b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/greyicon.png differ diff --git a/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/lightblue-equipped-EYES.png b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/lightblue-equipped-EYES.png new file mode 100644 index 0000000000..3c3bb21fa7 Binary files /dev/null and b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/lightblue-equipped-EYES.png differ diff --git a/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/lightblueicon.png b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/lightblueicon.png new file mode 100644 index 0000000000..287a4b7f5e Binary files /dev/null and b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/lightblueicon.png differ diff --git a/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/meta.json b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/meta.json new file mode 100644 index 0000000000..c5f31878ca --- /dev/null +++ b/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 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/orange-equipped-EYES.png b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/orange-equipped-EYES.png new file mode 100644 index 0000000000..5b8aaa2082 Binary files /dev/null and b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/orange-equipped-EYES.png differ diff --git a/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/orangeicon.png b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/orangeicon.png new file mode 100644 index 0000000000..da4869c4b2 Binary files /dev/null and b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/orangeicon.png differ diff --git a/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/pink-equipped-EYES.png b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/pink-equipped-EYES.png new file mode 100644 index 0000000000..d85f1d0276 Binary files /dev/null and b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/pink-equipped-EYES.png differ diff --git a/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/pinkicon.png b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/pinkicon.png new file mode 100644 index 0000000000..8be3e58a58 Binary files /dev/null and b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/pinkicon.png differ diff --git a/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/purple-equipped-EYES.png b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/purple-equipped-EYES.png new file mode 100644 index 0000000000..f1b41304cf Binary files /dev/null and b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/purple-equipped-EYES.png differ diff --git a/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/purpleicon.png b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/purpleicon.png new file mode 100644 index 0000000000..362f09c31f Binary files /dev/null and b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/purpleicon.png differ diff --git a/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/red-equipped-EYES.png b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/red-equipped-EYES.png new file mode 100644 index 0000000000..8310824c38 Binary files /dev/null and b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/red-equipped-EYES.png differ diff --git a/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/redicon.png b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/redicon.png new file mode 100644 index 0000000000..9c5d84f79a Binary files /dev/null and b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/redicon.png differ diff --git a/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/white-equipped-EYES.png b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/white-equipped-EYES.png new file mode 100644 index 0000000000..9a1bb14241 Binary files /dev/null and b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/white-equipped-EYES.png differ diff --git a/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/whiteicon.png b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/whiteicon.png new file mode 100644 index 0000000000..ddcac0d9ba Binary files /dev/null and b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/whiteicon.png differ diff --git a/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/yellow-equipped-EYES.png b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/yellow-equipped-EYES.png new file mode 100644 index 0000000000..ce41320217 Binary files /dev/null and b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/yellow-equipped-EYES.png differ diff --git a/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/yellowicon.png b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/yellowicon.png new file mode 100644 index 0000000000..7690a56d6c Binary files /dev/null and b/Resources/Textures/White/_Amour/Clothing/Eyes/Misc/blindfold.rsi/yellowicon.png differ