VigersRay 31b256cce8 Merge remote-tracking branch 'refs/remotes/wizards/master' ... # Conflicts: # .github/PULL_REQUEST_TEMPLATE.md # Resources/Prototypes/Accents/word_replacements.yml # Resources/Prototypes/Entities/Mobs/Species/arachnid.yml # Resources/Prototypes/Entities/Mobs/Species/base.yml # Resources/Prototypes/Entities/Mobs/Species/moth.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml # Resources/Prototypes/Traits/disabilities.yml # Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/meta.json # Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json # Resources/Textures/Clothing/Head/Misc/pumpkin.rsi/meta.json		2024-07-24 20:36:22 +03:00
..
AntagPreferenceTest.cs	Code Cleanup: Integration Tests (#29584)	2024-07-03 10:01:37 +10:00
FailAndStartPresetTest.cs	Code Cleanup: Integration Tests (#29584)	2024-07-03 10:01:37 +10:00
NukeOpsTest.cs	Merge remote-tracking branch 'refs/remotes/wizards/master'	2024-07-24 20:36:22 +03:00
RuleMaxTimeRestartTest.cs	move gamerule components to shared (#28572)	2024-06-04 21:53:24 +10:00
SecretStartsTest.cs	Mega Antag Refactor (#25786)	2024-04-25 11:31:45 +10:00
StartEndGameRulesTest.cs	Remove obsolete TestPair.Pair (#19496)	2023-08-25 10:56:51 +10:00
TraitorRuleTest.cs	Fix antag objectives always overshooting MaxDifficulty (and kill tries20) (#29830)	2024-07-13 14:14:30 +10:00