diff --git a/Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs b/Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs index be549daa76..39e6296af2 100644 --- a/Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs +++ b/Content.Client/GameObjects/Components/Power/AutolatheVisualizer.cs @@ -11,7 +11,7 @@ namespace Content.Client.GameObjects.Components.Power [UsedImplicitly] public class AutolatheVisualizer : AppearanceVisualizer { - private const string AnimationKey = "autolathe_animation"; + private const string AnimationKey = "inserting_animation"; private Animation _buildingAnimation; private Animation _insertingMetalAnimation; @@ -24,12 +24,12 @@ namespace Content.Client.GameObjects.Components.Power { base.LoadData(node); - _buildingAnimation = PopulateAnimation("autolathe_building", "autolathe_building_unlit", 0.5f); - _insertingMetalAnimation = PopulateAnimation("autolathe_inserting_metal_plate", "autolathe_inserting_unlit", 0.9f); - _insertingGlassAnimation = PopulateAnimation("autolathe_inserting_glass_plate", "autolathe_inserting_unlit", 0.9f); - _insertingGoldAnimation = PopulateAnimation("autolathe_inserting_gold_plate", "autolathe_inserting_unlit", 0.9f); - _insertingPlasmaAnimation = PopulateAnimation("autolathe_inserting_plasma_sheet", "autolathe_inserting_unlit", 0.9f); - _insertingPlasticAnimation = PopulateAnimation("autolathe_inserting_plastic_sheet", "autolathe_inserting_unlit", 0.9f); + _buildingAnimation = PopulateAnimation("building", "building_unlit", 0.5f); + _insertingMetalAnimation = PopulateAnimation("inserting_metal", "inserting_unlit", 0.5f); + _insertingGlassAnimation = PopulateAnimation("inserting_glass", "inserting_unlit", 0.5f); + _insertingGoldAnimation = PopulateAnimation("inserting_gold", "inserting_unlit", 0.5f); + _insertingPlasmaAnimation = PopulateAnimation("inserting_plasma", "inserting_unlit", 0.5f); + _insertingPlasticAnimation = PopulateAnimation("inserting_plastic", "inserting_unlit", 0.5f); } private Animation PopulateAnimation(string sprite, string spriteUnlit, float length) @@ -67,7 +67,7 @@ namespace Content.Client.GameObjects.Components.Power { state = LatheVisualState.Idle; } - + sprite.LayerSetVisible(AutolatheVisualLayers.AnimationLayer, true); switch (state) { case LatheVisualState.Idle: @@ -76,8 +76,9 @@ namespace Content.Client.GameObjects.Components.Power animPlayer.Stop(AnimationKey); } - sprite.LayerSetState(AutolatheVisualLayers.Base, "autolathe"); - sprite.LayerSetState(AutolatheVisualLayers.BaseUnlit, "autolathe_unlit"); + sprite.LayerSetState(AutolatheVisualLayers.Base, "icon"); + sprite.LayerSetState(AutolatheVisualLayers.BaseUnlit, "unlit"); + sprite.LayerSetVisible(AutolatheVisualLayers.AnimationLayer, false); break; case LatheVisualState.Producing: if (!animPlayer.HasRunningAnimation(AnimationKey)) @@ -125,7 +126,8 @@ namespace Content.Client.GameObjects.Components.Power public enum AutolatheVisualLayers : byte { Base, - BaseUnlit + BaseUnlit, + AnimationLayer } } } diff --git a/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs b/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs index 862478f86a..50e7b14029 100644 --- a/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs +++ b/Content.Client/GameObjects/Components/Power/ProtolatheVisualizer.cs @@ -11,7 +11,7 @@ namespace Content.Client.GameObjects.Components.Power [UsedImplicitly] public class ProtolatheVisualizer : AppearanceVisualizer { - private const string AnimationKey = "protolathe_animation"; + private const string AnimationKey = "inserting_animation"; private Animation _buildingAnimation; private Animation _insertingMetalAnimation; @@ -24,23 +24,28 @@ namespace Content.Client.GameObjects.Components.Power { base.LoadData(node); - _buildingAnimation = PopulateAnimation("protolathe_building", 0.9f); - _insertingMetalAnimation = PopulateAnimation("protolathe_metal", 0.9f); - _insertingGlassAnimation = PopulateAnimation("protolathe_glass", 0.9f); - _insertingGoldAnimation = PopulateAnimation("protolathe_gold", 0.9f); - _insertingPlasmaAnimation = PopulateAnimation("protolathe_plasma", 0.9f); - _insertingPlasticAnimation = PopulateAnimation("protolathe_plastic", 0.9f); + _buildingAnimation = PopulateAnimation("building", "building_unlit", 0.8f); + _insertingMetalAnimation = PopulateAnimation("inserting_metal", "inserting_unlit", 0.8f); + _insertingGlassAnimation = PopulateAnimation("inserting_glass", "inserting_unlit", 0.8f); + _insertingGoldAnimation = PopulateAnimation("inserting_gold", "inserting_unlit", 0.8f); + _insertingPlasmaAnimation = PopulateAnimation("inserting_plasma", "inserting_unlit", 0.8f); + _insertingPlasticAnimation = PopulateAnimation("inserting_plastic", "inserting_unlit", 0.8f); } - private Animation PopulateAnimation(string sprite, float length) + private Animation PopulateAnimation(string sprite, string spriteUnlit, float length) { - var animation = new Animation {Length = TimeSpan.FromSeconds(length)}; + var animation = new Animation { Length = TimeSpan.FromSeconds(length) }; var flick = new AnimationTrackSpriteFlick(); animation.AnimationTracks.Add(flick); - flick.LayerKey = ProtolatheVisualLayers.AnimationLayer; + flick.LayerKey = ProtolatheVisualLayers.Base; flick.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame(sprite, 0f)); + var flickUnlit = new AnimationTrackSpriteFlick(); + animation.AnimationTracks.Add(flickUnlit); + flickUnlit.LayerKey = ProtolatheVisualLayers.BaseUnlit; + flickUnlit.KeyFrames.Add(new AnimationTrackSpriteFlick.KeyFrame(spriteUnlit, 0f)); + return animation; } @@ -71,8 +76,8 @@ namespace Content.Client.GameObjects.Components.Power animPlayer.Stop(AnimationKey); } - sprite.LayerSetState(ProtolatheVisualLayers.Base, "protolathe"); - sprite.LayerSetState(ProtolatheVisualLayers.BaseUnlit, "protolathe_unlit"); + sprite.LayerSetState(ProtolatheVisualLayers.Base, "icon"); + sprite.LayerSetState(ProtolatheVisualLayers.BaseUnlit, "unlit"); sprite.LayerSetVisible(ProtolatheVisualLayers.AnimationLayer, false); break; case LatheVisualState.Producing: diff --git a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml b/Resources/Prototypes/Entities/Constructible/Power/lathe.yml index b8b5069f8e..55f9940020 100644 --- a/Resources/Prototypes/Entities/Constructible/Power/lathe.yml +++ b/Resources/Prototypes/Entities/Constructible/Power/lathe.yml @@ -44,13 +44,15 @@ - type: Sprite sprite: Constructible/Power/autolathe.rsi layers: - - state: autolathe + - state: icon map: ["enum.AutolatheVisualLayers.Base"] - - state: autolathe_unlit + - state: unlit shader: unshaded map: ["enum.AutolatheVisualLayers.BaseUnlit"] - - state: autolathe_panel - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + - state: icon + map: ["enum.AutolatheVisualLayers.AnimationLayer"] + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Construction graph: machine node: machine @@ -106,15 +108,15 @@ - type: Sprite sprite: Constructible/Power/protolathe.rsi layers: - - state: protolathe + - state: icon map: ["enum.ProtolatheVisualLayers.Base"] - - state: protolathe_unlit + - state: unlit shader: unshaded map: ["enum.ProtolatheVisualLayers.BaseUnlit"] - - state: protolathe + - state: icon map: ["enum.ProtolatheVisualLayers.AnimationLayer"] - - state: protolathe_panel - map: [ "enum.WiresVisualLayers.MaintenancePanel" ] + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: ResearchClient - type: Construction graph: machine diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_glass_plate.png b/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_glass_plate.png deleted file mode 100644 index 09507aa57f..0000000000 Binary files a/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_glass_plate.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_gold_plate.png b/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_gold_plate.png deleted file mode 100644 index c793be4520..0000000000 Binary files a/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_gold_plate.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_metal_plate.png b/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_metal_plate.png deleted file mode 100644 index a3974baed3..0000000000 Binary files a/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_metal_plate.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_phoron_sheet.png b/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_phoron_sheet.png deleted file mode 100644 index e70942302f..0000000000 Binary files a/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_phoron_sheet.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_plasma_sheet.png b/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_plasma_sheet.png deleted file mode 100644 index 87f6def58f..0000000000 Binary files a/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_plasma_sheet.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_plastic_sheet.png b/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_plastic_sheet.png deleted file mode 100644 index e9f55c9ba1..0000000000 Binary files a/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_plastic_sheet.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_building.png b/Resources/Textures/Constructible/Power/autolathe.rsi/building.png similarity index 100% rename from Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_building.png rename to Resources/Textures/Constructible/Power/autolathe.rsi/building.png diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_building_unlit.png b/Resources/Textures/Constructible/Power/autolathe.rsi/building_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_building_unlit.png rename to Resources/Textures/Constructible/Power/autolathe.rsi/building_unlit.png diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe.png b/Resources/Textures/Constructible/Power/autolathe.rsi/icon.png similarity index 100% rename from Resources/Textures/Constructible/Power/autolathe.rsi/autolathe.png rename to Resources/Textures/Constructible/Power/autolathe.rsi/icon.png diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_glass.png b/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_glass.png new file mode 100644 index 0000000000..907864a7cb Binary files /dev/null and b/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_glass.png differ diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_gold.png b/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_gold.png new file mode 100644 index 0000000000..d5d07bfb4f Binary files /dev/null and b/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_gold.png differ diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_metal.png b/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_metal.png new file mode 100644 index 0000000000..ccee553393 Binary files /dev/null and b/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_metal.png differ diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_phoron.png b/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_phoron.png new file mode 100644 index 0000000000..9b05fcf763 Binary files /dev/null and b/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_phoron.png differ diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_plasma.png b/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_plasma.png new file mode 100644 index 0000000000..ac63a5293c Binary files /dev/null and b/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_plasma.png differ diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_plastic.png b/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_plastic.png new file mode 100644 index 0000000000..c1ebffb3d9 Binary files /dev/null and b/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_plastic.png differ diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_unlit.png b/Resources/Textures/Constructible/Power/autolathe.rsi/inserting_unlit.png similarity index 100% rename from Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_inserting_unlit.png rename to Resources/Textures/Constructible/Power/autolathe.rsi/inserting_unlit.png diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/meta.json b/Resources/Textures/Constructible/Power/autolathe.rsi/meta.json index dc9c04a0b6..efa929279e 100644 --- a/Resources/Textures/Constructible/Power/autolathe.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/autolathe.rsi/meta.json @@ -1,165 +1,158 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "states": [ - { - "name": "autolathe", - - }, - { - "name": "autolathe_unlit", - - }, - { - "name": "autolathe_building", - "delays": [ - [ - 0.055, - 0.055, - 0.055, - 0.055, - 0.055, - 0.055, - 0.055, - 0.055, - 0.055 - ] - ] - }, - { - "name": "autolathe_building_unlit", - "delays": [ - [ - 0.055, - 0.055, - 0.055, - 0.055, - 0.055, - 0.055, - 0.055, - 0.055, - 0.055 - ] - ] - }, - { - "name": "autolathe_inserting_metal_plate", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "autolathe_inserting_glass_plate", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "autolathe_inserting_phoron_sheet", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "autolathe_inserting_plasma_sheet", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "autolathe_inserting_gold_plate", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "autolathe_inserting_plastic_sheet", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "autolathe_inserting_unlit", - "delays": [ - [ - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] - }, - { - "name": "autolathe_panel", - - } - ] + { + "name": "panel" + }, + { + "name": "unlit" + }, + { + "name": "building", + "delays": [ + [ + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5 + ] + ] + }, + { + "name": "building_unlit", + "delays": [ + [ + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5 + ] + ] + }, + { + "name": "inserting_unlit", + "delays": [ + [ + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5 + ] + ] + }, + { + "name": "inserting_glass", + "delays": [ + [ + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5 + ] + ] + }, + { + "name": "inserting_gold", + "delays": [ + [ + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5 + ] + ] + }, + { + "name": "inserting_metal", + "delays": [ + [ + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5 + ] + ] + }, + { + "name": "inserting_phoron", + "delays": [ + [ + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5 + ] + ] + }, + { + "name": "inserting_plasma", + "delays": [ + [ + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5 + ] + ] + }, + { + "name": "inserting_plastic", + "delays": [ + [ + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5, + 0.5 + ] + ] + } + ] } diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_panel.png b/Resources/Textures/Constructible/Power/autolathe.rsi/panel.png similarity index 100% rename from Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_panel.png rename to Resources/Textures/Constructible/Power/autolathe.rsi/panel.png diff --git a/Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_unlit.png b/Resources/Textures/Constructible/Power/autolathe.rsi/unlit.png similarity index 100% rename from Resources/Textures/Constructible/Power/autolathe.rsi/autolathe_unlit.png rename to Resources/Textures/Constructible/Power/autolathe.rsi/unlit.png diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_building.png b/Resources/Textures/Constructible/Power/protolathe.rsi/building.png similarity index 100% rename from Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_building.png rename to Resources/Textures/Constructible/Power/protolathe.rsi/building.png diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/building_unlit.png b/Resources/Textures/Constructible/Power/protolathe.rsi/building_unlit.png new file mode 100644 index 0000000000..f89b32d447 Binary files /dev/null and b/Resources/Textures/Constructible/Power/protolathe.rsi/building_unlit.png differ diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe.png b/Resources/Textures/Constructible/Power/protolathe.rsi/icon.png similarity index 100% rename from Resources/Textures/Constructible/Power/protolathe.rsi/protolathe.png rename to Resources/Textures/Constructible/Power/protolathe.rsi/icon.png diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_adamantine.png b/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_adamantine.png new file mode 100644 index 0000000000..b4baebf24c Binary files /dev/null and b/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_adamantine.png differ diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_bananium.png b/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_bananium.png new file mode 100644 index 0000000000..2e639d0996 Binary files /dev/null and b/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_bananium.png differ diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_diamond.png b/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_diamond.png new file mode 100644 index 0000000000..bb2bf4a3f0 Binary files /dev/null and b/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_diamond.png differ diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_glass.png b/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_glass.png new file mode 100644 index 0000000000..c6970276e8 Binary files /dev/null and b/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_glass.png differ diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_gold.png b/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_gold.png new file mode 100644 index 0000000000..5b891b54d1 Binary files /dev/null and b/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_gold.png differ diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_metal.png b/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_metal.png new file mode 100644 index 0000000000..0c2fb3b7ee Binary files /dev/null and b/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_metal.png differ diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_phoron.png b/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_phoron.png new file mode 100644 index 0000000000..8c3c2a995d Binary files /dev/null and b/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_phoron.png differ diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_plasma.png b/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_plasma.png new file mode 100644 index 0000000000..b40410b614 Binary files /dev/null and b/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_plasma.png differ diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_plastic.png b/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_plastic.png new file mode 100644 index 0000000000..b6d71d9fed Binary files /dev/null and b/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_plastic.png differ diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_silver.png b/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_silver.png new file mode 100644 index 0000000000..41dea825dc Binary files /dev/null and b/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_silver.png differ diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_unlit.png b/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_unlit.png new file mode 100644 index 0000000000..cce8a4f5af Binary files /dev/null and b/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_unlit.png differ diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_uranium.png b/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_uranium.png new file mode 100644 index 0000000000..3ae789356d Binary files /dev/null and b/Resources/Textures/Constructible/Power/protolathe.rsi/inserting_uranium.png differ diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/meta.json b/Resources/Textures/Constructible/Power/protolathe.rsi/meta.json index e51f4aded7..35c6d0d38a 100644 --- a/Resources/Textures/Constructible/Power/protolathe.rsi/meta.json +++ b/Resources/Textures/Constructible/Power/protolathe.rsi/meta.json @@ -1,219 +1,241 @@ { - "version": 1, - "size": { - "x": 32, - "y": 32 + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" }, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/machines/excelsior/autolathe.dmi at 40b254106b46981b8ad95ccd5589deb8fa56e765", - "states": [ - { - "name": "protolathe", - - }, - { - "name": "protolathe_unlit", - - }, - { - "name": "protolathe_adamantine", - "delays": [ - [ - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088 - ] - ] - }, - { - "name": "protolathe_bananium", - "delays": [ - [ - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088 - ] - ] - }, - { - "name": "protolathe_diamond", - "delays": [ - [ - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088 - ] - ] - }, - { - "name": "protolathe_glass", - "delays": [ - [ - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088 - ] - ] - }, - { - "name": "protolathe_gold", - "delays": [ - [ - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088 - ] - ] - }, - { - "name": "protolathe_metal", - "delays": [ - [ - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088 - ] - ] - }, - { - "name": "protolathe_phoron", - "delays": [ - [ - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088 - ] - ] - }, - { - "name": "protolathe_plastic", - "delays": [ - [ - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088 - ] - ] - }, - { - "name": "protolathe_building", - "delays": [ - [ - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05, - 0.05 - ] - ] - }, - { - "name": "protolathe_silver", - "delays": [ - [ - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088 - ] - ] - }, - { - "name": "protolathe_solid plasma", - "delays": [ - [ - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088 - ] - ] - }, - { - "name": "protolathe_panel", - - }, - { - "name": "protolathe_uranium", - "delays": [ - [ - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088, - 0.088 - ] - ] - } - ] + { + "name": "panel" + }, + { + "name": "unlit" + }, + { + "name": "building", + "delays": [ + [ + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8 + ] + ] + }, + { + "name": "building_unlit", + "delays": [ + [ + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8 + ] + ] + }, + { + "name": "inserting_unlit", + "delays": [ + [ + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8 + ] + ] + }, + { + "name": "inserting_glass", + "delays": [ + [ + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8 + ] + ] + }, + { + "name": "inserting_adamantine", + "delays": [ + [ + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8 + ] + ] + }, + { + "name": "inserting_bananium", + "delays": [ + [ + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8 + ] + ] + }, + { + "name": "inserting_diamond", + "delays": [ + [ + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8 + ] + ] + }, + { + "name": "inserting_silver", + "delays": [ + [ + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8 + ] + ] + }, + { + "name": "inserting_uranium", + "delays": [ + [ + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8 + ] + ] + }, + { + "name": "inserting_gold", + "delays": [ + [ + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8 + ] + ] + }, + { + "name": "inserting_metal", + "delays": [ + [ + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8 + ] + ] + }, + { + "name": "inserting_phoron", + "delays": [ + [ + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8 + ] + ] + }, + { + "name": "inserting_plasma", + "delays": [ + [ + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8 + ] + ] + }, + { + "name": "inserting_plastic", + "delays": [ + [ + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8, + 0.8 + ] + ] + } + ] } diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_panel.png b/Resources/Textures/Constructible/Power/protolathe.rsi/panel.png similarity index 100% rename from Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_panel.png rename to Resources/Textures/Constructible/Power/protolathe.rsi/panel.png diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_adamantine.png b/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_adamantine.png deleted file mode 100644 index 16e046556e..0000000000 Binary files a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_adamantine.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_bananium.png b/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_bananium.png deleted file mode 100644 index 2ba3e3ecf5..0000000000 Binary files a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_bananium.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_diamond.png b/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_diamond.png deleted file mode 100644 index 48b16a1879..0000000000 Binary files a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_diamond.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_glass.png b/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_glass.png deleted file mode 100644 index 6076271b76..0000000000 Binary files a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_glass.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_gold.png b/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_gold.png deleted file mode 100644 index 391e8be6cf..0000000000 Binary files a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_gold.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_metal.png b/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_metal.png deleted file mode 100644 index 4f762ab383..0000000000 Binary files a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_metal.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_phoron.png b/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_phoron.png deleted file mode 100644 index f590e9d057..0000000000 Binary files a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_phoron.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_plastic.png b/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_plastic.png deleted file mode 100644 index e48844d6be..0000000000 Binary files a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_plastic.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_silver.png b/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_silver.png deleted file mode 100644 index e48844d6be..0000000000 Binary files a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_silver.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_solid plasma.png b/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_solid plasma.png deleted file mode 100644 index 668c5453a6..0000000000 Binary files a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_solid plasma.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_uranium.png b/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_uranium.png deleted file mode 100644 index eb7a83f390..0000000000 Binary files a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_uranium.png and /dev/null differ diff --git a/Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_unlit.png b/Resources/Textures/Constructible/Power/protolathe.rsi/unlit.png similarity index 100% rename from Resources/Textures/Constructible/Power/protolathe.rsi/protolathe_unlit.png rename to Resources/Textures/Constructible/Power/protolathe.rsi/unlit.png