Ed cd736e4fd4 Merge remote-tracking branch 'upstream/stable' into ed-11-12-2024-upstream ...

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Maps/oasis.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/audio.yml

2024-12-11 14:49:02 +03:00

..

cargo_gifts.yml

refactor event schedulers to use explicit game rules (#29320)

2024-08-14 15:21:01 +10:00

events.yml

Derelict Borg Revival (#33433)

2024-12-06 00:22:38 -06:00

meteorswarms.yml

Extends the minimum round time for meteor swarm events (#32876)

2024-10-28 22:25:33 +01:00

midround.yml

Mind Role Entities (#31318)

2024-10-10 10:48:56 +02:00

pests.yml

fix: Snail event wasnt tabled (#31884)

2024-09-06 17:27:51 -06:00

random_sentience.yml

Re-add improved random sentience event (#29123)

2024-08-18 17:41:12 -06:00

roundstart.yml

Stable Merge (#33218)

2024-11-08 03:46:22 -08:00

unknown_shuttles.yml

Fix loneop spawnrate by reverting it to not use the shuttle event system. (#32942)

2024-10-28 18:52:21 +01:00

variation.yml

make GameRule use entity category (#28294)

2024-06-03 08:39:25 -04:00