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

Merge remote-tracking branch 'upstream/master' into ed-05-08-2024-upstream

Browse Source 
# Conflicts:
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
This commit is contained in:
Ed
2024-08-08 12:29:20 +03:00
parent 38c3bf2595 489efeb717
commit 97939f6e3e
155 changed files with 17151 additions and 15001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Resources/Prototypes/Maps/train.yml
View File

@@ -32,8 +32,8 @@
Detective: [ 1, 1 ]
#engineering
ChiefEngineer: [ 1, 1 ]
AtmosphericTechnician: [ 3, 3 ]
StationEngineer: [ 5, 5 ]
AtmosphericTechnician: [ 2, 2 ]
StationEngineer: [ 4, 4 ]
TechnicalAssistant: [ 3, 3 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
@@ -61,3 +61,4 @@
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
Borg: [ 2, 2 ]
Reporter: [ 1, 1 ]