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..d0cb252afc2 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,16 @@ ent-ClothingUnderwearBeerPants = пивные трусы .desc = Пивные трусы. +ent-ClothingUnderwearDriada = трусы дриады + .desc = Покровительница деревьев. +ent-ClothingUnderwearEroticPurple = фиолетовые эротические трусы + .desc = Тонкие трусики, едва прикрывающие гениталии. +ent-ClothingUnderwearMedusa = медузьи трусы + .desc = Желейные трусы. +ent-ClothingUnderwearLeafs = трусы из листьев + .desc = 100% натуральные. +ent-ClothingUnderwearPinkFancy = модные розовые трусы + .desc = Розовые, как Барби. +ent-ClothingUnderwearRed = красные трусы + .desc = Красные трусы. +ent-ClothingUnderwearAx = трусы Акса + .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..7842c7b6734 --- /dev/null +++ b/Resources/Prototypes/_Arcane/Catalog/VendingMachines/Inventories/undermate.yml @@ -0,0 +1,188 @@ +- 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 + ClothingUnderwearAx: 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..71c6cf662c6 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/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/undershirt/erotic_purple.rsi + +- type: entity + parent: ClothingBraBase + id: ClothingBraMedusa + name: medusa bra + description: Jelly bra. + components: + - type: Sprite + sprite: _Arcane/Clothing/Undershirt/undershirt/medusa.rsi + +- type: entity + parent: ClothingBraBase + id: ClothingBraLeafs + name: leafs bra + description: 100% natural. + components: + - type: Sprite + sprite: _Arcane/Clothing/Undershirt/undershirt/leafs.rsi + +- type: entity + parent: ClothingBraBase + id: ClothingBraPinkFancy + name: fancy pink bra + description: Pink like Barbie. + components: + - type: Sprite + sprite: _Arcane/Clothing/Undershirt/undershirt/pink_fancy.rsi + +- type: entity + parent: ClothingBraBase + id: ClothingBraRed + name: red bra + description: Red bra. + components: + - type: Sprite + sprite: _Arcane/Clothing/Undershirt/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..e11269af5a5 100644 --- a/Resources/Prototypes/_Arcane/Entities/Clothing/Underwear/underwear.yml +++ b/Resources/Prototypes/_Arcane/Entities/Clothing/Underwear/underwear.yml @@ -70,3 +70,66 @@ 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 + +- 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/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/ax.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/ax.rsi/equipped-UNDERWEAR.png new file mode 100644 index 00000000000..55ce8bbf2c1 Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/ax.rsi/equipped-UNDERWEAR.png differ diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/ax.rsi/icon.png b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/ax.rsi/icon.png new file mode 100644 index 00000000000..b4948efb5b0 Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/ax.rsi/icon.png differ 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 + } + ] +} 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 00000000000..108b64b95f8 Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/driada.rsi/equipped-UNDERWEAR.png differ diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/driada.rsi/icon.png b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/driada.rsi/icon.png new file mode 100644 index 00000000000..bc8839d51ee Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/driada.rsi/icon.png differ 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 00000000000..1f6c0c7d764 Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/erotic_purple.rsi/equipped-UNDERWEAR.png differ 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 00000000000..af9820dada0 Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/erotic_purple.rsi/icon.png differ diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/erotic_purple.rsi/meta.json b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/erotic_purple.rsi/meta.json new file mode 100644 index 00000000000..90f1fa898d2 --- /dev/null +++ b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/erotic_purple.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/leafs.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/leafs.rsi/equipped-UNDERWEAR.png new file mode 100644 index 00000000000..108b64b95f8 Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/leafs.rsi/equipped-UNDERWEAR.png differ diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/leafs.rsi/icon.png b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/leafs.rsi/icon.png new file mode 100644 index 00000000000..78fde2cac1f Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/leafs.rsi/icon.png differ diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/leafs.rsi/meta.json b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/leafs.rsi/meta.json new file mode 100644 index 00000000000..90f1fa898d2 --- /dev/null +++ b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/leafs.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/medusa.rsi/equipped-UNDERWEAR.png b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/medusa.rsi/equipped-UNDERWEAR.png new file mode 100644 index 00000000000..bf9c4e16f59 Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/medusa.rsi/equipped-UNDERWEAR.png differ 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 00000000000..2c7ee9d7071 Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/medusa.rsi/icon.png differ 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 00000000000..2f799e04975 Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/pink_fancy.rsi/equipped-UNDERWEAR.png differ 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 00000000000..f768d9cc682 Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/pink_fancy.rsi/icon.png differ 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 00000000000..4b17f4c3609 Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/red.rsi/equipped-UNDERWEAR.png differ diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/red.rsi/icon.png b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/red.rsi/icon.png new file mode 100644 index 00000000000..cc68585bc35 Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/Underwear/red.rsi/icon.png differ 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 00000000000..36cdcc93f58 Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/driada.rsi/equipped-UNDERSHIRT.png differ 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 00000000000..f30911a10d0 Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/driada.rsi/icon.png differ diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/driada.rsi/meta.json b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/driada.rsi/meta.json new file mode 100644 index 00000000000..a6449399085 --- /dev/null +++ b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/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-UNDERSHIRT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/erotic_purple.rsi/equipped-UNDERSHIRT.png b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/erotic_purple.rsi/equipped-UNDERSHIRT.png new file mode 100644 index 00000000000..87d2fb42f40 Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/erotic_purple.rsi/equipped-UNDERSHIRT.png differ 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 00000000000..9313a1bb8cb Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/erotic_purple.rsi/icon.png differ diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/erotic_purple.rsi/meta.json b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/erotic_purple.rsi/meta.json new file mode 100644 index 00000000000..a6449399085 --- /dev/null +++ b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/erotic_purple.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/leafs.rsi/equipped-UNDERSHIRT.png b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/leafs.rsi/equipped-UNDERSHIRT.png new file mode 100644 index 00000000000..7aab0b5139a Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/leafs.rsi/equipped-UNDERSHIRT.png differ diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/leafs.rsi/icon.png b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/leafs.rsi/icon.png new file mode 100644 index 00000000000..e8b9902356e Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/leafs.rsi/icon.png differ diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/leafs.rsi/meta.json b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/leafs.rsi/meta.json new file mode 100644 index 00000000000..a6449399085 --- /dev/null +++ b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/leafs.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/medusa.rsi/equipped-UNDERSHIRT.png b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/medusa.rsi/equipped-UNDERSHIRT.png new file mode 100644 index 00000000000..93f5709184b Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/medusa.rsi/equipped-UNDERSHIRT.png differ diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/medusa.rsi/icon.png b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/medusa.rsi/icon.png new file mode 100644 index 00000000000..45a645cec01 Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/medusa.rsi/icon.png differ diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/medusa.rsi/meta.json b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/medusa.rsi/meta.json new file mode 100644 index 00000000000..a6449399085 --- /dev/null +++ b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/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-UNDERSHIRT", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/pink_fancy.rsi/equipped-UNDERSHIRT.png b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/pink_fancy.rsi/equipped-UNDERSHIRT.png new file mode 100644 index 00000000000..a8d7492b4a0 Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/pink_fancy.rsi/equipped-UNDERSHIRT.png differ diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/pink_fancy.rsi/icon.png b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/pink_fancy.rsi/icon.png new file mode 100644 index 00000000000..3d502e35d8b Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/pink_fancy.rsi/icon.png differ 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 00000000000..df4f83e10a9 Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/red.rsi/equipped-UNDERSHIRT.png differ diff --git a/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/red.rsi/icon.png b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/red.rsi/icon.png new file mode 100644 index 00000000000..08f172cdafe Binary files /dev/null and b/Resources/Textures/_Arcane/Clothing/Underwear/undershirt/red.rsi/icon.png differ 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 00000000000..238c9525e6b Binary files /dev/null and b/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/broken.png differ 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 00000000000..a6bef5f0aab Binary files /dev/null and b/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/meta.json b/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/meta.json new file mode 100644 index 00000000000..50dd38aceed --- /dev/null +++ b/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/meta.json @@ -0,0 +1,136 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Made by .seemah (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" + }, + { + "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 + ] + ] + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.2, + 0.2 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + } + ] +} diff --git a/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/normal-unshaded.png b/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/normal-unshaded.png new file mode 100644 index 00000000000..3887361e978 Binary files /dev/null and b/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/normal-unshaded.png differ 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 00000000000..33b0e486cca Binary files /dev/null and b/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/off.png differ 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 00000000000..02709a20dc1 Binary files /dev/null and b/Resources/Textures/_Arcane/Structures/Machines/VendingMachines/pantymate.rsi/panel.png differ