NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 10:21:18 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Content.IntegrationTests
History
Exact
Morb0 611bfea5ff Merge remote-tracking branch 'upstream/master' into update-sposnors 
# Conflicts:
#	.github/workflows/publish.yml
#	Content.Packaging/ContentPackaging.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/GameTicking/GameTicker.StatusShell.cs
#	Resources/Audio/Weapons/Guns/Gunshots/license.txt
#	Resources/Prototypes/Roles/Jobs/Security/senior_officer.yml
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/open.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/opening.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closed.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/closing.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/open.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/opening.png
2023-11-08 03:00:51 +03:00
..
Pair Un-revert IPlayerManager refactor (#21244) 2023-10-28 09:59:53 +11:00
Tests Merge remote-tracking branch 'upstream/master' into update-sposnors 2023-11-08 03:00:51 +03:00
Content.IntegrationTests.csproj Fix content.integration tests warnings (#17817) 2023-07-06 14:54:25 +10: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 Replace all T : Component constraints with T : IComponent (#21073) 2023-10-17 19:42:47 -07:00
PoolManager.Cvars.cs Split PoolManager into separate classes. (#19370) 2023-08-22 22:14:01 +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 Fix content.integration tests warnings (#17817) 2023-07-06 14:54:25 +10:00
TestPrototypesAttribute.cs Fix test prototypes fields being marked as unused (#20853) 2023-10-09 00:19:32 -07:00