diff --git a/Content.Client/Fax/System/FaxVisualsSystem.cs b/Content.Client/Fax/System/FaxVisualsSystem.cs index 19b18da8da..b9431b9706 100644 --- a/Content.Client/Fax/System/FaxVisualsSystem.cs +++ b/Content.Client/Fax/System/FaxVisualsSystem.cs @@ -42,8 +42,7 @@ public sealed partial class FaxVisualsSystem : EntitySystem LayerKey = FaxMachineVisuals.VisualState, KeyFrames = { - new AnimationTrackSpriteFlick.KeyFrame(component.InsertingState, 0f), - new AnimationTrackSpriteFlick.KeyFrame("icon", 2.4f), + new AnimationTrackSpriteFlick.KeyFrame(component.InsertingState, 0f) }, }, }, diff --git a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml index 5a1a166954..3d1465993d 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml @@ -9,6 +9,12 @@ drawdepth: SmallObjects layers: - state: icon + - state: idle + map: [ "faxEyes" ] + - state: printing + map: [ "printing" ] + visible: false + - state: map: [ "enum.FaxMachineVisuals.VisualState" ] - type: Icon sprite: Structures/Machines/fax_machine.rsi @@ -54,13 +60,16 @@ - type: GenericVisualizer visuals: enum.PowerDeviceVisuals.Powered: - enum.FaxMachineVisuals.VisualState: - True: { state: idle } - False: { state: icon } + faxEyes: + True: { visible: true } + False: { visible: false } enum.FaxMachineVisuals.VisualState: + printing: + Printing: { visible: true } + Normal: { visible: false } enum.FaxMachineVisuals.VisualState: - Printing: { state: printing } - Normal: {state: idle} + Inserting: { visible: true } + Normal: { visible: false } - type: ItemSlots - type: ContainerContainer containers: @@ -80,10 +89,16 @@ suffix: CentCom components: - type: Sprite - layers: - - state: icon - map: [ "base" ] - color: "#bfe3ff" + layers: + - state: icon + color: "#bfe3ff" + - state: idle + map: [ "faxEyes" ] + - state: printing + map: [ "printing" ] + visible: false + - state: + map: [ "enum.FaxMachineVisuals.VisualState" ] - type: FaxMachine name: "Central Command" notifyAdmins: true @@ -95,10 +110,16 @@ suffix: Syndicate components: - type: Sprite - layers: - - state: icon - map: [ "base" ] - color: "#a3a3a3" + layers: + - state: icon + color: "#a3a3a3" + - state: idle + map: [ "faxEyes" ] + - state: printing + map: [ "printing" ] + visible: false + - state: + map: [ "enum.FaxMachineVisuals.VisualState" ] - type: FaxMachine name: "ERR*?*%!" responsePings: false diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/icon.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/icon.png index 6e7958ee47..e37eff84f2 100644 Binary files a/Resources/Textures/Structures/Machines/fax_machine.rsi/icon.png and b/Resources/Textures/Structures/Machines/fax_machine.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/idle.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/idle.png index c5a4600a00..b53dd98c50 100644 Binary files a/Resources/Textures/Structures/Machines/fax_machine.rsi/idle.png and b/Resources/Textures/Structures/Machines/fax_machine.rsi/idle.png differ diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting.png index e1347199ea..d52d3eb0b8 100644 Binary files a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting.png and b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting.png differ diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_hamster.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_hamster.png index 5f14e3013f..0eb0e53a68 100644 Binary files a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_hamster.png and b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_hamster.png differ diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mothroach.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mothroach.png index d034322697..cbb10bd7e9 100644 Binary files a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mothroach.png and b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mothroach.png differ diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mouse.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mouse.png index 7fb87053f3..39e51bc20e 100644 Binary files a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mouse.png and b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mouse.png differ diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/meta.json b/Resources/Textures/Structures/Machines/fax_machine.rsi/meta.json index 00681ca6da..3e9e3620d9 100644 --- a/Resources/Textures/Structures/Machines/fax_machine.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/fax_machine.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/tree/23b5c47245804dd24507b75f250de5e87d34e294", + "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/tree/23b5c47245804dd24507b75f250de5e87d34e294 and modified by AsnDen (github)", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png index a80691cdde..516ebc1e21 100644 Binary files a/Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png and b/Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png differ