crystall-punk-14

Files

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

# 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

2025-04-30 20:31:50 +03:00

EyeColorPicker.cs

Humanoid appearance refactor (#10882 )

2022-09-22 17:19:00 -05:00

HumanoidAppearanceSystem.cs

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

2025-04-30 20:31:50 +03:00

HumanoidMarkingModifierBoundUserInterface.cs

Fix window positions not saving (#35055 )

2025-02-23 23:57:57 +11:00

HumanoidMarkingModifierWindow.xaml

Shuttle console + FTL rework (#24430 )