Skip to content

Commit

Permalink
Added Cog(map) and its own evac shuttle (#30840)
Browse files Browse the repository at this point in the history
* Added new map Cog and its own evac shuttle

* removed cog from default.yml so all checks will pass

I added cog here because i thought it might need to be here for map choosing??????????? ill add it back if needed

* updated cog and fixed a bunch of stuff that was not visable in the image, also nerfed the singo so it no longer solos

* added renault spawner that was missing and changed some minor stuff

* moved a escape pod from med/sci hallway to northern maints

* added shutters to the brig and added vents and scrubbers where they were missing in the halls

* extended salv's docking port so they can dock

* Fixed according to cog review thread

* fix pools

* fix PostMapInitTest

* Update MapLoadBenchmark.cs

* added cap and hop spawn that i just forgot to add???????????????????

* fixed again

---------

Co-authored-by: Emisse <[email protected]>
  • Loading branch information
Spessmann and Emisse authored Aug 13, 2024
1 parent 14dfeab commit 208b1d2
Show file tree
Hide file tree
Showing 7 changed files with 174,887 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Content.Benchmarks/MapLoadBenchmark.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public async Task Cleanup()
PoolManager.Shutdown();
}

public static readonly string[] MapsSource = { "Empty", "Box", "Bagel", "Dev", "CentComm", "Atlas", "Core", "TestTeg", "Saltern", "Packed", "Omega", "Cluster", "Reach", "Origin", "Meta", "Marathon", "Europa", "MeteorArena", "Fland", "Barratry", "Oasis" };
public static readonly string[] MapsSource = { "Empty", "Box", "Bagel", "Dev", "CentComm", "Atlas", "Core", "TestTeg", "Saltern", "Packed", "Omega", "Cluster", "Reach", "Origin", "Meta", "Marathon", "Europa", "MeteorArena", "Fland", "Barratry", "Oasis", "Cog" };

[ParamsSource(nameof(MapsSource))]
public string Map;
Expand Down
3 changes: 2 additions & 1 deletion Content.IntegrationTests/Tests/PostMapInitTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ public sealed class PostMapInitTest
"Atlas",
"Reach",
"Train",
"Oasis"
"Oasis",
"Cog"
};

/// <summary>
Expand Down
3,663 changes: 3,663 additions & 0 deletions Resources/Maps/Shuttles/emergency_wode.yml

Large diffs are not rendered by default.

171,152 changes: 171,152 additions & 0 deletions Resources/Maps/cog.yml

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Resources/Prototypes/Maps/Pools/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- Bagel
- Box
- Cluster
- Cog
- Core
- Fland
- Marathon
Expand Down
64 changes: 64 additions & 0 deletions Resources/Prototypes/Maps/cog.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
- type: gameMap
id: Cog
mapName: 'Cog'
mapPath: /Maps/cog.yml
minPlayers: 35
maxPlayers: 70
stations:
Cog:
stationProto: StandardNanotrasenStation
components:
- type: StationNameSetup
mapNameTemplate: '{0} Cog {1}'
nameGenerator:
!type:NanotrasenNameGenerator
prefixCreator: '14'
- type: StationEmergencyShuttle
emergencyShuttlePath: /Maps/Shuttles/emergency_wode.yml
- type: StationJobs
availableJobs:
#service
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
Bartender: [ 2, 2 ]
Botanist: [ 4, 4 ]
Chef: [ 2, 2 ]
Janitor: [ 3, 3 ]
Chaplain: [ 1, 1 ]
Reporter: [ 2, 2 ]
#Librarian: [ 1, 1 ] no library :c
ServiceWorker: [ 3, 3 ]
#engineering
ChiefEngineer: [ 1, 1 ]
AtmosphericTechnician: [ 2, 2 ]
StationEngineer: [ 4, 4 ]
TechnicalAssistant: [ 3, 3 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
Chemist: [ 3, 3 ]
MedicalDoctor: [ 4, 4 ]
MedicalIntern: [ 3, 3 ]
Psychologist: [ 1, 1 ]
Paramedic: [ 1, 1 ]
#science
ResearchDirector: [ 1, 1 ]
Scientist: [ 5, 5 ]
ResearchAssistant: [ 3, 3 ]
Borg: [ 2, 2 ]
#security
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
SecurityOfficer: [ 4, 4 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 4, 4 ]
Lawyer: [ 2, 2 ] #No office but there is a courtroom, maybe limit to one
#supply
Quartermaster: [ 1, 1 ]
SalvageSpecialist: [ 3, 3 ]
CargoTechnician: [ 4, 4 ]
#civilian
Passenger: [ -1, -1 ]
Clown: [ 1, 1 ]
Mime: [ 1, 1 ]
Musician: [ 1, 1 ]
Boxer: [ 2, 2]
5 changes: 4 additions & 1 deletion Resources/map_attributions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,7 @@
authors: Ubaser

- files: ["oasis.yml"]
authors: CptJeanLuc
authors: CptJeanLuc

- files: ["cog.yml"]
authors: Spacemann

0 comments on commit 208b1d2

Please sign in to comment.