Ed dda8ea2b09 Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-13-05-2024-upstream ...

# Conflicts:
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Prototypes/Maps/oasis.yml

2024-05-13 18:32:59 +03:00

..

Antags

Nukie agent requires chemistry hours, rather than general medical hours. (#27098)

2024-05-08 23:48:53 -07: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/upstream/master' into ed-13-05-2024-upstream

2024-05-13 18:32:59 +03:00

play_time_trackers.yml

Upstream, Yay (#27)

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