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

# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
#	Content.Shared/Clothing/Components/ClothingComponent.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/atlas.yml
#	Resources/Prototypes/Maps/bagel.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/omega.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/Traits/speech.yml
#	Resources/Prototypes/Voice/disease_emotes.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Prototypes/game_presets.yml
#	Resources/Prototypes/secret_weights.yml

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

..

Commands

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

2024-08-12 14:40:15 +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

remove(NukeopsRuleComponent): Remove a trap from the component file (#31029)

2024-08-16 00:52:36 -04:00

GameTicker.cs

Add job whitelist system (#28085)

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

GameTicker.CVars.cs

Make the round end sound collection a cvar (#25741)

2024-03-01 21:08:48 +11:00

GameTicker.GamePreset.cs

Revert "setgamepreset command rework" (#30807)

2024-08-09 17:39:45 +10: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

Don't show Station Event announcements to players in the lobby. (#30886)

2024-08-11 16:09:33 +10:00

GameTicker.LobbyBackground.cs

WebP lobby images (#25184)

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

GameTicker.Player.cs

Fix gamerule display issues (#28178)

2024-05-25 16:18:05 -04:00

GameTicker.Replays.cs

Add server name into the replay final (#25564)

2024-02-25 23:44:05 +01:00

GameTicker.RoundFlow.cs

Revert "setgamepreset command rework" (#30807)

2024-08-09 17:39:45 +10:00

GameTicker.Spawning.cs

Merge remote-tracking branch 'space-station-14/master' into ed-02-06-2024-upstream

2024-06-02 11:01:34 +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