From a18ba5c2b5f20bfa2b485814cbea437217f93f65 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Thu, 16 Jun 2022 18:37:07 +1000 Subject: [PATCH] Power cell culling (#8814) --- Content.Client/PowerCell/PowerCellSystem.cs | 33 +- .../PowerCell/PowerCellVisualizer.cs | 46 -- .../PowerCell/PowerCellVisualsComponent.cs | 4 + Content.Server/Entry/IgnoredComponents.cs | 1 + .../EntitySystems/HandheldLightSystem.cs | 7 +- .../Components/PowerCellComponent.cs | 14 +- .../Components/PowerCellSlotComponent.cs | 7 - .../PowerCell/SharedPowerCellSystem.cs | 35 +- Resources/Maps/Salvage/stationstation.yml | 4 +- Resources/Maps/bagel.yml | 6 +- Resources/Maps/barratry.yml | 2 +- Resources/Maps/delta.yml | 16 +- Resources/Maps/marathon.yml | 4 +- Resources/Maps/nss_pillar.yml | 8 +- Resources/Maps/packedstation.yml | 10 +- Resources/Maps/packedstationxmas.yml | 10 +- Resources/Maps/saltern.yml | 2 +- Resources/Maps/splitstation.yml | 2 +- Resources/Maps/ssreach.yml | 4 +- Resources/Maps/waystation.yml | 6 +- .../Catalog/Fills/Crates/engineering.yml | 6 +- .../Catalog/Fills/Crates/salvage.yml | 3 - .../Catalog/Research/technologies.yml | 24 +- .../VendingMachines/Inventories/engivend.yml | 2 +- .../VendingMachines/Inventories/robotics.yml | 1 - .../Clothing/Head/base_clothinghead.yml | 10 +- .../Entities/Clothing/Head/hardhats.yml | 2 +- .../Entities/Clothing/Head/helmets.yml | 6 +- .../Markers/Spawners/Random/maintenance.yml | 9 +- .../Entities/Objects/Power/powercells.yml | 405 +++--------------- .../Entities/Objects/Tools/flashlights.yml | 4 +- .../Entities/Objects/Tools/lantern.yml | 2 +- .../Entities/Structures/Machines/lathe.yml | 12 +- .../Prototypes/Recipes/Lathes/powercells.yml | 87 +--- .../PowerCells/potato_battery.rsi/meta.json | 15 - .../power_cell_large_hi.rsi/l_hi.png | Bin 381 -> 0 bytes .../power_cell_large_hi.rsi/l_hi_0.png | Bin 237 -> 0 bytes .../power_cell_large_hi.rsi/l_hi_100.png | Bin 174 -> 0 bytes .../power_cell_large_hi.rsi/l_hi_25.png | Bin 186 -> 0 bytes .../power_cell_large_hi.rsi/l_hi_50.png | Bin 188 -> 0 bytes .../power_cell_large_hi.rsi/l_hi_75.png | Bin 187 -> 0 bytes .../power_cell_large_hi.rsi/meta.json | 40 -- .../power_cell_large_hy.rsi/l_hy.png | Bin 374 -> 0 bytes .../power_cell_large_hy.rsi/l_hy_0.png | Bin 221 -> 0 bytes .../power_cell_large_hy.rsi/l_hy_100.png | Bin 174 -> 0 bytes .../power_cell_large_hy.rsi/l_hy_25.png | Bin 187 -> 0 bytes .../power_cell_large_hy.rsi/l_hy_50.png | Bin 189 -> 0 bytes .../power_cell_large_hy.rsi/l_hy_75.png | Bin 187 -> 0 bytes .../power_cell_large_hy.rsi/meta.json | 40 -- .../power_cell_large_st.rsi/l_st.png | Bin 372 -> 0 bytes .../power_cell_large_st.rsi/l_st_0.png | Bin 220 -> 0 bytes .../power_cell_large_st.rsi/l_st_100.png | Bin 167 -> 0 bytes .../power_cell_large_st.rsi/l_st_25.png | Bin 181 -> 0 bytes .../power_cell_large_st.rsi/l_st_50.png | Bin 183 -> 0 bytes .../power_cell_large_st.rsi/l_st_75.png | Bin 180 -> 0 bytes .../power_cell_large_st.rsi/meta.json | 40 -- .../power_cell_large_sup.rsi/l_sup.png | Bin 377 -> 0 bytes .../power_cell_large_sup.rsi/l_sup_0.png | Bin 220 -> 0 bytes .../power_cell_large_sup.rsi/l_sup_100.png | Bin 176 -> 0 bytes .../power_cell_large_sup.rsi/l_sup_25.png | Bin 183 -> 0 bytes .../power_cell_large_sup.rsi/l_sup_50.png | Bin 186 -> 0 bytes .../power_cell_large_sup.rsi/l_sup_75.png | Bin 184 -> 0 bytes .../power_cell_large_sup.rsi/meta.json | 40 -- .../power_cell_medium_hi.rsi/m_hi.png | Bin 360 -> 0 bytes .../power_cell_medium_hi.rsi/m_hi_0.png | Bin 219 -> 0 bytes .../power_cell_medium_hi.rsi/m_hi_100.png | Bin 163 -> 0 bytes .../power_cell_medium_hi.rsi/m_hi_25.png | Bin 155 -> 0 bytes .../power_cell_medium_hi.rsi/m_hi_50.png | Bin 155 -> 0 bytes .../power_cell_medium_hi.rsi/m_hi_75.png | Bin 171 -> 0 bytes .../power_cell_medium_hi.rsi/meta.json | 40 -- .../power_cell_medium_hy.rsi/m_hy.png | Bin 357 -> 0 bytes .../power_cell_medium_hy.rsi/m_hy_0.png | Bin 206 -> 0 bytes .../power_cell_medium_hy.rsi/m_hy_100.png | Bin 163 -> 0 bytes .../power_cell_medium_hy.rsi/m_hy_25.png | Bin 167 -> 0 bytes .../power_cell_medium_hy.rsi/m_hy_50.png | Bin 174 -> 0 bytes .../power_cell_medium_hy.rsi/m_hy_75.png | Bin 172 -> 0 bytes .../power_cell_medium_hy.rsi/meta.json | 40 -- .../power_cell_medium_st.rsi/m_st.png | Bin 370 -> 0 bytes .../power_cell_medium_st.rsi/m_st_0.png | Bin 219 -> 0 bytes .../power_cell_medium_st.rsi/m_st_100.png | Bin 148 -> 0 bytes .../power_cell_medium_st.rsi/m_st_25.png | Bin 166 -> 0 bytes .../power_cell_medium_st.rsi/m_st_50.png | Bin 173 -> 0 bytes .../power_cell_medium_st.rsi/m_st_75.png | Bin 166 -> 0 bytes .../power_cell_medium_st.rsi/meta.json | 40 -- .../power_cell_medium_sup.rsi/m_sup.png | Bin 363 -> 0 bytes .../power_cell_medium_sup.rsi/m_sup_0.png | Bin 206 -> 0 bytes .../power_cell_medium_sup.rsi/m_sup_100.png | Bin 150 -> 0 bytes .../power_cell_medium_sup.rsi/m_sup_25.png | Bin 167 -> 0 bytes .../power_cell_medium_sup.rsi/m_sup_50.png | Bin 173 -> 0 bytes .../power_cell_medium_sup.rsi/m_sup_75.png | Bin 167 -> 0 bytes .../power_cell_medium_sup.rsi/meta.json | 40 -- .../meta.json | 40 -- .../s_ar.png | Bin 308 -> 0 bytes .../s_ar_0.png | Bin 176 -> 0 bytes .../s_ar_100.png | Bin 137 -> 0 bytes .../s_ar_25.png | Bin 146 -> 0 bytes .../s_ar_50.png | Bin 158 -> 0 bytes .../s_ar_75.png | Bin 140 -> 0 bytes .../power_cell_small_hi.rsi/meta.json | 1 - .../power_cell_small_hi.rsi/s_hi.png | Bin 170 -> 0 bytes .../power_cell_small_hi.rsi/s_hi_0.png | Bin 175 -> 0 bytes .../power_cell_small_hi.rsi/s_hi_100.png | Bin 129 -> 0 bytes .../power_cell_small_hi.rsi/s_hi_25.png | Bin 162 -> 0 bytes .../power_cell_small_hi.rsi/s_hi_50.png | Bin 166 -> 0 bytes .../power_cell_small_hi.rsi/s_hi_75.png | Bin 166 -> 0 bytes .../power_cell_small_hy.rsi/meta.json | 1 - .../power_cell_small_hy.rsi/s_hy.png | Bin 170 -> 0 bytes .../power_cell_small_hy.rsi/s_hy_0.png | Bin 175 -> 0 bytes .../power_cell_small_hy.rsi/s_hy_100.png | Bin 129 -> 0 bytes .../power_cell_small_hy.rsi/s_hy_25.png | Bin 162 -> 0 bytes .../power_cell_small_hy.rsi/s_hy_50.png | Bin 166 -> 0 bytes .../power_cell_small_hy.rsi/s_hy_75.png | Bin 166 -> 0 bytes .../power_cell_small_st.rsi/meta.json | 1 - .../power_cell_small_st.rsi/s_st.png | Bin 170 -> 0 bytes .../power_cell_small_st.rsi/s_st_0.png | Bin 175 -> 0 bytes .../power_cell_small_st.rsi/s_st_100.png | Bin 129 -> 0 bytes .../power_cell_small_st.rsi/s_st_25.png | Bin 162 -> 0 bytes .../power_cell_small_st.rsi/s_st_50.png | Bin 166 -> 0 bytes .../power_cell_small_st.rsi/s_st_75.png | Bin 166 -> 0 bytes .../power_cell_small_sup.rsi/meta.json | 1 - .../power_cell_small_sup.rsi/s_sup.png | Bin 170 -> 0 bytes .../power_cell_small_sup.rsi/s_sup_0.png | Bin 175 -> 0 bytes .../power_cell_small_sup.rsi/s_sup_100.png | Bin 129 -> 0 bytes .../power_cell_small_sup.rsi/s_sup_25.png | Bin 162 -> 0 bytes .../power_cell_small_sup.rsi/s_sup_50.png | Bin 166 -> 0 bytes .../power_cell_small_sup.rsi/s_sup_75.png | Bin 166 -> 0 bytes .../Objects/Power/power_cells.rsi/antique.png | Bin 0 -> 320 bytes .../Objects/Power/power_cells.rsi/high.png | Bin 0 -> 312 bytes .../Objects/Power/power_cells.rsi/hyper.png | Bin 0 -> 352 bytes .../Objects/Power/power_cells.rsi/medium.png | Bin 0 -> 351 bytes .../Objects/Power/power_cells.rsi/meta.json | 38 ++ .../Power/power_cells.rsi/microreactor.png | Bin 0 -> 315 bytes .../Objects/Power/power_cells.rsi/o1.png | Bin 0 -> 169 bytes .../Objects/Power/power_cells.rsi/o2.png | Bin 0 -> 174 bytes .../potato.png} | Bin .../Objects/Power/power_cells.rsi/small.png | Bin 0 -> 311 bytes 136 files changed, 234 insertions(+), 977 deletions(-) delete mode 100644 Content.Client/PowerCell/PowerCellVisualizer.cs create mode 100644 Content.Client/PowerCell/PowerCellVisualsComponent.cs delete mode 100644 Resources/Textures/Objects/Power/PowerCells/potato_battery.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_hi.rsi/l_hi.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_hi.rsi/l_hi_0.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_hi.rsi/l_hi_100.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_hi.rsi/l_hi_25.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_hi.rsi/l_hi_50.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_hi.rsi/l_hi_75.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_hi.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_hy.rsi/l_hy.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_hy.rsi/l_hy_0.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_hy.rsi/l_hy_100.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_hy.rsi/l_hy_25.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_hy.rsi/l_hy_50.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_hy.rsi/l_hy_75.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_hy.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_st.rsi/l_st.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_st.rsi/l_st_0.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_st.rsi/l_st_100.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_st.rsi/l_st_25.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_st.rsi/l_st_50.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_st.rsi/l_st_75.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_st.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_sup.rsi/l_sup.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_sup.rsi/l_sup_0.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_sup.rsi/l_sup_100.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_sup.rsi/l_sup_25.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_sup.rsi/l_sup_50.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_sup.rsi/l_sup_75.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_large_sup.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_hi.rsi/m_hi.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_hi.rsi/m_hi_0.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_hi.rsi/m_hi_100.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_hi.rsi/m_hi_25.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_hi.rsi/m_hi_50.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_hi.rsi/m_hi_75.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_hi.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_hy.rsi/m_hy.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_hy.rsi/m_hy_0.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_hy.rsi/m_hy_100.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_hy.rsi/m_hy_25.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_hy.rsi/m_hy_50.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_hy.rsi/m_hy_75.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_hy.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_st.rsi/m_st.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_st.rsi/m_st_0.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_st.rsi/m_st_100.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_st.rsi/m_st_25.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_st.rsi/m_st_50.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_st.rsi/m_st_75.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_st.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_sup.rsi/m_sup.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_sup.rsi/m_sup_0.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_sup.rsi/m_sup_100.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_sup.rsi/m_sup_25.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_sup.rsi/m_sup_50.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_sup.rsi/m_sup_75.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_medium_sup.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_autorecharge.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_autorecharge.rsi/s_ar.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_autorecharge.rsi/s_ar_0.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_autorecharge.rsi/s_ar_100.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_autorecharge.rsi/s_ar_25.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_autorecharge.rsi/s_ar_50.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_autorecharge.rsi/s_ar_75.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi_0.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi_100.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi_25.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi_50.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi_75.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy_0.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy_100.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy_25.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy_50.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy_75.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st_0.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st_100.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st_25.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st_50.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st_75.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup_0.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup_100.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup_25.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup_50.png delete mode 100644 Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup_75.png create mode 100644 Resources/Textures/Objects/Power/power_cells.rsi/antique.png create mode 100644 Resources/Textures/Objects/Power/power_cells.rsi/high.png create mode 100644 Resources/Textures/Objects/Power/power_cells.rsi/hyper.png create mode 100644 Resources/Textures/Objects/Power/power_cells.rsi/medium.png create mode 100644 Resources/Textures/Objects/Power/power_cells.rsi/meta.json create mode 100644 Resources/Textures/Objects/Power/power_cells.rsi/microreactor.png create mode 100644 Resources/Textures/Objects/Power/power_cells.rsi/o1.png create mode 100644 Resources/Textures/Objects/Power/power_cells.rsi/o2.png rename Resources/Textures/Objects/Power/{PowerCells/potato_battery.rsi/potato_battery.png => power_cells.rsi/potato.png} (100%) create mode 100644 Resources/Textures/Objects/Power/power_cells.rsi/small.png diff --git a/Content.Client/PowerCell/PowerCellSystem.cs b/Content.Client/PowerCell/PowerCellSystem.cs index 9d9ea40303..9776429eb2 100644 --- a/Content.Client/PowerCell/PowerCellSystem.cs +++ b/Content.Client/PowerCell/PowerCellSystem.cs @@ -1,7 +1,38 @@ using Content.Shared.PowerCell; using JetBrains.Annotations; +using Robust.Client.GameObjects; namespace Content.Client.PowerCell; [UsedImplicitly] -public sealed class PowerCellSystem : SharedPowerCellSystem { } +public sealed class PowerCellSystem : SharedPowerCellSystem +{ + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnPowerCellVisualsChange); + } + + private void OnPowerCellVisualsChange(EntityUid uid, PowerCellVisualsComponent component, ref AppearanceChangeEvent args) + { + if (args.Sprite == null) return; + + if (args.Component.TryGetData(PowerCellVisuals.ChargeLevel, out byte level)) + { + if (level == 0) + { + args.Sprite.LayerSetVisible(PowerCellVisualLayers.Unshaded, false); + return; + } + + args.Sprite.LayerSetVisible(PowerCellVisualLayers.Unshaded, true); + args.Sprite.LayerSetState(PowerCellVisualLayers.Unshaded, $"o{level}"); + } + } + + private enum PowerCellVisualLayers : byte + { + Base, + Unshaded, + } +} diff --git a/Content.Client/PowerCell/PowerCellVisualizer.cs b/Content.Client/PowerCell/PowerCellVisualizer.cs deleted file mode 100644 index ef0b0b4305..0000000000 --- a/Content.Client/PowerCell/PowerCellVisualizer.cs +++ /dev/null @@ -1,46 +0,0 @@ -using Content.Shared.PowerCell; -using JetBrains.Annotations; -using Robust.Client.GameObjects; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Serialization.Manager.Attributes; - -namespace Content.Client.PowerCell -{ - [UsedImplicitly] - public sealed class PowerCellVisualizer : AppearanceVisualizer - { - [DataField("prefix")] - private string? _prefix; - - public override void InitializeEntity(EntityUid entity) - { - base.InitializeEntity(entity); - - var sprite = IoCManager.Resolve().GetComponent(entity); - - if (_prefix != null) - { - sprite.LayerMapSet(Layers.Charge, sprite.AddLayerState($"{_prefix}_100")); - sprite.LayerSetShader(Layers.Charge, "unshaded"); - } - } - - public override void OnChangeData(AppearanceComponent component) - { - base.OnChangeData(component); - - var sprite = IoCManager.Resolve().GetComponent(component.Owner); - if (component.TryGetData(PowerCellVisuals.ChargeLevel, out byte level)) - { - var adjustedLevel = level * 25; - sprite.LayerSetState(Layers.Charge, $"{_prefix}_{adjustedLevel}"); - } - } - - private enum Layers : byte - { - Charge - } - } -} diff --git a/Content.Client/PowerCell/PowerCellVisualsComponent.cs b/Content.Client/PowerCell/PowerCellVisualsComponent.cs new file mode 100644 index 0000000000..7238ef6b93 --- /dev/null +++ b/Content.Client/PowerCell/PowerCellVisualsComponent.cs @@ -0,0 +1,4 @@ +namespace Content.Client.PowerCell; + +[RegisterComponent] +public sealed class PowerCellVisualsComponent : Component {} diff --git a/Content.Server/Entry/IgnoredComponents.cs b/Content.Server/Entry/IgnoredComponents.cs index 0e8214e0e1..f5ab20d53d 100644 --- a/Content.Server/Entry/IgnoredComponents.cs +++ b/Content.Server/Entry/IgnoredComponents.cs @@ -25,6 +25,7 @@ namespace Content.Server.Entry "HandheldGPS", "SpentAmmoVisuals", "MagazineVisuals", + "PowerCellVisuals", "ToggleableLightVisuals", "CableVisualizer", "PotencyVisuals", diff --git a/Content.Server/Light/EntitySystems/HandheldLightSystem.cs b/Content.Server/Light/EntitySystems/HandheldLightSystem.cs index 7d589ba853..562f6c0eaf 100644 --- a/Content.Server/Light/EntitySystems/HandheldLightSystem.cs +++ b/Content.Server/Light/EntitySystems/HandheldLightSystem.cs @@ -1,6 +1,7 @@ using Content.Server.Actions; using Content.Server.Light.Components; using Content.Server.Popups; +using Content.Server.Power.Components; using Content.Server.PowerCell; using Content.Shared.Actions; using Content.Shared.Actions.ActionTypes; @@ -220,7 +221,8 @@ namespace Content.Server.Light.EntitySystems { if (component.Activated) return false; - if (!_powerCell.TryGetBatteryFromSlot(component.Owner, out var battery)) + if (!_powerCell.TryGetBatteryFromSlot(component.Owner, out var battery) && + !TryComp(component.Owner, out battery)) { SoundSystem.Play(component.TurnOnFailSound.GetSound(), Filter.Pvs(component.Owner, entityManager: EntityManager), component.Owner); _popup.PopupEntity(Loc.GetString("handheld-light-component-cell-missing-message"), component.Owner, Filter.Entities(user)); @@ -253,7 +255,8 @@ namespace Content.Server.Light.EntitySystems public void TryUpdate(HandheldLightComponent component, float frameTime) { - if (!_powerCell.TryGetBatteryFromSlot(component.Owner, out var battery)) + if (!_powerCell.TryGetBatteryFromSlot(component.Owner, out var battery) && + !TryComp(component.Owner, out battery)) { TurnOff(component, false); return; diff --git a/Content.Shared/PowerCell/Components/PowerCellComponent.cs b/Content.Shared/PowerCell/Components/PowerCellComponent.cs index b8424df0a8..27a0d2ef97 100644 --- a/Content.Shared/PowerCell/Components/PowerCellComponent.cs +++ b/Content.Shared/PowerCell/Components/PowerCellComponent.cs @@ -12,25 +12,15 @@ namespace Content.Shared.PowerCell; public sealed class PowerCellComponent : Component { public const string SolutionName = "powerCell"; - public const int PowerCellVisualsLevels = 4; - - [DataField("cellSize")] - public PowerCellSize CellSize = PowerCellSize.Small; + public const int PowerCellVisualsLevels = 2; // Not networked to clients [ViewVariables(VVAccess.ReadWrite)] public bool IsRigged { get; set; } } -public enum PowerCellSize -{ - Small = 0, - Medium = 1, - Large = 2 -} - [Serializable, NetSerializable] -public enum PowerCellVisuals +public enum PowerCellVisuals : byte { ChargeLevel } diff --git a/Content.Shared/PowerCell/Components/PowerCellSlotComponent.cs b/Content.Shared/PowerCell/Components/PowerCellSlotComponent.cs index 59896c83f4..304ba3dac9 100644 --- a/Content.Shared/PowerCell/Components/PowerCellSlotComponent.cs +++ b/Content.Shared/PowerCell/Components/PowerCellSlotComponent.cs @@ -5,13 +5,6 @@ namespace Content.Shared.PowerCell.Components; [RegisterComponent] public sealed class PowerCellSlotComponent : Component { - /// - /// What size of cell fits into this component. - /// - [ViewVariables(VVAccess.ReadWrite)] - [DataField("slotSize")] - public PowerCellSize SlotSize { get; set; } = PowerCellSize.Small; - /// /// The actual item-slot that contains the cell. Allows all the interaction logic to be handled by . /// diff --git a/Content.Shared/PowerCell/SharedPowerCellSystem.cs b/Content.Shared/PowerCell/SharedPowerCellSystem.cs index becc8a04da..ae9c9f973c 100644 --- a/Content.Shared/PowerCell/SharedPowerCellSystem.cs +++ b/Content.Shared/PowerCell/SharedPowerCellSystem.cs @@ -18,8 +18,6 @@ public abstract class SharedPowerCellSystem : EntitySystem SubscribeLocalEvent(OnCellSlotInit); SubscribeLocalEvent(OnCellSlotRemove); - SubscribeLocalEvent(OnSlotExamined); - SubscribeLocalEvent(OnCellInserted); SubscribeLocalEvent(OnCellRemoved); SubscribeLocalEvent(OnCellInsertAttempt); @@ -33,7 +31,7 @@ public abstract class SharedPowerCellSystem : EntitySystem if (args.Container.ID != component.CellSlot.ID) return; - if (!TryComp(args.EntityUid, out PowerCellComponent? cell) || cell.CellSize != component.SlotSize) + if (!HasComp(args.EntityUid)) { args.Cancel(); } @@ -67,41 +65,10 @@ public abstract class SharedPowerCellSystem : EntitySystem { component.CellSlot.Name = component.SlotName; } - - if (component.StartEmpty) - return; - - if (!string.IsNullOrWhiteSpace(component.CellSlot.StartingItem)) - return; - - // set default starting cell based on cell-type - component.CellSlot.StartingItem = component.SlotSize switch - { - PowerCellSize.Small => "PowerCellSmallStandard", - PowerCellSize.Medium => "PowerCellMediumStandard", - PowerCellSize.Large => "PowerCellLargeStandard", - _ => throw new ArgumentOutOfRangeException() - }; } private void OnCellSlotRemove(EntityUid uid, PowerCellSlotComponent component, ComponentRemove args) { _itemSlotsSystem.RemoveItemSlot(uid, component.CellSlot); } - - private void OnSlotExamined(EntityUid uid, PowerCellSlotComponent component, ExaminedEvent args) - { - if (!args.IsInDetailsRange || string.IsNullOrWhiteSpace(component.DescFormatString)) - return; - - var sizeText = Loc.GetString(component.SlotSize switch - { - PowerCellSize.Small => "power-cell-slot-component-description-size-small", - PowerCellSize.Medium => "power-cell-slot-component-description-size-medium", - PowerCellSize.Large => "power-cell-slot-component-description-size-large", - _ => "???" - }); - - args.PushMarkup(Loc.GetString(component.DescFormatString, ("size", sizeText))); - } } diff --git a/Resources/Maps/Salvage/stationstation.yml b/Resources/Maps/Salvage/stationstation.yml index e234bb737a..060e405f3f 100644 --- a/Resources/Maps/Salvage/stationstation.yml +++ b/Resources/Maps/Salvage/stationstation.yml @@ -1737,13 +1737,13 @@ entities: parent: 179 type: Transform - uid: 186 - type: PowerCellSmallHigh + type: PowerCellMedium components: - pos: -2.67511,-10.351 parent: 179 type: Transform - uid: 187 - type: PowerCellSmallHigh + type: PowerCellMedium components: - pos: -2.55011,-10.6635 parent: 179 diff --git a/Resources/Maps/bagel.yml b/Resources/Maps/bagel.yml index a78c3efba7..36abc17153 100644 --- a/Resources/Maps/bagel.yml +++ b/Resources/Maps/bagel.yml @@ -86506,7 +86506,7 @@ entities: - canCollide: False type: Physics - uid: 7165 - type: PowerCellMediumPotato + type: PowerCellPotato components: - pos: -20.516964,-56.33504 parent: 60 @@ -105329,7 +105329,7 @@ entities: parent: 60 type: Transform - uid: 9621 - type: PowerCellLargeSuper + type: PowerCellHigh components: - pos: -37.43891,14.626589 parent: 60 @@ -151805,7 +151805,7 @@ entities: ents: [] type: ContainerContainer - uid: 16084 - type: PowerCellSmallAutorecharge + type: PowerCellMicroreactor components: - pos: 0.55256647,20.72724 parent: 60 diff --git a/Resources/Maps/barratry.yml b/Resources/Maps/barratry.yml index 7018486586..fa00b0ae17 100644 --- a/Resources/Maps/barratry.yml +++ b/Resources/Maps/barratry.yml @@ -111283,7 +111283,7 @@ entities: charger-slot: !type:ContainerSlot {} type: ContainerContainer - uid: 12271 - type: PowerCellMediumPotato + type: PowerCellPotato components: - pos: -3.516998,-36.44544 parent: 106 diff --git a/Resources/Maps/delta.yml b/Resources/Maps/delta.yml index d6e42babd2..d570a5f332 100644 --- a/Resources/Maps/delta.yml +++ b/Resources/Maps/delta.yml @@ -47764,7 +47764,7 @@ entities: charger-slot: !type:ContainerSlot {} type: ContainerContainer - uid: 1777 - type: PowerCellLargeStandard + type: PowerCellSmall components: - pos: -10.414857,-37.378014 parent: 60 @@ -54147,7 +54147,7 @@ entities: - canCollide: False type: Physics - uid: 2674 - type: PowerCellLargeStandard + type: PowerCellSmall components: - pos: -55.456623,-37.464394 parent: 60 @@ -54155,7 +54155,7 @@ entities: - canCollide: False type: Physics - uid: 2675 - type: PowerCellLargeStandard + type: PowerCellSmall components: - pos: -55.44885,-38.160557 parent: 60 @@ -57048,7 +57048,7 @@ entities: charger-slot: !type:ContainerSlot {} type: ContainerContainer - uid: 3076 - type: PowerCellLargeStandard + type: PowerCellSmall components: - pos: -55.356537,-43.214397 parent: 60 @@ -79980,7 +79980,7 @@ entities: charger-slot: !type:ContainerSlot {} type: ContainerContainer - uid: 6323 - type: PowerCellLargeStandard + type: PowerCellSmall components: - pos: -50.5,-9.5 parent: 60 @@ -133076,7 +133076,7 @@ entities: - canCollide: False type: Physics - uid: 13755 - type: PowerCellLargeStandard + type: PowerCellSmall components: - pos: 12.5294485,82.53368 parent: 60 @@ -154878,7 +154878,7 @@ entities: ents: [] type: ContainerContainer - uid: 16985 - type: PowerCellLargeStandard + type: PowerCellSmall components: - pos: 16.412798,54.560455 parent: 60 @@ -171164,7 +171164,7 @@ entities: charger-slot: !type:ContainerSlot {} type: ContainerContainer - uid: 19288 - type: PowerCellLargeStandard + type: PowerCellSmall components: - pos: 43.575706,-44.36233 parent: 60 diff --git a/Resources/Maps/marathon.yml b/Resources/Maps/marathon.yml index d98b108743..b0c7af9ba8 100644 --- a/Resources/Maps/marathon.yml +++ b/Resources/Maps/marathon.yml @@ -37441,7 +37441,7 @@ entities: charger-slot: !type:ContainerSlot {} type: ContainerContainer - uid: 2119 - type: PowerCellMediumStandard + type: PowerCellSmall components: - pos: -27.504559,56.49509 parent: 30 @@ -37449,7 +37449,7 @@ entities: - canCollide: False type: Physics - uid: 2120 - type: PowerCellMediumStandard + type: PowerCellSmall components: - pos: -27.504559,56.68259 parent: 30 diff --git a/Resources/Maps/nss_pillar.yml b/Resources/Maps/nss_pillar.yml index e4d1d6bd99..f0ae08b09e 100644 --- a/Resources/Maps/nss_pillar.yml +++ b/Resources/Maps/nss_pillar.yml @@ -53389,7 +53389,7 @@ entities: parent: 130 type: Transform - uid: 4846 - type: PowerCellLargeStandard + type: PowerCellSmall components: - pos: 29.227386,-9.561591 parent: 130 @@ -90644,7 +90644,7 @@ entities: parent: 130 type: Transform - uid: 9699 - type: PowerCellMediumPotato + type: PowerCellPotato components: - pos: 34.5,-20.500025 parent: 130 @@ -93243,7 +93243,7 @@ entities: charger-slot: !type:ContainerSlot {} type: ContainerContainer - uid: 9947 - type: PowerCellLargeHigh + type: PowerCellMedium components: - pos: 29.548517,-9.58406 parent: 130 @@ -95478,7 +95478,7 @@ entities: parent: 130 type: Transform - uid: 10276 - type: PowerCellLargeStandard + type: PowerCellSmall components: - pos: -40.50005,-16.500025 parent: 130 diff --git a/Resources/Maps/packedstation.yml b/Resources/Maps/packedstation.yml index d4aef9b16a..4950333d92 100644 --- a/Resources/Maps/packedstation.yml +++ b/Resources/Maps/packedstation.yml @@ -28487,7 +28487,7 @@ entities: - canCollide: False type: Physics - uid: 2075 - type: PowerCellMediumStandard + type: PowerCellSmall components: - pos: 9.531351,32.51714 parent: 2 @@ -50161,7 +50161,7 @@ entities: charger-slot: !type:ContainerSlot {} type: ContainerContainer - uid: 5313 - type: PowerCellLargeStandard + type: PowerCellSmall components: - pos: 56.529827,20.631775 parent: 2 @@ -50725,7 +50725,7 @@ entities: ents: [] type: ContainerContainer - uid: 5382 - type: PowerCellLargeStandard + type: PowerCellSmall components: - pos: 50.725174,11.548619 parent: 2 @@ -94093,7 +94093,7 @@ entities: parent: 2 type: Transform - uid: 11070 - type: PowerCellMediumStandard + type: PowerCellSmall components: - parent: 9191 type: Transform @@ -94878,7 +94878,7 @@ entities: parent: 2 type: Transform - uid: 11166 - type: PowerCellMediumStandard + type: PowerCellSmall components: - parent: 11154 type: Transform diff --git a/Resources/Maps/packedstationxmas.yml b/Resources/Maps/packedstationxmas.yml index 7baf96d964..4e33216d3c 100644 --- a/Resources/Maps/packedstationxmas.yml +++ b/Resources/Maps/packedstationxmas.yml @@ -22187,7 +22187,7 @@ entities: - canCollide: False type: Physics - uid: 2097 - type: PowerCellMediumStandard + type: PowerCellSmall components: - pos: 9.531351,32.51714 parent: 0 @@ -43826,7 +43826,7 @@ entities: charger-slot: !type:ContainerSlot {} type: ContainerContainer - uid: 5336 - type: PowerCellLargeStandard + type: PowerCellSmall components: - pos: 56.529827,20.631775 parent: 0 @@ -44390,7 +44390,7 @@ entities: ents: [] type: ContainerContainer - uid: 5405 - type: PowerCellLargeStandard + type: PowerCellSmall components: - pos: 50.725174,11.548619 parent: 0 @@ -87726,7 +87726,7 @@ entities: - canCollide: False type: Physics - uid: 11108 - type: PowerCellMediumStandard + type: PowerCellSmall components: - parent: 9229 type: Transform @@ -88505,7 +88505,7 @@ entities: - canCollide: False type: Physics - uid: 11204 - type: PowerCellMediumStandard + type: PowerCellSmall components: - parent: 11192 type: Transform diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml index 9863285fc1..a26c766d64 100644 --- a/Resources/Maps/saltern.yml +++ b/Resources/Maps/saltern.yml @@ -17902,7 +17902,7 @@ entities: parent: 852 type: Transform - uid: 1130 - type: PowerCellSmallStandard + type: PowerCellSmall components: - parent: 1549 type: Transform diff --git a/Resources/Maps/splitstation.yml b/Resources/Maps/splitstation.yml index acf1e8ff3b..d5a37fef70 100644 --- a/Resources/Maps/splitstation.yml +++ b/Resources/Maps/splitstation.yml @@ -105162,7 +105162,7 @@ entities: - canCollide: False type: Physics - uid: 11187 - type: PowerCellLargeStandard + type: PowerCellSmall components: - pos: 14.5,-105.5 parent: 69 diff --git a/Resources/Maps/ssreach.yml b/Resources/Maps/ssreach.yml index beb3d37953..6cd8fad41b 100644 --- a/Resources/Maps/ssreach.yml +++ b/Resources/Maps/ssreach.yml @@ -4210,7 +4210,7 @@ entities: - canCollide: False type: Physics - uid: 153 - type: PowerCellSmallStandard + type: PowerCellSmall components: - parent: 152 type: Transform @@ -4225,7 +4225,7 @@ entities: - canCollide: False type: Physics - uid: 155 - type: PowerCellSmallStandard + type: PowerCellSmall components: - parent: 154 type: Transform diff --git a/Resources/Maps/waystation.yml b/Resources/Maps/waystation.yml index 8ceb89fda6..ad841c741d 100644 --- a/Resources/Maps/waystation.yml +++ b/Resources/Maps/waystation.yml @@ -35234,7 +35234,7 @@ entities: - canCollide: False type: Physics - uid: 2452 - type: PowerCellLargeStandard + type: PowerCellSmall components: - pos: 8.459046,45.525425 parent: 82 @@ -45505,7 +45505,7 @@ entities: - canCollide: False type: Physics - uid: 3700 - type: PowerCellLargeStandard + type: PowerCellSmall components: - pos: 44.656002,21.563784 parent: 82 @@ -56560,7 +56560,7 @@ entities: parent: 82 type: Transform - uid: 4967 - type: PowerCellMediumPotato + type: PowerCellPotato components: - pos: 32.49642,-0.21778393 parent: 82 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml index 1341c0c4ee..308a110b67 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/engineering.yml @@ -37,11 +37,7 @@ # components: # - type: StorageFill # contents: -# - id: PowerCellLargeStandard -# amount: 3 -# - id: PowerCellMediumStandard -# amount: 3 -# - id: PowerCellSmallAutorecharge +# - id: PowerCellMicroreactor # amount: 3 - type: entity diff --git a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml index 66246f2773..2620ab2380 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/salvage.yml @@ -63,9 +63,6 @@ # Interesting (1%) # - Ammo - id: MagazineBoxMagnum - prob: 0.01 - # - #shinies - - id: PowerCellLargeHyper prob: 0.01 # Just no (0.1%) # - Working guns diff --git a/Resources/Prototypes/Catalog/Research/technologies.yml b/Resources/Prototypes/Catalog/Research/technologies.yml index 06e6806b68..8b9472462d 100644 --- a/Resources/Prototypes/Catalog/Research/technologies.yml +++ b/Resources/Prototypes/Catalog/Research/technologies.yml @@ -400,45 +400,39 @@ id: PowerCellBasic description: Print standard powercells. icon: - sprite: Objects/Power/PowerCells/power_cell_small_st.rsi - state: s_st + sprite: Objects/Power/power_cells.rsi + state: small requiredPoints: 2500 requiredTechnologies: - ElectromagneticTheory unlockedRecipes: - - PowerCellSmallStandard - - PowerCellMediumStandard - - PowerCellLargeStandard + - PowerCellSmall - type: technology name: "advanced powercell printing" id: PowerCellAdvanced description: Print advanced powercells. icon: - sprite: Objects/Power/PowerCells/power_cell_small_hi.rsi - state: s_hi + sprite: Objects/Power/power_cells.rsi + state: medium requiredPoints: 5000 requiredTechnologies: - PowerCellBasic unlockedRecipes: - - PowerCellSmallHigh - - PowerCellMediumHigh - - PowerCellLargeHigh + - PowerCellMedium - type: technology name: "super powercell printing" id: PowerCellSuper description: Print super powercells. icon: - sprite: Objects/Power/PowerCells/power_cell_small_sup.rsi - state: s_sup + sprite: Objects/Power/power_cells.rsi + state: high requiredPoints: 10000 requiredTechnologies: - PowerCellAdvanced unlockedRecipes: - - PowerCellSmallSuper - - PowerCellMediumSuper - - PowerCellLargeSuper + - PowerCellHigh # Basic Parts Technology Tree - type: technology diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml index 4c38fd4de7..b35681f854 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml @@ -6,7 +6,7 @@ startingInventory: ClothingEyesGlassesMeson: 4 Multitool: 4 - PowerCellSmallHigh: 5 + PowerCellMedium: 5 ClothingHandsGlovesColorYellow: 6 InflatableWallStack1: 24 InflatableDoorStack1: 8 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml index 56a49b3c2a..1236d446e4 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/robotics.yml @@ -8,7 +8,6 @@ #roboticist under CableStack: 4 Flash: 4 - PowerCellLargeHigh: 12 #proximity sensor #signaller #health anaylzer diff --git a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml index 1b3dc756ab..7e7da58c56 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/base_clothinghead.yml @@ -106,7 +106,9 @@ - type: FlashLightVisualizer - type: HandheldLight addPrefix: true - - type: PowerCellSlot - cellSlot: - startingItem: PowerCellHardsuitHelmet # self recharging - locked: true # no need to recharge manually + - type: Battery + maxCharge: 600 #lights drain 3/s but recharge of 2 makes this 1/s. Therefore 600 is 10 minutes of light. + startingCharge: 600 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 2 #recharge of 2 makes total drain 1w / s so max charge is 1:1 with time. Time to fully charge should be 5 minutes. Having recharge gives light an extended flicker period which gives you some warning to return to light area. diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml index 7bb577af60..f40a561fac 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardhats.yml @@ -36,7 +36,7 @@ - state: on-equipped-HELMET - type: PowerCellSlot cellSlot: - startingItem: PowerCellSmallHigh + startingItem: PowerCellMedium - type: entity parent: ClothingHeadHatHardhatBase diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index fb3e538511..818868f1b9 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -128,7 +128,7 @@ - type: Tag tags: - HidesHair - + - type: entity parent: ClothingHeadBase id: ClothingHeadHelmetSpaceNinja @@ -143,7 +143,7 @@ - type: Tag tags: - HidesHair - + - type: entity parent: ClothingHeadEVAHelmetBase id: ClothingHeadHelmetSyndicate @@ -207,7 +207,7 @@ - type: IngestionBlocker - type: PowerCellSlot cellSlot: - startingItem: PowerCellSmallHigh + startingItem: PowerCellMedium - type: TemperatureProtection coefficient: 0.01 - type: Armor diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 3792dce72e..20df4edf75 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -50,14 +50,13 @@ - type: Sprite layers: - state: red - - texture: Objects/Power/PowerCells/power_cell_large_sup.rsi/l_sup.png + - sprite: Objects/Power/power_cells.rsi + state: high - type: RandomSpawner rarePrototypes: - lanternextrabright - - PowerCellMediumSuper - - PowerCellSmallSuper - - PowerCellLargeSuper - - PowerCellSmallAutorecharge + - PowerCellHigh + - PowerCellMicroreactor rareChance: 0.08 prototypes: - FlashlightLantern diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml index 39960dbe4d..c0bdd68228 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml @@ -1,8 +1,5 @@ -# TODO: Add descriptions (3) -# Power cells - - type: entity - id: PowerCellSmallBase + id: BasePowerCell abstract: true parent: BaseItem components: @@ -11,6 +8,7 @@ - type: Explosive explosionType: Default - type: Sprite + sprite: Objects/Power/power_cells.rsi netsync: false - type: SolutionContainerManager solutions: @@ -28,144 +26,125 @@ - type: Tag tags: - DroneUsable - -- type: entity - id: PowerCellMediumBase - abstract: true - parent: PowerCellSmallBase - components: - - type: PowerCell - cellSize: Medium - -- type: entity - id: PowerCellLargeBase - abstract: true - parent: PowerCellSmallBase - components: - - type: PowerCell - cellSize: Large + - type: Appearance + - type: PowerCellVisuals - type: entity name: potato battery - description: Someone's stuck two nails and some wire in a large potato. Somehow it provides a little charge. You might be able to cram it into an M-sized slot. - id: PowerCellMediumPotato - parent: PowerCellMediumBase + description: Someone's stuck two nails and some wire in a large potato. Somehow it provides a little charge. + id: PowerCellPotato + parent: BasePowerCell components: - type: Sprite - sprite: Objects/Power/PowerCells/potato_battery.rsi layers: - - state: potato_battery + - state: potato - type: Battery - maxCharge: 360 - startingCharge: 360 + maxCharge: 200 + startingCharge: 200 - type: entity - name: small standard power cell - description: A rechargeable standardized power cell, size S. This is the cheapest kind you can find. - id: PowerCellSmallStandard + name: small-capacity power cell + description: A rechargeable power cell. This is the cheapest kind you can find. + id: PowerCellSmall suffix: Full - parent: PowerCellSmallBase + parent: BasePowerCell components: - type: Sprite - sprite: Objects/Power/PowerCells/power_cell_small_st.rsi layers: - - state: s_st + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: small + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: o2 + shader: unshaded - type: Battery maxCharge: 360 startingCharge: 360 - - type: Appearance - visuals: - - type: PowerCellVisualizer - prefix: s_st - type: entity - id: PowerCellSmallStandardPrinted + id: PowerCellSmallPrinted suffix: Empty - parent: PowerCellSmallStandard + parent: PowerCellSmall components: - type: Battery maxCharge: 360 startingCharge: 0 - type: entity - name: small high-capacity power cell - description: A rechargeable standardized power cell, size S. This is the popular and reliable version. - id: PowerCellSmallHigh + name: medium-capacity power cell + description: A rechargeable power cell. This is the popular and reliable version. + id: PowerCellMedium suffix: Full - parent: PowerCellSmallBase + parent: BasePowerCell components: - type: Sprite - sprite: Objects/Power/PowerCells/power_cell_small_hi.rsi layers: - - state: s_hi + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: medium + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: o2 + shader: unshaded - type: Battery maxCharge: 720 startingCharge: 720 - - type: Appearance - visuals: - - type: PowerCellVisualizer - prefix: s_hi - type: entity - id: PowerCellSmallHighPrinted + id: PowerCellMediumPrinted suffix: Empty - parent: PowerCellSmallHigh + parent: PowerCellMedium components: - type: Battery maxCharge: 720 startingCharge: 0 - type: entity - name: small super-capacity power cell - description: A rechargeable standardized power cell, size S. This premium high-capacity brand stores up to 50% more energy than the competition. - id: PowerCellSmallSuper + name: high-capacity power cell + description: A rechargeable standardized power cell. This premium brand stores up to 50% more energy than the competition. + id: PowerCellHigh suffix: Full - parent: PowerCellSmallBase + parent: BasePowerCell components: - type: Sprite - sprite: Objects/Power/PowerCells/power_cell_small_sup.rsi layers: - - state: s_sup + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: high + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: o2 + shader: unshaded - type: Battery maxCharge: 1080 startingCharge: 1080 - - type: Appearance - visuals: - - type: PowerCellVisualizer - prefix: s_sup - type: entity - id: PowerCellSmallSuperPrinted + id: PowerCellHighPrinted suffix: Empty - parent: PowerCellSmallSuper + parent: PowerCellHigh components: - type: Battery maxCharge: 1080 startingCharge: 0 - type: entity - name: small hyper-capacity power cell - description: A rechargeable standardized power cell, size S. This one looks like a rare and powerful prototype. - id: PowerCellSmallHyper + name: hyper-capacity power cell + description: A rechargeable standardized power cell. This one looks like a rare and powerful prototype. + id: PowerCellHyper suffix: Full - parent: PowerCellSmallBase + parent: BasePowerCell components: - type: Sprite - sprite: Objects/Power/PowerCells/power_cell_small_hy.rsi layers: - - state: s_hy + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: hyper + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: o2 + shader: unshaded - type: Battery maxCharge: 1800 startingCharge: 1800 - - type: Appearance - visuals: - - type: PowerCellVisualizer - prefix: s_hy - type: entity - id: PowerCellSmallHyperPrinted + id: PowerCellHyperPrinted suffix: Empty - parent: PowerCellSmallHyper + parent: PowerCellHyper components: - type: Battery maxCharge: 1800 @@ -173,289 +152,41 @@ - type: entity name: small microreactor cell - description: A rechargeable standardized microreactor cell, size S. Intended for low-power devices, it slowly recharges by itself. - id: PowerCellSmallAutorecharge + description: A rechargeable standardized microreactor cell. Intended for low-power devices, it slowly recharges by itself. + id: PowerCellMicroreactor suffix: Full - parent: PowerCellSmallBase + parent: BasePowerCell components: - type: Sprite - sprite: Objects/Power/PowerCells/power_cell_small_autorecharge.rsi layers: - - state: s_ar + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: microreactor + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: o2 + shader: unshaded - type: Battery maxCharge: 50 startingCharge: 50 - type: BatterySelfRecharger autoRecharge: true autoRechargeRate: 0.16667 #takes about 5 minutes to charge itself back to full - - type: Appearance - visuals: - - type: PowerCellVisualizer - prefix: s_ar - -- type: entity - name: hardsuit helmet power cell - description: A small cell that recharges itself intended for hardsuit helmets. - id: PowerCellHardsuitHelmet - suffix: Full - parent: PowerCellSmallBase - components: - - type: Sprite - sprite: Objects/Power/PowerCells/power_cell_small_autorecharge.rsi - layers: - - state: s_ar - - type: Battery - maxCharge: 600 #lights drain 3/s but recharge of 2 makes this 1/s. Therefore 600 is 10 minutes of light. - startingCharge: 600 - - type: BatterySelfRecharger - autoRecharge: true - autoRechargeRate: 2 #recharge of 2 makes total drain 1w / s so max charge is 1:1 with time. Time to fully charge should be 5 minutes. Having recharge gives light an extended flicker period which gives you some warning to return to light area. - - type: Appearance - visuals: - - type: PowerCellVisualizer - prefix: s_ar - type: entity name: antique power cell prototype description: A small cell that self recharges. Used in old laser arms research. id: PowerCellAntiqueProto - parent: PowerCellSmallBase + parent: BasePowerCell components: - type: Sprite - sprite: Objects/Power/PowerCells/power_cell_small_autorecharge.rsi layers: - - state: s_ar + - map: [ "enum.PowerCellVisualLayers.Base" ] + state: antique + - map: [ "enum.PowerCellVisualLayers.Unshaded" ] + state: o2 + shader: unshaded - type: Battery maxCharge: 1200 startingCharge: 1200 - type: BatterySelfRecharger autoRecharge: true autoRechargeRate: 40 - - type: Appearance - visuals: - - type: PowerCellVisualizer - prefix: s_ar - -- type: entity - name: medium standard power cell - description: A rechargeable standardized power cell, size M. This is the cheapest kind you can find. - id: PowerCellMediumStandard - suffix: Full - parent: PowerCellMediumBase - components: - - type: Sprite - sprite: Objects/Power/PowerCells/power_cell_medium_st.rsi - layers: - - state: m_st - - type: Battery - maxCharge: 2160 - startingCharge: 2160 - - type: Appearance - visuals: - - type: PowerCellVisualizer - prefix: m_st - -- type: entity - id: PowerCellMediumStandardPrinted - suffix: Empty - parent: PowerCellMediumStandard - components: - - type: Battery - maxCharge: 2160 - startingCharge: 0 - -- type: entity - name: medium high-capacity power cell - description: A rechargeable standardized power cell, size M. This is the popular and reliable version. - id: PowerCellMediumHigh - suffix: Full - parent: PowerCellMediumBase - components: - - type: Sprite - sprite: Objects/Power/PowerCells/power_cell_medium_hi.rsi - layers: - - state: m_hi - - type: Battery - maxCharge: 2880 - startingCharge: 2880 - - type: Appearance - visuals: - - type: PowerCellVisualizer - prefix: m_hi - -- type: entity - id: PowerCellMediumHighPrinted - suffix: Empty - parent: PowerCellMediumHigh - components: - - type: Battery - maxCharge: 2880 - startingCharge: 0 - -- type: entity - name: medium super-capacity power cell - description: A rechargeable standardized power cell, size M. This premium high-capacity brand stores up to 50% more energy than the competition. - id: PowerCellMediumSuper - suffix: Full - parent: PowerCellMediumBase - components: - - type: Sprite - sprite: Objects/Power/PowerCells/power_cell_medium_sup.rsi - layers: - - state: m_sup - - type: Battery - maxCharge: 3600 - startingCharge: 3600 - - type: Appearance - visuals: - - type: PowerCellVisualizer - prefix: m_sup - -- type: entity - id: PowerCellMediumSuperPrinted - suffix: Empty - parent: PowerCellMediumSuper - components: - - type: Battery - maxCharge: 3600 - startingCharge: 0 - -- type: entity - name: medium hyper-capacity power cell - description: A rechargeable standardized power cell, size M. This one looks like a rare and powerful prototype. - id: PowerCellMediumHyper - suffix: Full - parent: PowerCellMediumBase - components: - - type: Sprite - sprite: Objects/Power/PowerCells/power_cell_medium_hy.rsi - layers: - - state: m_hy - - type: Battery - maxCharge: 5400 - startingCharge: 5400 - - type: Appearance - visuals: - - type: PowerCellVisualizer - prefix: m_hy - -- type: entity - id: PowerCellMediumHyperPrinted - suffix: Empty - parent: PowerCellMediumHyper - components: - - type: Battery - maxCharge: 5400 - startingCharge: 0 - -- type: entity - name: large standard power cell - description: A rechargeable standardized power cell, size L. This is the cheapest kind you can find. - id: PowerCellLargeStandard - suffix: Full - parent: PowerCellLargeBase - components: - - type: Sprite - sprite: Objects/Power/PowerCells/power_cell_large_st.rsi - layers: - - state: l_st - - type: Battery - maxCharge: 9000 - startingCharge: 9000 - - type: Appearance - visuals: - - type: PowerCellVisualizer - prefix: l_st - -- type: entity - id: PowerCellLargeStandardPrinted - suffix: Empty - parent: PowerCellLargeStandard - components: - - type: Battery - maxCharge: 9000 - startingCharge: 0 - -- type: entity - name: large high-capacity power cell - description: A rechargeable standardized power cell, size L. This is the popular and reliable version. - id: PowerCellLargeHigh - suffix: Full - parent: PowerCellLargeBase - components: - - type: Sprite - sprite: Objects/Power/PowerCells/power_cell_large_hi.rsi - layers: - - state: l_hi - - type: Battery - maxCharge: 18000 - startingCharge: 18000 - - type: Appearance - visuals: - - type: PowerCellVisualizer - prefix: l_hi - -- type: entity - id: PowerCellLargeHighPrinted - suffix: Empty - parent: PowerCellLargeHigh - components: - - type: Battery - maxCharge: 18000 - startingCharge: 0 - -- type: entity - name: large super-capacity power cell - description: A rechargeable standardized power cell, size M. This premium high-capacity brand stores up to 50% more energy than the competition. - id: PowerCellLargeSuper - suffix: Full - parent: PowerCellLargeBase - components: - - type: Sprite - sprite: Objects/Power/PowerCells/power_cell_large_sup.rsi - layers: - - state: l_sup - - type: Battery - maxCharge: 54000 - startingCharge: 54000 - - type: Appearance - visuals: - - type: PowerCellVisualizer - prefix: l_sup - -- type: entity - id: PowerCellLargeSuperPrinted - suffix: Empty - parent: PowerCellLargeSuper - components: - - type: Battery - maxCharge: 54000 - startingCharge: 0 - -- type: entity - name: large hyper-capacity power cell - description: A rechargeable standardized power cell, size L. This one looks like a rare and powerful prototype. - id: PowerCellLargeHyper - suffix: Full - parent: PowerCellLargeBase - components: - - type: Sprite - sprite: Objects/Power/PowerCells/power_cell_large_hy.rsi - layers: - - state: l_hy - - type: Battery - maxCharge: 72000 - startingCharge: 72000 - - type: Appearance - visuals: - - type: PowerCellVisualizer - prefix: l_hy - -- type: entity - id: PowerCellLargeHyperPrinted - suffix: Empty - parent: PowerCellLargeHyper - components: - - type: Battery - maxCharge: 72000 - startingCharge: 0 diff --git a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml index 09e1c9286b..169aa54bf5 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/flashlights.yml @@ -27,7 +27,7 @@ shader: unshaded - type: PowerCellSlot cellSlot: - startingItem: PowerCellSmallHigh + startingItem: PowerCellMedium - type: ContainerContainer containers: cell_slot: !type:ContainerSlot @@ -60,7 +60,7 @@ components: - type: PowerCellSlot cellSlot: - startingItem: PowerCellSmallSuper + startingItem: PowerCellHigh - type: HandheldLight addPrefix: false inhandVisuals: diff --git a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml index 38f5483862..0912343c70 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/lantern.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/lantern.yml @@ -29,7 +29,7 @@ - type: ToggleableLightVisuals - type: PowerCellSlot cellSlot: - startingItem: PowerCellSmallHigh + startingItem: PowerCellMedium - type: entity name: extra-bright lantern diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 027038a8b4..8b82310d90 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -193,15 +193,9 @@ - FlashPayload - Signaller - SignalTrigger - - PowerCellSmallStandard - - PowerCellSmallHigh - - PowerCellSmallSuper - - PowerCellMediumStandard - - PowerCellMediumHigh - - PowerCellMediumSuper - - PowerCellLargeStandard - - PowerCellLargeHigh - - PowerCellLargeSuper + - PowerCellSmall + - PowerCellMedium + - PowerCellHigh - type: ActivatableUI key: enum.LatheUiKey.Key #Yes only having 1 of them here doesn't break anything - type: ActivatableUIRequiresPower diff --git a/Resources/Prototypes/Recipes/Lathes/powercells.yml b/Resources/Prototypes/Recipes/Lathes/powercells.yml index 3d92190ea9..ab5c0b1e63 100644 --- a/Resources/Prototypes/Recipes/Lathes/powercells.yml +++ b/Resources/Prototypes/Recipes/Lathes/powercells.yml @@ -1,16 +1,20 @@ - type: latheRecipe - id: PowerCellSmallStandard - icon: Objects/Power/PowerCells/power_cell_small_st.rsi/s_st.png - result: PowerCellSmallStandardPrinted + id: PowerCellSmall + icon: + sprite: Objects/Power/power_cells.rsi + state: small + result: PowerCellSmallPrinted completetime: 1 materials: Steel: 100 Plastic: 50 - type: latheRecipe - id: PowerCellSmallHigh - icon: Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi.png - result: PowerCellSmallHighPrinted + id: PowerCellMedium + icon: + sprite: Objects/Power/power_cells.rsi + state: medium + result: PowerCellMediumPrinted completetime: 6 materials: Steel: 300 @@ -19,75 +23,14 @@ Gold: 10 - type: latheRecipe - id: PowerCellSmallSuper - icon: Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup.png - result: PowerCellSmallSuperPrinted + id: PowerCellHigh + icon: + sprite: Objects/Power/power_cells.rsi + state: high + result: PowerCellHighPrinted completetime: 10 materials: Steel: 300 Glass: 400 Plastic: 200 Gold: 50 - -# The resource required is scaled to their power capacity -- type: latheRecipe - id: PowerCellMediumStandard - icon: Objects/Power/PowerCells/power_cell_medium_st.rsi/m_st.png - result: PowerCellMediumStandardPrinted - completetime: 1 - materials: - Steel: 600 - Plastic: 300 - -- type: latheRecipe - id: PowerCellMediumHigh - icon: Objects/Power/PowerCells/power_cell_medium_hi.rsi/m_hi.png - result: PowerCellMediumHighPrinted - completetime: 6 - materials: - Steel: 1800 - Glass: 1800 - Plastic: 600 - Gold: 60 - -- type: latheRecipe - id: PowerCellMediumSuper - icon: Objects/Power/PowerCells/power_cell_medium_sup.rsi/m_sup.png - result: PowerCellMediumSuperPrinted - completetime: 10 - materials: - Steel: 1800 - Glass: 2400 - Plastic: 1200 - Gold: 300 - -- type: latheRecipe - id: PowerCellLargeStandard - icon: Objects/Power/PowerCells/power_cell_large_st.rsi/l_st.png - result: PowerCellLargeStandardPrinted - completetime: 1 - materials: - Steel: 2500 - Plastic: 1250 - -- type: latheRecipe - id: PowerCellLargeHigh - icon: Objects/Power/PowerCells/power_cell_large_hi.rsi/l_hi.png - result: PowerCellLargeHighPrinted - completetime: 6 - materials: - Steel: 7500 - Glass: 7500 - Plastic: 2500 - Gold: 250 - -- type: latheRecipe - id: PowerCellLargeSuper - icon: Objects/Power/PowerCells/power_cell_large_sup.rsi/l_sup.png - result: PowerCellLargeSuperPrinted - completetime: 10 - materials: - Steel: 7500 - Glass: 10000 - Plastic: 5000 - Gold: 1250 \ No newline at end of file diff --git a/Resources/Textures/Objects/Power/PowerCells/potato_battery.rsi/meta.json b/Resources/Textures/Objects/Power/PowerCells/potato_battery.rsi/meta.json deleted file mode 100644 index 71a7f31af1..0000000000 --- a/Resources/Textures/Objects/Power/PowerCells/potato_battery.rsi/meta.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/tgstation/tgstation/commit/7dcdbc1468ffdc8689b984cb6b181d48ae41dbf2", - "states": [ - { - "name": "potato_battery", - - } - ] -} diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_large_hi.rsi/l_hi.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_large_hi.rsi/l_hi.png deleted file mode 100644 index 24319ba7b6475a7a9a1d605e475bfb6b5b383903..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 381 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=hEVFuHiUIEGZrNluVpU7WCl*)2$9 z_pc{^)!pvC)1BO5HoaAZ-2e!D<_DcB_;V+8P0=*BTRbx@@2bpn-^83C7RW8|mcd*4 z_kaGp_h~cC+y&R~V&7hV`52?YhRUxxL0bdPGnT&n%hUZVH~E5TL(8G3+}{naOqj&r zS#)6b_4N|x=I`!H+PJP!>F^Zx(-J&6^2Q*`Vk~sLyYBLUfRD=ShNv?K4jf3xSi-q| zPGciutFJJ70(VhL{AClCy!(63ojB0&!ItNOE{jg?n~l?&O1K$g8rEeh=$+(NmIaDV z*sN&ez|R;H=(>@40;7%y&_=&PjtL<`O5zR%`)r$4nGdIVvw=W08(W(`k9g)|h77Ym z@1i zfDK>+ro90R>i|XB>byHhl5VR;Rc-A!K0mMTBlFE4kYdnDm!bBSVo-huNKf|}Ce3`c n9h+^JzpKsF^%4XC0Kkvl#3)ISje?JA00000NkvXXu0mjftCL*9 diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_large_hi.rsi/l_hi_100.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_large_hi.rsi/l_hi_100.png deleted file mode 100644 index 7500ff37b675e422991b436f9feccce90be7c7b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJQcoAhkcv6U2@sn1pS^i%lCk?i4WKOz>lhe{z8d96 TZ*7nVI)K5`)z4*}Q$iB}T@gWV diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_large_hi.rsi/l_hi_25.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_large_hi.rsi/l_hi_25.png deleted file mode 100644 index 9ec9c4a60f8b5e73bfd624b324fd676dcc4ff085..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJMo$;Vkcv6U2@J^k`oMsdE=NvS}3v7*5f=Z4lG zc8MEyX&K+orY8Wwjb*hh3(Gm@%7U~ys~&c-s6N5i<$dUp^1c5Pf9^Gl)-)>y+r{;Q ai(%P3wO969*NcFTVeoYIb6Mw<&;$T})<)U@ diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_large_hi.rsi/l_hi_50.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_large_hi.rsi/l_hi_50.png deleted file mode 100644 index e78b3016f9d6cf864584a9cab9cc69926f023b3c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJW=|K#kcv6U2@J^k`oMsdE=NvS~E*^VVbqqL#% zZE{=L{TenPXv@9jE>Si8!cCAGqYxvXmd&25ixmwXG(4KL;YY{!`joo$XT!SA%786o c+Qr1ceOv3`fkk(vfX-p?boFyt=akR{0EAvfK>z>% diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_large_hi.rsi/l_hi_75.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_large_hi.rsi/l_hi_75.png deleted file mode 100644 index 0e1badd89134982498016feeff91ecb0d5871342..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJCQlc~kcv6U2@J^k`oMsdE=NvXoz5gMfpjc=3N z%I?>&0YO{tEq95k=@)K-G0*!V9762DkMNa@9uA>uDd)S;G^=oA?nP50|yc^mT+#L z)7Z$^>MP8iz+IFQf7yg3@BW^1Ck`}xu;sa+%c7I}X5+M`5^lzrhIN?=dMCM+Wr3m- zHY*xA@H55)x^85iz^Eevw9&7SV?v0KlDI>`zDeST8D}u5vaz-Ci)TJ&$T0i!UV7Fs zpj{_{Rx&J~=oqZptF6q&#r$O@`EA})?^o|PEoArD`J$ro`o$ovwzG?|HK87EV_Hn$K3n diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_large_hy.rsi/l_hy_100.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_large_hy.rsi/l_hy_100.png deleted file mode 100644 index 97c6df65ae7491b18ff66eec2505fdd93f0c2db0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJQcoAhkcv6U2@@PGw8l?Q_GBN;yIku{2Hhj7zJLyaC zn+EUi`wY(9=t-E&<>s7V!U7}?FdkKXczfo${}X>6dbwNEtQc%Q*9$I&mM$x46a52q QKnE~*y85}Sb4q9e019M5cK`qY diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_large_hy.rsi/l_hy_25.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_large_hy.rsi/l_hy_25.png deleted file mode 100644 index b4d70741792ef6aad01bbec3f29163eb8a4ee49a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJCQlc~kcv6U2@<4t*(=VT8oc^x%;HhP^ncbWdPP8*{ zFXg)cRDI%uXevmDMYY$A#HU-Wzmy(WS{*NumgBaeU1q@!l^W~IU+s f;&Nk*Wn@?=pmB9?_?b?iYZyFT{an^LB{Ts5VxmQ+ diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_large_hy.rsi/l_hy_50.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_large_hy.rsi/l_hy_50.png deleted file mode 100644 index fb1540d6b30334cda758451272ffb0e88fa3c2a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ7Ec$)kcv6U2@<4t*(=VT8oc^x%;HhP^ncHeOHUzw4 zuvL|7gTe~DWM4f+)_fz diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_large_hy.rsi/l_hy_75.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_large_hy.rsi/l_hy_75.png deleted file mode 100644 index 7de1faebd2fe51525f0fb9a73a35f28e258e1de3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJCQlc~kcv6U2@<4t*(=VT8oc^x%;3+k+4FRthY*ppj zc;W-ufS_&j@)pUkxZTe2>@mB(w2Tj^e~Eq3)1&^yVkEDIE! zuvyW_fuAuZ&~+p81V$YZppAZo91}u>l*Anj_L(p~@dR#Ad&&d3#JHR{qvyS5C+aHih9;~Cd`D}nY02{yt zumS4YMqS%zd)T?{M&%FH-{C->S(EC)pr1XWM6Hk+r6*f=k+4=5(EGMz(_B~ W`9;s64UQfF0000)Qrmodp5XfuPS LtDnm{r-UW|XdOQN diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_large_st.rsi/l_st_25.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_large_st.rsi/l_st_25.png deleted file mode 100644 index a15d4eac398f9d9eed9be91dd566d4d3e20ea7ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ8c!F;kcv6U2@YZ9*w`+!V26qe|2Hvt;jXhXV4IkB aF)`T5>AY!C-Ny}d2ZN`ppUXO@geCxRk4hQ< diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_large_st.rsi/l_st_50.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_large_st.rsi/l_st_50.png deleted file mode 100644 index a10e8e912664c5b85ecd4c08a1a67d1216e956a4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJI!_nJkcv6U2@}_*?`md@J^O6N=bY>Eo{Vu_TMT1pjddrK0_Z}rXZJY_Q$swG9 ZVeN0Tqw9OU3xFG1sEV#yrc8xkPEH~+^`hbR`HwG&s!FVdQ&MBb@0CfhBU;qFB diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_large_sup.rsi/l_sup_0.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_large_sup.rsi/l_sup_0.png deleted file mode 100644 index 099a6cb151673acee4d7b74efc19ae3a68de062b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQj0xZ978JRyuGH#cgR7Y^&xxa z4uaO0m$6s0*I!$@du6 zS$65W?RmRhe-?k;u2tS}ef|ASyVeLy{$$NyziIupLJOatyX|bd;+lZQN4((t5at?K TR(W(TkjLQZ>gTe~DWM4f-I!UA diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_large_sup.rsi/l_sup_100.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_large_sup.rsi/l_sup_100.png deleted file mode 100644 index f21fd15b259fbd29e5c8fd242c3b5e48ecf6c281..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJa!(h>kcv6U2@?=8^c}C9&ZiMw45E*l$E_FpOZUGByB$j8`&AGq!Y_{1vf& z@S!uFhleM6;*FBB0~s7WZ3iasH!`w|Om7JfyZPV!+3ObBB{$9l8gRKC)L5X+z;Hjs W;Pq$cd*6XhVDNPHb6Mw<&;$UlAV7@( diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_large_sup.rsi/l_sup_25.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_large_sup.rsi/l_sup_25.png deleted file mode 100644 index d6180813b4d0ccc675673c464b24b02b28e958cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJI!_nJkcv6U2@?=8^c}C9&ZiMw2^(*bnHqr(ZtH*zW)5(5Yp!ncbWdPP8*{ zFXh_+RK0=cOBzVWg)5dv3^K*%$})WX8m971fLUaEOL*AL|L)ITx5zHJaVF4!%k7}X c0&NBc!8*0hn+`js0$sx3>FVdQ&MBb@03;|x9{>OV diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_large_sup.rsi/l_sup_50.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_large_sup.rsi/l_sup_50.png deleted file mode 100644 index 93a089929350db4c658aa80ca3f06351cc672465..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJMo$;Vkcv6U2@?=8^c}C9&ZiMw2^(*bnHqr(ZtH*zW)5(5Yp!ncHeOHUzw4 zh~_q9JMECq1_Hiwop~mgUA)OC5TEawbonNuvmFbYOhAlKTx9Bh`I+m5%O)flyC2j5 e+Sss;f#Jpv&HuNS-uwY{41=eupUXO@geCy9AVFjR diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_large_sup.rsi/l_sup_75.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_large_sup.rsi/l_sup_75.png deleted file mode 100644 index 25191ae8900526b9000e7ea2c627e25887f0cc81..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJdQTU}kcv6U2@?=8^c}C9&ZiMw2^(*bnHqr(ZtH*zW)5&?z;s4FRthqPfl3 zPCMkYfq?H^XP(Jr7jH5O#OJ#vUB1bta#Jb~y=hNQV@< zsY8bD*P$fjayg=|zTfh=clZAHzjqHH2!bH~J4dFC>D7&_=ax_R#`AxzJFX|9(L@4( z=MNBsZkbP*z^Zd0{qYw3#fB+*eZ6j%A2j3Fm1aaU006W30tpj{!ZRiB+uK7Nn`2

-hPxeEs@EX!jYX(;2$5?@X0k zeK6}JOd#cI2R7?vWZPqOLz2D4vaGMKbzhVHR1`y1aTw{f?pN)}w) zKW&cM$uo@XD!aG+=rBLmaxHsvX~xewh;eQQH4=b;fr0&^zUGGWh9KuKc)I$ztaD0e F0sxhrInV$A diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_hi.rsi/m_hi_25.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_hi.rsi/m_hi_25.png deleted file mode 100644 index bccefded5defd892223905e61fd56569a764de0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJBu^K|kcv6U2@C%{uKbLh*2~7ZUQ8Wht diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_hi.rsi/m_hi_50.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_hi.rsi/m_hi_50.png deleted file mode 100644 index 6069362b2b97fa2b0c0b735f6efa9a092c2cc8a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJBu^K|kcv6U2@^!El5QAhTX9Rd#B_CWX!T^5Nl9jkFn6{b_~y(*Wtu( zdBCId*(2q98lCH|r)j%B>jjzPc2Gltm6?e_E>oj#kMd)4pluAEu6{1-oD!MGjr|R$FT9x!ewFfQ>f*0tSW}H{EBsGLazX OFnGH9xvXjc8u_ab_hx$!Lxux+w!=6ezPFQZ@A z6;WxZ(g4%R1Jzm`Fa&+6H&`Zsek840&MQq`m`-eI0O{>)otfE5YanRtt|8g|gYStG zh(nuj9_;@L)>LbC;!sQ;ho%27^a zBn&1kvWW41x__P!|KX+8@e&targ&Gj?L01Tv}R9PyNdBlkH9s{k2Fsb4&{XQ=>fX7F_N Kb6Mw<&;$V4PCfhp diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_hy.rsi/m_hy_50.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_hy.rsi/m_hy_50.png deleted file mode 100644 index 3ec152d2e4a12df06783239a7cc74423ebe446a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJQcoAhkcv6U2@ zBn&1kvWW41x__P!|KX+8@e&Coo0i%fzVn#>;g?g{tGYc&10-n&n5Bm-n8XvEkAZrb#jm z+zykN_3r*=TArR$*E?0Ns9^~UGjo3Wu7AhX^yciFt@GLKpa#?eMplN^o3-AE=3HzB PTF>C=>gTe~DWM4f0Ma|q diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_hy.rsi/meta.json b/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_hy.rsi/meta.json deleted file mode 100644 index d5b2771be5..0000000000 --- a/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_hy.rsi/meta.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/", - "states": [ - { - "name": "m_hy", - - }, - { - "name": "m_hy_0", - "delays": [ - [ - 0.2, - 0.2 - ] - ] - }, - { - "name": "m_hy_100", - - }, - { - "name": "m_hy_25", - - }, - { - "name": "m_hy_50", - - }, - { - "name": "m_hy_75", - - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_st.rsi/m_st.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_st.rsi/m_st.png deleted file mode 100644 index fa74c079656bb971bb0a11b66d44eeae347d779c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 370 zcmV-&0ge8NP)+SX(&;A%f*^>55Af24B?x5s Q%>V!Z07*qoM6N<$f^vnSNdN!< diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_st.rsi/m_st_0.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_st.rsi/m_st_0.png deleted file mode 100644 index d9df7bb487fbeebb04664b0afff8e89d31677e53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQJyZ2Ar*6y6C_v{Cy4Yk1sZU< z9n^qw1UV!;1J^u_|MP$MR%Pbr7yt6SC<(|?IlSxUX~}iDZ&XkEWZmRn?74Nm%F(Xa z=zotVMGGuDKVicwrNe)XCtpMESW73@WS)Km#mZwuFj5tchZ*`KEk% val^d@X{TrYH;q0gaArQH^+306!W(la*;k6Bqs1y;Zq+b)QAttYv%)SQ8Xo4WD29%frd?LXlm<^J>86 tr#x;>*&huRZ_WW~cRQ#7GV1~Z!-U&9x)ySBN zBn&1kia5Rh$N%zdceZnje@k9?x!{UNTj}QM#xb{Vcu$(?vqa-x-rJ7JWmg5;KW9E; zh+>!|bD*-s-p?xWs;fo)lg3%P>Hn_hSbnZwaMzH_?VtwO@CmF8(=MtfMjQ~=2U^VF M>FVdQ&MBb@08;xt2mk;8 diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_st.rsi/m_st_50.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_st.rsi/m_st_50.png deleted file mode 100644 index 57569320765c45ca95f5ec713971b67c66e22f92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ5>FS$kcv6U2@ zBn&1kia5Rh$N%zdceZnje@iBm1Z1fk-gWcz!!KKV_o~c1>C*M+{k1-cEvx%1xO}w~ zPBLy`P_bD)FkTNYx3(NkTkUD{dA&vp3p*^mvQXXSahIP#YK-8D{9Hpa0KS RIT>g_gQu&X%Q~loCIHPEKl%Uw diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_st.rsi/m_st_75.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_st.rsi/m_st_75.png deleted file mode 100644 index 0ac081dcaf3d7f8c397dde758e5b43e3e6108eb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJTu&Frkcv6U2@DXuI73w3xxu L)z4*}Q$iB}j(b5Y diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_st.rsi/meta.json b/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_st.rsi/meta.json deleted file mode 100644 index e6f88e7e5d..0000000000 --- a/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_st.rsi/meta.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/", - "states": [ - { - "name": "m_st", - - }, - { - "name": "m_st_0", - "delays": [ - [ - 0.2, - 0.2 - ] - ] - }, - { - "name": "m_st_100", - - }, - { - "name": "m_st_25", - - }, - { - "name": "m_st_50", - - }, - { - "name": "m_st_75", - - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_sup.rsi/m_sup.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_sup.rsi/m_sup.png deleted file mode 100644 index a966f9ad4a8f595756c390dd4b83b4954d59bbff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 363 zcmV-x0hIoUP)(@Xgkv(sw}8TGu2Y7vUFqMIXWl3gsFz_4a&P_wVxo1VIqQe`m|KF+D!j#oY4x!g~I%boYMdR diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_sup.rsi/m_sup_0.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_sup.rsi/m_sup_0.png deleted file mode 100644 index 43a174574ccb0b2464bbeda71cbe4ed57883fb14..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQd2!$978JRyuDz^)$Ab9`mpop zHOBJ^)0uBb?4F|%Q8i=ALE#%qye3~$l1o@Wk^9D)sog9wG97GR{?9soU_-v7AkYYg z8w;D$cJ7%IGfgVj diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_sup.rsi/m_sup_100.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_sup.rsi/m_sup_100.png deleted file mode 100644 index 3d38694cb67dc3188fcc3a27c0c40312903e668c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJSWg$nkcv6U2@2NR$;vdNiHmMrYwC4$xXP#R8_a%zX~Tp?KR$HE^YHLQb6#-fF_^UK w;VG@^Ih?-gZxl{G>jfF%c2Gltm6?xW?|tpB8{WFVdQ&MBb@0I(D^X8-^I diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_sup.rsi/m_sup_25.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_sup.rsi/m_sup_25.png deleted file mode 100644 index e6172f39a7c5d1f6968f117cbd116f7840183bd7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJJWm(Lkcv6U2@ zBn&1kvN-SieE(Wj>BA3&_e)%OxkV(gEwcEYkFS$kcv6U2@ zBn&1kvN-SieE(Wj>BA3&_e&&{M0FV)USpa6@XM0ea1W!&ogzoKiRDOaX;>x8<*TJ| zl5q=z&JqnbzAA~c2R4ZI$|W@{VQJ=Dw`SA-{xjD(tvx1I!VGsi*ucQ>`o3D=r8BBW Qf%Y?ay85}Sb4q9e04HWVSO5S3 diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_sup.rsi/m_sup_75.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_sup.rsi/m_sup_75.png deleted file mode 100644 index 1f90ad41d939b25f54c82abdd9f7bf908104252a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJJWm(Lkcv6U2@*bm>Zp<~Fm?U69p2b=gYh48{nLz?vUN^x1%- zZHLwC3=Ir&jym!i9`NW}2GXNuHg`jF%1m=Ew}TpB!+A6q7{Vj8p0&%X^8jsT@O1Ta JS?83{1ON{_Ine+B diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_sup.rsi/meta.json b/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_sup.rsi/meta.json deleted file mode 100644 index 9eee5bb770..0000000000 --- a/Resources/Textures/Objects/Power/PowerCells/power_cell_medium_sup.rsi/meta.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/", - "states": [ - { - "name": "m_sup", - - }, - { - "name": "m_sup_0", - "delays": [ - [ - 0.2, - 0.2 - ] - ] - }, - { - "name": "m_sup_100", - - }, - { - "name": "m_sup_25", - - }, - { - "name": "m_sup_50", - - }, - { - "name": "m_sup_75", - - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_autorecharge.rsi/meta.json b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_autorecharge.rsi/meta.json deleted file mode 100644 index ef93a794cf..0000000000 --- a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_autorecharge.rsi/meta.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "version": 1, - "size": { - "x": 32, - "y": 32 - }, - "license": "CC-BY-SA-3.0", - "copyright": "https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/power_cells.dmi", - "states": [ - { - "name": "s_ar", - - }, - { - "name": "s_ar_0", - "delays": [ - [ - 0.2, - 0.2 - ] - ] - }, - { - "name": "s_ar_100", - - }, - { - "name": "s_ar_25", - - }, - { - "name": "s_ar_50", - - }, - { - "name": "s_ar_75", - - } - ] -} \ No newline at end of file diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_autorecharge.rsi/s_ar.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_autorecharge.rsi/s_ar.png deleted file mode 100644 index fec988a177ca7a3ea0347d9e1037c435dc4cad60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ-<~dxAr*6y6C_v{Cy4Yk1sYsp zR90l2X7=sBJ@@>i6~aHy6}+)wZl0>h%y#!n+vLXYYb6hVRA%R#)y^03!SmIR;(yb_ zex4|J%-52i+A%jRAt7Oc+5Zy@l+XN(cXpN4D|>v-w@q7m|Km~-VMTGNj8g}19zU17 zeBxD6H7i3AHLHa$4zqvQb?(x!fBU!mbY}yCwvzobEv}xuGv(X?Ao%b_#h%&6w#Q#1 z>Vw3Mkeb-2aV15fhr@9`^Al7ab>%Z-u2X|}h)+M3v%z+hnTboFyt=akR{0IxEMF8}}l diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_autorecharge.rsi/s_ar_0.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_autorecharge.rsi/s_ar_0.png deleted file mode 100644 index d619413512e2da3a5cb17b954ddd56922fab9f44..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 176 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQstg5jv*Cu-dP+GylQPmpuQiAkCYeWY~Ag;$;~SL zdb-xEv%lxAzxQkH#8(IZ_pLTbxiPEyS?brV);EId*DT;KIBk2qvg^LmB6*-zAZX;P Wf1$)ycl_lK5YN-q&t;ucLK6VYU_?X! diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_autorecharge.rsi/s_ar_100.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_autorecharge.rsi/s_ar_100.png deleted file mode 100644 index 179172cf9603b1228623c366d8f88acf938d5e20..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 137 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ08bakkcv6U2@d17TfnTABzh`h$D^g0?;6zA%Zz2L`{&BRv~jr| d)R4Huz@RZn_Gm<)V=~Ze22WQ%mvv4FO#pZ4D*XTe diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_autorecharge.rsi/s_ar_25.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_autorecharge.rsi/s_ar_25.png deleted file mode 100644 index 49e5340fbbf6b46d81b737fe7394ea6c242600c1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJNKY5Xkcv6U2@d(C@P$~}eIx&$QKfR-?Ly85}Sb4q9e0H63U9{>OV diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_autorecharge.rsi/s_ar_50.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_autorecharge.rsi/s_ar_50.png deleted file mode 100644 index 4d1042d449f4d6893455cf87a9483b87d530bb50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 158 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJR8JSjkcv6U2@gTe~DWM4fTcbDA diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_autorecharge.rsi/s_ar_75.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_autorecharge.rsi/s_ar_75.png deleted file mode 100644 index dee613303f7a085ef31e38b6aa0173254dc1c182..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJU{4pvkcv6U2@Pn3HJ8PfsN%x>1H{& gPPc;^5|VS)S0K$6W2&mIX*N^B(#GD^ zC$FfcfAP8)f|8m*igmMmjjdihe&1Ey6A9TqHE!erj!$~n_~5(9%u3-`ps-s!J_ P1~GWL`njxgN@xNA&W<-l diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi_0.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi_0.png deleted file mode 100644 index dd1b92ce1b88aef0bb9e19b131a1a65fac5789f9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!py+HsJ;3=* zg#vs+T!A!OjH%g72_Pyy;=T7-`>V@=Hb7D4k|4ieApNWC$UPus;_2cTVsSb-K|#{M zl3^p$%3V_y%t&kSJjvjtZNOuAK%>JenX89Mi&<55DTB$rLm4Y3ura)7V>)_Ow@4qT OpTX1B&t;ucLK6TXdoU9K diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi_100.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi_100.png deleted file mode 100644 index 1b8c8d515e1157afb5e26fd71c65300fcc5c5565..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4S0K$6V`?^2qWFmS-e>K6 z7aXmDLX0Ire!&b5&u*jvISQUGjv*T7lM^KJ4xBh~g2DB`$&)7;T^#}g0~-@X1XvmF Xi!ue&y$p#0s%7wW^>bP0l+XkKuKFW~ diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi_25.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi_25.png deleted file mode 100644 index 5af6d17664524f8d22aefa62c7c578f844ee7bfd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF%)r3-EjT<7$l)yTh%9Dc;1&X5#!GkW{s0Aq z0(?STfizo;so6{kASyoMz4uxBtIL5lKvCwBAirQB{j2QAJs_p->EaloaXvZW0QU@; z4=1$@Cos;K!XuHvBf)x6(wR>~QEaloaXvZW0QU^0 z4<}a{O<zopr06>E( AG5`Po diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi_75.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hi.rsi/s_hi_75.png deleted file mode 100644 index b7a6380255f0b8a97be5d14338cb6fb4bcd44264..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF%)r3-EjT<7$l)yTh%9Dc;1&X5#!GkW{s09< z1AIbUfizo;so6{k2w8l@d+)P$CuOS#KndoOAirQB{j2QAJs_pw>EaloaXvZW0CxoQ zhm)&}CNR#3k&(#Yk%&#;Np4f*ni3Qw#I{?SF`bv`$nBTL-++1;JYD@<);T3K0RT{P BEEWI& diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/meta.json b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/meta.json deleted file mode 100644 index f5694ced90..0000000000 --- a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", "states": [{"name": "s_hy", "delays": [[1.0]]}, {"name": "s_hy_0", "delays": [[0.2, 0.2]]}, {"name": "s_hy_100", "delays": [[1.0]]}, {"name": "s_hy_25", "delays": [[1.0]]}, {"name": "s_hy_50", "delays": [[1.0]]}, {"name": "s_hy_75", "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy.png deleted file mode 100644 index 9daf4f00089df8e9573023f61a00d63c493e7a61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv=>VS)S0Jsbu4!pw@9L8muBB2` z)8Fc2uz1~$I}aW&y&>lelx8dm@(X5gcy=QV$g%ZwaSYKopPV3()?lfsswz2Ce$KRM z(`2Nic*Hf>R<3xV(Z*@O+Rn7p*}3@v)1hMy3K|+L<}IEAGtDP4FuZxs{YkT|MiFQb NgQu&X%Q~loCID;3=* zg#vs+T!D1BmP)IS0TAs?jR zWZ1~Ga@UjvGtwG7PcnFE8}Jw&(CF|==IUY6VpdgM%3!kZP{xW0Yz!~jn2ui6Ez$?- OXYh3Ob6Mw<&;$U;?=Ktx diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy_100.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy_100.png deleted file mode 100644 index 6e87d55d2b39512940d78e3db166f35f15c41625..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4S0Ej(rPAtSuq)a5?Mzpb zX;M#tLX0Ire!&b5&u*jvISQUGjv*T7lM^KJ4xBh~g2DB`$&)7;T^#}g0~-@X1XvmF Xi!ue&y$p#0s%7wW^>bP0l+XkKwI(B- diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy_25.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy_25.png deleted file mode 100644 index 46f46328d0f5c1a044da03f47de2d8f7419c9d0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF%)r3-EjT<7$l)yTh%9Dc;1&X5#!GkW{s0Aq z0(?STfpoZ*N~@0n5ba8Kemm3kh)h%jP?WhO$S)X3|0+9j4@jwdx;TbtoKH?Tz&%6e z!$~c}35+wQ@JM9vNU&a%bmr60)MVu;GiPGpF=CuNBkiUlPz!^ntDnm{r-UW|hNLKH diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy_50.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy_50.png deleted file mode 100644 index 8faafe600ad341fb0b1f791735babd23721700f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF%)r3-EjT<7$l)yTh%9Dc;1&X5#!GkW{s09< z1AIbUfpoZ*N~@0ngxrEaloaXvZW0QU^0 z4<}a{O<zopr0Armh Aj{pDw diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy_75.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_hy.rsi/s_hy_75.png deleted file mode 100644 index a0ce4bbfbec5ea3ef037595484fed1ee468052f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF%)r3-EjT<7$l)yTh%9Dc;1&X5#!GkW{s09< z1AIbUfpoZ*N~@0ngxrEaloaXvZW0CxoQ zhm)&}CNR#3k&(#Yk%&#;Np4f*ni3Qw#I{?SF`bv`$nBTL-++1;JYD@<);T3K0RVH1 BEOP(= diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/meta.json b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/meta.json deleted file mode 100644 index de99aab706..0000000000 --- a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", "states": [{"name": "s_st", "delays": [[1.0]]}, {"name": "s_st_0", "delays": [[0.2, 0.2]]}, {"name": "s_st_100", "delays": [[1.0]]}, {"name": "s_st_25", "delays": [[1.0]]}, {"name": "s_st_50", "delays": [[1.0]]}, {"name": "s_st_75", "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st.png deleted file mode 100644 index 7942c24471735b38c6cb576f3f27b226762d1560..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv=>VS)S0Js}wMA83Q_H{D(#GD^ zC$FfcfAP8R!eAW_lx8dm@(X5gcy=QV$g%ZwaSYKopPV3()({#I5g{^jzLtiD z#;j@6xWqMBSFU)W(aO1D$uh>JmoEi9U|O}%VZo9mOy(`FoHNZQF)#%6afv(pXlnr) O#Ng@b=d#Wzp$PyTNi+Qb diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st_0.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st_0.png deleted file mode 100644 index 4484d0df68e98367621a3a788bc268e5980ee055..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!py+HsJ;3=* zg#vs+T!FM=*A^}RVjx+w<;=kckLQFWJ^+d`mjw9*1L3k0f0>?g1%vPZ!4!jq}L~2e>6< zKb+(;n!qT*$}5qSdPgg&ebxsLQ0LSnz AZU6uP diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st_50.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st_50.png deleted file mode 100644 index 69c46ce94623575928a1ef130b49dbefb758ebc5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF%)r3-EjT<7$l)yTh%9Dc;1&X5#!GkW{s09< z1AIbUfwW@R7A^l`2wAh`%)tkb!#6IL1xhfN1o;I6>0f0>?g1$cPZ!4!jq}L~2e>7e zKb-6`n!qU0$}5q>Y^ BE$jdQ diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st_75.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_st.rsi/s_st_75.png deleted file mode 100644 index 27bad1603162fec69c47d38f21c3da189dfdddcb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF%)r3-EjT<7$l)yTh%9Dc;1&X5#!GkW{s09< z1AIbUfwW@R7A^l`2wAh`%)tkb!#6IL1xhfN1o;I6>0f0>?g1$cPZ!4!jq}L~2e>1c zKb-6`n!qU0%PWz=GovSwN4!mui)Hd;VYc1Uj109*jWbmQEP;9$JYD@<);T3K0RSQX BEQJ67 diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/meta.json b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/meta.json deleted file mode 100644 index 79ed6e45a2..0000000000 --- a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/meta.json +++ /dev/null @@ -1 +0,0 @@ -{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 9a3a3a180344460263e8df7ea2565128e07b86b5", "states": [{"name": "s_sup", "delays": [[1.0]]}, {"name": "s_sup_0", "delays": [[0.2, 0.2]]}, {"name": "s_sup_100", "delays": [[1.0]]}, {"name": "s_sup_25", "delays": [[1.0]]}, {"name": "s_sup_50", "delays": [[1.0]]}, {"name": "s_sup_75", "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup.png deleted file mode 100644 index 4bb892e29db3b2f47e3cb90fbcef5fb49eaa6735..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv=>VS)S0Jsbu4!pw@9LA6=cZFs z)4zD#j@5NWcOE?MZ{8dalx8dm@(X5gcy=QV$g%ZwaSYKopPV3(*06KQk|h!|;3=* zg#vs+T!D0+o6hPwBOto6%KpjuTE)_--+-dbB|(0{K>AnNk$XVO#M8ww#Nu>vf`X)h zCBsIhmAj@an32}td6L0P+knULfJTQ`GFK0i7PG4AQU;TKhcZ@7U}JdE#&qMpUXO@geCx}%rRU5 diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup_100.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup_100.png deleted file mode 100644 index 2113bc0ffd095fb17460d099f4a6a43d4a702bd2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4S0J6|rn9=v=*lYlC+BM~ zWuIXI3Ne-h`2{mLJiCzw3{>k}T#nP$YfTGMLL4LtN`d8VJdq7Iv)5S4F<9u?$0qz+x zA5Ll+PGFodg-0TTM}qaDq%)s}rY0*-nK=^!j}hbK8EH2afm#?mUHx3vIVCg!07*eA Ar~m)} diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup_50.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup_50.png deleted file mode 100644 index 0850afe461ff78897cf5b77f938dfa6f48fc3ec6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF%)r3-EjT<7$l)yTh%9Dc;1&X5#!GkW{s09< z1AIbUfpngm&gwcN2zh0d{gd;xsa>(hffCFmL4LtN`d8VJdq7IV)5S4F<9u?$0qz-0 zA5N|^n!q?CL`EWmN5VCMC$UYDYs!=$A-3JpjC}{0_`Q^v#DIDjJYD@<);T3K0RR;$ BEP((3 diff --git a/Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup_75.png b/Resources/Textures/Objects/Power/PowerCells/power_cell_small_sup.rsi/s_sup_75.png deleted file mode 100644 index b2f57efdd0194f8c992ac32bf8acccdf27a46964..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF%)r3-EjT<7$l)yTh%9Dc;1&X5#!GkW{s09< z1AIbUfpngm&gwcN2zh0d{gd;xsa>(hffCFmL4LtN`d8VJdq7IV)5S4F<9u?$0qzLq z4<}a{O<&O>k=rkgzXA0yc)I$ztaD0e0sti$ BE@c1! diff --git a/Resources/Textures/Objects/Power/power_cells.rsi/antique.png b/Resources/Textures/Objects/Power/power_cells.rsi/antique.png new file mode 100644 index 0000000000000000000000000000000000000000..e8fbf6f2874d0ff566f14228910c25fdded1ff83 GIT binary patch literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEP_K z#WAE}PI96|g2AhXK=vN1ge#1T`4nz3@|T_Z-@dW=uDrpTyDJ&ePVeqEu(|V-ZJpo2 zzlzGfG7Q^%+&T}sRLf5&6+4r5;U7zip@Bs6ji^i>p6h9hvZp@G7jd5;!`fQ;CSaQB z;Y)i?CrmS((EG+CNXBs%bHl!#c{A9aD{Vf>>SF!i#I@%Ro0!&1Rc_}iFu8DqQQ<<+ zHvymPB`1wtR2*+uDe)9+Y~QV=&{xrPe_@I>Lkg!NLlKM0mW&4sPXro%&IxiTAq6rK(|%2=#tG$G_r;9bToOpEy>N)N1Hc9S)Dz{kMw>W4GOO1)%x Qpzj$xUHx3vIVCg!0E=LG2mk;8 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Power/power_cells.rsi/high.png b/Resources/Textures/Objects/Power/power_cells.rsi/high.png new file mode 100644 index 0000000000000000000000000000000000000000..966d10dcab76c156f5ad2442a95f347d3268d999 GIT binary patch literal 312 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5DEP|L z#WAE}PI96|g2AhXK=vN1ge#1T`4nz38g700Kk?1$v&Ir8*~SOn96g&Zk(BNG;MFvf z^C?R@nH?Mg{ih~IXBbW>6+4s170Z|6ctliGMDm^e4*oI?%{~Q7t{=&J7wV|9J&!0f zI4yN{;u4FdEdmU`f(-Q~54tB!=I$svu$jGI@>}k$*6`lR^QA4MG9EDq>?nLAG~?Qa zOUV{nO4w)UF4JHYXSNi0)8V~6^D)B&)fR>mf(tGz>SUha%zopr0IVi* AdjJ3c literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Power/power_cells.rsi/hyper.png b/Resources/Textures/Objects/Power/power_cells.rsi/hyper.png new file mode 100644 index 0000000000000000000000000000000000000000..c2af41fc069b3d21e8a24341254ecb3dc707f205 GIT binary patch literal 352 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv(mfq_xT z)5S5QVoq|RM1sMqhCucntAs0zi}@68F&b`t`9JZ^>$AoZCfUXZ-W)xfE|HY&d*IE! z+s2Yd!VC;99br^huwwbC4Z2$-PFQiLnYZe(Z&G;F#nr_V)BeqPPtuOB^F`bz$guv| zcrRd@aC7k*iy5iCD(6#I9TQmm>PNljXP-qfj!_&8wJT>#?|GoS@g%E@^@E$u$9aC6 zy*;#A?PBcQhp$i0-crcGamS*J(^@ uzmR=)%u3(nmhWTEV0Dv)`Tc+_1H-Nx9!+7EaoxZmWAJqKb6Mw<&;$SnV2)z| literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Power/power_cells.rsi/medium.png b/Resources/Textures/Objects/Power/power_cells.rsi/medium.png new file mode 100644 index 0000000000000000000000000000000000000000..f231a622a73a600ec907d1c8fe71387d730387d1 GIT binary patch literal 351 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv(mfq_xb z)5S5QVoq|RM1sMqhCucntAs0zi}@68F$OPN|BpZU{CS>4k2(9;&YU~SVc&#%dH&v29#qr2e6<3KJ`&Jt6N!syszKHt-8P;t_ zWdo+^J0})$%nf1ja^^Y7V&ZJWCEVsc(RwOF7mW@r$zY$CJ6Gy$gd z%X89pDCfFLvn#YSoOwQlX_K=W^WX)o*}Vr_k%F^ZOmnP(Ox0@ r?r|z@(_OlcIfKvJ4DNogN$Bv>kZ?3^4{zS3j3^P6}Ci3)!k1rA$Pe2#h7 zq9l9dteL*?28(sf`)0PzJ#@m6fk~i&f#n77gPN~vKDXa!K6!nH{83SxeHpJ>EPS>w zq}4+T$~wr`;7;)f8aYw5yn5^~*c|99AhzVc6uo^VWOk#pVk% zxH=XUr}w_r`zQg_yd;zBqZ*5TMCc5O?>@zC{>LPkRF%%ZuVVP59(TYhTgA!Gn|pz6 zJ*?xqAj+b^z{p`>^? L`njxgN@xNA(!GBJ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Power/power_cells.rsi/o1.png b/Resources/Textures/Objects/Power/power_cells.rsi/o1.png new file mode 100644 index 0000000000000000000000000000000000000000..7d28199193808ed5c3facda1ddda69cbf5837ddf GIT binary patch literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4jBOuH;Rhv&5C>ZVO z;uumf=j{bUJ_bb&mq6cdZd+cz-1^iVTRRSrgeJi z##1J$@i8zuGyAsLc;_m-)|ru;D#@SXcx0)HtHeCpdgd|>%{~Q7uAFY`1v>F=KR?l&y_cyWOcEAaBi+OPxSW3;g8>Da`&;#vS45_%fH94thSa} zLhXxr^UYIQy9ze0z0Kb&TlkNuSB7CzivWWqlSq_FAwvu z-(YB0Im;^H`L?AhQwu`M8P*