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

Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync

Browse Source 
# Conflicts:
#	Content.Client/Parallax/ParallaxControl.cs
#	Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
#	Content.Server/Labels/Label/LabelSystem.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Fluids/Components/EvaporationComponent.cs
#	Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
#	README.md
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
#	Resources/Prototypes/Maps/Pools/deathmatch.yml
#	Resources/Prototypes/Maps/arenas.yml
This commit is contained in:
Ed
2025-04-30 20:31:50 +03:00
parent 0c8735f6df 0e586e3fae
commit ef6d973301
2053 changed files with 113995 additions and 38376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Shared/Input/ContentKeyFunctions.cs
View File

@@ -87,11 +87,22 @@ namespace Content.Shared.Input
public static readonly BoundKeyFunction Hotbar7 = "Hotbar7";
public static readonly BoundKeyFunction Hotbar8 = "Hotbar8";
public static readonly BoundKeyFunction Hotbar9 = "Hotbar9";
public static readonly BoundKeyFunction HotbarShift0 = "HotbarShift0";
public static readonly BoundKeyFunction HotbarShift1 = "HotbarShift1";
public static readonly BoundKeyFunction HotbarShift2 = "HotbarShift2";
public static readonly BoundKeyFunction HotbarShift3 = "HotbarShift3";
public static readonly BoundKeyFunction HotbarShift4 = "HotbarShift4";
public static readonly BoundKeyFunction HotbarShift5 = "HotbarShift5";
public static readonly BoundKeyFunction HotbarShift6 = "HotbarShift6";
public static readonly BoundKeyFunction HotbarShift7 = "HotbarShift7";
public static readonly BoundKeyFunction HotbarShift8 = "HotbarShift8";
public static readonly BoundKeyFunction HotbarShift9 = "HotbarShift9";
public static BoundKeyFunction[] GetHotbarBoundKeys() =>
new[]
{
Hotbar1, Hotbar2, Hotbar3, Hotbar4, Hotbar5, Hotbar6, Hotbar7, Hotbar8, Hotbar9, Hotbar0
Hotbar1, Hotbar2, Hotbar3, Hotbar4, Hotbar5, Hotbar6, Hotbar7, Hotbar8, Hotbar9, Hotbar0,
HotbarShift1, HotbarShift2, HotbarShift3, HotbarShift4, HotbarShift5, HotbarShift6, HotbarShift7, HotbarShift8, HotbarShift9, HotbarShift0
};
public static readonly BoundKeyFunction Vote0 = "Vote0";