Morb0 3e015c6f67 Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync ...

# Conflicts:
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml
#	Resources/Prototypes/Entities/Clothing/Masks/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml
#	Resources/Prototypes/GameRules/midround.yml
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
#	Resources/Prototypes/Roles/Jobs/Security/warden.yml
#	Resources/Prototypes/StatusEffects/health.yml
#	Resources/Prototypes/StatusIcon/antag.yml
#	Resources/ServerInfo/Guidebook/Antagonist/Antagonists.xml
#	Resources/ServerInfo/Guidebook/Antagonist/SpaceNinja.xml
#	Resources/ServerInfo/Guidebook/Engineering/AME.xml
#	Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml
#	Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
#	Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
#	Resources/ServerInfo/Guidebook/Engineering/Construction.xml
#	Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
#	Resources/ServerInfo/Guidebook/Engineering/Fires.xml
#	Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
#	Resources/ServerInfo/Guidebook/Engineering/Networking.xml
#	Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
#	Resources/ServerInfo/Guidebook/Engineering/Power.xml
#	Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/ServerInfo/Guidebook/Engineering/TEG.xml
#	Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml
#	Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml
#	Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml
#	Resources/ServerInfo/Guidebook/Security/Forensics.xml
#	Resources/Textures/Objects/Specific/Hydroponics/chili.rsi/produce.png

2024-04-26 11:19:50 +03:00

..

Pair

Add NukeOps Test (#27207)

2024-04-24 15:38:43 +10:00

Tests

Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync

2024-04-26 11:19:50 +03:00

Content.IntegrationTests.csproj

Switch project files to C# 12. (#25487)

2024-02-23 15:02:59 +11:00

DummyParallaxManager.cs

Update content vectors to numerics (#17759)

2023-07-08 14:08:32 +10:00

GlobalUsings.cs

Fix content.integration tests warnings (#17817)

2023-07-06 14:54:25 +10:00

PoolManager.cs

Reduced Warning Count By 130 For Full Rebuilds (#26518)

2024-03-29 16:28:16 +11:00

PoolManager.Cvars.cs

Add NukeOps Test (#27207)

2024-04-24 15:38:43 +10:00

PoolManager.Prototypes.cs

Remove PoolSettings.ExtraPrototypes option (#18678)

2023-08-05 14:16:48 +10:00

PoolManagerTestEventHandler.cs

Remove PoolSettings.ExtraPrototypes option (#18678)

2023-08-05 14:16:48 +10:00

PoolSettings.cs

Split PoolManager into separate classes. (#19370)

2023-08-22 22:14:01 +10:00

PoolTestLogHandler.cs

Add some tests and fix some miscellaneous bugs (#22836)

2023-12-28 10:05:20 +11:00

TestPrototypesAttribute.cs

Fix test prototypes fields being marked as unused (#20853)

2023-10-09 00:19:32 -07:00