From deeacce8f7bc0237b0bba7d34532a8363d7d5f17 Mon Sep 17 00:00:00 2001 From: Swept Date: Tue, 9 Mar 2021 09:42:26 +0000 Subject: [PATCH] Removed unused vending machines (#3553) --- .../VendingMachineVisualizer.cs | 2 +- .../{hats.yml => clothing.yml} | 17 +- .../Catalog/VendingMachines/sec.yml | 3 +- .../Catalog/VendingMachines/shoes.yml | 10 - .../Catalog/VendingMachines/suits.yml | 14 -- .../Catalog/VendingMachines/vox.yml | 5 - .../Constructible/Power/vending_machines.yml | 235 ++---------------- .../VendingMachines/boozeomat.rsi/meta.json | 94 +++---- .../VendingMachines/boozeomat.rsi/panel.png | Bin 146 -> 207 bytes .../Power/VendingMachines/cart.rsi/meta.json | 92 +++---- .../VendingMachines/chapel.rsi/broken.png | Bin 969 -> 0 bytes .../chapel.rsi/deny-unshaded.png | Bin 1871 -> 0 bytes .../VendingMachines/chapel.rsi/meta.json | 122 --------- .../chapel.rsi/normal-unshaded.png | Bin 21655 -> 0 bytes .../Power/VendingMachines/chapel.rsi/off.png | Bin 651 -> 0 bytes .../Power/VendingMachines/cigs.rsi/meta.json | 84 +++---- .../VendingMachines/clothing.rsi/broken.png | Bin 0 -> 747 bytes .../clothing.rsi/deny-unshaded.png | Bin 0 -> 398 bytes .../VendingMachines/clothing.rsi/meta.json | 44 ++++ .../clothing.rsi/normal-unshaded.png | Bin 0 -> 1271 bytes .../VendingMachines/clothing.rsi/off.png | Bin 0 -> 407 bytes .../VendingMachines/clothing.rsi/panel.png | Bin 0 -> 190 bytes .../VendingMachines/coffee.rsi/meta.json | 144 +++++------ .../Power/VendingMachines/cola.rsi/meta.json | 92 ++++--- .../VendingMachines/dinnerware.rsi/meta.json | 68 ++--- .../VendingMachines/discount.rsi/meta.json | 48 ++-- .../VendingMachines/empty.rsi/broken.png | Bin 1208 -> 0 bytes .../Power/VendingMachines/empty.rsi/meta.json | 20 -- .../empty.rsi/normal-unshaded.png | Bin 109 -> 0 bytes .../Power/VendingMachines/empty.rsi/off.png | Bin 811 -> 0 bytes .../VendingMachines/engivend.rsi/meta.json | 86 +++---- .../Power/VendingMachines/hats.rsi/broken.png | Bin 573 -> 0 bytes .../Power/VendingMachines/hats.rsi/meta.json | 28 --- .../hats.rsi/normal-unshaded.png | Bin 306 -> 0 bytes .../Power/VendingMachines/hats.rsi/off.png | Bin 380 -> 0 bytes .../VendingMachines/magivend.rsi/broken.png | Bin 1022 -> 0 bytes .../VendingMachines/magivend.rsi/meta.json | 20 -- .../magivend.rsi/normal-unshaded.png | Bin 502 -> 0 bytes .../VendingMachines/magivend.rsi/off.png | Bin 913 -> 0 bytes .../VendingMachines/medical.rsi/meta.json | 86 +++---- .../VendingMachines/mining.rsi/broken.png | Bin 1048 -> 0 bytes .../mining.rsi/deny-unshaded.png | Bin 487 -> 0 bytes .../VendingMachines/mining.rsi/meta.json | 29 --- .../mining.rsi/normal-unshaded.png | Bin 370 -> 0 bytes .../Power/VendingMachines/mining.rsi/off.png | Bin 898 -> 0 bytes .../Power/VendingMachines/nutri.rsi/meta.json | 78 +++--- .../VendingMachines/robotics.rsi/broken.png | Bin 1791 -> 0 bytes .../robotics.rsi/deny-unshaded.png | Bin 1090 -> 0 bytes .../VendingMachines/robotics.rsi/meta.json | 34 --- .../robotics.rsi/normal-unshaded.png | Bin 429 -> 0 bytes .../VendingMachines/robotics.rsi/off.png | Bin 1058 -> 0 bytes .../Power/VendingMachines/sale.rsi/meta.json | 88 +++---- .../Power/VendingMachines/sec.rsi/broken.png | Bin 1121 -> 1258 bytes .../VendingMachines/sec.rsi/deny-unshaded.png | Bin 898 -> 4470 bytes .../sec.rsi/eject-unshaded.png | Bin 644 -> 0 bytes .../Power/VendingMachines/sec.rsi/meta.json | 101 ++++---- .../sec.rsi/normal-unshaded.png | Bin 387 -> 791 bytes .../Power/VendingMachines/sec.rsi/off.png | Bin 778 -> 1126 bytes .../Power/VendingMachines/sec.rsi/panel.png | Bin 342 -> 212 bytes .../Power/VendingMachines/seeds.rsi/meta.json | 68 ++--- .../VendingMachines/shoes.rsi/broken.png | Bin 626 -> 0 bytes .../Power/VendingMachines/shoes.rsi/meta.json | 28 --- .../shoes.rsi/normal-unshaded.png | Bin 282 -> 0 bytes .../Power/VendingMachines/shoes.rsi/off.png | Bin 460 -> 0 bytes .../VendingMachines/smartfridge.rsi/meta.json | 34 +-- .../Power/VendingMachines/snack.rsi/meta.json | 98 ++++---- .../VendingMachines/sovietsoda.rsi/meta.json | 82 +++--- .../VendingMachines/suits.rsi/broken.png | Bin 639 -> 0 bytes .../Power/VendingMachines/suits.rsi/meta.json | 28 --- .../suits.rsi/normal-unshaded.png | Bin 337 -> 0 bytes .../Power/VendingMachines/suits.rsi/off.png | Bin 492 -> 0 bytes .../VendingMachines/theater.rsi/meta.json | 102 ++++---- .../VendingMachines/vendomat.rsi/meta.json | 84 +++---- .../Power/VendingMachines/vox.rsi/broken.png | Bin 788 -> 0 bytes .../Power/VendingMachines/vox.rsi/meta.json | 20 -- .../vox.rsi/normal-unshaded.png | Bin 3583 -> 0 bytes .../Power/VendingMachines/vox.rsi/off.png | Bin 637 -> 0 bytes .../VendingMachines/wallmed.rsi/meta.json | 72 +++--- .../VendingMachines/youtool.rsi/meta.json | 111 ++++----- 79 files changed, 947 insertions(+), 1424 deletions(-) rename Resources/Prototypes/Catalog/VendingMachines/{hats.yml => clothing.yml} (51%) delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/shoes.yml delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/suits.yml delete mode 100644 Resources/Prototypes/Catalog/VendingMachines/vox.yml delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/broken.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/deny-unshaded.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/meta.json delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/normal-unshaded.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/off.png create mode 100644 Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/broken.png create mode 100644 Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/deny-unshaded.png create mode 100644 Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/meta.json create mode 100644 Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/normal-unshaded.png create mode 100644 Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/off.png create mode 100644 Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/panel.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/broken.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/meta.json delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/normal-unshaded.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/off.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/broken.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/meta.json delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/normal-unshaded.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/off.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/broken.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/meta.json delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/normal-unshaded.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/off.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/broken.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/deny-unshaded.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/meta.json delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/normal-unshaded.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/off.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/broken.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/deny-unshaded.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/meta.json delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/normal-unshaded.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/off.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/eject-unshaded.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/broken.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/meta.json delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/normal-unshaded.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/off.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/broken.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/meta.json delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/normal-unshaded.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/off.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/broken.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/meta.json delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/normal-unshaded.png delete mode 100644 Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/off.png diff --git a/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs b/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs index 7042ca0261..0be6539c1f 100644 --- a/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs +++ b/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using JetBrains.Annotations; using Robust.Client.Animations; diff --git a/Resources/Prototypes/Catalog/VendingMachines/hats.yml b/Resources/Prototypes/Catalog/VendingMachines/clothing.yml similarity index 51% rename from Resources/Prototypes/Catalog/VendingMachines/hats.yml rename to Resources/Prototypes/Catalog/VendingMachines/clothing.yml index 3daca32b71..bdc53946fe 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/hats.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/clothing.yml @@ -1,8 +1,6 @@ - type: vendingMachineInventory - id: Hatlord 9000 - name: Hatlord 9000 - description: "Hats for the hatlord. Skulls for the hat-throne!" - spriteName: hats + id: ClothesMate + name: ClothesMate startingInventory: HatBandBlack: 3 HatBandBlue: 3 @@ -19,3 +17,14 @@ ClothingHeadHatCargosoft: 3 ClothingHeadHatCentcom: 3 ClothingHeadHatChef: 3 + ClothingShoesColorWhite: 3 + ClothingShoesClown: 3 + ClothingShoesBootsJack: 3 + ClothingShoesColorBrown: 3 + ClothingUniformJumpsuitJanitor: 3 + ClothingUniformJumpsuitColorGrey: 3 + ClothingUniformJumpsuitEngineering: 3 + ClothingUniformJumpsuitClown: 3 + ClothingUniformJumpsuitSec: 3 + ClothingUniformJumpsuitChef: 3 + ClothingUniformJumpsuitCaptain: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/sec.yml b/Resources/Prototypes/Catalog/VendingMachines/sec.yml index 85992e4642..c382003e3d 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/sec.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/sec.yml @@ -2,7 +2,7 @@ id: SecTech name: SecTech description: "A vending machine containing Security equipment. A label reads \"SECURITY PERSONNEL ONLY\"." - animationDuration: 1.4 + animationDuration: 2.8 spriteName: sec startingInventory: Handcuffs: 8 @@ -14,4 +14,3 @@ ClothingEyesGlassesSunglasses: 2 ClothingBeltSecurityWebbing: 5 #box evidence - diff --git a/Resources/Prototypes/Catalog/VendingMachines/shoes.yml b/Resources/Prototypes/Catalog/VendingMachines/shoes.yml deleted file mode 100644 index fa80b492bf..0000000000 --- a/Resources/Prototypes/Catalog/VendingMachines/shoes.yml +++ /dev/null @@ -1,10 +0,0 @@ -- type: vendingMachineInventory - id: Shoelord 9000 - name: Shoelord 9000 - description: A vending machine containing footwear. - spriteName: shoes - startingInventory: - ClothingShoesColorWhite: 3 - ClothingShoesClown: 3 - ClothingShoesBootsJack: 3 - ClothingShoesColorBrown: 3 diff --git a/Resources/Prototypes/Catalog/VendingMachines/suits.yml b/Resources/Prototypes/Catalog/VendingMachines/suits.yml deleted file mode 100644 index 676338d6a2..0000000000 --- a/Resources/Prototypes/Catalog/VendingMachines/suits.yml +++ /dev/null @@ -1,14 +0,0 @@ -- type: vendingMachineInventory - id: Suitlord 9000 - name: Suitlord 9000 - description: A vending machine containing jumpsuits and dress garments. - spriteName: suits - startingInventory: - ClothingUniformJumpsuitJanitor: 3 - ClothingUniformJumpsuitColorGrey: 3 - ClothingUniformJumpsuitEngineering: 3 - ClothingUniformJumpsuitClown: 3 - ClothingUniformJumpsuitSec: 3 - ClothingUniformJumpsuitChef: 3 - ClothingUniformJumpsuitCaptain: 3 - diff --git a/Resources/Prototypes/Catalog/VendingMachines/vox.yml b/Resources/Prototypes/Catalog/VendingMachines/vox.yml deleted file mode 100644 index bc01c3f1fa..0000000000 --- a/Resources/Prototypes/Catalog/VendingMachines/vox.yml +++ /dev/null @@ -1,5 +0,0 @@ -- type: vendingMachineInventory - id: Trader Supply - name: Trader Supply - description: Make much coin. - spriteName: vox diff --git a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml index 81b82e7096..167cb12a6e 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml @@ -129,31 +129,6 @@ broken: true - type: WiresVisualizer -- type: entity - parent: VendingMachine - id: VendingMachineChapel - name: PietyVend - components: - - type: VendingMachine - pack: PietyVend - - type: Sprite - sprite: Constructible/Power/VendingMachines/chapel.rsi - layers: - - state: "off" - map: ["enum.VendingMachineVisualLayers.Unlit"] - - state: "off" - map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] - shader: unshaded - - texture: Constructible/Power/VendingMachines/maintenance_panel.png - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - visuals: - - type: VendingMachineVisualizer - normalUnshaded: true - denyUnshaded: true - broken: true - - type: WiresVisualizer - - type: entity parent: VendingMachine id: VendingMachineCigs @@ -180,6 +155,32 @@ broken: true - type: WiresVisualizer +- type: entity + parent: VendingMachine + id: VendingMachineClothing + name: ClothesMate + components: + - type: VendingMachine + pack: ClothesMate + - type: Sprite + sprite: Constructible/Power/VendingMachines/clothing.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Unlit"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: Appearance + visuals: + - type: VendingMachineVisualizer + normalUnshaded: true + denyUnshaded: true + broken: true + - type: WiresVisualizer +# slogans = "Dress for success!;Prepare to look swagalicious!;Look at all this swag!;Why leave style up to fate? Use the ClothesMate!" + - type: entity parent: VendingMachine id: VendingMachineCoffee @@ -315,54 +316,6 @@ - type: AccessReader access: [["Engineering"]] -- type: entity - parent: VendingMachine - id: VendingMachineHats - name: Hatlord 9000 - components: - - type: VendingMachine - pack: Hatlord 9000 - - type: Sprite - sprite: Constructible/Power/VendingMachines/hats.rsi - layers: - - state: "off" - map: ["enum.VendingMachineVisualLayers.Unlit"] - - state: "off" - map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] - shader: unshaded - - texture: Constructible/Power/VendingMachines/maintenance_panel.png - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - visuals: - - type: VendingMachineVisualizer - normalUnshaded: true - broken: true - - type: WiresVisualizer - -- type: entity - parent: VendingMachine - id: VendingMachineMagivend - name: MagiVend - components: - - type: VendingMachine - pack: MagiVend - - type: Sprite - sprite: Constructible/Power/VendingMachines/magivend.rsi - layers: - - state: "off" - map: ["enum.VendingMachineVisualLayers.Unlit"] - - state: "off" - map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] - shader: unshaded - - texture: Constructible/Power/VendingMachines/maintenance_panel.png - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - visuals: - - type: VendingMachineVisualizer - normalUnshaded: true - broken: true - - type: WiresVisualizer - - type: entity parent: VendingMachine id: VendingMachineMedical @@ -391,31 +344,6 @@ - type: AccessReader access: [["Medical"]] -- type: entity - parent: VendingMachine - id: VendingMachineMining - name: Dwarven Mining Equipment - components: - - type: VendingMachine - pack: Dwarven Mining Equipment - - type: Sprite - sprite: Constructible/Power/VendingMachines/mining.rsi - layers: - - state: "off" - map: ["enum.VendingMachineVisualLayers.Unlit"] - - state: "off" - map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] - shader: unshaded - - texture: Constructible/Power/VendingMachines/maintenance_panel.png - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - visuals: - - type: VendingMachineVisualizer - normalUnshaded: true - denyUnshaded: true - broken: true - - type: WiresVisualizer - - type: entity parent: VendingMachine id: VendingMachineNutri @@ -444,33 +372,6 @@ - type: AccessReader access: [["Service"]] -- type: entity - parent: VendingMachine - id: VendingMachineRobotics - name: Robotech Deluxe - components: - - type: VendingMachine - pack: Robotech Deluxe - - type: Sprite - sprite: Constructible/Power/VendingMachines/robotics.rsi - layers: - - state: "off" - map: ["enum.VendingMachineVisualLayers.Unlit"] - - state: "off" - map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] - shader: unshaded - - texture: Constructible/Power/VendingMachines/maintenance_panel.png - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - visuals: - - type: VendingMachineVisualizer - normalUnshaded: true - denyUnshaded: true - broken: true - - type: WiresVisualizer - - type: AccessReader - access: [["Research"]] - - type: entity parent: VendingMachine id: VendingMachineSales @@ -517,7 +418,6 @@ visuals: - type: VendingMachineVisualizer normalUnshaded: true - ejectUnshaded: true denyUnshaded: true broken: true - type: WiresVisualizer @@ -531,7 +431,6 @@ components: - type: VendingMachine pack: MegaSeed Servitor - - type: Sprite sprite: Constructible/Power/VendingMachines/seeds.rsi layers: @@ -552,31 +451,6 @@ - type: AccessReader access: [["Service"]] -- type: entity - parent: VendingMachine - id: VendingMachineShoes - name: Shoelord 9000 - components: - - type: VendingMachine - pack: Shoelord 9000 - - - type: Sprite - sprite: Constructible/Power/VendingMachines/shoes.rsi - layers: - - state: "off" - map: ["enum.VendingMachineVisualLayers.Unlit"] - - state: "off" - map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] - shader: unshaded - - texture: Constructible/Power/VendingMachines/maintenance_panel.png - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - visuals: - - type: VendingMachineVisualizer - normalUnshaded: true - broken: true - - type: WiresVisualizer - - type: entity parent: VendingMachine id: VendingMachineSmartFridge @@ -584,7 +458,6 @@ components: - type: VendingMachine pack: SmartFridge - - type: Sprite sprite: Constructible/Power/VendingMachines/smartfridge.rsi layers: @@ -609,7 +482,6 @@ components: - type: VendingMachine pack: Getmore Chocolate Corp - - type: Sprite sprite: Constructible/Power/VendingMachines/snack.rsi layers: @@ -636,7 +508,6 @@ components: - type: VendingMachine pack: BODA - - type: Sprite sprite: Constructible/Power/VendingMachines/sovietsoda.rsi layers: @@ -656,31 +527,6 @@ broken: true - type: WiresVisualizer -- type: entity - parent: VendingMachine - id: VendingMachineSuits - name: Suitlord 9000 - components: - - type: VendingMachine - pack: Suitlord 9000 - - - type: Sprite - sprite: Constructible/Power/VendingMachines/suits.rsi - layers: - - state: "off" - map: ["enum.VendingMachineVisualLayers.Unlit"] - - state: "off" - map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] - shader: unshaded - - texture: Constructible/Power/VendingMachines/maintenance_panel.png - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - visuals: - - type: VendingMachineVisualizer - normalUnshaded: true - broken: true - - type: WiresVisualizer - - type: entity parent: VendingMachine id: VendingMachineTheater @@ -688,7 +534,6 @@ components: - type: VendingMachine pack: AutoDrobe - - type: Sprite sprite: Constructible/Power/VendingMachines/theater.rsi layers: @@ -719,7 +564,6 @@ components: - type: VendingMachine pack: Vendomat - - type: Sprite sprite: Constructible/Power/VendingMachines/vendomat.rsi layers: @@ -740,31 +584,6 @@ broken: true - type: WiresVisualizer -- type: entity - parent: VendingMachine - id: VendingMachineVox - name: Trader Supply - components: - - type: VendingMachine - pack: Trader Supply - - - type: Sprite - sprite: Constructible/Power/VendingMachines/vox.rsi - layers: - - state: "off" - map: ["enum.VendingMachineVisualLayers.Unlit"] - - state: "off" - map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] - shader: unshaded - - texture: Constructible/Power/VendingMachines/maintenance_panel.png - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: Appearance - visuals: - - type: VendingMachineVisualizer - normalUnshaded: true - broken: true - - type: WiresVisualizer - - type: entity parent: VendingMachine id: VendingMachineWallMedical @@ -772,7 +591,6 @@ components: - type: VendingMachine pack: NanoMed - - type: Sprite sprite: Constructible/Power/VendingMachines/wallmed.rsi layers: @@ -800,7 +618,6 @@ components: - type: VendingMachine pack: YouTool - - type: Sprite sprite: Constructible/Power/VendingMachines/youtool.rsi layers: diff --git a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/meta.json index 8bce6d8cf4..61901426da 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/meta.json @@ -1,50 +1,50 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", - "states": [ - { - "name": "broken" - }, - { - "name": "deny-unshaded", - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] - }, - { - "name": "normal-unshaded", - "delays": [ - [ - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2, - 0.2 - ] - ] - }, - { - "name": "off" - }, - { - "name": "panel" - } - ] + { + "name": "deny-unshaded", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "normal-unshaded", + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + } + ] } diff --git a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/panel.png b/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/panel.png index 597a8b05ccdefd01d16b5b17745ac75a696315d3..b0b7e5a0f48ab65324f552cdcf07296b2901e887 100644 GIT binary patch delta 191 zcmV;w06_ne0nY)D7=H)`0001UdV2H#005RrL_t(|obApn4#GeX#qmEMmszoDZ%~1( z>M2mH!!(@%4n;vt3d#K3Bro$G7-Nhv#!PIc@ie70h{)@9 z&JkmL+cno1AR;t%N6wk1?kJ^p3NtTzh)R_*p=!)R`)QSQCx t-u6^g;BwVy_~I18FhT7Pjxfgjg(u~=AzQ1t<_rJ;002ovPDHLkV1hg*Q=o`8B*-tA!Qt7BG$2RG)5S4FV`6fG#IlA!0bd6X315c`qP`AmnC?!P f8B%&FfQ8}KCC06anXb2hsu?_8{an^LB{Ts5)e$IK diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/meta.json index 3f073d2b47..d262e0049d 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/meta.json @@ -1,49 +1,49 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded" }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", - "states": [ - { - "name": "normal-unshaded" - }, - { - "name": "broken" - }, - { - "name": "deny-unshaded", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "off" - }, - { - "name": "panel" - }, - { - "name": "eject-unshaded", - "delays": [ - [ - 0.5, - 0.05, - 0.5, - 0.05, - 0.1 - ] - ] - } - ] + { + "name": "broken" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.5, + 0.05, + 0.5, + 0.05, + 0.1 + ] + ] + } + ] } diff --git a/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/broken.png deleted file mode 100644 index b301690f9f2e92ce14ffbd2d1c942bbc5ea9ddba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 969 zcmV;)12+7LP)(Dd}qtPfHSEO;afMsBsCMc!Qbse^C3+*&b0|4mX!|6DV&^FKOlq3nNs;0;- z%ZkY*Ns4WGczAe-8vy*VF>CYSdVnz|R2-2(d$a4A80wNKNG5EfZ{r!E^>vh<+4cB#rbBe_xip658U*F{0bN2ub&1N(4 z)vBs;*vF;v9STmvf#Qd zHa9oXXf)7hG~Oq`G)<_g3g7oZDMho{Oo%W|6NHe|ysN7#+}zyY_VyMR7Z>RF`$7(3 z2vk)~#5sC)yWKd$QA$%MqSNVMcXt=EEMq(#XO>9bU7oLJF^|ozu!(bQ&`u#q}<5>w_TU*0m2n>elH8MS5nkH=9 z<`$ml{dGtHAeYPG?CcCLFE8+YA3HlcczSvgatH-Tk_1Wxe)|qyVcOo_j;~^#=V3S; zA`C-J1O+y;8fKMc0NkwTc^(u+Nv-wx?;8cYuK8IadAPj11b}!C0Kh-(=tw57W|H)hleS*pVP2ft)f<|{S^82^)-gWAy!vc rQ)7R9z6Fr_Gs?vRev0{h$N|7N8%Wq4FzjF<00000NkvXXu0mjfG{3rZ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/deny-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/deny-unshaded.png deleted file mode 100644 index a7405a3f50dd0481fc021da6b1fd2359b709c788..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1871 zcmZuxX;_n27QSH%2qdxy6~O?55oD3EVAA-I#DNGQzyw7hASEhcYbDZQQGo!C1%(c> z2y_fciYyf@MX(8iX$VeOY7vDhU<_NT6hcY_Nmvr-hjyGlbD!s)^W)s*J?Fgdxk?T4 zHQr{m4FF(F_VYOk`7UU4^z|Sc?sz5=0JsI&=WxjRN_o}YM6sVaiD{viW!pULanGkc(>*0a zhZ@KM2k;>t%yFas3)i7vw$@jQ`u3@)+4$ioEp z-Ss!Q{n3#E-!i1YSRr0Q@l%P`y>qFZ`?+O$hjky{irbS_&N!7N0y^m~#$aS+$YYti zm)zQB8&`@#RMSDb-L=m$Dzg5?*YMxoH}R+B`s^CIKEdFGY9{de$fgY1>-BzOdM{IC z+&nUXJcO%GpG&SQB$(2yLo5FhBJ4oTi5>xlcj5NcGbfoZ7gWwwU!`oSScKmMo%mvO zMM>@Y=jAzzF0H{N0qFs7q^u5IO@4d)2IASQf5oDz(~f*xfsyh2&LOA)%grhSxnPi+ z>A%8OMof#Wi6!RCFT*o`#}MVlDT4E&v|%}Er9^yre!1mM>c`XvW8J%JHm;2)KFQG&zb zJ+`4l4o2?@v}HMw3Kme;YsRHdEMyO*JbA1a_&Vklz@}rLk3D?jHVDz`g(e!f5B%iZ z-8{be^3??*CBAh8xjMMJkoUr(AJA{`X=VX>33{r{@es7*8c%}g19U4b5a126rs`1c=mTaFueVLXY_%)F$~ndc}~T9Srf?Ys4p5j(7&wO$Zqy> zHFo7y$80tjGe>!XKDLUWdc1Y{Jf<7590O;m8SXma(@5d=Z!0scwTfX1Df~lf*puf8 zfHlk-M`lmltInJ1@_2v(f_TDC5U`XG$)RSZ-u@9@p^#40RU3i&3!d8Z9r!~mb>JG5 z(tpwaiENCm(vkKG49jD()$*BE0qQ`;#=}juQBIc!)UciiB6az~e50YgLi)XU(3)=W zE*ia6R^fCzyY-qV_>EZkv4P$&)y4`!;B5;HHb5zl{=A5GjSBYJZ*$ex)m0n^$!`2^zRyNWkp-5{o*g>2TPU?GXrnZ3pXb1G)k)S1(XP#;6Q3em{Ll6^ zI$`te2N!-+pN=;Qh1ZYjqe~4~VTKEYpEF@@ugZ5gr=%q1Gn}~3fC3}s^%X3G=8^se z$>W)uI7tPGB1sbcHDSlrK+MI!9Vz$i7JD7YHQ2&u6CC`Z4dsgKv@X$XdF&0Zmsvb{ zoP(3KNtx9Xrc<86+&M_vfmpD(JSMRWp0T_npb6|A*cFM^6f0+?y4ml%S*1=yBl6nB zLE$Iabz1>%2E;>1n0DYD&$kBC9j^Tyg^Rx&nz>nB_Zo4@!_GB#)?K@uOTIAQ#kn_r zWAZGVC}9=c+ov6-%F`l-^Y`h%TJR9rp-SqlqQJ4wt?H9xt6Oy?lY)Gj|3<&`2ac10 A6#xJL diff --git a/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/meta.json deleted file mode 100644 index 01399c435f..0000000000 --- a/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/meta.json +++ /dev/null @@ -1,122 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", - "states": [ - { - "name": "broken" - }, - { - "name": "deny-unshaded", - "delays": [ - [ - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.1, - 0.05, - 0.1, - 0.05, - 0.1, - 0.05, - 0.1, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05 - ] - ] - }, - { - "name": "normal-unshaded", - "delays": [ - [ - 2.0, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 2.0, - 0.05, - 0.05, - 2.0, - 0.05, - 0.05, - 0.05, - 2.0, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 2.0, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.5, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 1.0, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05 - ] - ] - }, - { - "name": "off" - } - ] -} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/normal-unshaded.png deleted file mode 100644 index a38fb3626cdd1e40be99caea022842aa4a5ef644..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21655 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/off.png new file mode 100644 index 0000000000000000000000000000000000000000..81220a8f6659c7d862ef5ffd93085ba608101468 GIT binary patch literal 407 zcmV;I0cie-P)G8x~7Ik1_vV>>}H_> zylH@3KuX%7NjZQX0{Fma2#kinXb23?5O6TEp>ha(Vj!t9Laqm>=KyM|BgFy2r$tCN zm6{GTD@E@bvU_NvA($#wnr(!Xc+! zxY-SW0LU@E^H5*bg578Khv|+_lg$sW*?jCvdBeJOdWZj3DYB`nt4B%rOPnz=`)6-p h#&6~hvQUMA!DX(Lkd@zrT|fshc)I$ztaD0e0svz&KxzO0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/meta.json index 4ea385ba22..9b8b70a6f4 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/meta.json @@ -1,75 +1,75 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded" }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", - "states": [ - { - "name": "normal-unshaded" - }, - { - "name": "broken" - }, - { - "name": "deny-unshaded", - "delays": [ - [ - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "hellfire", - "delays": [ - [ - 0.25, - 0.25, - 0.25 - ] - ] - }, - { - "name": "off" - }, - { - "name": "panel" - }, - { - "name": "screen", - "delays": [ - [ - 0.6, - 0.6, - 0.6, - 0.6 - ] - ] - }, - { - "name": "eject-unshaded", - "delays": [ - [ - 0.2, - 0.2, - 0.6, - 0.3, - 0.3, - 0.3, - 0.3, - 0.3, - 0.3, - 0.2, - 0.2, - 0.2, - 0.2, - 0.8 - ] - ] - } - ] + { + "name": "broken" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "hellfire", + "delays": [ + [ + 0.25, + 0.25, + 0.25 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "screen", + "delays": [ + [ + 0.6, + 0.6, + 0.6, + 0.6 + ] + ] + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.2, + 0.2, + 0.6, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3, + 0.3, + 0.2, + 0.2, + 0.2, + 0.2, + 0.8 + ] + ] + } + ] } diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/meta.json index dd08f20d21..e6c88899b0 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/meta.json @@ -1,50 +1,48 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded" }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", - "states": [ - { - "name": "broken", - - }, - { - "name": "normal", - - }, - { - "name": "eject-unshaded", - "delays": [ - [ - 0.5, - 0.1, - 1.0, - 0.1, - 0.1 - ] - ] - }, - { - "name": "deny-unshaded", - "delays": [ - [ - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "normal-unshaded" - }, - { - "name": "panel" - }, - { - "name": "off" - } - ] + { + "name": "broken" + }, + { + "name": "normal" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.5, + 0.1, + 1.0, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + } + ] } diff --git a/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/meta.json index a1a4cfba89..64d7c7e94a 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/meta.json @@ -1,37 +1,37 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", - "states": [ - { - "name": "broken" - }, - { - "name": "eject-unshaded", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "normal-unshaded" - }, - { - "name": "off" - } - ] + { + "name": "eject-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "normal-unshaded" + }, + { + "name": "off" + } + ] } diff --git a/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/meta.json index e1731ae274..bba22b2d83 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/meta.json @@ -1,27 +1,27 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/a7290010020e541ed6b57817a07023ca6bef26fe", - "states": [ - { - "name": "broken" - }, - { - "name": "normal-unshaded", - "delays": [ - [ - 4.0, - 0.1, - 0.6 - ] - ] - }, - { - "name": "off" - } - ] + { + "name": "normal-unshaded", + "delays": [ + [ + 4, + 0.1, + 0.6 + ] + ] + }, + { + "name": "off" + } + ] } diff --git a/Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/broken.png deleted file mode 100644 index d54cdcf9eb00c4be2b50b1e7cfb3fc6d579aea3e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1208 zcmV;p1V{UcP)aS*c*I>zX;Wj>m>!2%!5xq+S*l7Ig1wgb?G{GXZ+pvTYkFB|?Z4BbP3o=g-~0 zc=hU4DrTmC!qV9@6N64`uNzGRvfl;(0L+~^{oX;ZUAsoTUT44ALP}}a7z;ot1;F}m zn})&!`7jOi>p^SH6~6(%+KZnle)<&@ZHTkuc-{ic*Mmy1N8$;4q8^0wOr;Kb}K*=*JT3xa?k44KL2CxS=;=shyE)&yaQ z>$*6OgOke{5K>CIuFKm_7mdck;?$`ON-4rH8^~ zL{Vgbe|ED2x{-ei(xk7HEw|8zGN65eFDZ^6PpY`FtMBf}_q`q?BxJZLzqxX#7r|Jjv$f z=J7jV9WO%1C7sP=h$3nHCtk@CHM^e2;o(uN13$p?e590YZ*Q}+vxC+erBtdCqWIc< zyoyA?G4%;!69FXD&(6#Mkarx=;0FPf@)Cs;CvZKFD2j-pD9)`;#>NZ?%R(Hl-f?mS zVTf(pBkvhQ8FE=ucI7aHu0jfE8l7lMp!BY-f9I6Uf@%kAH< z_unlAjs2EUZST!E`47X;e1HICRW|i0HtK_>boLC5{nkMHfalq{(+D9rSDFLhTxkv= z1Q*Viux*lnG6@smyBOBUI@XBk3Yb+Z5sP6wzszjDEJ4@ WjK7pmuuO;m00004A$D@+TDJ5EKgb)#9mzS5p zn$`~H_If=48;6KIlu9KV-i?%Uoc96)VQ(p=&{`vx{3lNM$0LB;qK7Tn5Tg+suJoL^7^!tiYVM{E)d`S_da) zWo3m*r80J&UtcByOcK|1+1%U&uEOHF?o@NbCngbKRIeWgnAV_g6t3=UKp%c$m2DJFQ}nHRG7bwl#+$wd@xZ6!Qw&zAq2%j9;Fn;LLMn)pznVV p>q#luez1vB3a`<^b=@Hs{089ut8gXB`iKAk002ovPDHLkV1gsAeVYIP diff --git a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/meta.json index ad6128228b..d57f4ec0c9 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/meta.json @@ -1,46 +1,46 @@ { - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", - "states": [ - { - "name": "broken" - }, - { - "name": "deny-unshaded", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "eject-unshaded", - "delays": [ - [ - 0.1, - 0.4, - 0.1 - ] - ] - }, - { - "name": "normal-unshaded" - }, - { - "name": "off" - }, - { - "name": "panel" - } - ], - "version": 1 + { + "name": "deny-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.1, + 0.4, + 0.1 + ] + ] + }, + { + "name": "normal-unshaded" + }, + { + "name": "off" + }, + { + "name": "panel" + } + ] } diff --git a/Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/broken.png deleted file mode 100644 index d75949c270bf67c4ccc77ca1af2363c2c71a6de2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 573 zcmV-D0>b@?P)1pw6n!mervyqdl!6ysAihFTmyW%FhD<$^r$6Wd9Xkoyp}TScFM(1B!Nl1*q)QYO zOO_Pdc_2unZ@s6d?{Db}9Vm)o-!(P_TI;K5(1H9SEz7c#g*j?2wQ>N^S|iIctk>&q z7rIu@IZs+4=iD1>=50H0J?08I=KuhuRPr;U3Ft#Us(?P^05C}jA|gmBK}6nhDJ6su zCjzL<@%V6qpWi<$-d4i|NGVgoP7oqJOMuzi5QGqp$W#Y{Ibg_z5CFnXm>Bci;%$YO z*DC5nGzrbVriidXWsZ+`1}gJm0_?<#i6A0y&Y_e_cEEwDSfR?-RqgD4D)arvJKIy4 zpI-^viD$b&M8|Eh``h`_c3`{Rp67sRL=^mO_t~zr9bk-k9dKX*Z6eb`wBjCwDK!FMn8UJ|3l;!MnDGc--(y_Eg~qvN`iCTc^N00000 LNkvXXu0mjfzy1i7 diff --git a/Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/meta.json deleted file mode 100644 index 19725837ef..0000000000 --- a/Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/meta.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/a7290010020e541ed6b57817a07023ca6bef26fe", - "states": [ - { - "name": "broken" - }, - { - "name": "normal-unshaded", - "delays": [ - [ - 2.0, - 0.1, - 0.2, - 0.1 - ] - ] - }, - { - "name": "off" - } - ] -} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/normal-unshaded.png deleted file mode 100644 index abd7aa091a4614878f35649e9db5f1ecefa5d2c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=KRsO>Ln`LHy=BPPS( z`$G#gj!a(B+WtuIi-}rtt6@r_yg^&T|LHSwVh+7A2tL@tz;NKcm8N)UZ2GBE*T9;0 z;o%qa`pshW4e!ifE0XSW*(B)CCY|)-|8FvX*z$yN#ktS@i&w7B_{J3$9%%I^?BmOZ zpT{rCEMmTLiode7DeC7!)wvJy^ko$cjf1c4y~@bG&pI*d?*EwP=ab}be_!RG_j6IA`=>Mc1uilM z&pyMxX2W#82?p{88`JC(KFl|N#?17Y5v)8vKje-2dS#!f%^bY*FO|Wz!-tNWpJ0Ib#2L#>T^2O z4-SlUy7%r7KHUlqaL!xT-V`XMR$iwI`7Fj5`;pi{&0LuSfKm#KF;rFc#hbVsslhq7 zuHTU}MPdO)IUXO@_&A**p5CVk_zlKLZz5o+07(TxFJIqZ2tiYU z?yZhRXaxqaH6kfx(D&8)=K-`uQCORiSAdV)xnJh(^RZ}Una2sZI*w)LBcD`(t^jYA zmVNRHP?<}>pEsjL!2c0ojIpkJo001=Ifj@=?LdG{X_}^}wZ{E+>kZg6O)$Atz!+++ zy*`^HuEPg;*IHw@KLiDQdwro7ut}2Wz+?jEn3B4<>3^U<7Xp^y^x{Z5pk`SHW6XdY a06qad!6t~!La{sm0000-GUBrO$(__@l6+je>4xe8jjV0a0uaW*p$3s7ziO+8nvI$Fbq^xrBbONgm6S8QCMZ6{{n?V z!Qr#RZE!ZfajJ0A1JXHJ;SQcru5s>()1)N?5?;Uf;zRoFD1n z?3u<+?c}%uRaG5}=FS>Q*C_F1&XP;=R9&OQZ`Q7(RI0ALUiEY5)hk|>j{(5zuFRb^ z&yD8J8thd0%hNTT6ElDE$!35DTL%2n8bH%h=lA>Z`~94ajk0w8iY3c$>G~Bu+b&uo zc;`Ud02*cML1x+F=Tiwjz5hD^xv@CIKP-|QrO&q2^<>15>GA)WjgHYrj(@QzSZ0PY;9 zyxe7KY6{adtzy!M-{0Q{;E&xCZ8>fU;Pa0kF|vI3NXG26e(4-6x7PFg4c9N7gW%zK zT<2}>cL0!o!N~Gm*ydOuq;s}uD}tU65(&b7k{dsEH#M~JY@?xb`L6J)GYt!om$7Ix zN+c3taBz@FB*M_p5YcGV0op5aGO{fJG; zU_vcx?X8u)QL(>*Wdma8-AN}KlWPOxbpYy;a7Me05Q4c!-viY~MNt$Ig;f+qVK%>l ss;bQ9R}ey2`f}Z_C+(=J>ggQdFUr{98JSIzN(y*)nXf^4p9 zeErs=0l(i5Ks>9mJz*ZcpG&_C-wOX@27u%6E8Fy z(*Yp_k%JuNH%S;vv%0(k!247T+Cz5}PCH;}^GnDp3oqURuwSYha^a}Y5D!OvR7wRU zRvMJkM_xA88Z3T4vu%UrhER0W(M?z>6&&A$j}uZNy|`Nwz1H_c s(iib=$sSa^uO{3X=$5Rn;x6tBmj=ZdKPGS?-T(jq07*qoM6N<$f?Vz5hX4Qo diff --git a/Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/off.png deleted file mode 100644 index dc0b3e84af51c3852a511332efa8e84454fcc2b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 913 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 diff --git a/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/meta.json deleted file mode 100644 index 6bacc6bc49..0000000000 --- a/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/meta.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/a7290010020e541ed6b57817a07023ca6bef26fe", - "states": [ - { - "name": "broken" - }, - { - "name": "deny-unshaded", - "delays": [ - [ - 0.1, - 0.1 - ] - ] - }, - { - "name": "normal-unshaded" - }, - { - "name": "off" - } - ] -} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/normal-unshaded.png deleted file mode 100644 index a711db836598a76f5eed6fd9493a0af54a27f97a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 370 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 diff --git a/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/deny-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/deny-unshaded.png deleted file mode 100644 index 4918d9f5f9ed51491c214ac60707ed6838fd5eaa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1090 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 diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/meta.json index 53ea80e9ac..c9c6f67855 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/meta.json @@ -1,47 +1,47 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/a7290010020e541ed6b57817a07023ca6bef26fe", - "states": [ - { - "name": "broken" - }, - { - "name": "broken-unshaded", - "delays": [ - [ - 1.0, - 0.05, - 0.1, - 0.02 - ] - ] - }, - { - "name": "normal-unshaded", - "delays": [ - [ - 0.2, - 0.1, - 0.2, - 0.1, - 0.2, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "off" - } - ] + { + "name": "broken-unshaded", + "delays": [ + [ + 1, + 0.05, + 0.1, + 0.02 + ] + ] + }, + { + "name": "normal-unshaded", + "delays": [ + [ + 0.2, + 0.1, + 0.2, + 0.1, + 0.2, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off" + } + ] } diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/broken.png index ddbc85cc3ad04284f6b5a05ced9eaf3e96cad11b..922173d72622e28c56e4791e775fea04f016d515 100644 GIT binary patch delta 1239 zcmV;|1StFA2sEV0WAG;fV4vyYVrI z1(FfjA{~a{A4U=h(M6fE1Za?GqA?+p#SLc=V9k3_vhAob<(# zj$wqbvf7W^4NDF-VJh{L*R3ZrOV8kqOT6^PyG+f}A_zK;J3eRe)6c}@d#_#wDn{4D zmUIk5MuSSebayS<8M#<2;h52AWL4#6Y%AyEx!A=(aDNhI%gQ--p(_TXrltm~)k;lG zO;Q14Rv^8)35~Cpz+pS-)lC3oW@zcZa}Pt$1)8sAa%UuskwB1Bzh7s{l*uvq_4W1C z*VhB#Pm_`WjjxyXopvl1Xlcw-_dC7akq4QjL1Q%HrV1G9JO3{L1S`K{@gR$@9PjNb(eAu`z zbpa7;-)UFL0d8rs>F*z;udk15?pB&U*u~=`>p0Q!9n)r8Vsb0WS0jodwzU-#7ZBYC z0OhM!F?)7CB_$>5<8if8yr78e(5;xWjw7wevW(+MYw7|*MguL4c?1sIIaRifK=(}m z`hOLLMTL)H$~R%R+W{z?b(YUwe4BT6^~7M<)>izp3T$xhK)b$Hy@&uhFI~lbXCfUlcj?(#}HuAbrL z4fn6($P|d8n7ROsub0Zk@DzlM2DJhUSAW2G;%(-w}n&$D6kRt|m9%z)p|#@Dt(Xb=Fa)f$K6 zbUMc`Ai4>oKf#$}-!Qqff*)KzV$2RQ90;IGPsj4?3+P74fiW+iaS4EM6EZ4VTYsF3 z+a10K20|gk!kHZUXgApgk=}kkf4a|eVDC}t>goXScszK$UKOjLpdjIA7_$fVY|T)A z%_K?UH&-4xIXMj9o5b0U4(jUaFq_R(lr2M&BnF4>S3nR1Y&M(fkNb}(Vtck`;PH6W zL`6}c=qEkBYyw^b5ch_0Itp)=>Px(8%ab#R9J<@m(PnMMHI(B5kb_zrn8{a zm_x%jBJIGCu$#kf_Oh^-Fl56Xy&0K5Ac`js9{d9`CtYSR-aHPOnI#v&Q$PrkW@L!& z41qpm?MWcr8Occx?P08%s!nyrU*H#-H1)dbed}AV-h0VlKz}xyjcwaDnQlZ71S}Sd z48X?5Mx167c**44bzO?ZB9>+StzQ7!w#jC*aW5owGzA>T(PT40#E96b3F7zwj*pMAEK8eTtybmy)EF2Jhw|NZ zUF}`9!PWg%A-<2INVBO#1T+GwthR0QR$-kt-ptc|c7L=)B-pd%rDhaeNh0Yin!d^Lg!h_j*0)PiDf!Vv#YC zID0;#z29cLR_D&$3U6<`Cx64)jOip?avp{u0L^Aoj=8QYRa5;)0_Ac!RwY(3pGUO! z+cb6>d87rQ z8UyO@N&?AFMaAzg&g3J4P}~5}0~M|nI2oO?wZ6&2+M`qgG7%*^6@g?BhO?P`|Dpdq zjenhnOh(g*9(d8^oQJhXe0TJ1DuJbzOh6=!=_DlgOTgLl5!{5Xyo3?Svi2k=^mCjid%4Af21eQynuc-tBg8bPg+GV3kAP_wjw7VzDS& zZs8~h0xZii%56$;sRYDgK@iAhLfnd^B0_rg2u#j}?fm>)jxS}uw1o6;A)F`wA4aAs z@ZtL(@Xpq|oSpm(z*paVjcwaE1|(cJqhgKS-CgNC31j~MuT>Do1FLJ!|AIdNQJ5uU TIa2tW00000NkvXXu0mjfVu=;t diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/deny-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/deny-unshaded.png index 88a96e1504566d5b9395ee6debf5498d3a36e0e4..afb46c2facea2c82b06bf33f16de3ca646c8db1a 100644 GIT binary patch literal 4470 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 literal 898 zcmV-|1AY97P)2#L6o!9q%+|qdwZ4FFAaEB$+MvRuPLT_wSXiGxffTtwiqye{aBJ{(2Hn6HSXUvq z4mR4t`;^gmB+b|(5rzK)GuBAauQzYr=qY{z2qA~WO|i}>ztfO&tN?FY<`dX4VW4Q|q>;41ZY z#Q?%^c;Ez+Gkofc-HVrnwG(XgE0-W$Y~Ekv^6$^Wi}1Y!=@B5r@e<>tmu-tP>R5tI z_6zzl?0pH+2U!MR7jH5GRK!7bMu2Xw$$k?y`cC%%b?E`}HzZRu{Fwaioa4E3o6Jt0 zmHGgO;V`#tiWFb^rW>!#GGwD~6#?oXo5D}-4?0i5Rr(s;pELv2ftT-byaa$;He`wb zANn%L(vGf2#(onv`jrk4k$HceeabFWB@Bn?PF4rA)fE|J$$;d1WhtpIeSNuEyetm- zi=1GiZ{+~s!}C=asv?<+%-Ca)ftMLB8IYV)T2lo0(ASqAbsVaeAsceLTjm65)ojRj79?4ZDe|RX%?e%Z?^Yd<^FHz^*Sx>3jEqx} z!Hwf3#^~+0lNAu`XMGqAu?_df*70CAx*lPNyzPSY?@lub!UGZ&yWnq>sp0z=KyQn%D0Fbz-9Fi-9?dP}4O2mEX3w7A<6agYq)ataMKHr5p z?01d;(>q&DL_kq}e$x@)+kWc^(BH*UOT^Vyr49A@w$x?6l><}{ORK&lp|&b*sL!{d zPWzoAKowC>T9gg6p+4W1y6m^U2TX%EjQ`i?>x`2gq>f+ZHkoy9lbNlAk$HcO%STk! z=bP}MFVtnfl>@fX03m>F2!y8n(x0@iKHr8q?XPq|(@(oPpW&&O5JCtcgb+dqA>@nj Y4^o;5_ZC6h#{d8T07*qoM6N<$fcA(6c-U3$E z9uDl^_dES}{p7hq2=C92ciwho*^}iYl`pLTrAer0V*`)NF^USH&R3cQ8#gP%*TDLR zI^O^K{b=8ByRz&FAwpFEb-uI$9H)&pAJ=^En*e}%?KJ?va@wQ)iF0=jFLBi z`^RZnR3iCG6)>y4tyR4Je2TrTRmzx9`O<~Zw4qTigsAgpngr{$6KrgL8g2)Ip2@SK z&R3cP{Lk6JGkJ1hLM7>Z#u8>2hSEf+dfcSI88e^Hd!}h3m&-{9>U28j^?Gn!H?pTd z9QlEhplOI{Q=ap?+;*%k?(CS7*g``5*(1%fIE04Ccc5r|(_d+L(VbH-QF6`NS z_hwG+J@>n3zVD)e1{!GKUxP8be>faI@_Qzefyd*avGO9M@_$c*42cou@V#2h3V1y| zquLJ4Hv!o8Bf*0kLrhIXAPxipMB>KlnHF$b=zv2M=s1}x=jeA5^PmT{Bh=;2% zEr7u1^PvJBlE5Msi{XpXj$4)rW`5xX7bV8;_XANdp?V2u=Q(^{m$AOK48GTeb%ljX z6tU3B!!DO}Tz_)+cOx<2VH^n6$pdfWi|G2c3I~Ac=rsD=BIagi(d8DQDhe(*2Q+RZ zG6)RD>w5*g=R9EBEXc2H;^y#0diTydUFb+{!P4BUCu^GQo{^YP#W(}U^1x-^HJs^lLy{yaqIoxgXHPaDU9aeP1Byg5 z5acC84}X{zKs>OG3OGwEHVOr7D=dbudhl|xfcb@jj!RBX%JQ2JQPpTY)6Gb__gH1v zy;Ntv?%jP2qz>Ho4`{uB!0YuQolYYV2pqcJu{_YN~CNAR4#WRyPd*0000{^2;C~=GxP%p z-7Gi=bu07(6dWCdLW2nDM{qidi$jJMTSW9$Cy9fkN!qkYqaeclAiQ_U-Fuh!?*5=q zC=`Fp#;T9!7oEVi&D_C+@VUA?TN!hn%{-Ib{vcri?5dR*7k{OcC%JBzsTRKfdKps6 zVCq?1-@eoCeWX?NlGcCxx_()B00000NkvXX Hu0mjfSI4bP diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/off.png index 76624816878dad2e36b3e8426b82b4d5e4b10bd6..7a8fc64b097144cfdb840453493b408217a9201e 100644 GIT binary patch delta 1106 zcmV-Y1g-mu2IdHmBYy-fNklUi_n&rfKK$cHX?1@Au7{dHdi$7EhxxFfdSk6QDagJAV$YaNamQJZ)t5i2y*rAE0nlXc;8n4|D|S)~_XjivYbYKkubbUZb?kz~JEE8zb=l>w@v| zaWqXM7K>dfcqWrU*L5^aV|{&{L?Ypgx~{XavEf?ZL_pItbX~s`IN*Tmy3TI)57*dA znh4Yb+*vL+Er0%D>}zH>-$H7bGXd#z1el+ha$?xF1%Pc^Z8z4o4eNlDvwLiB!}UjN zyfeB-U^_-Ir~*(d+gy_c=i75)y8P3>`~*y#j;*CFfofmW0Ux=yh%_8#XsBij232eX zqN104KF_PFk856=-4l0=xw$#U#>P7Bv2zB**)=@5Jb&in1;p94+MFbCY@T46M+kle zv+6++MGQ$mF1ebDrKKg7mX-imUS95wfG3w{>+S+WL-1rJ;>wTErC7F+`xL}t1%JTb z3?PV3F@JVN0Gf-iF0YDZ)GIOvMiEJtDf?`CRRKF^yZk?&{ft;FMkbSKi_!L9;K}8g zoZUmZwaE2HYe@aI42Y6|q=*>B@~JKoLg2Upwq0?>c<}v0lF20Bt~}_TKwY-(E;!%- zM};GfizVzz1-nwATsr39w*sDnQd6oYKKU3;(|<_Zn7BNF#yS9yWra{krMI`2P)Nn= z6`k>X4Xi(XhOXN^3%fP3}FOY66)-Ixk8mMC9^ZKwXlas24aJZLD*5c)!`}(eDpney$lCHbp zsDE(83tj+FDp@Fs$Zi%u;;`T*Q11dw)4C_%$>o_`sdYiMFY07KmK7qR$gv>M)6?Vf z@p1N?&~+WdFi53R0H~_k9f3w^>;iz2Z4s=(p(qfEM#*Ng_E3c)aB?bgY5I}nh>8&02{NEDD<#Ob5xeKxHBo~eG Y7k|9w*po8P_y7O^07*qoM6N<$f<>b#?*IS* delta 755 zcmVPx%#7RU!R9J=WS21teKotIHg9t6EY*!6f zWk8BVlUpJdmNHeXDtYJ+=vMVduqBYqe}SKofhAJZMpgz7k-DH3DUyd!1A`3>B7v%+ z1G?jEpTQ(pUHVDZJ>Q-0d++n}yK@2pWHOnVs;Z))2f?;&jDJR>1mE{qL{137{{B8D zlgUQgWHO22a9Ep8r*+Dg@HXzXMy;D3{AKYUlI$ z*a$7lVqB(aCbsy&LZN_Wvl$yX0JK^yXqpDgvH)-jh$h|_gpkN{Jr3~FtE!5Z`CaT} zmB@?rdk#9+SAPHi*L4HqvMe*6fC9@RZvVJK@zpMC0U(#l;{59cyZ6Jk?NA2{!(e=& zuYf0)Bw5%3^QirBoOz$F>o_|(#g|J1liNGt`YRm(fWg3pB*_>I7P3l`%r)g3-EJ4vYIWt>o;o0U4U#0Yg?XDt@7K_C&nxi$^?zHW(%YVKo`)$w2tlP%L8H;| zOpcU4kH?ljFVirjM>(oZ{J0}BOG>22t`9#DYC%2M3# zIY>Qu%C3ITLBHqV{9+9AX6&&k6lJd3ajlNClT#em>S4>ryB8eRj_~HgI~>-ILg#qC zg0NcfyMNOT^zq3kN=yKl+}^GH67H3RqQV4tYl5a}f#+!T6FLwUeZS{;zH?d={DmnB znFvb@(awu!0Du92V$R#=Zz($0;Q@&@sZa-GS&kfq|2bg3neqEU*eN?S38}r#@thJ8 zLQpD|P%4!?<4bdZR;NrR!%jwo5V)?(qFM&mb!eW4h=JunJ2HQIyCZ zG9Or?fU2rY&UKDw>;BRO{*3q>hztB~7^=YMkDpLH*hBls%qqfv~63s lh93b1fOu8#{~iBx`~`z3V~tJ9=bHck002ovPDHLkV1jvVZ4dwe diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/panel.png b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/panel.png index c568b18e2173089dd63af97b1345466b4d54cbd7..5e88a32c0cd5c58e3898065bb8cfb73591cf168b 100644 GIT binary patch delta 184 zcmcb{bcJz(O8sn47srr_ImrnUtcw#wdYS?axZDnENW5&A7{=y5&*tZ!r>Cd$Ce--) z`nDZ9yty>joA%=AVt)`7)0;58vY=} zIhfsN_J`?>K#&-o%zk*y=3^08H(WSX6dQY&`}^zjQic|mlE!Opx@bp#Xqb8I*njo| iw;W$|fE>Z7$iR@Uqtt!>=T>tDAnE-3wy344tI7X6fuI{+mQ_vhLj+kM>JcNccHuIvMDYv?%wi_rm*d z+`Zs%I2`|xFbqX0C97n&sxAhIqKIbF1fUvfs+x}|x) zYJsBsD9L%++2%7i{W-Z`k3hlQut7e#B3|48FfYl~CXi3AY3yH+90UN|KCf9|{&3<= z2OT+lTi}n&Ybt+)1=IJA9G_+QW1s9iE6vq*1G{@4UYe!?@cQ@yBg9@>udY7edk5k; zUjBKlwP>vcpfo*duQW`R2q>k*7*l`YZvsjwDHd@f0vjoII2?{Y%@^6ZPp*&)OM3tS N002ovPDHLkV1f_Rj_m*d diff --git a/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/meta.json index 8a9cc9ce4c..cafccdfabf 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/meta.json @@ -1,37 +1,37 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "broken" }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/a7290010020e541ed6b57817a07023ca6bef26fe", - "states": [ - { - "name": "broken" - }, - { - "name": "eject-unshaded", - "delays": [ - [ - 0.1, - 0.2, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 1.0, - 0.1, - 0.1 - ] - ] - }, - { - "name": "normal-unshaded" - }, - { - "name": "off" - } - ] + { + "name": "eject-unshaded", + "delays": [ + [ + 0.1, + 0.2, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "normal-unshaded" + }, + { + "name": "off" + } + ] } diff --git a/Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/broken.png deleted file mode 100644 index 95475da791c76a57fdd7459304fa71883b4b7240..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 626 zcmV-&0*(ENP)!VMeUz;{TBuvV`dNLUyakRmbQ z6l)R`MT(THeE=a+Gvv%X4u2bXkmvc$Cwl~SU2lR)cjK>82qA;OM&7(u>1gF49d6s2pnnu^NEE_oX=ieu65=%u#KxI&B%+QK-;#?{)({>1Cvu=8doqQ2QZMCP}v_^1x^QinQa?)$rM!N z>U+6d;vKLZY1>v)O)1rFRVbySzOf99u-onQ(aAZ#an1*Ac#c_@%>1XuwU6Uq4lKn( zIRF4vRiUaX054Oa>Plwn*ll2(1G60f0LIvW1s5ZXv4KprV==iAsc58>kWvmYTF=uq4!RIm%l>>l#?JK>hwr@}I!d!-H6txuZ%Wt#{gU7M&GC2j;rS^0>Idw-< z(D(gFDNR%Sy(p0e}DcIr=Ar03q%j zG0K6bBykSB27(UQ3AHvBy$hDYeis6c$LU>h)d%W!yG7skBjW(@AFWtdA4_eAiU0rr M07*qoM6N<$g3LJ(IsgCw diff --git a/Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/meta.json deleted file mode 100644 index f6b8ff02d1..0000000000 --- a/Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/meta.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/a7290010020e541ed6b57817a07023ca6bef26fe", - "states": [ - { - "name": "broken" - }, - { - "name": "normal-unshaded", - "delays": [ - [ - 3.0, - 0.2, - 0.3, - 0.1 - ] - ] - }, - { - "name": "off" - } - ] -} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/normal-unshaded.png deleted file mode 100644 index 1ad15d7ffad8e93cc43e61ab374e790c13752d64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=4?SHRLn`LHy=BXF*np=kacRlN z)IHDsEe?x6w%D4*x!`ZRwTag~b}N&K+|#B8y-;UjVE7Pl`;=0s@7CA9_vzQ(v)>yo zUiE(ex|La*uC=^mo3dQaNnm1?vd+w`hE>b1xjAzzoBcsb^oyB(k&nYXw(d6G8HqbN zgZmq=*#+rtQ`;WPvV4uLxAa#PB<0r!>#wW}t e*nz6MgQqI0Q{dLG807MS9MGg%D6i+7t_j7=KwDrO1;k zu>F{MGk6U4AVHEO7unn`sH)1-l1ArF8X@FIU@JAQA_st~sz3+8%ZPg;NfP1s z-R_<&@h`xcfb)sq@^!sh!Bq)PcKI?CR)G$Ao(spbESvAoCxX{EhL>l8qGVEAn_oc` zMXR>Ok$^nUrH<;l7S0tVLs0^NIs@8QpmGjeGcaXi z3DYXrvQcCIEras1KmSa3;$-}J~ zNYfN)nkohJ^Ey5cr2tAPD5cWA?3rBzh@#(;k<9{3qMdlEzBOEx;kfwhKgY74Nfm5< zYF7gKzF(1oAVAZ$xIZ4X28UrVb}kg4LesWd&cV0)ycn^Yw#CEalaayCkN5or9DLu} z@NNQJoRXIK)pG%VE(8RJ(~-FA0W}Om^nJf_4glZIr6!sEv+8gF0000xo;!WW=ZxMrh6xKWW5=~UBvNG|g(%=-v6JEJ~>rn8)U`A_st`X+SB3 zl(P4mgbe3^F$MrA%Q9$_W!a$o%Pdb3#GJQk^=Sf}a}YwHl z(NQdf0ATlfS(ado^*X?w3#Qz};c%Fj0U?AJl@P*pbTG Z@DKdKjPjxyyx;%;002ovPDHLkV1g0`FfsrD diff --git a/Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/meta.json deleted file mode 100644 index 365a54db4e..0000000000 --- a/Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/meta.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/a7290010020e541ed6b57817a07023ca6bef26fe", - "states": [ - { - "name": "broken" - }, - { - "name": "normal-unshaded", - "delays": [ - [ - 1.9, - 0.1, - 0.2, - 0.05 - ] - ] - }, - { - "name": "off" - } - ] -} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/normal-unshaded.png deleted file mode 100644 index 5229d2b9e8b7365e45242ff3366c49f1e3c77424..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 337 zcmV-X0j~auP)$a%Et{v%gjM&6XADO^|9qf4ad|9}97O(!NTOGZEu006e7JwaxcTQM=l zuJ2londOvHPATQ%IDWRTpPnMk=xZc6=OuHjsusY^atJ}(T|`7wRaF0uba$5!Lf4}* zo5x7-b|YX1)dIvA^)>uk+hl}gC=V-tBe{P*puA(|ZU1d)~WLC&BZ@kKEboc{3NGcwu+Xeys?1 z$7fC+00000fKAaK&_aK}$zuO^cA-CDBzU_Kumk!7S^@M2e7NlkK!3pQ=nuF(kwF{dIxbOl}3e}n=Dbi~KFF+Uv%Vhwkh-patiIk~S zd4M2^ygR---r>jvEXecxYMXlmZQCwJg>H+_@-W5*j%jS>@*Du#wgqDhLWujiiA^vz z@;o<=KSf_D5dQ>>IiR8}%TXE5`QU%IVJP1P_?Drng;md31^px}%MxjtjuIdujf7&? zSOv3f!EVEF{r-Ks;3OcuCnBd2B0`#`gRQD+fkgsm_(usm0^bODCE*lQwLnz^zylHB zoR5ZILQTRbIUq^+K$TN-;Cwz$BQO<{bHK(l6j5@Z4w?wm=b}aCJ)^j@G=0AMJ?n_$!n i>UzCK*LB+B0Pq7@DWP)#t-C<0z!2bCMHJBCEBQ5Wp&N{fvYY32gc^A>n=G93ga0o zi!&7Dt^hWuoi67`RCYaZQ7>5Fj61^&yNkppnK181=6&{^cV1>RD3HlyhAP`EU|E(1 z07q28Z(Y9x!$@-aIEiwy=4zn>KiYi4$q`j>0I=-?*!BSnuDKdFrU`zpa*fk*8K7ye zZtsL%JP1}ROX%U3ng9TZsi$8a6hks9oxXbr04#&5j~XLj7)d-_-wGU1#M;U-hGd91 ziK6cw!Z4DIL?8kbr%#;(0K9tr1{cnsQ!e1OzyI(Nz^FJy5`hUM{-|QH7}I&@GRW*A z32}Xju~R@nbR9(30RYXG$z<# z880an23=Qa^Q{4u-fI`@;zhl|$(PH8@C4|dQY_5p(QKJqO^Eil?<^);ZWjQM{GmPp zK)@RC?z31E$^ap%U}iNTcw9LGU@cMtX5J>LaXC=?24G#b8s(k)1(Qplv! zFx%}h5@K!0YQ=WG;c4}8Afgj%fbKgz_aapKn^zXu{IlCb$L=Z#Ox=pTK0*6{jEHX^ zP@Q`KzBM9VK4b{o2mJbih#?sQlK$g+BcibO_t`v^N^vsPiGI^SN?>he8G!tc#SbTr zANw}~>9c9vf3O~Ek=4plDF2BB0O0o3MQlBP$ zgTYTGZ)`qe4^t@tud~W#3wm9Tv0!l$#aw0%9jh~TC9iJpaKQn96aLqe+>77uwjtg^ Sh;Zou0000 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 FV1iHL(#QY+ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/off.png deleted file mode 100644 index 3ff4e5394ed949d73d37f99b245f41af8180619d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 637 zcmV-@0)qXCP)ezw6vzM95S^PuIY6SN3Ch9((rrxbP^l6sQYE?|r4v(^eu2)6d;`SNiLFu@G9ZeW zI<(5bmalMEC<1avFZh7!7!I4*Ip^$4j=vPi@7eMD*?D=kEhyA(w-Z(0Jmh(v1pwDn z!M7i+!EqXbzeXy8ZBffO@XNzDg1w*$4gf)Li6FS-!7XYDpCZAZb~go|umfz{d&j57 zlj~@&yM+k9)c^n>Z#`SNt`d@_&WK(C0N+8?q9ym}|6X>YeG7S|Esj{z>960$f5bX5_t~o%_ z9ANV35CG8lss0B{1(-Dl?%lZ$*LCr>_j>C0O3MM)bukzWa>tdD13~ybcjdVNv*f_z zjaAOW&>WzQI^YLGw4CdLuhcpqUp}%_+F6j01jwjAxi=yv@BDlw09|DQ?C