diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 3acf7c4ab8..20057aa6a0 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -54,8 +54,6 @@ ClothingHeadHatRedsoft: 2 ClothingHeadHatPurplesoft: 2 ClothingHeadHatCorpsoft: 2 - ClothingOuterWinterCoat: 3 - ClothingOuterCoatBomber: 3 ClothingHeadFishCap: 2 ClothingHeadRastaHat: 2 ClothingBeltStorageWaistbag: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml new file mode 100644 index 0000000000..ba60084367 --- /dev/null +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/winterdrobe.yml @@ -0,0 +1,15 @@ +- type: vendingMachineInventory + id: WinterDrobeInventory + startingInventory: + ClothingNeckScarfStripedRed: 3 + ClothingNeckScarfStripedGreen: 3 + ClothingNeckScarfStripedBlue: 3 + ClothingNeckScarfStripedBlack: 3 + ClothingNeckScarfStripedBrown: 3 + ClothingNeckScarfStripedLightBlue: 3 + ClothingNeckScarfStripedOrange: 3 + ClothingNeckScarfStripedPurple: 3 + ClothingOuterWinterCoat: 6 + ClothingOuterCoatBomber: 3 + ClothingHeadHatSantahat: 2 + ClothingHeadHatXmasCrown: 2 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml index 950267aa8b..74168fc8f0 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -103,6 +103,7 @@ - SciDrobeInventory - SecDrobeInventory - ViroDrobeInventory + - WinterDrobeInventory - type: Sprite layers: - state: base diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index a662bafc99..b213383162 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -293,6 +293,39 @@ energy: 1.6 color: "#3db83b" +- type: entity + parent: VendingMachine + id: VendingMachineWinter + name: WinterDrobe + description: The best place to enjoy the cold! + components: + - type: VendingMachine + pack: WinterDrobeInventory + offState: off + brokenState: broken + normalState: normal-unshaded + denyState: deny-unshaded + - type: Advertise + pack: ClothesMateAds + - type: Speech + - type: Tag + tags: + - DroneUsable + - type: Sprite + sprite: Structures/Machines/VendingMachines/winterdrobe.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: 1.8 + energy: 1.6 + color: "#3db83b" + - type: entity parent: VendingMachine id: VendingMachineCoffee diff --git a/Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/broken.png b/Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/broken.png new file mode 100644 index 0000000000..682af2e6ec Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/broken.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/deny-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/deny-unshaded.png new file mode 100644 index 0000000000..87d2bb87ab Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/meta.json b/Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/meta.json new file mode 100644 index 0000000000..281e08e26c --- /dev/null +++ b/Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by MrGreen06#0618 (discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded", + "delays": [ + [ + 3, + 3, + 3, + 3, + 3, + 3, + 3, + 3 + ] + ] + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "broken" + }, + { + "name": "panel" + } + ] +} diff --git a/Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/normal-unshaded.png b/Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/normal-unshaded.png new file mode 100644 index 0000000000..ec9a770f23 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/off.png b/Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/off.png new file mode 100644 index 0000000000..93f88d1a7e Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/off.png differ diff --git a/Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/panel.png b/Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/panel.png new file mode 100644 index 0000000000..0032751ff4 Binary files /dev/null and b/Resources/Textures/Structures/Machines/VendingMachines/winterdrobe.rsi/panel.png differ