Skip to content

Commit

Permalink
New Highpop map: Convex recreational complex (#33346)
Browse files Browse the repository at this point in the history
* start ig

* command work +AI

* finished bridge, added signs to departments

* engi partly done

* finish engi + atmos except for cams

* added med yippie

* carGODO

* nerd department finished

* se(x)c finish

* courtroom + service power

* man im tweaking out

* service propa done

* hallways

* added cams everywhere and named all the doors :pain:

* arrivals maints + exterior catwalk

* more maints

* voxob

* draft done

* holopadpilled + gaspipesensor based

* added convex name everywhere it needed to be

* nvm i guess we dont do oxford comma

* redid ALL THE HGOLOPADS FAAAAAAAAAAAAAAAAAAAAA

* Fix conflicts?

* ok let me try something

* this works right?

* atmos updated + jani lights

* uniform hallway tiles +roundstart TEG

* fixed some hidden atmos stuff

* Update map_attributions.txt

* :finnadie: no map review ...

* the fog is coming

* maints theater redone

* light dirt and the murder of most trims

* 💔

* decal based and tileoverlay pilled

* updated arrivals/library

* bungus

* yvgh

* 6 hours later...

* finished for real?
  • Loading branch information
Spessmann authored Jan 30, 2025
1 parent 54ce3d7 commit a07df05
Show file tree
Hide file tree
Showing 7 changed files with 241,770 additions and 4 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", "Satlern", "Box", "Bagel", "Dev", "CentComm", "Core", "TestTeg", "Packed", "Omega", "Reach", "Meta", "Marathon", "MeteorArena", "Fland", "Oasis", "Cog" };
public static readonly string[] MapsSource = { "Empty", "Satlern", "Box", "Bagel", "Dev", "CentComm", "Core", "TestTeg", "Packed", "Omega", "Reach", "Meta", "Marathon", "MeteorArena", "Fland", "Oasis", "Cog", "Convex"};

[ParamsSource(nameof(MapsSource))]
public string Map;
Expand Down
4 changes: 3 additions & 1 deletion Content.IntegrationTests/Tests/PostMapInitTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ public sealed class PostMapInitTest
"Amber",
"Loop",
"Plasma",
"Elkridge"
"Elkridge",
"Convex"

};

/// <summary>
Expand Down
4 changes: 2 additions & 2 deletions Resources/Locale/en-US/job/job-description.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ job-description-atmostech = Optimize the station's atmospherics setup, and synth
job-description-bartender = Manage the bar and keep it lively, give out drinks, and listen to the crew's stories.
job-description-botanist = Grow food for the chef, drugs for medbay, and other plants to keep yourself entertained.
job-description-borg = Half-human, Half-machine. Follow your laws, serve the crew, and hound the science team for upgrades.
job-description-boxer = Fight your way to the top! Challenge the head of personnel and get brigged when you win. Currently available on Core and Cog.
job-description-boxer = Fight your way to the top! Challenge the head of personnel and get brigged when you win. Currently available on Core, Convex and Cog.
job-description-brigmedic = Fight in the rear of the security service, for the lives of your comrades! You are the first and last hope of your squad. Hippocrates bless you.
job-description-cadet = Learn the basics of arresting criminals and managing the brig. Listen to your supervisors and feel free to ask them for any help.
job-description-captain = Keep the station running, delegate work to the other heads of staff, and exert your will.
Expand Down Expand Up @@ -38,7 +38,7 @@ job-description-psychologist = Provide emotional support to traumatized crew. Cu
job-description-qm = Manage the supplies of the station & the cargo department, keep the salvage specialists working, make sure all orders are fulfilled, and keep the money flowing.
job-description-rd = Manage the science department, unlocking technologies, acquiring & researching artifacts, and performing experiments.
job-description-research-assistant = Learn the basics of how to research various artifacts, anomalies and robotics.
job-description-reporter = Entertain & inform the crew with your vibrant journalism through wireless cameras, the radio and the news. Currently available on Bagel Station, Cog, Core, Train and Oasis.
job-description-reporter = Entertain & inform the crew with your vibrant journalism through wireless cameras, the radio and the news. Currently available on Bagel Station, Cog, Convex, Core, Train and Oasis.
job-description-salvagespec = Use the salvage magnet to draw in detatched scraps & asteroids to loot and enrich the station, build a salvage ship and then travel to new planets, while fighting off any space fauna along the way.
job-description-scientist = Research alien artifacts, unlock new technologies, build newer and better machines around the station, and make everything run more efficiently.
job-description-security = Catch criminals and enemies of the station, enforce the law, and ensure that the station does not fall into disarray.
Expand Down
241,696 changes: 241,696 additions & 0 deletions Resources/Maps/convex.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
- Cog
- Convex
- Core
- Elkridge
- Fland
Expand Down
64 changes: 64 additions & 0 deletions Resources/Prototypes/Maps/convex.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
- type: gameMap
id: Convex
mapName: 'Convex'
mapPath: /Maps/convex.yml
minPlayers: 75
stations:
Convex:
stationProto: StandardNanotrasenStation
components:
- type: StationNameSetup
mapNameTemplate: '{0} Convex Recreational Complex {1}'
nameGenerator:
!type:NanotrasenNameGenerator
prefixCreator: '14-SM'
- type: StationEmergencyShuttle
emergencyShuttlePath: /Maps/Shuttles/emergency_delta.yml
- type: StationJobs
availableJobs:
#service
Captain: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
Bartender: [ 2, 2 ]
Botanist: [ 3, 3 ]
Chef: [ 2, 2 ]
Janitor: [ 3, 3 ]
Chaplain: [ 1, 1 ]
Librarian: [ 1, 1 ]
ServiceWorker: [ 3, 3 ]
Reporter: [ 1, 2 ]
#engineering
ChiefEngineer: [ 1, 1 ]
AtmosphericTechnician: [ 3, 3 ]
StationEngineer: [ 5, 5 ]
TechnicalAssistant: [ 4, 4 ]
#medical
ChiefMedicalOfficer: [ 1, 1 ]
Chemist: [ 3, 3 ]
MedicalDoctor: [ 6, 6 ]
Paramedic: [ 1, 1 ]
MedicalIntern: [ 4, 4 ]
#science
ResearchDirector: [ 1, 1 ]
Scientist: [ 5, 5 ]
ResearchAssistant: [ 6, 6 ]
#security
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
SecurityOfficer: [ 8, 8 ]
Detective: [ 1, 1 ]
SecurityCadet: [ 4, 4 ]
Lawyer: [ 2, 2 ]
#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]
#silicon
StationAi: [ 1, 1 ]
Borg: [ 3, 3 ]
3 changes: 3 additions & 0 deletions Resources/map_attributions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,6 @@

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

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

0 comments on commit a07df05

Please sign in to comment.