Ed bd011bf418 Merge remote-tracking branch 'upstream/master' into ed-05-07-2024-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/Round/JobTest.cs
#	Resources/Prototypes/Traits/speech.yml

2024-07-04 18:14:21 +03:00

..

Antags

Fix ERT becoming sleeper agents and add sleeper agent preferences (#27817)

2024-06-20 21:12:58 +10: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 'upstream/master' into ed-05-07-2024-upstream

2024-07-04 18:14:21 +03:00

play_time_trackers.yml

Upstream, Yay (#27)

2024-04-03 10:33:34 +03:00

requirement_overrides.yml

Revert "Ed 09 06 2024 upstream (#230)"

2024-06-11 15:20:47 +03:00