NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-15 21:31:12 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
CatStation/Content.IntegrationTests
History
Morb0 32a8d1a21e Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
#	Content.Server/Power/Generator/GeneratorSystem.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Entities/Objects/Misc/paper.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Textures/Effects/speech.rsi/meta.json
#	Resources/Textures/Structures/Doors/Airlocks/Glass/centcomm.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/glass.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Glass/syndicate.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/assembly.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/syndicate.rsi/assembly.png
2024-02-03 03:38:29 +03:00
..
Pair Dependency update / fixes / skrungle bungle (#23745) 2024-01-12 23:22:01 +01:00
Tests Merge remote-tracking branch 'upstream/master' into upstream-sync 2024-02-03 03:38:29 +03:00
Content.IntegrationTests.csproj Dependency update / fixes / skrungle bungle (#23745) 2024-01-12 23:22:01 +01: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 Dependency update / fixes / skrungle bungle (#23745) 2024-01-12 23:22:01 +01:00
PoolManager.Cvars.cs Fix MapPainter (#22290) 2023-12-10 22:19:26 +11: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