VigersRay c01034d336 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs		2024-06-07 20:16:41 +03:00
..
Antags	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-07 11:28:58 +03:00
Ghostroles	monkey reinforcement teleporters can now select between kobold or monkey with a verb (#25982)	2024-04-26 15:06:43 +02:00
Jobs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-06-07 11:28:58 +03:00
play_time_trackers.yml	Add ERT Chaplain (#25956)	2024-04-01 17:48:49 +11:00
requirement_overrides.yml	Add JobRequirementOverride prototypes (#28607)	2024-06-07 09:43:02 -07:00