juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'space-station-14/master' into 04-05-2024-upstream

Browse Source 
# Conflicts:
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/train.yml
This commit is contained in:
Ed
2024-05-04 21:13:30 +03:00
parent 72b8fcf99c 540c45cbe9
commit 445f08ae07
144 changed files with 1514 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Client/Station/StationSpawningSystem.cs
View File

@@ -2,7 +2,4 @@ using Content.Shared.Station;
namespace Content.Client.Station;
public sealed class StationSpawningSystem : SharedStationSpawningSystem
{
}
public sealed class StationSpawningSystem : SharedStationSpawningSystem;