NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 10:21:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.Shared/Preferences/Loadouts
History
Exact
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
..
Effects Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-09-01 22:20:47 +03:00
Loadout.cs Fix RoleLoadout equality (#28737) 2024-06-15 16:52:49 +10:00
LoadoutGroupPrototype.cs Hidden loadout groups (#29170) 2024-06-19 10:26:46 +10:00
LoadoutPrototype.cs De-duplicate loadout gear (#30341) 2024-08-05 00:42:25 -04:00
RoleLoadout.cs Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-09-01 22:20:47 +03:00
RoleLoadoutPrototype.cs Station AI (#30944) 2024-08-28 10:57:12 +10:00