diff --git a/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs b/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs index 0f052ef173..1202401d27 100644 --- a/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs +++ b/Content.Client/GameObjects/Components/VendingMachines/VendingMachineVisualizer.cs @@ -1,44 +1,109 @@ using System; +using System.Collections.Generic; +using JetBrains.Annotations; using Robust.Client.Animations; using Robust.Client.GameObjects; using Robust.Client.GameObjects.Components.Animations; using Robust.Client.Interfaces.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Utility; using YamlDotNet.RepresentationModel; using static Content.Shared.GameObjects.Components.VendingMachines.SharedVendingMachineComponent; namespace Content.Client.GameObjects.Components.VendingMachines { - public class VendingMachineVisualizer : AppearanceVisualizer + [UsedImplicitly] + public sealed class VendingMachineVisualizer : AppearanceVisualizer { + // TODO: Should default to off or broken if damaged + // + // TODO: The length of these animations is supposed to be dictated // by the vending machine's pack prototype's `AnimationDuration` // but we have no good way of passing that data from the server // to the client at the moment. Rework Visualizers? - private const string DeniedAnimationKey = "deny"; - private const string EjectAnimationKey = "eject"; - private Animation _deniedAnimation; - private Animation _ejectAnimation; + private Dictionary _baseStates; + + private static readonly Dictionary LayerMap = + new Dictionary + { + {"off", VendingMachineVisualLayers.Unlit}, + {"screen", VendingMachineVisualLayers.Screen}, + {"normal", VendingMachineVisualLayers.Base}, + {"normal-unshaded", VendingMachineVisualLayers.BaseUnshaded}, + {"eject", VendingMachineVisualLayers.Base}, + {"eject-unshaded", VendingMachineVisualLayers.BaseUnshaded}, + {"deny", VendingMachineVisualLayers.Base}, + {"deny-unshaded", VendingMachineVisualLayers.BaseUnshaded}, + {"broken", VendingMachineVisualLayers.Unlit}, + }; + + private Dictionary _animations = new Dictionary(); public override void LoadData(YamlMappingNode node) { base.LoadData(node); - _deniedAnimation = new Animation {Length = TimeSpan.FromSeconds(1.2f)}; + + _baseStates = new Dictionary { - var flick = new AnimationTrackSpriteFlick(); - _deniedAnimation.AnimationTracks.Add(flick); - flick.LayerKey = VendingMachineVisualLayers.Base; - flick.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame("deny", 0f)); + {"off", true}, + }; + + // Used a dictionary so the yaml can adhere to the style-guide and the texture states can be clear + var states = new Dictionary + { + {"screen", "screen"}, + {"normal", "normal"}, + {"normalUnshaded", "normal-unshaded"}, + {"eject", "eject"}, + {"ejectUnshaded", "eject-unshaded"}, + {"deny", "deny"}, + {"denyUnshaded", "deny-unshaded"}, + {"broken", "broken"}, + {"brokenUnshaded", "broken-unshaded"}, + }; + + foreach (var (state, textureState) in states) + { + if (!node.TryGetNode(state, out var yamlNode)) + { + _baseStates[textureState] = false; + continue; + } + + _baseStates.Add(textureState, yamlNode.AsBool()); } - _ejectAnimation = new Animation {Length = TimeSpan.FromSeconds(1.2f)}; + if (_baseStates["deny"]) { - var flick = new AnimationTrackSpriteFlick(); - _ejectAnimation.AnimationTracks.Add(flick); - flick.LayerKey = VendingMachineVisualLayers.Base; - flick.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame("eject", 0f)); + InitializeAnimation("deny"); } + + if (_baseStates["deny-unshaded"]) + { + InitializeAnimation("deny-unshaded", true); + } + + if (_baseStates["eject"]) + { + InitializeAnimation("eject"); + } + + if (_baseStates["eject-unshaded"]) + { + InitializeAnimation("eject-unshaded", true); + } + } + + private void InitializeAnimation(string key, bool unshaded = false) + { + _animations.Add(key, new Animation {Length = TimeSpan.FromSeconds(1.2f)}); + + var flick = new AnimationTrackSpriteFlick(); + _animations[key].AnimationTracks.Add(flick); + flick.LayerKey = unshaded ? VendingMachineVisualLayers.BaseUnshaded : VendingMachineVisualLayers.Base; + flick.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame(key, 0f)); } public override void InitializeEntity(IEntity entity) @@ -51,6 +116,16 @@ namespace Content.Client.GameObjects.Components.VendingMachines } } + private void HideLayers(ISpriteComponent spriteComponent) + { + foreach (var layer in spriteComponent.AllLayers) + { + layer.Visible = false; + } + + spriteComponent.LayerSetVisible(VendingMachineVisualLayers.Unlit, true); + } + public override void OnChangeData(AppearanceComponent component) { var sprite = component.Owner.GetComponent(); @@ -59,40 +134,81 @@ namespace Content.Client.GameObjects.Components.VendingMachines { state = VendingMachineVisualState.Normal; } + + // Hide last state + HideLayers(sprite); + ActivateState(sprite, "off"); switch (state) { case VendingMachineVisualState.Normal: - sprite.LayerSetState(VendingMachineVisualLayers.Base, "normal"); + ActivateState(sprite, "screen"); + ActivateState(sprite, "normal-unshaded"); + ActivateState(sprite, "normal"); break; + case VendingMachineVisualState.Off: - sprite.LayerSetState(VendingMachineVisualLayers.Base, "off"); break; + case VendingMachineVisualState.Broken: - sprite.LayerSetState(VendingMachineVisualLayers.Base, "broken"); + ActivateState(sprite, "broken-unshaded"); + ActivateState(sprite, "broken"); + break; case VendingMachineVisualState.Deny: - if (!animPlayer.HasRunningAnimation(DeniedAnimationKey)) - { - animPlayer.Play(_deniedAnimation, DeniedAnimationKey); - } + ActivateState(sprite, "screen"); + ActivateAnimation(sprite, animPlayer, "deny-unshaded"); + ActivateAnimation(sprite, animPlayer, "deny"); break; case VendingMachineVisualState.Eject: - if (!animPlayer.HasRunningAnimation(EjectAnimationKey)) - { - animPlayer.Play(_ejectAnimation, EjectAnimationKey); - } + ActivateState(sprite, "screen"); + ActivateAnimation(sprite, animPlayer, "eject-unshaded"); + ActivateAnimation(sprite, animPlayer, "eject"); break; default: throw new ArgumentOutOfRangeException(); } } + + // Helper methods just to avoid all of that hard-to-read-indented code + private void ActivateState(ISpriteComponent spriteComponent, string stateId) + { + // No state for it on the rsi :( + if (!_baseStates[stateId]) + { + return; + } + var stateLayer = LayerMap[stateId]; + spriteComponent.LayerSetVisible(stateLayer, true); + spriteComponent.LayerSetState(stateLayer, stateId); + } + + private void ActivateAnimation(ISpriteComponent spriteComponent, AnimationPlayerComponent animationPlayer, string key) + { + if (!_animations.TryGetValue(key, out var animation)) + { + return; + } + + if (!animationPlayer.HasRunningAnimation(key)) + { + spriteComponent.LayerSetVisible(LayerMap[key], true); + animationPlayer.Play(animation, key); + } + } + public enum VendingMachineVisualLayers { + // Off / Broken. The other layers will overlay this if the machine is on. + Unlit, + // Normal / Deny / Eject Base, + BaseUnshaded, + // Screens that are persistent (where the machine is not off or broken) + Screen, } } } diff --git a/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs b/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs index b395675156..58e408e3eb 100644 --- a/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs +++ b/Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs @@ -10,8 +10,11 @@ using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.VendingMachines; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.UserInterface; +using Robust.Server.GameObjects.EntitySystems; using Robust.Server.Interfaces.GameObjects; +using Robust.Shared.Audio; using Robust.Shared.GameObjects; +using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.Random; using Robust.Shared.IoC; using Robust.Shared.Prototypes; @@ -43,6 +46,8 @@ namespace Content.Server.GameObjects.Components.VendingMachines private bool Powered => _powerReceiver.Powered; private bool _broken = false; + private string _soundVend; + public void Activate(ActivateEventArgs eventArgs) { if(!eventArgs.User.TryGetComponent(out IActorComponent actor)) @@ -67,6 +72,8 @@ namespace Content.Server.GameObjects.Components.VendingMachines base.ExposeData(serializer); serializer.DataField(ref _packPrototypeId, "pack", string.Empty); + // Grabbed from: https://github.com/discordia-space/CEV-Eris/blob/f702afa271136d093ddeb415423240a2ceb212f0/sound/machines/vending_drop.ogg + serializer.DataField(ref _soundVend, "soundVend", "/Audio/Machines/machine_vend.ogg"); } private void InitializeFromPrototype() @@ -178,6 +185,8 @@ namespace Content.Server.GameObjects.Components.VendingMachines TrySetVisualState(VendingMachineVisualState.Normal); Owner.EntityManager.SpawnEntity(id, Owner.Transform.GridPosition); }); + + EntitySystem.Get().PlayFromEntity(_soundVend, Owner, AudioParams.Default.WithVolume(-2f)); } private void FlickDenyAnimation() diff --git a/Resources/Audio/Machines/machine_vend.ogg b/Resources/Audio/Machines/machine_vend.ogg new file mode 100644 index 0000000000..8f7c187d0c Binary files /dev/null and b/Resources/Audio/Machines/machine_vend.ogg differ diff --git a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml index c53aa0cc93..83b0f92fa1 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/vending_machines.yml @@ -1,6 +1,7 @@ - type: entity id: VendingMachine name: vending machine + abstract: true components: - type: Physics anchored: true @@ -8,14 +9,10 @@ - type: InteractionOutline - type: Sprite sprite: Constructible/Power/VendingMachines/empty.rsi - layers: - - state: normal - map: ["enum.VendingMachineVisualLayers.Base"] - - texture: Constructible/Power/VendingMachines/maintenance_panel.png - map: ["enum.WiresVisualLayers.MaintenancePanel"] + netsync: false - type: Icon sprite: Constructible/Power/VendingMachines/empty.rsi - state: normal + state: "off" - type: Collidable shapes: - !type:PhysShapeAabb @@ -35,10 +32,6 @@ offset: Center - type: Damageable - type: Breakable - - type: Appearance - visuals: - - type: VendingMachineVisualizer - - type: WiresVisualizer - type: UserInterface interfaces: - key: enum.VendingMachineUiKey.Key @@ -63,6 +56,20 @@ sprite: Constructible/Power/VendingMachines/boozeomat.rsi - type: Sprite sprite: Constructible/Power/VendingMachines/boozeomat.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 @@ -75,6 +82,22 @@ sprite: Constructible/Power/VendingMachines/cart.rsi - type: Sprite sprite: Constructible/Power/VendingMachines/cart.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 + ejectUnshaded: true + denyUnshaded: true + broken: true + - type: WiresVisualizer - type: entity parent: VendingMachine @@ -87,6 +110,21 @@ sprite: Constructible/Power/VendingMachines/chapel.rsi - 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 @@ -99,6 +137,22 @@ sprite: Constructible/Power/VendingMachines/cigs.rsi - type: Sprite sprite: Constructible/Power/VendingMachines/cigs.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 + ejectUnshaded: true + denyUnshaded: true + broken: true + - type: WiresVisualizer - type: entity parent: VendingMachine @@ -112,13 +166,25 @@ - type: Sprite sprite: Constructible/Power/VendingMachines/coffee.rsi layers: - - state: normal - map: ["enum.VendingMachineVisualLayers.Base"] - - state: screen - map: ["enum.PowerDeviceVisualLayers.Powered"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.Unlit"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] shader: unshaded - - map: ["enum.WiresVisualLayers.MaintenancePanel"] - state: panel + - state: "screen" + map: ["enum.VendingMachineVisualLayers.Screen"] + shader: unshaded + - texture: Constructible/Power/VendingMachines/maintenance_panel.png + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: Appearance + visuals: + - type: VendingMachineVisualizer + screen: true + normalUnshaded: true + ejectUnshaded: true + denyUnshaded: true + broken: true + - type: WiresVisualizer - type: entity parent: VendingMachine @@ -131,6 +197,22 @@ sprite: Constructible/Power/VendingMachines/cola.rsi - type: Sprite sprite: Constructible/Power/VendingMachines/cola.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 + ejectUnshaded: true + denyUnshaded: true + broken: true + - type: WiresVisualizer - type: entity parent: VendingMachine @@ -143,6 +225,21 @@ sprite: Constructible/Power/VendingMachines/dinnerware.rsi - type: Sprite sprite: Constructible/Power/VendingMachines/dinnerware.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 + ejectUnshaded: true + broken: true + - type: WiresVisualizer - type: entity parent: VendingMachine @@ -155,6 +252,20 @@ sprite: Constructible/Power/VendingMachines/discount.rsi - type: Sprite sprite: Constructible/Power/VendingMachines/discount.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 @@ -167,6 +278,22 @@ sprite: Constructible/Power/VendingMachines/engivend.rsi - type: Sprite sprite: Constructible/Power/VendingMachines/engivend.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 + ejectUnshaded: true + denyUnshaded: true + broken: true + - type: WiresVisualizer - type: entity parent: VendingMachine @@ -179,6 +306,20 @@ sprite: Constructible/Power/VendingMachines/hats.rsi - 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 @@ -191,6 +332,20 @@ sprite: Constructible/Power/VendingMachines/magivend.rsi - 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 @@ -203,6 +358,22 @@ sprite: Constructible/Power/VendingMachines/medical.rsi - type: Sprite sprite: Constructible/Power/VendingMachines/medical.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 + ejectUnshaded: true + denyUnshaded: true + broken: true + - type: WiresVisualizer - type: entity parent: VendingMachine @@ -215,6 +386,21 @@ sprite: Constructible/Power/VendingMachines/mining.rsi - 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 @@ -227,6 +413,22 @@ sprite: Constructible/Power/VendingMachines/nutri.rsi - type: Sprite sprite: Constructible/Power/VendingMachines/nutri.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 + ejectUnshaded: true + denyUnshaded: true + broken: true + - type: WiresVisualizer - type: entity parent: VendingMachine @@ -239,6 +441,21 @@ sprite: Constructible/Power/VendingMachines/robotics.rsi - 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: entity parent: VendingMachine @@ -251,6 +468,21 @@ sprite: Constructible/Power/VendingMachines/sale.rsi - type: Sprite sprite: Constructible/Power/VendingMachines/sale.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 + brokenUnshaded: true + - type: WiresVisualizer - type: entity parent: VendingMachine @@ -263,6 +495,22 @@ sprite: Constructible/Power/VendingMachines/sec.rsi - type: Sprite sprite: Constructible/Power/VendingMachines/sec.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 + ejectUnshaded: true + denyUnshaded: true + broken: true + - type: WiresVisualizer - type: entity parent: VendingMachine @@ -275,6 +523,21 @@ sprite: Constructible/Power/VendingMachines/seeds.rsi - type: Sprite sprite: Constructible/Power/VendingMachines/seeds.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 + ejectUnshaded: true + broken: true + - type: WiresVisualizer - type: entity parent: VendingMachine @@ -287,6 +550,20 @@ sprite: Constructible/Power/VendingMachines/shoes.rsi - 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 @@ -299,6 +576,20 @@ sprite: Constructible/Power/VendingMachines/smartfridge.rsi - type: Sprite sprite: Constructible/Power/VendingMachines/smartfridge.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 @@ -311,6 +602,22 @@ sprite: Constructible/Power/VendingMachines/snack.rsi - type: Sprite sprite: Constructible/Power/VendingMachines/snack.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 + ejectUnshaded: true + denyUnshaded: true + broken: true + - type: WiresVisualizer - type: entity parent: VendingMachine @@ -323,6 +630,22 @@ sprite: Constructible/Power/VendingMachines/sovietsoda.rsi - type: Sprite sprite: Constructible/Power/VendingMachines/sovietsoda.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 + ejectUnshaded: true + denyUnshaded: true + broken: true + - type: WiresVisualizer - type: entity parent: VendingMachine @@ -335,6 +658,20 @@ sprite: Constructible/Power/VendingMachines/suits.rsi - 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 @@ -347,6 +684,26 @@ sprite: Constructible/Power/VendingMachines/theater.rsi - type: Sprite sprite: Constructible/Power/VendingMachines/theater.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Unlit"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - state: "screen" + map: ["enum.VendingMachineVisualLayers.Screen"] + shader: unshaded + - type: Appearance + visuals: + - type: VendingMachineVisualizer + screen: true + normalUnshaded: true + ejectUnshaded: true + denyUnshaded: true + broken: true + - type: WiresVisualizer - type: entity parent: VendingMachine @@ -359,6 +716,23 @@ sprite: Constructible/Power/VendingMachines/vendomat.rsi - type: Sprite sprite: Constructible/Power/VendingMachines/vendomat.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 + eject: true + ejectUnshaded: true + denyUnshaded: true + broken: true + - type: WiresVisualizer - type: entity parent: VendingMachine @@ -371,6 +745,20 @@ sprite: Constructible/Power/VendingMachines/vox.rsi - 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 @@ -383,6 +771,21 @@ sprite: Constructible/Power/VendingMachines/wallmed.rsi - type: Sprite sprite: Constructible/Power/VendingMachines/wallmed.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 @@ -395,3 +798,22 @@ sprite: Constructible/Power/VendingMachines/youtool.rsi - type: Sprite sprite: Constructible/Power/VendingMachines/youtool.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Unlit"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: Appearance + visuals: + - type: VendingMachineVisualizer + normalUnshaded: true + eject: true + ejectUnshaded: true + denyUnshaded: true + broken: true + - type: WiresVisualizer diff --git a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/deny-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/deny-unshaded.png new file mode 100644 index 0000000000..c6e30865ce Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/deny.png deleted file mode 100644 index 74d3402ded..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/deny.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/meta.json index 2ac9594470..88196b331c 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/meta.json @@ -1 +1,51 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "deny", "directions": 1, "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2]]}, {"name": "normal", "directions": 1, "delays": [[0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2]]}, {"name": "off", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{ + "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", + "directions": 1 + }, + { + "name": "deny-unshaded", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "normal-unshaded", + "directions": 1, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "off", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/normal-unshaded.png new file mode 100644 index 0000000000..17240bfdf9 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/normal.png deleted file mode 100644 index 5dae4ee2a2..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/boozeomat.rsi/normal.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/deny-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/deny-unshaded.png new file mode 100644 index 0000000000..c7fa863d4d Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/deny.png deleted file mode 100644 index d62be37f93..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/deny.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/eject-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/eject-unshaded.png new file mode 100644 index 0000000000..161a9f2bfb Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/eject.png deleted file mode 100644 index 7c62b0721d..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/eject.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/meta.json index 12fd9a9146..07adf4e804 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/meta.json @@ -1 +1,55 @@ -{"version":1,"size":{"x":32,"y":32},"states":[{"name":"normal","directions":1,"delays":[[1.0]]},{"name":"broken","directions":1,"delays":[[1.0]]},{"name":"deny","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1,0.1]]},{"name":"off","directions":1,"delays":[[1.0]]},{"name":"panel","directions":1,"delays":[[1.0]]},{"name":"eject","directions":1,"delays":[[0.5,0.05,0.5,0.05,0.1]]}]} \ No newline at end of file +{ + "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": "normal-unshaded", + "directions": 1 + }, + { + "name": "broken", + "directions": 1 + }, + { + "name": "deny-unshaded", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off", + "directions": 1 + }, + { + "name": "panel", + "directions": 1 + }, + { + "name": "eject-unshaded", + "directions": 1, + "delays": [ + [ + 0.5, + 0.05, + 0.5, + 0.05, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/normal-unshaded.png new file mode 100644 index 0000000000..3e95ed4aa0 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/normal.png deleted file mode 100644 index a960108cbf..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/cart.rsi/normal.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 new file mode 100644 index 0000000000..a7405a3f50 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/deny.png deleted file mode 100644 index 8821a295f2..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/deny.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 index befea40432..a097122ca1 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/meta.json @@ -1 +1,126 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "deny", "directions": 1, "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", "directions": 1, "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", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{ + "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", + "directions": 1 + }, + { + "name": "deny-unshaded", + "directions": 1, + "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", + "directions": 1, + "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", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/normal-unshaded.png new file mode 100644 index 0000000000..a38fb3626c Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/normal.png deleted file mode 100644 index 6053dc5d28..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/chapel.rsi/normal.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/deny-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/deny-unshaded.png new file mode 100644 index 0000000000..4b8fc2a3e5 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/deny.png deleted file mode 100644 index 2ed8a88e1c..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/deny.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/eject-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/eject-unshaded.png new file mode 100644 index 0000000000..505d5f3861 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/eject.png deleted file mode 100644 index 873d7e8e70..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/eject.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 d00c37f2ec..29e93fb3ef 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/meta.json @@ -1 +1,51 @@ -{"version":1,"size":{"x":32,"y":32},"states":[{"name":"normal","directions":1,"delays":[[1.0]]},{"name":"broken","directions":1,"delays":[[1.0]]},{"name":"deny","directions":1,"delays":[[0.1,0.1,0.1]]},{"name":"off","directions":1,"delays":[[1.0]]},{"name":"panel","directions":1,"delays":[[1.0]]},{"name":"eject","directions":1,"delays":[[0.1,0.1,0.8,0.1,0.1]]}]} \ No newline at end of file +{ + "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": "normal-unshaded", + "directions": 1 + }, + { + "name": "broken", + "directions": 1 + }, + { + "name": "deny-unshaded", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off", + "directions": 1 + }, + { + "name": "panel", + "directions": 1 + }, + { + "name": "eject-unshaded", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.8, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/normal-unshaded.png new file mode 100644 index 0000000000..f92b13efd1 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/normal.png deleted file mode 100644 index 036d9b33e8..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/cigs.rsi/normal.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/deny-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/deny-unshaded.png new file mode 100644 index 0000000000..826a5517e3 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/deny.png deleted file mode 100644 index 17aabbe639..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/deny.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/eject-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/eject-unshaded.png new file mode 100644 index 0000000000..8b66206bd7 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/eject.png deleted file mode 100644 index d3329033b7..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/eject.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/meta.json index 0dc3d47206..a6e22752ac 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/meta.json @@ -1 +1,83 @@ -{"version":1,"size":{"x":32,"y":32},"states":[{"name":"normal","directions":1,"delays":[[1.0]]},{"name":"broken","directions":1,"delays":[[1.0]]},{"name":"deny","directions":1,"delays":[[0.1,0.1,0.1]]},{"name":"hellfire","directions":1,"delays":[[0.25,0.25,0.25]]},{"name":"off","directions":1,"delays":[[1.0]]},{"name":"panel","directions":1,"delays":[[1.0]]},{"name":"screen","directions":1,"delays":[[0.6,0.6,0.6,0.6]]},{"name":"eject","directions":1,"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]]}]} \ No newline at end of file +{ + "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": "normal-unshaded", + "directions": 1 + }, + { + "name": "broken", + "directions": 1 + }, + { + "name": "deny-unshaded", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "hellfire", + "directions": 1, + "delays": [ + [ + 0.25, + 0.25, + 0.25 + ] + ] + }, + { + "name": "off", + "directions": 1 + }, + { + "name": "panel", + "directions": 1 + }, + { + "name": "screen", + "directions": 1, + "delays": [ + [ + 0.6, + 0.6, + 0.6, + 0.6 + ] + ] + }, + { + "name": "eject-unshaded", + "directions": 1, + "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/coffee.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/normal-unshaded.png new file mode 100644 index 0000000000..1a7fd066cd Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/normal.png deleted file mode 100644 index 90d1bbd8bb..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/coffee.rsi/normal.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/deny-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/deny-unshaded.png new file mode 100644 index 0000000000..5450574f55 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/deny.png deleted file mode 100644 index 3bc5c1a554..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/deny.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/eject-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/eject-unshaded.png new file mode 100644 index 0000000000..0c39a51203 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/eject.png deleted file mode 100644 index 00c05769a8..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/eject.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/meta.json index 276f9ec8ad..35e8a5cd3f 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/meta.json @@ -1 +1,56 @@ -{"version":1,"size":{"x":32,"y":32},"states":[{"name":"broken","directions":1,"delays":[[1.0]]},{"name":"eject","directions":1,"delays":[[0.5,0.1,1.0,0.1,0.1]]},{"name":"deny","directions":1,"delays":[[0.1,0.1,0.1]]},{"name":"normal","directions":1,"delays":[[1.0]]},{"name":"panel","directions":1,"delays":[[1.0]]},{"name":"off","directions":1,"delays":[[1.0]]}]} \ No newline at end of file +{ + "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", + "directions": 1, + "delays": [ + [ + 1.0 + ] + ] + }, + { + "name": "eject-unshaded", + "directions": 1, + "delays": [ + [ + 0.5, + 0.1, + 1.0, + 0.1, + 0.1 + ] + ] + }, + { + "name": "deny-unshaded", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "normal-unshaded", + "directions": 1 + }, + { + "name": "panel", + "directions": 1 + }, + { + "name": "off", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/normal-unshaded.png new file mode 100644 index 0000000000..5a4eb5ccbd Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/normal.png deleted file mode 100644 index 80ab90fb8b..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/cola.rsi/normal.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/eject-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/eject-unshaded.png new file mode 100644 index 0000000000..2fd223d6f4 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/eject.png deleted file mode 100644 index 7d0de068b1..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/eject.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/meta.json index 0f01469900..d1f1da23c0 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/meta.json @@ -1 +1,41 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "eject", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "normal", "directions": 1, "delays": [[1.0]]}, {"name": "off", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{ + "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", + "directions": 1 + }, + { + "name": "eject-unshaded", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "normal-unshaded", + "directions": 1 + }, + { + "name": "off", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/normal-unshaded.png new file mode 100644 index 0000000000..22f242b7dd Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/normal.png deleted file mode 100644 index e928a54ca0..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/dinnerware.rsi/normal.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/meta.json index 75bf5b7173..ad5abb7d69 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/meta.json @@ -1 +1,30 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "normal", "directions": 1, "delays": [[4.0, 0.1, 0.6]]}, {"name": "off", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{ + "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", + "directions": 1 + }, + { + "name": "normal-unshaded", + "directions": 1, + "delays": [ + [ + 4.0, + 0.1, + 0.6 + ] + ] + }, + { + "name": "off", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/normal-unshaded.png new file mode 100644 index 0000000000..4de940667a Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/normal.png deleted file mode 100644 index 96595bdccc..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/discount.rsi/normal.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 index 8288f2c29d..92aee55bb4 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/meta.json @@ -1 +1,23 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "normal", "directions": 1, "delays": [[1.0]]}, {"name": "off", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{ + "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", + "directions": 1 + }, + { + "name": "normal-unshaded", + "directions": 1 + }, + { + "name": "off", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/normal-unshaded.png new file mode 100644 index 0000000000..618d58f847 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/normal.png deleted file mode 100644 index 7e197b073c..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/empty.rsi/normal.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/deny-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/deny-unshaded.png new file mode 100644 index 0000000000..03c3bb39ec Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/deny.png deleted file mode 100644 index a4ca61c04c..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/deny.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/eject-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/eject-unshaded.png new file mode 100644 index 0000000000..dc5931f654 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/eject.png deleted file mode 100644 index 0b657ff93a..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/eject.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 a830d84162..52e45bdc98 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/meta.json @@ -1 +1,52 @@ -{"copyright":"https://github.com/Baystation12/Baystation12","license":"CC-BY-SA-3.0","size":{"x":32,"y":32},"states":[{"delays":[[1.0]],"directions":1,"name":"broken"},{"delays":[[0.1,0.1,0.1,0.1,0.1,0.1]],"directions":1,"name":"deny"},{"delays":[[0.1,0.4,0.1]],"directions":1,"name":"eject"},{"delays":[[1.0]],"directions":1,"name":"normal"},{"delays":[[1.0]],"directions":1,"name":"off"},{"delays":[[1.0]],"directions":1,"name":"panel"}],"version":1} \ No newline at end of file +{ + "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", + "directions": 1 + }, + { + "name": "deny-unshaded", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "eject-unshaded", + "directions": 1, + "delays": [ + [ + 0.1, + 0.4, + 0.1 + ] + ] + }, + { + "name": "normal-unshaded", + "directions": 1 + }, + { + "name": "off", + "directions": 1 + }, + { + "name": "panel", + "directions": 1 + } + ], + "version": 1 +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/normal-unshaded.png new file mode 100644 index 0000000000..bbf5692ec9 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/normal.png deleted file mode 100644 index 45fecab42b..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/engivend.rsi/normal.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 index 95aa5778c4..96ad51b296 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/meta.json @@ -1 +1,31 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "normal", "directions": 1, "delays": [[2.0, 0.1, 0.2, 0.1]]}, {"name": "off", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{ + "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", + "directions": 1 + }, + { + "name": "normal-unshaded", + "directions": 1, + "delays": [ + [ + 2.0, + 0.1, + 0.2, + 0.1 + ] + ] + }, + { + "name": "off", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/normal-unshaded.png new file mode 100644 index 0000000000..abd7aa091a Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/normal.png deleted file mode 100644 index 6c22e9ca0e..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/hats.rsi/normal.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 index 8288f2c29d..92aee55bb4 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/meta.json @@ -1 +1,23 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "normal", "directions": 1, "delays": [[1.0]]}, {"name": "off", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{ + "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", + "directions": 1 + }, + { + "name": "normal-unshaded", + "directions": 1 + }, + { + "name": "off", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/normal-unshaded.png new file mode 100644 index 0000000000..ce4ed07f20 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/normal.png deleted file mode 100644 index 3e626ac04c..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/magivend.rsi/normal.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/deny-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/deny-unshaded.png new file mode 100644 index 0000000000..96403be7cf Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/deny.png deleted file mode 100644 index 9c73caedef..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/deny.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/eject-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/eject-unshaded.png new file mode 100644 index 0000000000..a4fd4d3258 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/eject.png deleted file mode 100644 index c00889f7e9..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/eject.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 6b9dc19981..2798539692 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/meta.json @@ -1 +1,52 @@ -{"version":1,"size":{"x":32,"y":32},"states":[{"name":"normal","directions":1,"delays":[[1.0]]},{"name":"broken","directions":1,"delays":[[1.0]]},{"name":"deny","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1]]},{"name":"off","directions":1,"delays":[[1.0]]},{"name":"panel","directions":1,"delays":[[1.0]]},{"name":"eject","directions":1,"delays":[[0.1,0.4,0.1]]}]} \ No newline at end of file +{ + "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": "normal-unshaded", + "directions": 1 + }, + { + "name": "broken", + "directions": 1 + }, + { + "name": "deny-unshaded", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off", + "directions": 1 + }, + { + "name": "panel", + "directions": 1 + }, + { + "name": "eject-unshaded", + "directions": 1, + "delays": [ + [ + 0.1, + 0.4, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/normal-unshaded.png new file mode 100644 index 0000000000..8e1e181e13 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/normal.png deleted file mode 100644 index 2b58e1171a..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/medical.rsi/normal.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 new file mode 100644 index 0000000000..5d9acc4010 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/deny.png deleted file mode 100644 index 2727014548..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/deny.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 index dc487ded34..0d0c8a222b 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/meta.json @@ -1 +1,33 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1]]}, {"name": "normal", "directions": 1, "delays": [[1.0]]}, {"name": "off", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{ + "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", + "directions": 1 + }, + { + "name": "deny-unshaded", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1 + ] + ] + }, + { + "name": "normal-unshaded", + "directions": 1 + }, + { + "name": "off", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/normal-unshaded.png new file mode 100644 index 0000000000..a711db8365 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/normal.png deleted file mode 100644 index 336cf05372..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/mining.rsi/normal.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/deny-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/deny-unshaded.png new file mode 100644 index 0000000000..e507e6960f Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/deny.png deleted file mode 100644 index 770e2092de..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/deny.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/eject-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/eject-unshaded.png new file mode 100644 index 0000000000..88699f866a Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/eject.png deleted file mode 100644 index e7a8d00b38..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/eject.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 22ee707ea4..295f5467fa 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/meta.json @@ -1 +1,47 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "deny", "directions": 1, "delays": [[1.0]]}, {"name": "eject", "directions": 1, "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", "directions": 1, "delays": [[1.0]]}, {"name": "off", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{ + "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", + "directions": 1 + }, + { + "name": "deny-unshaded", + "directions": 1 + }, + { + "name": "eject-unshaded", + "directions": 1, + "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", + "directions": 1 + }, + { + "name": "off", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/normal-unshaded.png new file mode 100644 index 0000000000..783cbaa6e3 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/normal.png deleted file mode 100644 index e4f030005c..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/nutri.rsi/normal.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 new file mode 100644 index 0000000000..4918d9f5f9 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/deny.png deleted file mode 100644 index c30eca1bc0..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/deny.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 index 8ab345bb1d..74a652e3c4 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/meta.json @@ -1 +1,38 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "deny", "directions": 1, "delays": [[0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1]]}, {"name": "normal", "directions": 1, "delays": [[1.0]]}, {"name": "off", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{ + "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", + "directions": 1 + }, + { + "name": "deny-unshaded", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "normal-unshaded", + "directions": 1 + }, + { + "name": "off", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/normal-unshaded.png new file mode 100644 index 0000000000..6d68fe041e Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/normal.png deleted file mode 100644 index ca90dc6242..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/robotics.rsi/normal.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/broken-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/broken-unshaded.png new file mode 100644 index 0000000000..86dde0af4e Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/broken-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/broken.png b/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/broken.png index 50d487e689..5036439a63 100644 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/broken.png and b/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/broken.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/meta.json index 12fa42f831..67feef3131 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/meta.json @@ -1 +1,51 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0, 0.05, 0.1, 0.02]]}, {"name": "normal", "directions": 1, "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", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{ + "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", + "directions": 1 + }, + { + "name": "broken-unshaded", + "directions": 1, + "delays": [ + [ + 1.0, + 0.05, + 0.1, + 0.02 + ] + ] + }, + { + "name": "normal-unshaded", + "directions": 1, + "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", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/normal-unshaded.png new file mode 100644 index 0000000000..79d03c6c74 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/normal.png deleted file mode 100644 index 01cec66b56..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/sale.rsi/normal.png and /dev/null 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 new file mode 100644 index 0000000000..88a96e1504 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/deny.png deleted file mode 100644 index 686150ace5..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/deny.png and /dev/null 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 new file mode 100644 index 0000000000..de939af0da Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/eject.png deleted file mode 100644 index 00ebf9513c..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/eject.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 6b9dc19981..2798539692 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/meta.json @@ -1 +1,52 @@ -{"version":1,"size":{"x":32,"y":32},"states":[{"name":"normal","directions":1,"delays":[[1.0]]},{"name":"broken","directions":1,"delays":[[1.0]]},{"name":"deny","directions":1,"delays":[[0.1,0.1,0.1,0.1,0.1,0.1]]},{"name":"off","directions":1,"delays":[[1.0]]},{"name":"panel","directions":1,"delays":[[1.0]]},{"name":"eject","directions":1,"delays":[[0.1,0.4,0.1]]}]} \ No newline at end of file +{ + "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": "normal-unshaded", + "directions": 1 + }, + { + "name": "broken", + "directions": 1 + }, + { + "name": "deny-unshaded", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off", + "directions": 1 + }, + { + "name": "panel", + "directions": 1 + }, + { + "name": "eject-unshaded", + "directions": 1, + "delays": [ + [ + 0.1, + 0.4, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/normal-unshaded.png new file mode 100644 index 0000000000..1299157d19 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/normal.png deleted file mode 100644 index 39350f5269..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/sec.rsi/normal.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/eject-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/eject-unshaded.png new file mode 100644 index 0000000000..67483d624e Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/eject.png deleted file mode 100644 index 717c131e38..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/eject.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/meta.json index 11edaddccc..b75062afcf 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/meta.json @@ -1 +1,41 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "eject", "directions": 1, "delays": [[0.1, 0.2, 0.1, 0.1, 0.1, 0.1, 0.1, 1.0, 0.1, 0.1]]}, {"name": "normal", "directions": 1, "delays": [[1.0]]}, {"name": "off", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{ + "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", + "directions": 1 + }, + { + "name": "eject-unshaded", + "directions": 1, + "delays": [ + [ + 0.1, + 0.2, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 1.0, + 0.1, + 0.1 + ] + ] + }, + { + "name": "normal-unshaded", + "directions": 1 + }, + { + "name": "off", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/normal-unshaded.png new file mode 100644 index 0000000000..7cc9cf08dc Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/normal.png deleted file mode 100644 index 29d19452a5..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/seeds.rsi/normal.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 index 69873a4421..aec9da4eaa 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/meta.json @@ -1 +1,31 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "normal", "directions": 1, "delays": [[3.0, 0.2, 0.3, 0.1]]}, {"name": "off", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{ + "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", + "directions": 1 + }, + { + "name": "normal-unshaded", + "directions": 1, + "delays": [ + [ + 3.0, + 0.2, + 0.3, + 0.1 + ] + ] + }, + { + "name": "off", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/normal-unshaded.png new file mode 100644 index 0000000000..1ad15d7ffa Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/normal.png deleted file mode 100644 index d7eb072411..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/shoes.rsi/normal.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 8288f2c29d..92aee55bb4 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/meta.json @@ -1 +1,23 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "normal", "directions": 1, "delays": [[1.0]]}, {"name": "off", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{ + "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", + "directions": 1 + }, + { + "name": "normal-unshaded", + "directions": 1 + }, + { + "name": "off", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/normal-unshaded.png new file mode 100644 index 0000000000..728bda8ad4 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/normal.png deleted file mode 100644 index f9a2e20e6a..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/smartfridge.rsi/normal.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/deny-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/deny-unshaded.png new file mode 100644 index 0000000000..5d00b8caff Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/deny.png deleted file mode 100644 index cc277a5521..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/deny.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/eject-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/eject-unshaded.png new file mode 100644 index 0000000000..26f071948d Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/eject.png deleted file mode 100644 index 056bb7f1e0..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/eject.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/meta.json index 4db277b7bd..cd0be6613e 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/meta.json @@ -1 +1,58 @@ -{"version":1,"size":{"x":32,"y":32},"states":[{"name":"normal","directions":1,"delays":[[0.8,0.8,0.8]]},{"name":"broken","directions":1,"delays":[[1.0]]},{"name":"deny","directions":1,"delays":[[0.1,0.1,0.1]]},{"name":"off","directions":1,"delays":[[1.0]]},{"name":"panel","directions":1,"delays":[[1.0]]},{"name":"eject","directions":1,"delays":[[0.1,0.1,0.8,0.1,0.1]]}]} \ No newline at end of file +{ + "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": "normal-unshaded", + "directions": 1, + "delays": [ + [ + 0.8, + 0.8, + 0.8 + ] + ] + }, + { + "name": "broken", + "directions": 1 + }, + { + "name": "deny-unshaded", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off", + "directions": 1 + }, + { + "name": "panel", + "directions": 1 + }, + { + "name": "eject-unshaded", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.8, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/normal-unshaded.png new file mode 100644 index 0000000000..10aa4ddb02 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/normal.png deleted file mode 100644 index cc086552a2..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/snack.rsi/normal.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/deny-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/deny-unshaded.png new file mode 100644 index 0000000000..155d490ff6 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/deny.png deleted file mode 100644 index 0b25e5cf7e..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/deny.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/eject-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/eject-unshaded.png new file mode 100644 index 0000000000..27d8062b02 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/eject.png deleted file mode 100644 index ca286a53d8..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/eject.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/meta.json index 51ef3f6e2c..f8c1c9f822 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/meta.json @@ -1 +1,50 @@ -{"version":1,"size":{"x":32,"y":32},"states":[{"name":"normal","directions":1,"delays":[[1.0]]},{"name":"broken","directions":1,"delays":[[1.0]]},{"name":"deny","directions":1,"delays":[[0.4,0.4]]},{"name":"off","directions":1,"delays":[[1.0]]},{"name":"panel","directions":1,"delays":[[1.0]]},{"name":"eject","directions":1,"delays":[[0.1,0.1,0.8,0.1,0.1]]}]} \ No newline at end of file +{ + "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": "normal-unshaded", + "directions": 1 + }, + { + "name": "broken", + "directions": 1 + }, + { + "name": "deny-unshaded", + "directions": 1, + "delays": [ + [ + 0.4, + 0.4 + ] + ] + }, + { + "name": "off", + "directions": 1 + }, + { + "name": "panel", + "directions": 1 + }, + { + "name": "eject-unshaded", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.8, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/normal-unshaded.png new file mode 100644 index 0000000000..781ae3dfd1 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/normal.png deleted file mode 100644 index 5eab060bc7..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/sovietsoda.rsi/normal.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 index a435b611e6..66964fb02a 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/meta.json @@ -1 +1,31 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "normal", "directions": 1, "delays": [[1.9, 0.1, 0.2, 0.05]]}, {"name": "off", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{ + "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", + "directions": 1 + }, + { + "name": "normal-unshaded", + "directions": 1, + "delays": [ + [ + 1.9, + 0.1, + 0.2, + 0.05 + ] + ] + }, + { + "name": "off", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/normal-unshaded.png new file mode 100644 index 0000000000..5229d2b9e8 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/normal.png deleted file mode 100644 index 92bbb8d9ef..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/suits.rsi/normal.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/deny-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/deny-unshaded.png new file mode 100644 index 0000000000..66e29f2bf0 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/deny.png deleted file mode 100644 index 2b52d5bd84..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/deny.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/eject-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/eject-unshaded.png new file mode 100644 index 0000000000..865de78e60 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/eject.png deleted file mode 100644 index d40c01396f..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/eject.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 5ce19b184b..4f791ae991 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/meta.json @@ -1 +1,61 @@ -{"version":1,"size":{"x":32,"y":32},"states":[{"name":"normal","directions":1,"delays":[[1.0]]},{"name":"broken","directions":1,"delays":[[1.0]]},{"name":"deny","directions":1,"delays":[[0.1,0.1,0.1]]},{"name":"off","directions":1,"delays":[[1.0]]},{"name":"overlay","directions":1,"delays":[[3.0,0.1]]},{"name":"panel","directions":1,"delays":[[1.0]]},{"name":"eject","directions":1,"delays":[[0.1,0.1,0.8,0.1,0.1]]}]} \ No newline at end of file +{ + "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": "normal-unshaded", + "directions": 1 + }, + { + "name": "broken", + "directions": 1 + }, + { + "name": "deny-unshaded", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off", + "directions": 1 + }, + { + "name": "screen", + "directions": 1, + "delays": [ + [ + 3.0, + 0.1 + ] + ] + }, + { + "name": "panel", + "directions": 1 + }, + { + "name": "eject-unshaded", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.8, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/normal-unshaded.png new file mode 100644 index 0000000000..027d2fe009 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/normal.png deleted file mode 100644 index 83be99ca3b..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/normal.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/overlay.png b/Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/screen.png similarity index 100% rename from Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/overlay.png rename to Resources/Textures/Constructible/Power/VendingMachines/theater.rsi/screen.png diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/deny-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/deny-unshaded.png new file mode 100644 index 0000000000..fec5ee5813 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/deny.png deleted file mode 100644 index d8c1a8d69a..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/deny.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/eject-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/eject-unshaded.png new file mode 100644 index 0000000000..c090eec02b Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/eject.png index 895181a2af..adc0d37966 100644 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/eject.png and b/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/eject.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/meta.json index d00c37f2ec..29e93fb3ef 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/meta.json @@ -1 +1,51 @@ -{"version":1,"size":{"x":32,"y":32},"states":[{"name":"normal","directions":1,"delays":[[1.0]]},{"name":"broken","directions":1,"delays":[[1.0]]},{"name":"deny","directions":1,"delays":[[0.1,0.1,0.1]]},{"name":"off","directions":1,"delays":[[1.0]]},{"name":"panel","directions":1,"delays":[[1.0]]},{"name":"eject","directions":1,"delays":[[0.1,0.1,0.8,0.1,0.1]]}]} \ No newline at end of file +{ + "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": "normal-unshaded", + "directions": 1 + }, + { + "name": "broken", + "directions": 1 + }, + { + "name": "deny-unshaded", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "off", + "directions": 1 + }, + { + "name": "panel", + "directions": 1 + }, + { + "name": "eject-unshaded", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.8, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/normal-unshaded.png new file mode 100644 index 0000000000..85cd16ec8c Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/normal.png deleted file mode 100644 index 5063d3c1e1..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/vendomat.rsi/normal.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 index 8288f2c29d..92aee55bb4 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/meta.json @@ -1 +1,23 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "normal", "directions": 1, "delays": [[1.0]]}, {"name": "off", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{ + "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", + "directions": 1 + }, + { + "name": "normal-unshaded", + "directions": 1 + }, + { + "name": "off", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/normal-unshaded.png new file mode 100644 index 0000000000..34b18a86aa Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/normal.png deleted file mode 100644 index 8bdb138db0..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/vox.rsi/normal.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/deny-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/deny-unshaded.png new file mode 100644 index 0000000000..e2042da994 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/deny.png deleted file mode 100644 index 55c19da916..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/deny.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 b695d522f4..efebc20fb2 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/meta.json @@ -1 +1,43 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "broken", "directions": 1, "delays": [[1.0]]}, {"name": "deny", "directions": 1, "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", "directions": 1, "delays": [[1.0]]}, {"name": "off", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file +{ + "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", + "directions": 1 + }, + { + "name": "deny-unshaded", + "directions": 1, + "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", + "directions": 1 + }, + { + "name": "off", + "directions": 1 + } + ] +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/normal-unshaded.png new file mode 100644 index 0000000000..032f615f62 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/normal.png deleted file mode 100644 index 418fb06850..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/wallmed.rsi/normal.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/deny-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/deny-unshaded.png new file mode 100644 index 0000000000..10df5c2f12 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/deny-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/deny.png b/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/deny.png deleted file mode 100644 index 3b1938a44d..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/deny.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/eject-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/eject-unshaded.png new file mode 100644 index 0000000000..f4378bc950 Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/eject-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/eject.png b/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/eject.png index ef706dfbbe..f9555b79ab 100644 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/eject.png and b/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/eject.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/meta.json b/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/meta.json index 97b0c2ab7a..70d2bb6b55 100644 --- a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/meta.json @@ -1 +1,66 @@ -{"copyright":"https://github.com/Baystation12/Baystation12","license":"CC-BY-SA-3.0","size":{"x":32,"y":32},"states":[{"delays":[[1.0]],"directions":1,"name":"broken"},{"delays":[[0.1,0.1,0.1,0.1,0.1,0.1]],"directions":1,"name":"deny"},{"delays":[[0.1,0.4,0.1,0.1]],"directions":1,"name":"eject"},{"delays":[[1.0]],"directions":1,"name":"normal"},{"delays":[[1.0]],"directions":1,"name":"off"},{"delays":[[1.0]],"directions":1,"name":"panel"}],"version":1} \ No newline at end of file +{ + "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", + "directions": 1 + }, + { + "name": "deny-unshaded", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "eject", + "directions": 1, + "delays": [ + [ + 0.1, + 0.4, + 0.1, + 0.1 + ] + ] + }, + { + "name": "eject-unshaded", + "directions": 1, + "delays": [ + [ + 0.1, + 0.4, + 0.1, + 0.1 + ] + ] + }, + { + "name": "normal-unshaded", + "directions": 1 + }, + { + "name": "off", + "directions": 1 + }, + { + "name": "panel", + "directions": 1 + } + ], + "version": 1 +} diff --git a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/normal-unshaded.png b/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/normal-unshaded.png new file mode 100644 index 0000000000..b0dab7ee0b Binary files /dev/null and b/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/normal-unshaded.png differ diff --git a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/normal.png b/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/normal.png deleted file mode 100644 index 0eeeae5c0e..0000000000 Binary files a/Resources/Textures/Constructible/Power/VendingMachines/youtool.rsi/normal.png and /dev/null differ