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 597a8b05cc..b0b7e5a0f4 100644 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/panel.png and b/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/panel.png differ 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 b301690f9f..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/broken.png and /dev/null differ 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 a7405a3f50..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/deny-unshaded.png and /dev/null differ 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 a38fb3626c..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/normal-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/off.png deleted file mode 100644 index 1907f2fc41..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/off.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/meta.json index 368ff80848..bcca5620cc 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/meta.json @@ -1,45 +1,45 @@ { - "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": "off" - }, - { - "name": "panel" - }, - { - "name": "eject-unshaded", - "delays": [ - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ] - ] - } - ] + { + "name": "broken" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.8, + 0.1, + 0.1 + ] + ] + } + ] } diff --git a/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/broken.png new file mode 100644 index 0000000000..16e350f9cb Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/broken.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/deny-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/deny-unshaded.png new file mode 100644 index 0000000000..5c09a67f30 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/meta.json new file mode 100644 index 0000000000..acfc7c3cb8 --- /dev/null +++ b/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/meta.json @@ -0,0 +1,44 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "normal-unshaded", + "delays": [ + [ + 1, + 0.1, + 1, + 0.1, + 1, + 0.1, + 1, + 0.1 + ] + ] + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "broken" + }, + { + "name": "panel" + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/normal-unshaded.png new file mode 100644 index 0000000000..6e2b252d25 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/normal-unshaded.png differ 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 0000000000..81220a8f66 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/off.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/panel.png b/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/panel.png new file mode 100644 index 0000000000..0032751ff4 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/clothing.rsi/panel.png differ 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 d54cdcf9eb..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/broken.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/meta.json deleted file mode 100644 index 82487c99a9..0000000000 --- a/Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/meta.json +++ /dev/null @@ -1,20 +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" - }, - { - "name": "off" - } - ] -} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/normal-unshaded.png deleted file mode 100644 index 618d58f847..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/normal-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/off.png deleted file mode 100644 index fc8e534745..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/off.png and /dev/null differ 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 d75949c270..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/broken.png and /dev/null differ 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 abd7aa091a..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/normal-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/off.png deleted file mode 100644 index e00e887597..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/off.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/broken.png deleted file mode 100644 index 1d06ddbaf7..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/broken.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/meta.json deleted file mode 100644 index 82487c99a9..0000000000 --- a/Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/meta.json +++ /dev/null @@ -1,20 +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" - }, - { - "name": "off" - } - ] -} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/normal-unshaded.png deleted file mode 100644 index ce4ed07f20..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/normal-unshaded.png and /dev/null differ 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 dc0b3e84af..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/off.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/meta.json index 275205a433..2cf9a24e7e 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/meta.json @@ -1,46 +1,46 @@ { - "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 - ] - ] - }, - { - "name": "off" - }, - { - "name": "panel" - }, - { - "name": "eject-unshaded", - "delays": [ - [ - 0.1, - 0.4, - 0.1 - ] - ] - } - ] + { + "name": "broken" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.1, + 0.4, + 0.1 + ] + ] + } + ] } diff --git a/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/broken.png deleted file mode 100644 index 4ad4c691d4..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/broken.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/deny-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/deny-unshaded.png deleted file mode 100644 index 5d9acc4010..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/deny-unshaded.png and /dev/null differ 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 a711db8365..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/normal-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/off.png deleted file mode 100644 index 02078e5f4d..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/off.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/meta.json index 915493755c..17451a85e4 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/meta.json @@ -1,42 +1,42 @@ { - "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": "deny-unshaded" - }, - { - "name": "eject-unshaded", - "delays": [ - [ - 1.0, - 0.1, - 0.1, - 0.1, - 0.1, - 0.5, - 0.1, - 1.0, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "normal-unshaded" - }, - { - "name": "off" - } - ] + { + "name": "deny-unshaded" + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.5, + 0.1, + 1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "normal-unshaded" + }, + { + "name": "off" + } + ] } diff --git a/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/broken.png deleted file mode 100644 index e6488fcdd2..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/broken.png and /dev/null differ 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 4918d9f5f9..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/deny-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/meta.json deleted file mode 100644 index a9eef5edc3..0000000000 --- a/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/meta.json +++ /dev/null @@ -1,34 +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, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "normal-unshaded" - }, - { - "name": "off" - } - ] -} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/normal-unshaded.png deleted file mode 100644 index 6d68fe041e..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/normal-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/off.png deleted file mode 100644 index 2ca864c020..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/off.png and /dev/null differ 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 ddbc85cc3a..922173d726 100644 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/broken.png and b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/broken.png differ 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 88a96e1504..afb46c2fac 100644 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/deny-unshaded.png and b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/eject-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/eject-unshaded.png deleted file mode 100644 index de939af0da..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/eject-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/meta.json index 275205a433..4b69aa785a 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/meta.json @@ -1,46 +1,61 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", + "license": "CC-BY-SA-3.0", + "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 - ] - ] - }, - { - "name": "off" - }, - { - "name": "panel" - }, - { - "name": "eject-unshaded", - "delays": [ - [ - 0.1, - 0.4, - 0.1 - ] - ] - } - ] + { + "name": "deny-unshaded", + "delays": [ + [ + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.3, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.3, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05, + 0.05 + ] + ] + }, + { + "name": "broken" + }, + { + "name": "off" + }, + { + "name": "panel" + } + ] } diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/normal-unshaded.png index 1299157d19..c40d6dbab9 100644 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/normal-unshaded.png and b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/off.png index 7662481687..7a8fc64b09 100644 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/off.png and b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/off.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/panel.png b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/panel.png index c568b18e21..5e88a32c0c 100644 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/panel.png and b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/panel.png differ 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 95475da791..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/broken.png and /dev/null differ 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 1ad15d7ffa..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/normal-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/off.png deleted file mode 100644 index 23c0cc6903..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/off.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/meta.json index 82487c99a9..3f1ec5cf52 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/meta.json @@ -1,20 +1,20 @@ { - "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" - }, - { - "name": "off" - } - ] + { + "name": "normal-unshaded" + }, + { + "name": "off" + } + ] } diff --git a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/meta.json index 116fe5799a..bd48d5b390 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/meta.json @@ -1,52 +1,52 @@ { - "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", + "delays": [ + [ + 0.8, + 0.8, + 0.8 + ] + ] }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/commit/e107a20eb3e8def075a7d967dbf91426accabcbe", - "states": [ - { - "name": "normal-unshaded", - "delays": [ - [ - 0.8, - 0.8, - 0.8 - ] - ] - }, - { - "name": "broken" - }, - { - "name": "deny-unshaded", - "delays": [ - [ - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "off" - }, - { - "name": "panel" - }, - { - "name": "eject-unshaded", - "delays": [ - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ] - ] - } - ] + { + "name": "broken" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.8, + 0.1, + 0.1 + ] + ] + } + ] } diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/meta.json index 36fe024ae0..42654486b9 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/meta.json @@ -1,44 +1,44 @@ { - "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.4, - 0.4 - ] - ] - }, - { - "name": "off" - }, - { - "name": "panel" - }, - { - "name": "eject-unshaded", - "delays": [ - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ] - ] - } - ] + { + "name": "broken" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.8, + 0.1, + 0.1 + ] + ] + } + ] } diff --git a/Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/broken.png deleted file mode 100644 index 29f9b1d4fc..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/broken.png and /dev/null differ 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 5229d2b9e8..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/normal-unshaded.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/off.png b/Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/off.png deleted file mode 100644 index 10bb1136e4..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/off.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/meta.json index c6ac9a17eb..8bbbbeb1e4 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/meta.json @@ -1,54 +1,54 @@ { - "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/vgstation-coders/vgstation13/commit/a7290010020e541ed6b57817a07023ca6bef26fe", - "states": [ - { - "name": "normal-unshaded" - }, - { - "name": "broken" - }, - { - "name": "deny-unshaded", - "delays": [ - [ - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "off" - }, - { - "name": "screen", - "delays": [ - [ - 3.0, - 0.1 - ] - ] - }, - { - "name": "panel" - }, - { - "name": "eject-unshaded", - "delays": [ - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ] - ] - } - ] + { + "name": "broken" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "screen", + "delays": [ + [ + 3, + 0.1 + ] + ] + }, + { + "name": "panel" + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.8, + 0.1, + 0.1 + ] + ] + } + ] } diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/meta.json index 368ff80848..bcca5620cc 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/meta.json @@ -1,45 +1,45 @@ { - "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": "off" - }, - { - "name": "panel" - }, - { - "name": "eject-unshaded", - "delays": [ - [ - 0.1, - 0.1, - 0.8, - 0.1, - 0.1 - ] - ] - } - ] + { + "name": "broken" + }, + { + "name": "deny-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off" + }, + { + "name": "panel" + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.8, + 0.1, + 0.1 + ] + ] + } + ] } diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/broken.png deleted file mode 100644 index fd48b78fe3..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/broken.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/meta.json deleted file mode 100644 index 82487c99a9..0000000000 --- a/Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/meta.json +++ /dev/null @@ -1,20 +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" - }, - { - "name": "off" - } - ] -} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/normal-unshaded.png deleted file mode 100644 index 34b18a86aa..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/normal-unshaded.png and /dev/null differ 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 3ff4e5394e..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/off.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/meta.json index dbd2422646..a11313214d 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/meta.json @@ -1,39 +1,39 @@ { - "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": "deny-unshaded", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.3, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "normal-unshaded" - }, - { - "name": "off" - } - ] + { + "name": "deny-unshaded", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.3, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "normal-unshaded" + }, + { + "name": "off" + } + ] } diff --git a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/meta.json index 92c7cc67bb..84266eea4c 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/meta.json @@ -1,59 +1,58 @@ { - "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", - "delays": [ - [ - 0.1, - 0.4, - 0.1, - 0.1 - ] - ] - }, - { - "name": "eject-unshaded", - "delays": [ - [ - 0.1, - 0.4, - 0.1, - 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", + "delays": [ + [ + 0.1, + 0.4, + 0.1, + 0.1 + ] + ] + }, + { + "name": "eject-unshaded", + "delays": [ + [ + 0.1, + 0.4, + 0.1, + 0.1 + ] + ] + }, + { + "name": "normal-unshaded" + }, + { + "name": "off" + }, + { + "name": "panel" + } + ] }