Added Cog(map) and its own evac shuttle (#30840)
* 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 <99158783+Emisse@users.noreply.github.com>
This commit is contained in:
@@ -46,7 +46,7 @@ public class MapLoadBenchmark
|
|||||||
PoolManager.Shutdown();
|
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))]
|
[ParamsSource(nameof(MapsSource))]
|
||||||
public string Map;
|
public string Map;
|
||||||
|
|||||||
@@ -63,7 +63,8 @@ namespace Content.IntegrationTests.Tests
|
|||||||
"Atlas",
|
"Atlas",
|
||||||
"Reach",
|
"Reach",
|
||||||
"Train",
|
"Train",
|
||||||
"Oasis"
|
"Oasis",
|
||||||
|
"Cog"
|
||||||
};
|
};
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
3663
Resources/Maps/Shuttles/emergency_wode.yml
Normal file
3663
Resources/Maps/Shuttles/emergency_wode.yml
Normal file
File diff suppressed because it is too large
Load Diff
171152
Resources/Maps/cog.yml
Normal file
171152
Resources/Maps/cog.yml
Normal file
File diff suppressed because it is too large
Load Diff
@@ -5,6 +5,7 @@
|
|||||||
- Bagel
|
- Bagel
|
||||||
- Box
|
- Box
|
||||||
- Cluster
|
- Cluster
|
||||||
|
- Cog
|
||||||
- Core
|
- Core
|
||||||
- Fland
|
- Fland
|
||||||
- Marathon
|
- Marathon
|
||||||
|
|||||||
64
Resources/Prototypes/Maps/cog.yml
Normal file
64
Resources/Prototypes/Maps/cog.yml
Normal file
@@ -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]
|
||||||
@@ -50,4 +50,7 @@
|
|||||||
authors: Ubaser
|
authors: Ubaser
|
||||||
|
|
||||||
- files: ["oasis.yml"]
|
- files: ["oasis.yml"]
|
||||||
authors: CptJeanLuc
|
authors: CptJeanLuc
|
||||||
|
|
||||||
|
- files: ["cog.yml"]
|
||||||
|
authors: Spacemann
|
||||||
|
|||||||
Reference in New Issue
Block a user