Ed 5420469d62 Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync ...

# Conflicts:
#	Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs

2025-04-15 00:44:29 +03:00

..

cargo_gifts.yml

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

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

events.yml

Make RandomMetadata properly support localization (#36343)

2025-04-06 11:12:39 -07:00

meteorswarms.yml

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

2024-10-28 22:25:33 +01: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

Make RandomMetadata properly support localization (#36343)

2025-04-06 11:12:39 -07:00

subgamemodes.yml

Make RandomMetadata properly support localization (#36343)

2025-04-06 11:12:39 -07:00

survivor.yml

Fix/Addition - Wizard Survivor Antag Status (#35226)

2025-02-23 12:24:36 -05:00

unknown_shuttles.yml

add man-o-war shuttle (#32105)

2024-12-20 14:36:23 +03:00

variation.yml

make GameRule use entity category (#28294)

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