Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Faxes are colored again #32353

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Content.Client/Fax/System/FaxVisualsSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
32 changes: 22 additions & 10 deletions Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 4 additions & 20 deletions Resources/Textures/Structures/Machines/fax_machine.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,7 @@
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
0.2
]
]
},
Expand All @@ -51,11 +47,7 @@
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
0.2
]
]
},
Expand All @@ -70,11 +62,7 @@
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
0.2
]
]
},
Expand All @@ -89,11 +77,7 @@
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2,
0.2
0.2
]
]
},
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading