Morb0 1e0bee212f Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/workflows/publish.yml # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Maps/barratry.yml # Resources/ServerInfo/Gameplay.txt # Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml # Resources/ServerInfo/Guidebook/Engineering/Power.xml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/ServerInfo/Guidebook/Jobs.xml # Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml # Resources/Textures/Clothing/Mask/bat.rsi/meta.json # Resources/Textures/Clothing/Mask/bear.rsi/meta.json # Resources/Textures/Clothing/Mask/bee.rsi/meta.json # Resources/Textures/Clothing/Mask/breath.rsi/meta.json # Resources/Textures/Clothing/Mask/clown.rsi/meta.json # Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json # Resources/Textures/Clothing/Mask/ert.rsi/meta.json # Resources/Textures/Clothing/Mask/fox.rsi/meta.json # Resources/Textures/Clothing/Mask/gas.rsi/meta.json # Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json # Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json # Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json # Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json # Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json # Resources/Textures/Clothing/Mask/jackal.rsi/meta.json # Resources/Textures/Clothing/Mask/joy.rsi/meta.json # Resources/Textures/Clothing/Mask/medical.rsi/meta.json # Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json # Resources/Textures/Clothing/Mask/merc.rsi/meta.json # Resources/Textures/Clothing/Mask/mime.rsi/meta.json # Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json # Resources/Textures/Clothing/Mask/rat.rsi/meta.json # Resources/Textures/Clothing/Mask/raven.rsi/meta.json # Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json # Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json # Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json # Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json # Resources/Textures/Clothing/Mask/squadron.rsi/meta.json # Resources/Textures/Clothing/Mask/sterile.rsi/meta.json # Resources/Textures/Clothing/Mask/swat.rsi/meta.json		2024-01-10 00:23:02 +03:00
..
Commands	Un-revert IPlayerManager refactor (#21244)	2023-10-28 09:59:53 +11:00
Events	Make AdminLogsSystem an IoC manager (#8492)	2022-05-28 23:41:17 -07:00
Presets	Make all prototype types partial (#21374)	2023-11-01 19:56:23 -07:00
Prototypes	Make all prototype types partial (#21374)	2023-11-01 19:56:23 -07:00
Rules	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-10 00:23:02 +03:00
GameTicker.cs	Log server ID in connection logs table (#21911)	2023-12-07 09:48:56 +11:00
GameTicker.CVars.cs	Remove dummy gameticker cvars (#23596)	2024-01-06 16:21:32 +11:00
GameTicker.GamePreset.cs	Fix next map not being displayed on the lobby UI after map vote (#23231)	2023-12-30 12:51:36 -05:00
GameTicker.GameRule.cs	Add active and ended game rule components, generic TryRoundStartAttempt and minPlayers field (#20564)	2023-09-28 10:48:59 -04:00
GameTicker.Lobby.cs	Fix RoundStartTimeSpan not being networked on client-side after reconnecting (#23707)	2024-01-07 19:30:10 -05:00
GameTicker.LobbyBackground.cs	Revert "Revert "Replace ResourcePath with ResPath (#15308)" (#155… (#15566)	2023-04-20 20:16:01 +10:00
GameTicker.LobbyMusic.cs	Lint more const string prototypes (#18922)	2023-08-13 20:26:59 -04:00
GameTicker.Player.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-10 00:23:02 +03:00
GameTicker.Replays.cs	Add Exists check and try catch when creating replay dir (#20852)	2023-10-08 23:34:10 -07:00
GameTicker.RoundFlow.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-10 00:23:02 +03:00
GameTicker.Spawning.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2023-11-22 20:22:45 +03:00
GameTicker.StatusShell.cs	Merge remote-tracking branch 'upstream/master' into upstream-sync	2024-01-10 00:23:02 +03:00
ManifestEntry.cs	Cleanup the namespaces (#8132)	2022-05-13 17:59:03 +10:00