From 61044147fd878b605dc3dcbf9594b0f14c407a94 Mon Sep 17 00:00:00 2001 From: bzzzbzzbz Date: Wed, 5 Aug 2026 06:47:18 +0700 Subject: [PATCH 1/4] =?UTF-8?q?=D0=BD=D0=B8=D0=B6=D0=BD=D0=B5=D0=BC=D0=B0?= =?UTF-8?q?=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clothing/underwear/undershirt.ftl | 12 ++ .../entities/clothing/underwear/underwear.ftl | 12 ++ .../entities/machines/vending_machines.ftl | 2 + .../VendingMachines/Inventories/undermate.yml | 187 ++++++++++++++++++ .../Clothing/Underwear/undershirt.yml | 54 +++++ .../Entities/Clothing/Underwear/underwear.yml | 54 +++++ .../Structures/Machines/vending_machines.yml | 41 +++- .../driada.rsi/equipped-UNDERWEAR.png | Bin 0 -> 234 bytes .../Underwear/Underwear/driada.rsi/icon.png | Bin 0 -> 203 bytes .../Underwear/Underwear/driada.rsi/meta.json | 18 ++ .../erotic_purple.rsi/equipped-UNDERWEAR.png | Bin 0 -> 257 bytes .../Underwear/erotic_purple.rsi/icon.png | Bin 0 -> 154 bytes .../Underwear/erotic_purple.rsi/meta.json | 18 ++ .../leafs.rsi/equipped-UNDERWEAR.png | Bin 0 -> 234 bytes .../Underwear/Underwear/leafs.rsi/icon.png | Bin 0 -> 145 bytes .../Underwear/Underwear/leafs.rsi/meta.json | 18 ++ .../medusa.rsi/equipped-UNDERWEAR.png | Bin 0 -> 451 bytes .../Underwear/Underwear/medusa.rsi/icon.png | Bin 0 -> 232 bytes .../Underwear/Underwear/medusa.rsi/meta.json | 18 ++ .../pink_fancy.rsi/equipped-UNDERWEAR.png | Bin 0 -> 379 bytes .../Underwear/pink_fancy.rsi/icon.png | Bin 0 -> 231 bytes .../Underwear/pink_fancy.rsi/meta.json | 18 ++ .../Underwear/red.rsi/equipped-UNDERWEAR.png | Bin 0 -> 301 bytes .../Underwear/Underwear/red.rsi/icon.png | Bin 0 -> 193 bytes .../Underwear/Underwear/red.rsi/meta.json | 18 ++ .../driada.rsi/equipped-UNDERSHIRT.png | Bin 0 -> 537 bytes .../Underwear/undershirt/driada.rsi/icon.png | Bin 0 -> 221 bytes .../Underwear/undershirt/driada.rsi/meta.json | 18 ++ .../erotic_purple.rsi/equipped-UNDERSHIRT.png | Bin 0 -> 299 bytes .../undershirt/erotic_purple.rsi/icon.png | Bin 0 -> 174 bytes .../undershirt/erotic_purple.rsi/meta.json | 18 ++ .../leafs.rsi/equipped-UNDERSHIRT.png | Bin 0 -> 341 bytes .../Underwear/undershirt/leafs.rsi/icon.png | Bin 0 -> 219 bytes .../Underwear/undershirt/leafs.rsi/meta.json | 18 ++ .../medusa.rsi/equipped-UNDERSHIRT.png | Bin 0 -> 714 bytes .../Underwear/undershirt/medusa.rsi/icon.png | Bin 0 -> 304 bytes .../Underwear/undershirt/medusa.rsi/meta.json | 18 ++ .../pink_fancy.rsi/equipped-UNDERSHIRT.png | Bin 0 -> 395 bytes .../undershirt/pink_fancy.rsi/icon.png | Bin 0 -> 227 bytes .../undershirt/pink_fancy.rsi/meta.json | 18 ++ .../red.rsi/equipped-UNDERSHIRT.png | Bin 0 -> 336 bytes .../Underwear/undershirt/red.rsi/icon.png | Bin 0 -> 214 bytes .../Underwear/undershirt/red.rsi/meta.json | 18 ++ .../VendingMachines/pantymate.rsi/broken.png | Bin 0 -> 737 bytes .../pantymate.rsi/deny-unshaded.png | Bin 0 -> 515 bytes .../VendingMachines/pantymate.rsi/meta.json | 132 +++++++++++++ .../pantymate.rsi/normal-unshaded.png | Bin 0 -> 22154 bytes .../VendingMachines/pantymate.rsi/off.png | Bin 0 -> 470 bytes .../VendingMachines/pantymate.rsi/panel.png | Bin 0 -> 222 bytes 49 files changed, 709 insertions(+), 1 deletion(-) create mode 100644 Resources/Prototypes/_Arcane/Catalog/VendingMachines/Inventories/undermate.yml create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/Underwear/driada.rsi/equipped-UNDERWEAR.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/Underwear/driada.rsi/icon.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/Underwear/driada.rsi/meta.json create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/Underwear/erotic_purple.rsi/equipped-UNDERWEAR.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/Underwear/erotic_purple.rsi/icon.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/Underwear/erotic_purple.rsi/meta.json create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/Underwear/leafs.rsi/equipped-UNDERWEAR.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/Underwear/leafs.rsi/icon.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/Underwear/leafs.rsi/meta.json create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/Underwear/medusa.rsi/equipped-UNDERWEAR.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/Underwear/medusa.rsi/icon.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/Underwear/medusa.rsi/meta.json create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/Underwear/pink_fancy.rsi/equipped-UNDERWEAR.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/Underwear/pink_fancy.rsi/icon.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/Underwear/pink_fancy.rsi/meta.json create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/Underwear/red.rsi/equipped-UNDERWEAR.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/Underwear/red.rsi/icon.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/Underwear/red.rsi/meta.json create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/undershirt/driada.rsi/equipped-UNDERSHIRT.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/undershirt/driada.rsi/icon.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/undershirt/driada.rsi/meta.json create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/undershirt/erotic_purple.rsi/equipped-UNDERSHIRT.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/undershirt/erotic_purple.rsi/icon.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/undershirt/erotic_purple.rsi/meta.json create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/undershirt/leafs.rsi/equipped-UNDERSHIRT.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/undershirt/leafs.rsi/icon.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/undershirt/leafs.rsi/meta.json create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/undershirt/medusa.rsi/equipped-UNDERSHIRT.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/undershirt/medusa.rsi/icon.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/undershirt/medusa.rsi/meta.json create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/undershirt/pink_fancy.rsi/equipped-UNDERSHIRT.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/undershirt/pink_fancy.rsi/icon.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/undershirt/pink_fancy.rsi/meta.json create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/undershirt/red.rsi/equipped-UNDERSHIRT.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/undershirt/red.rsi/icon.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/undershirt/red.rsi/meta.json create mode 100644 Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/broken.png create mode 100644 Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/deny-unshaded.png create mode 100644 Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/meta.json create mode 100644 Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/normal-unshaded.png create mode 100644 Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/off.png create mode 100644 Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/panel.png diff --git a/Resources/Locale/ru-RU/_Arcane/entities/clothing/underwear/undershirt.ftl b/Resources/Locale/ru-RU/_Arcane/entities/clothing/underwear/undershirt.ftl index 8ee9f499b7e..63c177609d4 100644 --- a/Resources/Locale/ru-RU/_Arcane/entities/clothing/underwear/undershirt.ftl +++ b/Resources/Locale/ru-RU/_Arcane/entities/clothing/underwear/undershirt.ftl @@ -1,2 +1,14 @@ ent-ClothingBraBeer = пивной лифчик .desc = Вы однозначно этого хотите. +ent-ClothingBraDriada = бюстгальтер дриады + .desc = Покровительница деревьев. +ent-ClothingBraEroticPurple = эротический фиолетовый бюстгальтер + .desc = Тонкий бюстгальтер, едва прикрывающий соски. +ent-ClothingBraMedusa = бюстгальтер медузы + .desc = Желейный бюстгальтер. +ent-ClothingBraLeafs = бюстгальтер из листьев + .desc = 100% натуральный. +ent-ClothingBraPinkFancy = модный розовый бюстгальтер + .desc = Розовый, как Барби. +ent-ClothingBraRed = красный бюстгальтер + .desc = Красный бюстгальтер. diff --git a/Resources/Locale/ru-RU/_Arcane/entities/clothing/underwear/underwear.ftl b/Resources/Locale/ru-RU/_Arcane/entities/clothing/underwear/underwear.ftl index 42fd732af3b..0abf59d52e4 100644 --- a/Resources/Locale/ru-RU/_Arcane/entities/clothing/underwear/underwear.ftl +++ b/Resources/Locale/ru-RU/_Arcane/entities/clothing/underwear/underwear.ftl @@ -1,2 +1,14 @@ ent-ClothingUnderwearBeerPants = пивные трусы .desc = Пивные трусы. +ent-ClothingUnderwearDriada = трусы дриады + .desc = Покровительница деревьев. +ent-ClothingUnderwearEroticPurple = фиолетовые эротические трусы + .desc = Тонкие трусики, едва прикрывающие гениталии. +ent-ClothingUnderwearMedusa = медузьи трусы + .desc = Желейные трусы. +ent-ClothingUnderwearLeafs = трусы из листьев + .desc = 100% натуральные. +ent-ClothingUnderwearPinkFancy = модные розовые трусы + .desc = Розовые, как Барби. +ent-ClothingUnderwearRed = красные трусы + .desc = Красные трусы. diff --git a/Resources/Locale/ru-RU/_Arcane/entities/machines/vending_machines.ftl b/Resources/Locale/ru-RU/_Arcane/entities/machines/vending_machines.ftl index 2dd5d0cbdcc..8ce6de232a5 100644 --- a/Resources/Locale/ru-RU/_Arcane/entities/machines/vending_machines.ftl +++ b/Resources/Locale/ru-RU/_Arcane/entities/machines/vending_machines.ftl @@ -1,2 +1,4 @@ ent-VendingMachineDressMate = DressMate .desc = Торговый автомат с элегантными платьями и женской одеждой. +ent-VendingMachineUnderwear = Нижнемат + .desc = Нижнее бельё для вас! diff --git a/Resources/Prototypes/_Arcane/Catalog/VendingMachines/Inventories/undermate.yml b/Resources/Prototypes/_Arcane/Catalog/VendingMachines/Inventories/undermate.yml new file mode 100644 index 00000000000..48a7ceb032c --- /dev/null +++ b/Resources/Prototypes/_Arcane/Catalog/VendingMachines/Inventories/undermate.yml @@ -0,0 +1,187 @@ +- type: vendingMachineInventory + id: UnderMateInventory + startingInventory: + ClothingUnderwearpantiesSpiderman: 3 + ClothingUnderwearboxerwolf: 3 + ClothingUnderwearboxerelephant: 3 + ClothingUnderwearboxerfrance: 3 + ClothingUnderwearboxermaidwithsuspenders: 3 + ClothingUnderwearBoxerShorts: 3 + ClothingUnderwearBoxerShortsBriefs: 3 + ClothingUnderwearPantiesBriefs: 3 + ClothingUnderwearBoxerShortsHeart: 3 + ClothingUnderwearBoxerShortsSponge: 3 + ClothingUnderwearMankini: 3 + ClothingUnderwearPanties: 3 + ClothingUnderwearPantiesJockstrap: 3 + ClothingUnderwearPantiesSlim: 3 + ClothingUnderwearPantiesThin: 3 + ClothingUnderwearWarmThongs: 3 + ClothingUndershirtWarmBra: 3 + ClothingUndershirtCorset: 3 + ClothingUndershirtShibari: 3 + ClothingUndershirtShibariSleeves: 3 + ClothingUnderwearPussystickers: 3 + ClothingUndershirtNippleStickers: 3 + ClothingUndershirtHeartShapedNippleStickers: 3 + ClothingUnderwearBeerPants: 3 + ClothingBraBeer: 3 + ClothingSocksBeer: 3 + ClothingUndershirtCowSwimsuit: 3 + ClothingUndershirtBraSwimming: 3 + ClothingUndershirtBraSwimmingAlt: 3 + ClothingUndershirtSwimming: 3 + ClothingUndershirtSwimmingBlack: 3 + ClothingUndershirtSwimmingBlue: 3 + ClothingUndershirtSwimmingRed: 3 + ClothingUnderwearPantiesSwimming: 3 + ClothingBraDriada: 3 + ClothingUnderwearDriada: 3 + ClothingBraEroticPurple: 3 + ClothingUnderwearEroticPurple: 3 + ClothingBraMedusa: 3 + ClothingUnderwearMedusa: 3 + ClothingBraLeafs: 3 + ClothingUnderwearLeafs: 3 + ClothingBraPinkFancy: 3 + ClothingUnderwearPinkFancy: 3 + ClothingBraRed: 3 + ClothingUnderwearRed: 3 + ClothingUndershirtBabydoll: 3 + ClothingUnderwearThongBabydoll: 3 + ClothingUndershirtBraBinder: 3 + ClothingUndershirtBraBinderStrapless: 3 + ClothingUndershirtBraHalterneck: 3 + ClothingUndershirtBraHarley: 3 + ClothingUnderwearPantiesHarley: 3 + ClothingUndershirtBraKinky: 3 + ClothingUnderwearPantiesKinky: 3 + ClothingUndershirtBraLizared: 3 + ClothingUnderwearPantiesLizared: 3 + ClothingUndershirtBraNeko: 3 + ClothingUnderwearPantiesNeko: 3 + ClothingUndershirtBraSport: 3 + ClothingUndershirtBraSportAlt: 3 + ClothingUndershirtShirtSportBlue: 3 + ClothingUndershirtShirtSportGreen: 3 + ClothingUndershirtShirtSportRed: 3 + ClothingUndershirtBraStrapless: 3 + ClothingUndershirtBraStraplessAlt: 3 + ClothingUndershirtBraThin: 3 + ClothingUndershirtBraTubeTop: 3 + ClothingUndershirtShirtAlien: 3 + ClothingUndershirtShirtBand: 3 + ClothingUndershirtShirtBowlingCyan: 3 + ClothingUndershirtShirtBowlingGrey: 3 + ClothingUndershirtShirtBowlingPink: 3 + ClothingUndershirtShirtBowlingRed: 3 + ClothingUndershirtShirtCowboy: 3 + ClothingUndershirtShirtCowboyNavy: 3 + ClothingUndershirtShirtCowboyRed: 3 + ClothingUndershirtShirtCowboyShort: 3 + ClothingUndershirtShirtCowboyShortNavy: 3 + ClothingUndershirtShirtCowboyShortRed: 3 + ClothingUndershirtShirtCowboyShortWhite: 3 + ClothingUndershirtShirtCowboyWhite: 3 + ClothingUndershirtShirtILoveNT: 3 + ClothingUndershirtShirtNanoTrasen: 3 + ClothingUndershirtShirtSS13: 3 + ClothingUndershirtShirtPeace: 3 + ClothingUndershirtShirtPogoman: 3 + ClothingUndershirtShirtPolo: 3 + ClothingUndershirtShirtQuestion: 3 + ClothingUndershirtShirtIan: 3 + ClothingUndershirtShirtJerseyBlue: 3 + ClothingUndershirtShirtJerseyRed: 3 + ClothingUndershirtShirtClown: 3 + ClothingUndershirtShirtLover: 3 + ClothingUndershirtShirtMatroska: 3 + ClothingUndershirtShirtMeat: 3 + ClothingUndershirtShirtSkull: 3 + ClothingUndershirtShirtTankTop: 3 + ClothingUndershirtShirtTankTopFire: 3 + ClothingUndershirtShirtTankTopMidriff: 3 + ClothingUndershirtShirtTankTopMidriffAlt: 3 + ClothingUndershirtShirtTankTopStriped: 3 + ClothingUndershirtShirtTankTopSun: 3 + ClothingUndershirtShirtTankTopAlt: 3 + ClothingUndershirtShirtTieDye: 3 + ClothingUndershirtBraAssBlastUSA: 3 + ClothingUndershirtShirtAssBlastUSA: 3 + ClothingUnderwearBoxerShortsAssBlastUSA: 3 + ClothingUnderwearPantiesAssBlastUSA: 3 + ClothingSocksAssBlastUSAKnee: 3 + ClothingSocksAssBlastUSAThigh: 3 + ClothingUndershirtShirtBee: 3 + ClothingUndershirtBraBeeKini: 3 + ClothingUnderwearPantiesBeeKini: 3 + ClothingUnderwearBoxerShortsBee: 3 + ClothingSocksBeeKnee: 3 + ClothingSocksBee: 3 + ClothingSocksBeeThigh: 3 + ClothingSocksCandyCaneGreenKnee: 3 + ClothingSocksCandyCaneGreen: 3 + ClothingSocksCandyCaneGreenThigh: 3 + ClothingSocksCandyCaneRedKnee: 3 + ClothingSocksCandyCaneRed: 3 + ClothingSocksCandyCaneRedThigh: 3 + ClothingSocksChristmasKnee: 3 + ClothingSocksChristmas: 3 + ClothingSocksChristmasThigh: 3 + ClothingUndershirtShirtCommie: 3 + ClothingUndershirtBraCommie: 3 + ClothingUnderwearBoxerShortsCommie: 3 + ClothingUnderwearPantiesCommie: 3 + ClothingSocksCommieKnee: 3 + ClothingSocksCommieThigh: 3 + ClothingUndershirtFishnetBody: 3 + ClothingUndershirtFishnetBodyAlt: 3 + ClothingUndershirtFishnetGloves: 3 + ClothingUndershirtFishnetSleeves: 3 + ClothingUndershirtFishnetSleevesAlt: 3 + ClothingUnderwearPantiesFishnet: 3 + ClothingUnderwearPantiesFishnetLower: 3 + ClothingUnderwearPantiesFishnetLowerAlt: 3 + ClothingSocksFishnet: 3 + ClothingSocksFishnetAlt: 3 + ClothingSocksGarter: 3 + ClothingSocksLeggings: 3 + ClothingSocksLeggingsBlack: 3 + ClothingSocksPantyhose: 3 + ClothingSocksPantyhoseRipped: 3 + ClothingSocksKnee: 3 + ClothingSocksLatex: 3 + ClothingUndershirtShirtShort: 3 + ClothingUndershirtShirtShortSleeves: 3 + ClothingUndershirtShirtLong: 3 + ClothingUndershirtShirt: 3 + ClothingUndershirtBra: 3 + ClothingUndershirtBraAlt: 3 + ClothingUnderwearBoxerShortsLong: 3 + ClothingUnderwearPantiesAlt: 3 + ClothingUnderwearThong: 3 + ClothingSocks: 3 + ClothingSocksShort: 3 + ClothingSocksThigh: 3 + ClothingStockingsDarkPink: 3 + ClothingStockingsGreen: 3 + ClothingStockingsLightPink: 3 + ClothingStockingsOrange: 3 + ClothingStockingsPurple: 3 + ClothingStockingsYellow: 3 + ClothingUndershirtShirtStriped: 3 + ClothingUndershirtShirtLongStriped: 3 + ClothingUndershirtShirtLongStripedBlue: 3 + ClothingUndershirtBraStriped: 3 + ClothingUnderwearBoxerShortsStriped: 3 + ClothingUnderwearPantiesStriped: 3 + ClothingSocksStripedKnee: 3 + ClothingSocksStripedThigh: 3 + ClothingSocksThinKnee: 3 + ClothingSocksThinThigh: 3 + ClothingUndershirtShirtUK: 3 + ClothingUndershirtBraUK: 3 + ClothingUnderwearBoxerShortsUK: 3 + ClothingUnderwearPantiesUK: 3 + ClothingSocksUKKnee: 3 + ClothingSocksUKThigh: 3 diff --git a/Resources/Prototypes/_Arcane/Entities/Clothing/Underwear/undershirt.yml b/Resources/Prototypes/_Arcane/Entities/Clothing/Underwear/undershirt.yml index d2cd8ad15fa..fe48a1512f8 100644 --- a/Resources/Prototypes/_Arcane/Entities/Clothing/Underwear/undershirt.yml +++ b/Resources/Prototypes/_Arcane/Entities/Clothing/Underwear/undershirt.yml @@ -42,3 +42,57 @@ components: - type: Sprite sprite: _Arcane/Clothing/Undershirt/beer_undershirt.rsi + +- type: entity + parent: ClothingBraBase + id: ClothingBraDriada + name: driada bra + description: Patroness of trees. + components: + - type: Sprite + sprite: _Arcane/Clothing/Undershirt/driada.rsi + +- type: entity + parent: ClothingBraBase + id: ClothingBraEroticPurple + name: purple erotic bra + description: A thin bra that barely covers the nipples. + components: + - type: Sprite + sprite: _Arcane/Clothing/Undershirt/erotic_purple.rsi + +- type: entity + parent: ClothingBraBase + id: ClothingBraMedusa + name: medusa bra + description: Jelly bra. + components: + - type: Sprite + sprite: _Arcane/Clothing/Undershirt/medusa.rsi + +- type: entity + parent: ClothingBraBase + id: ClothingBraLeafs + name: leafs bra + description: 100% natural. + components: + - type: Sprite + sprite: _Arcane/Clothing/Undershirt/leafs.rsi + +- type: entity + parent: ClothingBraBase + id: ClothingBraPinkFancy + name: fancy pink bra + description: Pink like Barbie. + components: + - type: Sprite + sprite: _Arcane/Clothing/Undershirt/pink_fancy.rsi + +- type: entity + parent: ClothingBraBase + id: ClothingBraRed + name: red bra + description: Red bra. + components: + - type: Sprite + sprite: _Arcane/Clothing/Undershirt/red.rsi diff --git a/Resources/Prototypes/_Arcane/Entities/Clothing/Underwear/underwear.yml b/Resources/Prototypes/_Arcane/Entities/Clothing/Underwear/underwear.yml index 17cc17c4dfc..3a27f4b4175 100644 --- a/Resources/Prototypes/_Arcane/Entities/Clothing/Underwear/underwear.yml +++ b/Resources/Prototypes/_Arcane/Entities/Clothing/Underwear/underwear.yml @@ -70,3 +70,57 @@ components: - type: Sprite sprite: _Arcane/Clothing/Underwear/beer_pants.rsi + +- type: entity + parent: ClothingUnderwearBase + id: ClothingUnderwearDriada + name: driada panties + description: Patroness of trees. + components: + - type: Sprite + sprite: _Arcane/Clothing/Underwear/Underwear/driada.rsi + +- type: entity + parent: ClothingUnderwearBase + id: ClothingUnderwearEroticPurple + name: purple erotic panties + description: A thin panties that barely covers the genitals. + components: + - type: Sprite + sprite: _Arcane/Clothing/Underwear/Underwear/erotic_purple.rsi + +- type: entity + parent: ClothingUnderwearBase + id: ClothingUnderwearMedusa + name: medusa panties + description: Jelly panties. + components: + - type: Sprite + sprite: _Arcane/Clothing/Underwear/Underwear/medusa.rsi + +- type: entity + parent: ClothingUnderwearBase + id: ClothingUnderwearLeafs + name: leafs panties + description: 100% natural. + components: + - type: Sprite + sprite: _Arcane/Clothing/Underwear/Underwear/leafs.rsi + +- type: entity + parent: ClothingUnderwearBase + id: ClothingUnderwearPinkFancy + name: fancy pink panties + description: Pink like Barbie. + components: + - type: Sprite + sprite: _Arcane/Clothing/Underwear/Underwear/pink_fancy.rsi + +- type: entity + parent: ClothingUnderwearBase + id: ClothingUnderwearRed + name: red panties + description: Red panties. + components: + - type: Sprite + sprite: _Arcane/Clothing/Underwear/Underwear/red.rsi diff --git a/Resources/Prototypes/_Arcane/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_Arcane/Entities/Structures/Machines/vending_machines.yml index aa80cc46936..4824b9f1b8c 100644 --- a/Resources/Prototypes/_Arcane/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_Arcane/Entities/Structures/Machines/vending_machines.yml @@ -17,7 +17,7 @@ radius: 1.5 energy: 1.6 color: "#FF69B4" - + - type: entity parent: VendingMachine id: VendingMachineLove @@ -56,3 +56,42 @@ defaultPrice: 35 extraPrice: 100 # Orion-Edit-End + +- type: entity + parent: VendingMachine + id: VendingMachineUnderwear + name: UnderMate + description: Underclothes for you! + components: + - type: VendingMachine + pack: UnderMateInventory + offState: off + brokenState: broken + normalState: normal-unshaded + denyState: deny-unshaded + - type: SpeakOnUIClosed + pack: GenericVendGoodbyes + - type: Sprite + sprite: _Arcane/Structures/Machines/VendingMachines/pantymate.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: PointLight + radius: 2 + energy: 1.6 + color: "#a625e2" + mask: /Textures/Effects/LightMasks/cone.png + autoRot: true + - type: Tag + tags: + - DroneUsable # Goobstation + # Orion-Edit-Start + - type: VendingMachinePricing + defaultPrice: 35 + extraPrice: 100 + # Orion-Edit-End diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/driada.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/driada.rsi/equipped-UNDERWEAR.png new file mode 100644 index 0000000000000000000000000000000000000000..108b64b95f83f70820c46b31735790e0d8fdaf65 GIT binary patch literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|mUy~2hE&XX zdut=-AqNq*2f=IZC@1A+CaP@^xO1>H=dPl63ZvtNQ=CdKm>R9aId)FasEM!t{_pqt zT1B9428P(&ymph)wwTZR*t=Kxoc%4@wQA0qmcNgu*zPW84Ax#{6g#{68~Yc%2bF8m zPoGz^>Hn&u4%P@H{->1Q>)WPo@MMkSH|A^8W4m%?9p8x;LHt+xI?>i>Gac~O~xh}i$@A(4< z4t)6X%bkrgQjkqdOswtx`|20OVR)U literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/driada.rsi/meta.json b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/driada.rsi/meta.json new file mode 100644 index 00000000000..90f1fa898d2 --- /dev/null +++ b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/driada.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by theanemone (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-UNDERWEAR", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/erotic_purple.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/erotic_purple.rsi/equipped-UNDERWEAR.png new file mode 100644 index 0000000000000000000000000000000000000000..1f6c0c7d764bfc54b1a16ed0f72a3a4ef45453a5 GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|c6+)whE&XX zduuOWlYvOv!{9ZBe0+T|P38}e77NEXxwEk)JM=Lhydcr`t2paPtx%AM)V}^{ye>ek zAh4#>d*+=szwU#l-&)1xmkG_~chzq%nq6}KPMqHDE31xAF24NZWRUl*3oAQ1;`VeL zk$&*)Z}Pm8Y9?D>)oht&ZLc-a*!nfolWnis*&zl3$$c6j=kGsqT52Ub&32kmaP^P! u(^H;*yw7l&b;k35Jg?0UXmK+zJjlPx7;TcwR@;yc*68W#=d#Wzp$Py4n`6WP literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/erotic_purple.rsi/icon.png b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/erotic_purple.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..af9820dada0dbe01d0e2dbc7853d28b4f106fc4c GIT binary patch literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}A)YRdArY;~ z2@((0m3@S3j3^P6H=dPl63ZvtNQ=CdKm>R9aId)FasEM!t{_pqt zT1B9428P(&ymph)wwTZR*t=Kxoc%4@wQA0qmcNgu*zPW84Ax#{6g#{68~Yc%2bF8m zPoGz^>Hn&u4%P@H{->1Q>)WPo@MMkSH|A^8W4m%?9S>6^j=7kTl8ZbG?E%|Mk!E?^iJh!a%H$bNXi=Rj)-3)1FqGw=c})TvOaB zeY!C>TEO6AM#+{cvy=L!C-+~v`Q{K$?2NxR5nFa&7j$;N1GT|C1-&f4#Y?dgZl$#da|3 zLG(q{87p1huAX|`^0~#7mDcUoo`0;pwL$Q-NanWOTdTI2+*X>Vd2568_e)j{5zA(* zy84~dT}v{50_(mH@2>C6vGIxB{a;8;I>m9xq{7JgtEP6PuDW{q(oLJ9s$(H*LrhDS zub)~avz|eW;n!0ec@2Z2s^!0(Sr}qwI6f`=m{2m0;edEt!Gnp5Kevic*}1!PkBYe7(8A5T-G@yGywp!XT;(F literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/medusa.rsi/icon.png b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/medusa.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2c7ee9d70717c979182ae90b2ed77d4de19d4f5b GIT binary patch literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}i#%N%Ln2z= zo;Tz=WFW%!V85DVkk^8y$+ix84^{WLR~smPVc@fE+Uv|FXf513_k1RpRnov`_;uG9(3^WNT~)#hiOo8HZ@ fbaQd3f6Q9@!g79f^5uM>YZ*LU{an^LB{Ts5*9l#R literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/medusa.rsi/meta.json b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/medusa.rsi/meta.json new file mode 100644 index 00000000000..90f1fa898d2 --- /dev/null +++ b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/medusa.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by theanemone (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-UNDERWEAR", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/pink_fancy.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/pink_fancy.rsi/equipped-UNDERWEAR.png new file mode 100644 index 0000000000000000000000000000000000000000..2f799e049753cd2040044bc6d55145823c2d2539 GIT binary patch literal 379 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zO+8&4Ln`LH zy=Cin*g)dgNA(UtQ(3Mi=?QCv%3tV4?E20!v%1O1u;is~5sS)_yq5=#1+d6IS|QvW zS+L>8B$Id7|C>j3-dA70MyE~{Xf_BuS6TJ>L)x}2lfHcYxN`OGeN~12OEtH~itpOD zccKcf+To~bx!_vQNi&~^P5NZA`MtlsnZNPt_2s$Ozv|Co^IWz#W4GQEANRXudmjJl zm44u~rE>q;*emO|HUc&9*S_33LFMRUl~sNB-dEZ9S!JKv_nH}EEd#@YoE@)UI$u?} zpL%;y+Qv=q`s}WxX3k5yc9#7}|M$?d2U8?+)4Ze8-4=X%yWxK7_m97WW(B2fT=j{? za^d~+`SrXX+Jx>baN?-bwQruU+Yu0~7@L-1s!+%!^>@oZepL@HyBP%>k_-&T-?6W- V*)WaY|JN&!&7Q7)F6*2UngD~7rQ`qr literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/pink_fancy.rsi/icon.png b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/pink_fancy.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f768d9cc68239b511056fc82d3f6cc38b9db6a51 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}3q4&NLn2z= zUNYo5?#ME8 zy-eD4^TQ26UYbj<^v|5}?DsnrhV7@PzSL6P$QgV4qIu)bBE|zbyZe3_M@3gMesI-& z{@1Z4@N~NEwUi8j@U&(5OzY0L`Px_<&^|KbyFev#?$cIZuHy_1XXjR~{};J^=kIsC f8cVO-uVgS3)Vp|G?*1~MV;MYM{an^LB{Ts5p|)K$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/pink_fancy.rsi/meta.json b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/pink_fancy.rsi/meta.json new file mode 100644 index 00000000000..90f1fa898d2 --- /dev/null +++ b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/pink_fancy.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by theanemone (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-UNDERWEAR", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/red.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/red.rsi/equipped-UNDERWEAR.png new file mode 100644 index 0000000000000000000000000000000000000000..4b17f4c36093a35d3d1e97374175a06215e0a808 GIT binary patch literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|o_o4DhE&XX zd&`io$v~nl(L^X+|G+EL9n71#SKm8y^4vKcJ)O8F?;RyZ_YOTQ&thWXJ#s1jVXfLF zlbZP1ZLMyCKr?`#Vc#YT!MA+(qj+cDiTjXQZs9h)IQh-5J^D2wuP5J6J@dznbN1|0 z&z5c3srh@_=b7<2K{wZL56TJRoOz#P)6SKdufL@{#10_2+3;w*zjwSo*G|j%o7%oflsFz@-QmqKOMTJ2wbz!*tte&MV)cTh s@4~^`<_Tf9rVE+)9nvphVED6JTc7R3v627{-opUXO@geCxw=|Xh? literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/red.rsi/meta.json b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/red.rsi/meta.json new file mode 100644 index 00000000000..90f1fa898d2 --- /dev/null +++ b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/red.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by theanemone (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-UNDERWEAR", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/driada.rsi/equipped-UNDERSHIRT.png b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/driada.rsi/equipped-UNDERSHIRT.png new file mode 100644 index 0000000000000000000000000000000000000000..36cdcc93f58f9fced90f260dc854fe39dd054d63 GIT binary patch literal 537 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zFMGN;hE&XX zd(&T|IZ=lF!~4}smrV7QSr&Ul=+Od?=peqXS+QXewYFIB%-=+geQ)-Y^S}31to>Q1m+yam{qvuH=Y6mAvv24C0S$lO z6S7X;d-R`N5&6GTZoc#Nq~^)%b?}UXNj7ILiLe|=m;i;`U|=`S6u^+ zo%-|irSLNLX{ryNUIG7w1Y^dmsPt%00u&M4{T{l}2xc38!Xo&(xjFE6bMza$IJ%`u#foZdcRt zJs-Eez~Nhm&}7M#Pb~F<%z=W_zopr0QIc#rT_o{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/driada.rsi/icon.png b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/driada.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f30911a10d0be4cf2cbf0ae901f5f718e58b75c5 GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}(>+}rLn2y} z6C_v{Cy4Yk1sZU%S$DiQ{wIGw{m=YsRUJlC8XFrIR<&RL|4P>H|84)Of9VMc2_Ey- zewSBkThkYDz@ul;3(r^or$4)!(gW0|zv{@*10Znj;HeLfK1#E3Mhdpgx34oc0D?XH zzV{|3UW{~`Q57W9botSfn^pfW9$loqaWJFbMT5v+i~iCS?D(Tyy^As=+mV_HTgXg3QmW{ykC)& z9g@DZI*+gabI!YK!MZ^qe_P~vvP0HZ{uO?I4rCYv@OWKOxa^-kd+}}lRDoB|Cq=&d zW+?n9jIrjiN%8OK%m3Xsx_#X_-(&Z@$7cGErK1;H#dgg3o}0%#{pq@Jae3>vk6OF5 lJnKZ`mhAojHt>P{UB<8Kkte*Tx#@ufJYD@<);T3K0RZmSb7cSk literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/erotic_purple.rsi/icon.png b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/erotic_purple.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9313a1bb8cb20c1230a28caefb1cfbea3a89e49d GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}8J;eVArY;~ z2@55yDW*dPfxgFF18_Offz#yKY!g_dz R{5znX44$rjF6*2UngCSXKP>?m^VqkfJ@L^rGG-BSsI9-0@^R?SJ=+u$nYKOy)DOJ>j$rgxHSE@f;G(Q#QF znj>~b$g@K1P{Z8QNl736zrJUX|LkMM-5wU86%79a)}DEGZbiE54@J+aT{C{&xprix zN~^2$_vzP{p1ZR}Uc9=hJn!c1?*8fh#i@TIb>+&}*6n$G{qbMtyYpgleTBV5Z_ToZ z))AkyWR3mjoga5(Pr9+SgR!}i~6`F0_)Q0&JK4f_>WT237;bF+Px%gh@m}RCt{2+Cgg?K@sIU~-yngKf`{Z#zd;U#^^y{D zX+5_RkTiG^ddLR|=%F4KDuO-bT*w;Sq^-1t9LjpAn$<>~9@5>K5R#o0ZCc(Byv)qL zc{B5NFC#z*A%qY@2)WASoo$v>i|oQNn!@Cr?F+}8HD+f}QZ2Ieqg`8p*N=8DP1F&e zH}U0%4p~#qjV)^mgI))G-U3h9Yjy_pB!3>-;bNM7WZvJ8)QpDJKPBD(0MyYzvs^_x za&wI*2|F@U^p&hB^U&)HvZk<%6cx-qr;7({RzSiXS@Hz^``dbwKc8?% zmU!awkTvBU06Y+V3)8p!`2Ot>6+=$|nCD$QVDl9)J%9K}FyC+Uq$iGnX1Tg(_VXs- zKnVaUhF+S6|7FF{3jqJgn;a*c`nmTO02*$*cX!y_Fi-tFvZlNMPQDGJocEO1tv&Ux zO-=|Qgb+dqA%qY@2qA>#`93eEDyPx#>PbXFR9J=W(Xna*K@i6Azrh91B#qsrOLO4)5EiNRRnnvhHt9q#1o9|aTjU+? zRtSXH*zzW?m@ayB-Q+2VPU_WnPovKrIZpFrZYF%Buoi`S9Eq_^Ya@0of2`RD&m&U@|ww1eRTf9SQDUkasXKl~9pDJAsn($AMJ zx=acw{DsBkx39gEBGQs(m3J++cdG0qE9+^YTc`G^dCAXH_3X_V()N7y zt@_jLwWk(EOq^5i2Q>ZL`Uo**kYm80Avb8%Bx%-#nH72e_SC=3Ut(nQ!lhEttn+l} z67K28pC`9}U0jnB`c{5_i=(>HWj7wrs<-=VW(PlUD(lkOr|~hT-XTgQlCy7<-qf`( j-EWlCGyLTM8$9I`=R?+#WTv%jt3Z5DS3j3^P6-t5tx{Wvl3d(Mh8T)*wy9X*b}7M%RX zaNp?*-*}#DGsx+M2G_qkR%vy6f5z#LMu7rM0j8#f^Q`WtWm|=7Z$8vlpPHqnq@+~; anDfO^V}ss~bU&a&89ZJ6T-G@yGywo6G+H14 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/pink_fancy.rsi/meta.json b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/pink_fancy.rsi/meta.json new file mode 100644 index 00000000000..a6449399085 --- /dev/null +++ b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/pink_fancy.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by theanemone (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-UNDERSHIRT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/red.rsi/equipped-UNDERSHIRT.png b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/red.rsi/equipped-UNDERSHIRT.png new file mode 100644 index 0000000000000000000000000000000000000000..df4f83e10a99dd1e1ca3cfb58a7acdbb23a7753c GIT binary patch literal 336 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zxjbDQLn`LH zy``IX*g>G};rY;SQm46US{URNGYUN?I40&#n8YUD5oQB zSN#%RKX9NbNyzcnR8u$Hb7*J;4Ew4*%msaiG zRJYyc&87!?Sf8K0Ha{$0J-bHs$9-d7RKC_R{N?}~ awxx*W4LkA8l zICbE_hx%h*5BGrNy>)8CjUtThq(#^~{eSCzzl5jZzkZ!_ZsYO2{eS&?o0Nov zgdJxO94P4W+3dl5a81$wi@`Q#8v_lv+zx7ht>=+sV3_h-b#va-HEV!wWAJqKb6Mw< G&;$U~9904U literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/red.rsi/meta.json b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/red.rsi/meta.json new file mode 100644 index 00000000000..a6449399085 --- /dev/null +++ b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/red.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by theanemone (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-UNDERSHIRT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/broken.png b/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/broken.png new file mode 100644 index 0000000000000000000000000000000000000000..238c9525e6b9d1f5b6e2f7066769fa7d9bf41a27 GIT binary patch literal 737 zcmV<70v`Q|P)XqG_r- zHY(3}?0!!#$^kZxrxwpKFlFgSr$AE1v@@uc1}nlCJ+}q`XaUH%cBCa(gcp;9e$?xP zCq%wuyquiB2()001KFw z1XJ*O_F=flS69#1`RQm++`Lha0ch{6tYn+|zYb;3KB~|ueW6Qqr3EI(c!&I^Uo^e+ zh}PEEX?v-b&HYr2NN<7+up*2PP?9--Ckv13^f8-)b0^fGr!x<75no6fktb#!*n7X3 zYnjq08)HBoCp6r0?(y?ybnAY#WwSH`*C)n%ERSJCI{-b*OVJFt;in5;Cp^10HWu2~ zTGPg{pcy#W+H$d?YC!L{SO_tIU_2+H?g9xeBetTq7zj~WngLmK9&kHqAeetIa^9qC zplu9zx!3a@Vc=iJ!3s0uoPr~ZiKrTodB?kUCZ-Rh&27MPz&!=}*su|O3aolS7nGe4 zhSTQOSIPlyMBQXI#X|Q3`1h0>2rePMh%jzq9hXXhWB@lDgEI)yAa6#@<02|6ZVkZe zZ@ZuA@bae&^N4l}*oS4U8TwI0hx2Xy;Iqs*)ZYlqjOAEpP3jl^tu~uRNB$k_PrXhsS{m~&2tfc1 TZUL*}00000NkvXXu0mjfU&K*J literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/deny-unshaded.png b/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/deny-unshaded.png new file mode 100644 index 0000000000000000000000000000000000000000..a6bef5f0aab2757cafbc8eb0b8303855cc2f5293 GIT binary patch literal 515 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 E0R7#ZS^xk5 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/off.png b/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/off.png new file mode 100644 index 0000000000000000000000000000000000000000..33b0e486cca89b4a1cbb3211e0588645e223a56d GIT binary patch literal 470 zcmV;{0V)28P)kI6fQJCiLI=Sis$k7L3}OTw^MwIYZlta#VAyx)5X1QuE5Ur2StNx38?f+z0g&bV43Km{2!I^X zo0W~C4B0Gn{Wx<0va5-;9Hy>#+EfO^h;X=FWQ71BpW>584*`5?X;KcLhX6hY;LQc( zhQeqFjE2By2n=`#fJ#B+l91wZ;3LCxqUr*WIuL+WLd29KL={A^T8@x`#HvF!hoA#K z3Ec*(|HJ^HsSOA^0AwL3J|CPtOOo9R#>PZN1yK%w*_>2ZNR%Vy_4gB{4y1@E2Y`GJ z@)4+&Lks|^B{sx}a=`oBcNjpJ767jUh|SBCI1Hx)hz&wYEFTnl0Z0sk7z>PuOaK4? M07*qoM6N<$f=ai(jQ{`u literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/panel.png b/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/panel.png new file mode 100644 index 0000000000000000000000000000000000000000..02709a20dc1926afcac29b1960a53b212c32aa73 GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?31We{epSZZGe6rAAc z;usR)o}3`Tx>(UbiU}LREW^~ZWkda^Cnx{w$M54YiwX{&yl}$?f#tS3TM8IXd=l7y zmnV|-3`=ji(uyV@R)y2=KTH?8;%m(AGyB7I$EV5Whu3UARw3&s%>LrlE2BH>#ght( yij*XnOacuq-}qtg%cFMmg5yJuAQ_v4EXM72QbKh}Uju+{WAJqKb6Mw<&;$VV5lE*1 literal 0 HcmV?d00001 From 361f27ccd7af8bfcf4c2f384dbcf6b8f906f7f93 Mon Sep 17 00:00:00 2001 From: bzzzbzzbz Date: Wed, 5 Aug 2026 07:00:50 +0700 Subject: [PATCH 2/4] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D1=82=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Clothing/Underwear/undershirt.yml | 12 +- .../VendingMachines/pantymate.rsi/meta.json | 210 +++++++++--------- 2 files changed, 113 insertions(+), 109 deletions(-) diff --git a/Resources/Prototypes/_Arcane/Entities/Clothing/Underwear/undershirt.yml b/Resources/Prototypes/_Arcane/Entities/Clothing/Underwear/undershirt.yml index fe48a1512f8..71c6cf662c6 100644 --- a/Resources/Prototypes/_Arcane/Entities/Clothing/Underwear/undershirt.yml +++ b/Resources/Prototypes/_Arcane/Entities/Clothing/Underwear/undershirt.yml @@ -50,7 +50,7 @@ description: Patroness of trees. components: - type: Sprite - sprite: _Arcane/Clothing/Undershirt/driada.rsi + sprite: _Arcane/Clothing/Undershirt/undershirt/driada.rsi - type: entity parent: ClothingBraBase @@ -59,7 +59,7 @@ description: A thin bra that barely covers the nipples. components: - type: Sprite - sprite: _Arcane/Clothing/Undershirt/erotic_purple.rsi + sprite: _Arcane/Clothing/Undershirt/undershirt/erotic_purple.rsi - type: entity parent: ClothingBraBase @@ -68,7 +68,7 @@ description: Jelly bra. components: - type: Sprite - sprite: _Arcane/Clothing/Undershirt/medusa.rsi + sprite: _Arcane/Clothing/Undershirt/undershirt/medusa.rsi - type: entity parent: ClothingBraBase @@ -77,7 +77,7 @@ description: 100% natural. components: - type: Sprite - sprite: _Arcane/Clothing/Undershirt/leafs.rsi + sprite: _Arcane/Clothing/Undershirt/undershirt/leafs.rsi - type: entity parent: ClothingBraBase @@ -86,7 +86,7 @@ description: Pink like Barbie. components: - type: Sprite - sprite: _Arcane/Clothing/Undershirt/pink_fancy.rsi + sprite: _Arcane/Clothing/Undershirt/undershirt/pink_fancy.rsi - type: entity parent: ClothingBraBase @@ -95,4 +95,4 @@ description: Red bra. components: - type: Sprite - sprite: _Arcane/Clothing/Undershirt/red.rsi + sprite: _Arcane/Clothing/Undershirt/undershirt/red.rsi diff --git a/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/meta.json b/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/meta.json index a8c76f00130..51101f97bf8 100644 --- a/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/meta.json +++ b/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyirght": "Made bu .seemah (Discord)", + "copyirght": "Made by .seemah (Discord)", "size": { "x": 32, "y": 32 @@ -13,113 +13,117 @@ { "name": "normal-unshaded", "delays": [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] ] }, { "name": "deny-unshaded", "delays": [ - 0.2, - 0.2 + [ + 0.2, + 0.2 + ] ] }, { From 6e1bfda4252edd6534374131fdaa3732bb0e585f Mon Sep 17 00:00:00 2001 From: bzzzbzzbz Date: Wed, 5 Aug 2026 15:53:52 +0700 Subject: [PATCH 3/4] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Structures/Machines/VendingMachines/pantymate.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/meta.json b/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/meta.json index 51101f97bf8..50dd38aceed 100644 --- a/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/meta.json +++ b/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-4.0", - "copyirght": "Made by .seemah (Discord)", + "copyright": "Made by .seemah (Discord)", "size": { "x": 32, "y": 32 From a331da139ca9f9ede0d4271d6cf2b0965b09a517 Mon Sep 17 00:00:00 2001 From: bzzzbzzbz Date: Thu, 6 Aug 2026 02:46:18 +0700 Subject: [PATCH 4/4] =?UTF-8?q?=D1=83=D0=B3=D0=B0=20=D0=B1=D1=83=D0=B3?= =?UTF-8?q?=D0=B0=20=D1=82=D1=80=D1=83=D1=81=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entities/clothing/underwear/underwear.ftl | 2 ++ .../VendingMachines/Inventories/undermate.yml | 1 + .../Entities/Clothing/Underwear/underwear.yml | 9 +++++++++ .../Underwear/ax.rsi/equipped-UNDERWEAR.png | Bin 0 -> 377 bytes .../Underwear/Underwear/ax.rsi/icon.png | Bin 0 -> 233 bytes .../Underwear/Underwear/ax.rsi/meta.json | 18 ++++++++++++++++++ 6 files changed, 30 insertions(+) create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/Underwear/ax.rsi/equipped-UNDERWEAR.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/Underwear/ax.rsi/icon.png create mode 100644 Resources/Textures/_Arcane/Clothing/Underwear/Underwear/ax.rsi/meta.json diff --git a/Resources/Locale/ru-RU/_Arcane/entities/clothing/underwear/underwear.ftl b/Resources/Locale/ru-RU/_Arcane/entities/clothing/underwear/underwear.ftl index 0abf59d52e4..d0cb252afc2 100644 --- a/Resources/Locale/ru-RU/_Arcane/entities/clothing/underwear/underwear.ftl +++ b/Resources/Locale/ru-RU/_Arcane/entities/clothing/underwear/underwear.ftl @@ -12,3 +12,5 @@ ent-ClothingUnderwearPinkFancy = модные розовые трусы .desc = Розовые, как Барби. ent-ClothingUnderwearRed = красные трусы .desc = Красные трусы. +ent-ClothingUnderwearAx = трусы Акса + .desc = Уга буга. diff --git a/Resources/Prototypes/_Arcane/Catalog/VendingMachines/Inventories/undermate.yml b/Resources/Prototypes/_Arcane/Catalog/VendingMachines/Inventories/undermate.yml index 48a7ceb032c..7842c7b6734 100644 --- a/Resources/Prototypes/_Arcane/Catalog/VendingMachines/Inventories/undermate.yml +++ b/Resources/Prototypes/_Arcane/Catalog/VendingMachines/Inventories/undermate.yml @@ -16,6 +16,7 @@ ClothingUnderwearPantiesJockstrap: 3 ClothingUnderwearPantiesSlim: 3 ClothingUnderwearPantiesThin: 3 + ClothingUnderwearAx: 3 ClothingUnderwearWarmThongs: 3 ClothingUndershirtWarmBra: 3 ClothingUndershirtCorset: 3 diff --git a/Resources/Prototypes/_Arcane/Entities/Clothing/Underwear/underwear.yml b/Resources/Prototypes/_Arcane/Entities/Clothing/Underwear/underwear.yml index 3a27f4b4175..e11269af5a5 100644 --- a/Resources/Prototypes/_Arcane/Entities/Clothing/Underwear/underwear.yml +++ b/Resources/Prototypes/_Arcane/Entities/Clothing/Underwear/underwear.yml @@ -124,3 +124,12 @@ components: - type: Sprite sprite: _Arcane/Clothing/Underwear/Underwear/red.rsi + +- type: entity + parent: ClothingUnderwearBase + id: ClothingUnderwearAx + name: ax panties + description: Uga buga. + components: + - type: Sprite + sprite: _Arcane/Clothing/Underwear/Underwear/ax.rsi diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/ax.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/ax.rsi/equipped-UNDERWEAR.png new file mode 100644 index 0000000000000000000000000000000000000000..55ce8bbf2c1b76768b118e844fc05b437b8232e6 GIT binary patch literal 377 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zjXhl)Ln`LH zy|vJvDN*A1M|bs$of8d9ix)p&HQ%|j^XQ_Z2jmk<#BVAj9&j-F=`T~?z}WnjiS0QD zTXU^WJByoOe0vbm-+>yyp4tSylZpta*?AT)i)L%=~+eyZzzDj*dO$ z&L3;seM`4pX=>Vc=ljx{?e>$lPV~IV+b6#+po;h{!$cFlJ&TedMY;9YP zTK$i|`|IR_6uko%o)^!W*x1;3(9m_>0_Ka1!W+4?`DYyB^^acj`TytN@;o4L{{7x` z51@ejY^znwDTkS}LjNB&P@N_$%LI~r%eVaD$JHr%4Ni+sUuG4_U6@$V4|WUVUIvDy XTD=zs{&_hAoy*|q>gTe~DWM4f(1TZ~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/ax.rsi/meta.json b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/ax.rsi/meta.json new file mode 100644 index 00000000000..90f1fa898d2 --- /dev/null +++ b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/ax.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by theanemone (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-UNDERWEAR", + "directions": 4 + } + ] +}