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.

Sign up for GitHub

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

use unused filled chemmaster sprite #2729

Merged
merged 5 commits into from
Jan 19, 2025
+13 −0
Merged

use unused filled chemmaster sprite #2729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
40d88bf
use unused filled chemmaster sprite
Temoffy Jan 19, 2025
6cbef3b
map BeakerInserted layer
whatston3 Jan 19, 2025
d313142
Update Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
Temoffy Jan 19, 2025
7a4fe68
Update Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
Temoffy Jan 19, 2025
2ba4116
Apply suggestions from code review
Temoffy Jan 19, 2025
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: 2 additions & 0 deletions Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public sealed class ChemMasterSystem : EntitySystem
{
[Dependency] private readonly PopupSystem _popupSystem = default!;
[Dependency] private readonly AudioSystem _audioSystem = default!;
[Dependency] private readonly SharedAppearanceSystem _appearanceSystem = default!; // Frontier
[Dependency] private readonly SharedSolutionContainerSystem _solutionContainerSystem = default!;
[Dependency] private readonly ItemSlotsSystem _itemSlotsSystem = default!;
[Dependency] private readonly UserInterfaceSystem _userInterfaceSystem = default!;
Expand Down Expand Up @@ -70,6 +71,7 @@ private void UpdateUiState(Entity<ChemMasterComponent> ent, bool updateLabel = f
if (!_solutionContainerSystem.TryGetSolution(owner, SharedChemMaster.BufferSolutionName, out _, out var bufferSolution))
return;
var inputContainer = _itemSlotsSystem.GetItemOrNull(owner, SharedChemMaster.InputSlotName);
_appearanceSystem.SetData(owner, ChemMasterVisualState.BeakerInserted, inputContainer.HasValue); // Frontier
var outputContainer = _itemSlotsSystem.GetItemOrNull(owner, SharedChemMaster.OutputSlotName);

var bufferReagents = bufferSolution.Contents;
Expand Down
6 changes: 6 additions & 0 deletions Content.Shared/Chemistry/SharedChemMaster.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ public ChemMasterSetPillTypeMessage(uint pillType)
}
}

[Serializable, NetSerializable]
public enum ChemMasterVisualState : byte // Frontier
{
BeakerInserted
}

[Serializable, NetSerializable]
public sealed class ChemMasterReagentAmountButtonMessage : BoundUserInterfaceMessage
{
Expand Down
5 changes: 5 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
snapCardinals: true
layers:
- state: mixer_empty
map: ["BeakerInserted"] # Frontier
- state: mixer_screens
shader: unshaded
map: ["enum.PowerDeviceVisualLayers.Powered"]
Expand Down Expand Up @@ -61,6 +62,10 @@
enum.PowerDeviceVisualLayers.Powered:
True: { visible: true }
False: { visible: false }
enum.ChemMasterVisualState.BeakerInserted: # Frontier
BeakerInserted: # Frontier
True: {state: "mixer_loaded"} # Frontier
False: {state: "mixer_empty"} # Frontier
# Machine / Construction stuff
- type: WiresPanel
- type: Machine
Expand Down
Loading