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.

Sign up for GitHub

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

Plasma Station #33991

Merged
merged 29 commits into from
Jan 16, 2025
+177,355 −2
Merged

Plasma Station #33991

Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
6af09fb
Plasma Station initial commit
Compilatron144 Dec 21, 2024
90b498e
Merge remote-tracking branch 'upstream/master' into plasma-station
Compilatron144 Dec 21, 2024
aaf0cd6
Map fixes 1
Compilatron144 Dec 23, 2024
b534e40
Merge remote-tracking branch 'upstream/master' into plasma-station
Compilatron144 Dec 25, 2024
5c4abaf
Add cargo and emergency shuttle
Compilatron144 Dec 25, 2024
5cedade
Updated maps
Compilatron144 Dec 26, 2024
5858208
Add plasma to map testing list
Compilatron144 Dec 30, 2024
08a1dea
Map fixes 2
Compilatron144 Dec 30, 2024
1dac79b
Fixes a 6 pack destroying the universe
Compilatron144 Dec 30, 2024
8922519
Merge remote-tracking branch 'upstream/master' into plasma-station
Compilatron144 Dec 30, 2024
596209b
Merge remote-tracking branch 'upstream/master' into plasma-station
Compilatron144 Jan 1, 2025
c7954f0
Merge remote-tracking branch 'upstream/master' into plasma-station
Compilatron144 Jan 1, 2025
083cefd
Map fixes 3
Compilatron144 Jan 2, 2025
f877344
Quick research assistant fix
Compilatron144 Jan 2, 2025
4df99ac
Map fixes 4
Compilatron144 Jan 2, 2025
20c0bcc
Map fixes 5
Compilatron144 Jan 3, 2025
eba3e56
Merge branch 'master' into plasma-station
Compilatron144 Jan 7, 2025
afdbd99
webedit go brrrt
Compilatron144 Jan 7, 2025
165f82b
Merge branch 'master' into plasma-station
Compilatron144 Jan 11, 2025
3df1dcf
Map fixes 6
Compilatron144 Jan 12, 2025
01a6dc9
Merge branch 'plasma-station' of https://github.com/jbox144/space-sta…
Compilatron144 Jan 12, 2025
f95690e
Map fixes 7
Compilatron144 Jan 12, 2025
7f5da5d
Map fixes 8
Compilatron144 Jan 13, 2025
c81a91a
Fixes non-existent object
Compilatron144 Jan 14, 2025
41330e9
Merge remote-tracking branch 'upstream/master' into plasma-station
Compilatron144 Jan 16, 2025
51e78dc
Map fixes 9
Compilatron144 Jan 16, 2025
f6f9157
update pools
Emisse Jan 16, 2025
0f7b8eb
Map fixes 10
Compilatron144 Jan 16, 2025
964eaf0
forgot to clear my multitool
Compilatron144 Jan 16, 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
3 changes: 1 addition & 2 deletions Content.IntegrationTests/Tests/PostMapInitTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,8 @@ public sealed class PostMapInitTest
"Gate",
"Amber",
"Loop",
"Plasma",
"Elkridge"


};

/// <summary>
Expand Down
Loading
Loading