Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Highpop map: Convex recreational complex #33346

Open
wants to merge 67 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
2a954eb
start ig
Spessmann Nov 16, 2024
5feac4c
Merge branch 'space-wizards:master' into newmap
Spessmann Nov 16, 2024
0dbe962
command work +AI
Spessmann Nov 16, 2024
12af916
Merge branch 'space-wizards:master' into newmap
Spessmann Nov 17, 2024
c2653c5
finished bridge, added signs to departments
Spessmann Nov 17, 2024
7d6ad64
engi partly done
Spessmann Nov 18, 2024
4f48be9
Merge branch 'space-wizards:master' into newmap
Spessmann Nov 18, 2024
2c904d4
finish engi + atmos except for cams
Spessmann Nov 18, 2024
e2507a5
Merge branch 'space-wizards:master' into newmap
Spessmann Nov 19, 2024
0338f63
added med yippie
Spessmann Nov 19, 2024
e27e502
Merge branch 'space-wizards:master' into newmap
Spessmann Nov 19, 2024
04e6e62
carGODO
Spessmann Nov 20, 2024
ae81cc6
Merge branch 'space-wizards:master' into newmap
Spessmann Nov 21, 2024
3e99a25
nerd department finished
Spessmann Nov 21, 2024
be34f76
Merge branch 'space-wizards:master' into newmap
Spessmann Nov 21, 2024
152f3e0
se(x)c finish
Spessmann Nov 22, 2024
62392b8
courtroom + service power
Spessmann Nov 22, 2024
53b3c4b
Merge branch 'space-wizards:master' into newmap
Spessmann Nov 26, 2024
c7a06a8
man im tweaking out
Spessmann Nov 26, 2024
6a5a6f8
service propa done
Spessmann Nov 27, 2024
128a39d
Merge branch 'space-wizards:master' into newmap
Spessmann Nov 27, 2024
d8d0aee
hallways
Spessmann Nov 28, 2024
e6b6512
Merge branch 'space-wizards:master' into newmap
Spessmann Nov 30, 2024
f6738dc
added cams everywhere and named all the doors :pain:
Spessmann Nov 30, 2024
f7acc4d
arrivals maints + exterior catwalk
Spessmann Dec 1, 2024
1ec613b
more maints
Spessmann Dec 3, 2024
4ae3537
Merge branch 'space-wizards:master' into newmap
Spessmann Dec 3, 2024
3541431
voxob
Spessmann Dec 4, 2024
ff5958d
draft done
Spessmann Dec 6, 2024
b2b339e
Merge branch 'space-wizards:master' into newmap
Spessmann Dec 17, 2024
9b72622
holopadpilled + gaspipesensor based
Spessmann Dec 18, 2024
7d87475
added convex name everywhere it needed to be
Spessmann Dec 18, 2024
d4d8b3b
nvm i guess we dont do oxford comma
Spessmann Dec 18, 2024
d137f74
Merge branch 'space-wizards:master' into newmap
Spessmann Dec 18, 2024
8e7b8aa
redid ALL THE HGOLOPADS FAAAAAAAAAAAAAAAAAAAAA
Spessmann Dec 18, 2024
f73c596
Fix conflicts?
Spessmann Dec 28, 2024
98c3c37
ok let me try something
Spessmann Dec 28, 2024
929704c
Merge branch 'master' into newmap
Spessmann Dec 28, 2024
3ca7fe7
this works right?
Spessmann Dec 28, 2024
c0db964
Merge branch 'space-wizards:master' into newmap
Spessmann Dec 29, 2024
3964dc9
atmos updated + jani lights
Spessmann Dec 29, 2024
b9e2d8f
Merge branch 'space-wizards:master' into newmap
Spessmann Jan 1, 2025
6a9c2ad
uniform hallway tiles +roundstart TEG
Spessmann Jan 1, 2025
c94221f
Merge branch 'space-wizards:master' into newmap
Spessmann Jan 1, 2025
51f8eff
fixed some hidden atmos stuff
Spessmann Jan 1, 2025
10a1535
Merge branch 'master' into newmap
Spessmann Jan 3, 2025
e3588e6
Update map_attributions.txt
Spessmann Jan 3, 2025
33e3da0
Merge branch 'master' into newmap
Spessmann Jan 8, 2025
1aab154
Merge branch 'space-wizards:master' into newmap
Spessmann Jan 12, 2025
c682310
:finnadie: no map review ...
Spessmann Jan 12, 2025
df1ba9a
Merge branch 'space-wizards:master' into newmap
Spessmann Jan 12, 2025
9f47de3
the fog is coming
Spessmann Jan 13, 2025
20bcf83
Merge branch 'space-wizards:master' into newmap
Spessmann Jan 13, 2025
df37dcb
maints theater redone
Spessmann Jan 13, 2025
a5bf5b0
light dirt and the murder of most trims
Spessmann Jan 14, 2025
a94ff75
Merge branch 'space-wizards:master' into newmap
Spessmann Jan 16, 2025
41704d8
:broken_heart:
Spessmann Jan 16, 2025
c97648c
Merge branch 'master' into newmap
Spessmann Jan 16, 2025
13855af
decal based and tileoverlay pilled
Spessmann Jan 17, 2025
6b613b7
updated arrivals/library
Spessmann Jan 17, 2025
2865e7a
Merge branch 'space-wizards:master' into newmap
Spessmann Jan 18, 2025
69ae6ed
Merge branch 'space-wizards:master' into newmap
Spessmann Jan 26, 2025
2e6f334
Merge branch 'newmap' of https://github.com/Spessmann/space-station-1…
Spessmann Jan 26, 2025
4c0dbbb
bungus
Spessmann Jan 26, 2025
377d8fa
yvgh
Spessmann Jan 26, 2025
16c4cec
Merge branch 'space-wizards:master' into newmap
Spessmann Jan 28, 2025
bec11c9
6 hours later...
Spessmann Jan 29, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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,009 changes: 241,009 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
Loading