crystall-punk-14

Files

Ed 3409e0f752 Merge remote-tracking branch 'upstream/stable' into ed-15-09-2025-upstream-sync

# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Overlays/StencilOverlay.cs
#	Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
#	Content.Server/GameTicking/Commands/SetGamePresetCommand.cs
#	Content.Server/Players/PlayTimeTracking/PlayTimeTrackingSystem.cs
#	Content.Shared/Chemistry/EntitySystems/SharedInjectorSystem.cs
#	Content.Shared/Clothing/Components/ClothingComponent.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Content.Shared/Humanoid/SkinColor.cs
#	Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml

2025-09-15 13:50:49 +03:00

Loadouts

Merge remote-tracking branch 'upstream/stable' into ed-15-09-2025-upstream-sync

2025-09-15 13:50:49 +03:00

GameSettings.cs

Cleanup the namespaces (#8132 )

2022-05-13 17:59:03 +10:00

HumanoidCharacterProfile.cs

Merge remote-tracking branch 'upstream/stable' into ed-15-09-2025-upstream-sync

2025-09-15 13:50:49 +03:00

ICharacterProfile.cs

Loadouts redux (#25715 )