Faxes are colored again

space-wizards · Sep 21, 2024 · 658c7dd · 658c7dd
1 parent 5f5bed8
commit 658c7dd
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 31 deletions.
diff --git a/Content.Client/Fax/System/FaxVisualsSystem.cs b/Content.Client/Fax/System/FaxVisualsSystem.cs
@@ -34,7 +34,7 @@ private void OnAppearanceChanged(EntityUid uid, FaxMachineComponent component, r
             _player.Play(uid,
                 new Animation()
                 {
-                    Length = TimeSpan.FromSeconds(2.4),
+                    Length = TimeSpan.FromSeconds(1.6),
                     AnimationTracks =
                     {
                         new AnimationTrackSpriteFlick()

diff --git a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
@@ -9,6 +9,10 @@
     drawdepth: SmallObjects
     layers:
     - state: icon
+      map: [ "faxLayerBody" ]
+    - state: printing
+      map: [ "faxLayerPrint" ]
+    - state: 
       map: [ "enum.FaxMachineVisuals.VisualState" ]
   - type: Icon
     sprite: Structures/Machines/fax_machine.rsi
@@ -50,13 +54,13 @@
   - type: GenericVisualizer
     visuals:
       enum.PowerDeviceVisuals.Powered:
-        enum.FaxMachineVisuals.VisualState:
+        faxLayerBody:
           True: { state: idle }
           False: { state: icon }
       enum.FaxMachineVisuals.VisualState:
-        enum.FaxMachineVisuals.VisualState:
-          Printing: { state: printing }
-          Normal: {state: idle}
+        faxLayerPrint:
+          Printing: { visible: true }
+          Normal: { visible: false }
   - type: ItemSlots
   - type: ContainerContainer
     containers:
@@ -77,9 +81,13 @@
   components:
   - type: Sprite
     layers:
-      - state: icon
-        map: [ "base" ]
-        color: "#bfe3ff"
+    - state: icon
+      color: "#bfe3ff"
+      map: [ "faxLayerBody" ]
+    - state: printing
+      map: [ "faxLayerPrint" ]
+    - state: 
+      map: [ "enum.FaxMachineVisuals.VisualState" ]
   - type: FaxMachine
     name: "Central Command"
     notifyAdmins: true
@@ -92,9 +100,13 @@
   components:
   - type: Sprite
     layers:
-      - state: icon
-        map: [ "base" ]
-        color: "#a3a3a3"
+    - state: icon
+      color: "#a3a3a3"
+      map: [ "faxLayerBody" ]
+    - state: printing
+      map: [ "faxLayerPrint" ]
+    - state: 
+      map: [ "enum.FaxMachineVisuals.VisualState" ]
   - type: FaxMachine
     name: "ERR*?*%!"
     responsePings: false

diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting.png
diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_hamster.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_hamster.png
diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mothroach.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mothroach.png
diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mouse.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mouse.png
diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/meta.json b/Resources/Textures/Structures/Machines/fax_machine.rsi/meta.json
@@ -32,11 +32,7 @@
           0.2,
           0.2,
           0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
+		  0.2
         ]
       ]
     },
@@ -51,11 +47,7 @@
           0.2,
           0.2,
           0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
+		  0.2
         ]
       ]
     },
@@ -70,11 +62,7 @@
           0.2,
           0.2,
           0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
+		  0.2
         ]
       ]
     },
@@ -89,11 +77,7 @@
           0.2,
           0.2,
           0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2,
-          0.2
+		  0.2
         ]
       ]
     },

diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png