NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-18 14:41:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 16
CatStation/Content.Shared/Preferences/Loadouts
History
Morb0 4bf8b9eed6 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 
# Conflicts:
#	Content.Shared/Preferences/Loadouts/RoleLoadout.cs
#	Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Nuclear Operatives.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml
#	Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
#	Resources/ServerInfo/Guidebook/Antagonist/Traitors.xml
2024-05-29 01:14:59 +03:00
..
Effects Fix upstream 2024-05-15 19:36:04 +03:00
Loadout.cs Lobby refactor + species loadouts support (#27576) 2024-05-12 09:18:21 +10:00
LoadoutGroupPrototype.cs Make remaining IPrototypes partial (#27157) 2024-04-20 17:48:38 +10:00
LoadoutPrototype.cs Make remaining IPrototypes partial (#27157) 2024-04-20 17:48:38 +10:00
RoleLoadout.cs Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync 2024-05-29 01:14:59 +03:00
RoleLoadoutPrototype.cs Make remaining IPrototypes partial (#27157) 2024-04-20 17:48:38 +10:00