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

Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-13-05-2024-upstream

Browse Source 
# Conflicts:
#	Content.Shared/Lock/LockSystem.cs
#	Resources/Prototypes/Maps/oasis.yml
This commit is contained in:
Ed
2024-05-13 18:32:59 +03:00
parent 50c4fd3a58 1f03111ff8
commit dda8ea2b09
624 changed files with 43352 additions and 25174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Resources/Prototypes/Maps/oasis.yml
View File

@@ -29,6 +29,7 @@
# Librarian: [ 1, 1 ]
# ServiceWorker: [ 2, 2 ]
# Zookeeper: [ 1, 1 ]
# Reporter: [ 1, 1 ]
# #engineering
# ChiefEngineer: [ 1, 1 ]
# AtmosphericTechnician: [ 3, 3 ]
@@ -61,4 +62,4 @@
# Passenger: [ -1, -1 ]
# Clown: [ 1, 1 ]
# Mime: [ 1, 1 ]
# Musician: [ 1, 1 ]
# Musician: [ 1, 1 ]