Add map Oasis (#25736)
* Add map Oasis * integration test fix * psych job * 1984 an invalid component * address reviews * address reviews, touch ups. * tiny feexes * move a tree * Actually put it in the active maps pool. * minor tweeks * tweek some door accesses. * add extra lawyer, make evac the right docking arrangement. * Address the small things, fix cryopods, make perma huge. * Fix some small things in the new perma. * Improve perma spacing resiliancy... maybe. * burn the invalids * Pray to the Sloth gods that painters arent cooked. * rearrange some buttons * fix fax names and add a genedrobe. * Housekeeping * fix some stuff I thought I already fixed * wood benches * Some under door tiles, a couple missing decals. * one pipe got brokey. feexit! * astrograsses and lathe to cargo * N2 lockers, minor things. * cap laser to case * GridFill the briggle so it feels better. Some other minor things * name the Briggle correctly
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
@@ -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" };
|
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" };
|
||||||
|
|
||||||
[ParamsSource(nameof(MapsSource))]
|
[ParamsSource(nameof(MapsSource))]
|
||||||
public string Map;
|
public string Map;
|
||||||
|
|||||||
@@ -63,7 +63,8 @@ namespace Content.IntegrationTests.Tests
|
|||||||
"MeteorArena",
|
"MeteorArena",
|
||||||
"Atlas",
|
"Atlas",
|
||||||
"Reach",
|
"Reach",
|
||||||
"Train"
|
"Train",
|
||||||
|
"Oasis"
|
||||||
};
|
};
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
1181
Resources/Maps/Shuttles/briggle.yml
Normal file
1181
Resources/Maps/Shuttles/briggle.yml
Normal file
File diff suppressed because it is too large
Load Diff
180378
Resources/Maps/oasis.yml
Normal file
180378
Resources/Maps/oasis.yml
Normal file
File diff suppressed because it is too large
Load Diff
@@ -9,6 +9,7 @@
|
|||||||
- Fland
|
- Fland
|
||||||
- Marathon
|
- Marathon
|
||||||
- Meta
|
- Meta
|
||||||
|
- Oasis
|
||||||
- Omega
|
- Omega
|
||||||
- Origin
|
- Origin
|
||||||
- Saltern
|
- Saltern
|
||||||
|
|||||||
64
Resources/Prototypes/Maps/oasis.yml
Normal file
64
Resources/Prototypes/Maps/oasis.yml
Normal file
@@ -0,0 +1,64 @@
|
|||||||
|
- type: gameMap
|
||||||
|
id: Oasis
|
||||||
|
mapName: 'Oasis'
|
||||||
|
mapPath: /Maps/oasis.yml
|
||||||
|
minPlayers: 70
|
||||||
|
stations:
|
||||||
|
Oasis:
|
||||||
|
stationProto: StandardNanotrasenStation
|
||||||
|
components:
|
||||||
|
- type: StationNameSetup
|
||||||
|
mapNameTemplate: '{0} Oasis {1}'
|
||||||
|
nameGenerator:
|
||||||
|
!type:NanotrasenNameGenerator
|
||||||
|
prefixCreator: 'B'
|
||||||
|
- type: StationEmergencyShuttle
|
||||||
|
emergencyShuttlePath: /Maps/Shuttles/emergency_delta.yml
|
||||||
|
- type: StationJobs
|
||||||
|
overflowJobs:
|
||||||
|
- Passenger
|
||||||
|
availableJobs:
|
||||||
|
#service
|
||||||
|
Captain: [ 1, 1 ]
|
||||||
|
HeadOfPersonnel: [ 1, 1 ]
|
||||||
|
Bartender: [ 2, 2 ]
|
||||||
|
Botanist: [ 4, 4 ]
|
||||||
|
Chef: [ 2, 2 ]
|
||||||
|
Janitor: [ 3, 3 ]
|
||||||
|
Chaplain: [ 1, 1 ]
|
||||||
|
Librarian: [ 1, 1 ]
|
||||||
|
ServiceWorker: [ 2, 2 ]
|
||||||
|
Zookeeper: [ 1, 1 ]
|
||||||
|
#engineering
|
||||||
|
ChiefEngineer: [ 1, 1 ]
|
||||||
|
AtmosphericTechnician: [ 3, 3 ]
|
||||||
|
StationEngineer: [ 5, 5 ]
|
||||||
|
TechnicalAssistant: [ 4, 4 ]
|
||||||
|
#medical
|
||||||
|
ChiefMedicalOfficer: [ 1, 1 ]
|
||||||
|
Chemist: [ 3, 3 ]
|
||||||
|
MedicalDoctor: [ 6, 6 ]
|
||||||
|
Paramedic: [ 2, 2 ]
|
||||||
|
MedicalIntern: [ 4, 4 ]
|
||||||
|
Psychologist: [ 1, 1 ]
|
||||||
|
#science
|
||||||
|
ResearchDirector: [ 1, 1 ]
|
||||||
|
Scientist: [ 5, 5 ]
|
||||||
|
ResearchAssistant: [ 6, 6 ]
|
||||||
|
Borg: [ 2, 2 ]
|
||||||
|
#security
|
||||||
|
HeadOfSecurity: [ 1, 1 ]
|
||||||
|
Warden: [ 1, 1 ]
|
||||||
|
SecurityOfficer: [ 8, 8 ]
|
||||||
|
Detective: [ 1, 1 ]
|
||||||
|
SecurityCadet: [ 4, 4 ]
|
||||||
|
Lawyer: [ 3, 3 ]
|
||||||
|
#supply
|
||||||
|
Quartermaster: [ 1, 1 ]
|
||||||
|
SalvageSpecialist: [ 3, 3 ]
|
||||||
|
CargoTechnician: [ 4, 4 ]
|
||||||
|
#civilian
|
||||||
|
Passenger: [ -1, -1 ]
|
||||||
|
Clown: [ 1, 1 ]
|
||||||
|
Mime: [ 1, 1 ]
|
||||||
|
Musician: [ 1, 1 ]
|
||||||
@@ -49,3 +49,5 @@
|
|||||||
- files: ["core.yml"]
|
- files: ["core.yml"]
|
||||||
authors: Ubaser
|
authors: Ubaser
|
||||||
|
|
||||||
|
- files: ["oasis.yml"]
|
||||||
|
authors: CptJeanLuc
|
||||||
Reference in New Issue
Block a user