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

Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync

Browse Source 
# Conflicts:
#	Content.Client/Parallax/ParallaxControl.cs
#	Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
#	Content.Server/Labels/Label/LabelSystem.cs
#	Content.Shared/Actions/SharedActionsSystem.cs
#	Content.Shared/Fluids/Components/EvaporationComponent.cs
#	Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
#	README.md
#	Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
#	Resources/Prototypes/Maps/Pools/deathmatch.yml
#	Resources/Prototypes/Maps/arenas.yml
This commit is contained in:
Ed
2025-04-30 20:31:50 +03:00
parent 0c8735f6df 0e586e3fae
commit ef6d973301
2053 changed files with 113995 additions and 38376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Resources/Prototypes/Maps/Pools/deathmatch.yml
View File

@@ -1,4 +1,5 @@
- type: gameMapPool
id: NOCP14DeathMatchMapPool
maps:
- MeteorArena
- MeteorArena
- dm01-entryway

2
Resources/Prototypes/Maps/arenas.yml
View File

@@ -1,3 +1,3 @@
# NOT USED
# DO NOT REVERT!
# COPY OF THIS MAPS EXIST IN _CP14 FOLDERS
# COPY OF THIS MAPS EXIST IN _CP14 FOLDERS

6
Resources/Prototypes/Maps/bagel.yml
View File

@@ -16,7 +16,7 @@
- type: StationEmergencyShuttle
emergencyShuttlePath: /Maps/Shuttles/emergency_lox.yml
- type: StationJobs
availableJobs: # 58 jobs total w/o latejoins & interns, 75 jobs total w/ latejoins & interns
availableJobs: # 60 jobs total w/o latejoins & interns, 77 jobs total w/ latejoins & interns
#command (7)
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
@@ -46,9 +46,9 @@
#science (5)
Scientist: [ 5, 5 ]
ResearchAssistant: [ 4, 4 ] #intern, not counted
#security (8)
#security (10)
Warden: [ 1, 1 ]
SecurityOfficer: [ 4, 4 ]
SecurityOfficer: [ 6, 6 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 4, 4 ] #intern, not counted
Lawyer: [ 2, 2 ]

22
Resources/Prototypes/Maps/box.yml
View File

@@ -15,8 +15,8 @@
- type: StationEmergencyShuttle
emergencyShuttlePath: /Maps/Shuttles/emergency_box.yml
- type: StationJobs
availableJobs: # 63 jobs total w/o latejoins & interns, 81 jobs total w/ latejoins & interns
#command (7)
availableJobs: # 63 jobs total w/o latejoins & interns, 82 jobs total w/ latejoins & interns
#Command (7)
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
HeadOfSecurity: [ 1, 1 ]
@@ -24,7 +24,7 @@
ChiefEngineer: [ 1, 1 ]
ResearchDirector: [ 1, 1 ]
Quartermaster: [ 1, 1 ]
#service (14)
#Service (14)
Bartender: [ 2, 2 ]
Botanist: [ 3, 3 ]
Chef: [ 2, 2 ]
@@ -33,33 +33,33 @@
Librarian: [ 1, 1 ]
Reporter: [ 1, 1 ]
ServiceWorker: [ 2, 2 ]
#engineering (8)
#Engineering (8)
AtmosphericTechnician: [ 3, 3 ]
StationEngineer: [ 5, 5 ]
TechnicalAssistant: [ 4, 4 ] #intern, exclude from dept count
#medical (8)
#Medical (8)
Chemist: [ 2, 2 ]
MedicalDoctor: [ 4, 4 ]
Paramedic: [ 1, 1 ]
MedicalIntern: [ 4, 4 ] #intern, exclude from dept count
Psychologist: [ 1, 1 ]
#science (5)
#Science (5)
Scientist: [ 5, 5 ]
ResearchAssistant: [ 4, 4 ] #intern, exclude from dept count
#security (9 - 11)
#Security (9 - 11)
Warden: [ 1, 1 ]
SecurityOfficer: [ 5, 7 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 2, 4 ] #intern, exclude from dept count
Lawyer: [ 2, 2 ]
#supply (6)
#Supply (6)
SalvageSpecialist: [ 3, 3 ]
CargoTechnician: [ 3, 3 ]
#civilian (3+)
#Civilian (3+)
Passenger: [ -1, -1 ] #infinite, not counted
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
#silicon (3)
#Silicon (3)
StationAi: [ 1, 1 ]
Borg: [ 2, 2 ]
Borg: [ 2, 3 ]