CatStation/Content.Shared/Preferences/Loadouts/Effects
Morb0 0f339baab5 Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
# Conflicts:
#	Content.Server/Connection/ConnectionManager.cs
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Entities/Stations/base.yml
2024-09-01 22:20:47 +03:00
..
GroupLoadoutEffect.cs Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-09-01 22:20:47 +03:00
JobRequirementLoadoutEffect.cs Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 2024-08-08 01:38:43 +03:00
LoadoutEffect.cs Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 2024-06-15 10:39:49 +03:00
LoadoutEffectGroupPrototype.cs Make remaining IPrototypes partial (#27157) 2024-04-20 17:48:38 +10:00
PointsCostLoadoutEffect.cs Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 2024-06-15 10:39:49 +03:00
SpeciesLoadoutEffect.cs Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 2024-06-15 10:39:49 +03:00