]> git.smokeofanarchy.ru Git - space-station-14.git/commit
THE RETURN OF ITEM STATUS (#22986)
authorPieter-Jan Briers <pieterjan.briers+git@gmail.com>
Sun, 21 Apr 2024 13:16:23 +0000 (15:16 +0200)
committerGitHub <noreply@github.com>
Sun, 21 Apr 2024 13:16:23 +0000 (23:16 +1000)
commit58f025ba8043bcf5c32204b08eec8ae9e5d2bd41
treee990b131da9627f90096496c8099f7321c619ee2
parentee4ef4b96af61239f9cddfb9258e3cdbb793b7f9
THE RETURN OF ITEM STATUS (#22986)

* THE RETURN OF ITEM STATUS

Item status is now inline with the hands again. You can now see item status for both hands at once.

If you have more than 2 hands, the last active hand of that side is displayed in the respective item status.

The item status for the active hand is also highlighted.

Item status has been given a new look so it looks unique and matches every UI theme.

* Shrink item status to 125px

This is going to require fixing the existing controls. Do that later.

* New bullet item status rendering

sex

* Make gun item status look just a little bit nicer.

Avoid only one or two bullets ending up on a single row of an item status.

* Delete Eris theme files

* More improvements

Fixed the fact that left/right were flipped around when assigning status panel locations. Involved renaming all the UI textures.

Redid how content margins are set from the theme. Less complex and cleaner now.

Made the item name always left-aligned, just looks better since other UI elements don't adapt anyways.

* Compact down item status text

Now it fits 3 lines of text on one line. Yay.

This is achieved by compacting RichTextLabels by reducing their line height and giving them a negative bottom margin.

* Add item status sprites for Ashen theme.

* Add status control to show beaker/bucket/jug solution/transfer volumes

Also PollingItemStatusControl I'll be using that more.

* Fix welder item status, clean up welder code

The item status control implementation was ancient and bad. That's why it was buggy.

Removed all the complex dated networking stuff for welders, we just sync the solution contents now anyways so none of that is needed anymore. This moves a buncha stuff to shared and just removes code.

Cleanup. The code was doing some really dumb stuff.

* Spray bottles show contents in item status.

* cowtools

* Fix plasmafire and clockwork themes.

Actual git gaslighting wtf.

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
62 files changed:
Content.Client/Chemistry/Components/SolutionItemStatusComponent.cs [new file with mode: 0644]
Content.Client/Chemistry/EntitySystems/SolutionItemStatusSystem.cs [new file with mode: 0644]
Content.Client/Chemistry/UI/SolutionStatusControl.cs [new file with mode: 0644]
Content.Client/Items/UI/PollingItemStatusControl.cs [new file with mode: 0644]
Content.Client/Stylesheets/StyleNano.cs
Content.Client/Tools/ToolSystem.cs
Content.Client/Tools/UI/WelderStatusControl.cs
Content.Client/UserInterface/Systems/Hands/HandsUIController.cs
Content.Client/UserInterface/Systems/Hotbar/HotbarUIController.cs
Content.Client/UserInterface/Systems/Hotbar/Widgets/HotbarGui.xaml
Content.Client/UserInterface/Systems/Hotbar/Widgets/HotbarGui.xaml.cs
Content.Client/UserInterface/Systems/Inventory/Controls/ItemStatusPanel.xaml
Content.Client/UserInterface/Systems/Inventory/Controls/ItemStatusPanel.xaml.cs
Content.Client/Weapons/Ranged/ItemStatus/BulletRender.cs [new file with mode: 0644]
Content.Client/Weapons/Ranged/Systems/GunSystem.AmmoCounter.cs
Content.Server/Content.Server.csproj
Content.Server/Entry/IgnoredComponents.cs
Content.Server/Tools/ToolSystem.cs
Content.Shared/Tools/Components/WelderComponent.cs
Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs
Content.Shared/Tools/Systems/SharedToolSystem.cs
Resources/Locale/en-US/chemistry/components/solution-status.ftl [new file with mode: 0644]
Resources/Locale/en-US/tools/components/welder-component.ftl
Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
Resources/Prototypes/Entities/Objects/Tools/bucket.yml
Resources/Prototypes/themes.yml
Resources/Textures/Interface/Ashen/item_status_left.png [new file with mode: 0644]
Resources/Textures/Interface/Ashen/item_status_left_highlight.png [new file with mode: 0644]
Resources/Textures/Interface/Ashen/item_status_right.png [new file with mode: 0644]
Resources/Textures/Interface/Ashen/item_status_right_highlight.png [new file with mode: 0644]
Resources/Textures/Interface/Clockwork/item_status_left.png [new file with mode: 0644]
Resources/Textures/Interface/Clockwork/item_status_left_highlight.png [new file with mode: 0644]
Resources/Textures/Interface/Clockwork/item_status_right.png [new file with mode: 0644]
Resources/Textures/Interface/Clockwork/item_status_right_highlight.png [new file with mode: 0644]
Resources/Textures/Interface/Default/item_status_left.png [new file with mode: 0644]
Resources/Textures/Interface/Default/item_status_left_highlight.png [new file with mode: 0644]
Resources/Textures/Interface/Default/item_status_right.png [new file with mode: 0644]
Resources/Textures/Interface/Default/item_status_right_highlight.png [new file with mode: 0644]
Resources/Textures/Interface/Minimalist/item_status_left.png [new file with mode: 0644]
Resources/Textures/Interface/Minimalist/item_status_left_highlight.png [new file with mode: 0644]
Resources/Textures/Interface/Minimalist/item_status_right.png [new file with mode: 0644]
Resources/Textures/Interface/Minimalist/item_status_right_highlight.png [new file with mode: 0644]
Resources/Textures/Interface/Nano/item_status_left.svg [deleted file]
Resources/Textures/Interface/Nano/item_status_left.svg.96dpi.png [deleted file]
Resources/Textures/Interface/Nano/item_status_middle.svg [deleted file]
Resources/Textures/Interface/Nano/item_status_middle.svg.96dpi.png [deleted file]
Resources/Textures/Interface/Nano/item_status_right.svg [deleted file]
Resources/Textures/Interface/Nano/item_status_right.svg.96dpi.png [deleted file]
Resources/Textures/Interface/Plasmafire/item_status_left.png [new file with mode: 0644]
Resources/Textures/Interface/Plasmafire/item_status_left_highlight.png [new file with mode: 0644]
Resources/Textures/Interface/Plasmafire/item_status_right.png [new file with mode: 0644]
Resources/Textures/Interface/Plasmafire/item_status_right_highlight.png [new file with mode: 0644]
Resources/Textures/Interface/Retro/item_status_left.png [new file with mode: 0644]
Resources/Textures/Interface/Retro/item_status_left_highlight.png [new file with mode: 0644]
Resources/Textures/Interface/Retro/item_status_right.png [new file with mode: 0644]
Resources/Textures/Interface/Retro/item_status_right_highlight.png [new file with mode: 0644]
Resources/Textures/Interface/Slimecore/item_status_left.png [new file with mode: 0644]
Resources/Textures/Interface/Slimecore/item_status_left_highlight.png [new file with mode: 0644]
Resources/Textures/Interface/Slimecore/item_status_right.png [new file with mode: 0644]
Resources/Textures/Interface/Slimecore/item_status_right_highlight.png [new file with mode: 0644]