juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'space-station-14/master' into ed-26-04-2024-upstream

Browse Source 
# Conflicts:
#	Content.IntegrationTests/Tests/Station/EvacShuttleTest.cs
This commit is contained in:
Ed
2024-04-26 00:33:04 +03:00
parent 045c81b3c4 cf45005471
commit 057556b605
254 changed files with 4595 additions and 3363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/Storage/EntitySystems/StorageSystem.cs
View File

@@ -76,13 +76,13 @@ public sealed partial class StorageSystem : SharedStorageSystem
};
if (uiOpen)
{
verb.Text = Loc.GetString("verb-common-close-ui");
verb.Text = Loc.GetString("comp-storage-verb-close-storage");
verb.Icon = new SpriteSpecifier.Texture(
new("/Textures/Interface/VerbIcons/close.svg.192dpi.png"));
}
else
{
verb.Text = Loc.GetString("verb-common-open-ui");
verb.Text = Loc.GetString("comp-storage-verb-open-storage");
verb.Icon = new SpriteSpecifier.Texture(
new("/Textures/Interface/VerbIcons/open.svg.192dpi.png"));
}