Ed 677e5194d6 Merge remote-tracking branch 'upstream/master' into ed-20-11-2024-upstream-sync ...

# Conflicts:
#	Content.Server/Chemistry/EntitySystems/InjectorSystem.cs
#	Content.Server/Traits/TraitSystem.cs
#	Content.Shared/CCVar/CCVars.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Resources/Maps/box.yml
#	Resources/Maps/core.yml

2024-11-23 01:48:24 +03:00

..

Commands

Merge remote-tracking branch 'upstream/master' into ed-08-09-2024-upstream

2024-09-08 21:20:54 +03:00

Events

Add job whitelist system (#28085)

2024-06-01 05:08:31 -07:00

Presets

Some round beginning preparation (#317)

2024-07-08 17:39:04 +03:00

Prototypes

Make all prototype types partial (#21374)

2023-11-01 19:56:23 -07:00

Rules

Fix imports

2024-11-19 21:16:49 -08:00

GameTicker.cs

Fix RA0032 (#32514)

2024-09-29 02:25:21 +02:00

GameTicker.CVars.cs

Fix RA0032 (#32514)

2024-09-29 02:25:21 +02:00

GameTicker.GamePreset.cs

Fix RA0032 (#32514)

2024-09-29 02:25:21 +02:00

GameTicker.GameRule.cs

Merge remote-tracking branch 'upstream/master' into ed-19-08-2024-upstream

2024-08-19 19:06:38 +03:00

GameTicker.Lobby.cs

Replace direct uses of GameTicker dictionary with TryGetValue (#33222)

2024-11-18 21:57:50 +03:00

GameTicker.LobbyBackground.cs

WebP lobby images (#25184)

2024-02-16 16:55:57 -07:00

GameTicker.Player.cs

Fix RA0032 (#32514)

2024-09-29 02:25:21 +02:00

GameTicker.Replays.cs

Fix RA0032 (#32514)

2024-09-29 02:25:21 +02:00

GameTicker.RoundFlow.cs

Fix role ban loading bugs (#32725)

2024-10-14 14:30:31 +11:00

GameTicker.Spawning.cs

Merge remote-tracking branch 'upstream/master' into ed-20-11-2024-upstream-sync

2024-11-23 01:48:24 +03:00

GameTicker.StatusShell.cs

Fix baby jail (#29896)

2024-07-11 15:14:01 +10:00

ManifestEntry.cs

Cleanup the namespaces (#8132)

2022-05-13 17:59:03 +10:00