Morb0 3fcd731834 Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync ... # Conflicts: # Resources/Prototypes/Datasets/criminal_records.yml # Resources/Prototypes/Roles/Antags/nukeops.yml # Resources/ServerInfo/Guidebook/Antagonist/Revolutionaries.xml		2024-05-09 13:47:39 +03:00
..
base_objectives.yml	ninja criminal records hacking (#24982)	2024-05-08 23:35:11 -07:00
dragon.yml	dragon refactor, objectives and use GenericAntag (#20201)	2023-09-30 13:18:01 -07:00
ninja.yml	Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync	2024-05-09 13:47:39 +03:00
objectiveGroups.yml	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-04-02 11:32:48 +03:00
stealTargetGroups.yml	Removed Cannabis from thief objectives (#26412)	2024-03-25 01:02:56 +03:00
thief.yml	Removed Cannabis from thief objectives (#26412)	2024-03-25 01:02:56 +03:00
traitor.yml	Raise difficulty class of RD hardsuit objective (#27103)	2024-04-18 19:41:11 -04:00