juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
master
crystall-punk-14/Content.Shared/Preferences/Loadouts/Effects
History
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
..
GroupLoadoutEffect.cs
Remove calls to FormattedMessage obsolete methods (#31706)
2024-09-01 13:00:53 +02:00
JobRequirementLoadoutEffect.cs
Merge remote-tracking branch 'upstream/stable' into ed-15-09-2025-upstream-sync
2025-09-15 13:50:49 +03:00
LoadoutEffect.cs
Don't use invalid defaults for loadouts (#28740)
2024-06-15 16:53:42 +10:00
LoadoutEffectGroupPrototype.cs
Fix prototypes so they pass analyzer checks (#35435)
2025-02-24 15:21:59 +11:00
PointsCostLoadoutEffect.cs
Don't use invalid defaults for loadouts (#28740)
2024-06-15 16:53:42 +10:00
SpeciesLoadoutEffect.cs
Don't use invalid defaults for loadouts (#28740)
2024-06-15 16:53:42 +10:00