Ed a899122d1b Merge remote-tracking branch 'space-station-14/master' into 21-04-2024-cleaning-up ...

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Recipes/Lathes/electronics.yml
#	Resources/Textures/Interface/Nano/item_status_left.svg.96dpi.png
#	Resources/Textures/Interface/Nano/item_status_middle.svg.96dpi.png
#	Resources/Textures/Interface/Nano/item_status_right.svg.96dpi.png

2024-04-21 20:54:50 +03:00

..

Slots

try2

2024-04-11 00:18:33 +03:00

Storage

feat(inventory): Add secondary smart-equip star (#25696)

2024-03-02 18:57:42 -05:00

blocked.png

Move slot UI files around (#11282)

2022-09-14 17:13:28 -07:00

item_status_left_highlight.png

THE RETURN OF ITEM STATUS (#22986)

2024-04-21 23:16:23 +10:00

item_status_left.png

THE RETURN OF ITEM STATUS (#22986)

2024-04-21 23:16:23 +10:00

item_status_right_highlight.png

THE RETURN OF ITEM STATUS (#22986)

2024-04-21 23:16:23 +10:00

item_status_right.png

THE RETURN OF ITEM STATUS (#22986)

2024-04-21 23:16:23 +10:00

left_arrow.svg

Fix action numbers (/handle UI default theme update) (#15840)

2023-05-15 13:45:56 +10:00

left_arrow.svg.192dpi.png

Fix action numbers (/handle UI default theme update) (#15840)

2023-05-15 13:45:56 +10:00

left_arrow.svg.192dpi.png.yml

Fix action numbers (/handle UI default theme update) (#15840)

2023-05-15 13:45:56 +10:00

meta.json

Arachnid species (#13945)

2023-04-30 02:19:06 +10:00

right_arrow.svg

Fix action numbers (/handle UI default theme update) (#15840)

2023-05-15 13:45:56 +10:00

right_arrow.svg.192dpi.png

Fix action numbers (/handle UI default theme update) (#15840)

2023-05-15 13:45:56 +10:00

right_arrow.svg.192dpi.png.yml

Fix action numbers (/handle UI default theme update) (#15840)

2023-05-15 13:45:56 +10:00

slot_highlight.png

The HUDening™️ (SS13 HUD themes, Classic as default, and more) (#22287)

2023-12-11 02:28:17 -07:00

SlotBackground.png

The HUDening™️ (SS13 HUD themes, Classic as default, and more) (#22287)

2023-12-11 02:28:17 -07:00

template_small.png

The HUDening™️ (SS13 HUD themes, Classic as default, and more) (#22287)

2023-12-11 02:28:17 -07:00