NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-14 21:01:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
CatStation/Resources/Prototypes/Objectives
History
Morb0 58ef40767e Merge remote-tracking branch 'upstream/master' into upstream-sync2 
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Client/Preferences/ClientPreferencesManager.cs
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Resources/Prototypes/Entities/Clothing/Shoes/boots.yml
#	Resources/Prototypes/Entities/Mobs/Species/base.yml
2023-09-19 11:41:15 +03:00
..
base_objectives.yml Objectives ecs rework (#19967) 2023-09-16 16:18:10 +10:00
ninja.yml Objectives ecs rework (#19967) 2023-09-16 16:18:10 +10:00
objectiveGroups.yml Merge remote-tracking branch 'upstream/master' into upstream-sync2 2023-09-19 11:41:15 +03:00
traitor.yml hopefully fix no objectives (#20246) 2023-09-16 22:10:05 +10:00