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

Adds new station: Lobster Station (Second PR, ignore the first one) #2094

Open
wants to merge 142 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
142 commits
Select commit Hold shift + click to select a range
e253e32
Lobster Station
PubliclyExecutedPig Nov 2, 2024
d2b3193
Update lobster.yml
PubliclyExecutedPig Nov 2, 2024
92a4efd
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 2, 2024
6a941c0
Update lobster.yml
PubliclyExecutedPig Nov 2, 2024
7a81cf4
Merge branch 'map-testing' of https://github.com/PubliclyExecutedPig/…
PubliclyExecutedPig Nov 2, 2024
253093f
Update lobster.yml
PubliclyExecutedPig Nov 2, 2024
7546c5e
Update lobster.yml
PubliclyExecutedPig Nov 3, 2024
702f357
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 3, 2024
f571db3
Update lobster.yml
PubliclyExecutedPig Nov 3, 2024
0388515
Merge branch 'map-testing' of https://github.com/PubliclyExecutedPig/…
PubliclyExecutedPig Nov 3, 2024
90e61cf
Update lobster.yml
PubliclyExecutedPig Nov 3, 2024
2028a56
Update lobster.yml
PubliclyExecutedPig Nov 3, 2024
bc65a90
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 3, 2024
9d89f42
Update lobster.yml
PubliclyExecutedPig Nov 3, 2024
efdee66
Merge branch 'map-testing' of https://github.com/PubliclyExecutedPig/…
PubliclyExecutedPig Nov 3, 2024
96262f7
Update lobster.yml
PubliclyExecutedPig Nov 3, 2024
0e3ced3
Update lobster.yml
PubliclyExecutedPig Nov 3, 2024
25689e4
Update lobster.yml
PubliclyExecutedPig Nov 4, 2024
430c150
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 4, 2024
b462137
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 5, 2024
2e7b203
fixes stuff
PubliclyExecutedPig Nov 5, 2024
46669c0
Merge branch 'map-testing' of https://github.com/PubliclyExecutedPig/…
PubliclyExecutedPig Nov 5, 2024
655b47a
Update PostMapInitTest.cs
PubliclyExecutedPig Nov 5, 2024
5d7bf8c
Update PostMapInitTest.cs
PubliclyExecutedPig Nov 5, 2024
c9fc83c
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 6, 2024
16228cb
Update lobster.yml
PubliclyExecutedPig Nov 6, 2024
6a3f31e
Merge branch 'map-testing' of https://github.com/PubliclyExecutedPig/…
PubliclyExecutedPig Nov 6, 2024
824cdd0
Update PostMapInitTest.cs
PubliclyExecutedPig Nov 6, 2024
ad00d4c
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 7, 2024
f28ebef
Update lobster.yml
PubliclyExecutedPig Nov 7, 2024
73cba56
idk maybe fixes things
PubliclyExecutedPig Nov 7, 2024
050be7a
Update lobster.yml
PubliclyExecutedPig Nov 7, 2024
8444bda
Update lobster.yml
PubliclyExecutedPig Nov 7, 2024
ac93f3b
Update lobster.yml
PubliclyExecutedPig Nov 7, 2024
12640e6
Update lobster.yml
PubliclyExecutedPig Nov 7, 2024
c4e3a92
Update lobster.yml
PubliclyExecutedPig Nov 7, 2024
a239892
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 7, 2024
9a21003
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 8, 2024
d475ec4
Update lobster.yml
PubliclyExecutedPig Nov 8, 2024
31db94d
Merge branch 'map-testing' of https://github.com/PubliclyExecutedPig/…
PubliclyExecutedPig Nov 8, 2024
1cec001
THE REAL LAST COMMIT
PubliclyExecutedPig Nov 8, 2024
2ed7b1f
last commit fr
PubliclyExecutedPig Nov 8, 2024
fa4c1a1
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 8, 2024
9db98c9
lol
PubliclyExecutedPig Nov 8, 2024
039ef30
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 9, 2024
c5ceb72
Update lobster.yml
PubliclyExecutedPig Nov 9, 2024
fb6beca
fix
PubliclyExecutedPig Nov 9, 2024
68e11ad
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 9, 2024
94a6245
last one i promise
PubliclyExecutedPig Nov 9, 2024
7a2441d
Merge branch 'map-testing' of https://github.com/PubliclyExecutedPig/…
PubliclyExecutedPig Nov 9, 2024
0f79005
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 10, 2024
c06618b
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 11, 2024
4c483c7
idk some more rooms plus librarian
PubliclyExecutedPig Nov 11, 2024
9486493
Merge branch 'map-testing' of https://github.com/PubliclyExecutedPig/…
PubliclyExecutedPig Nov 11, 2024
5fa0393
Update lobster.yml
PubliclyExecutedPig Nov 11, 2024
90e02ca
fixed shit and added borgs
PubliclyExecutedPig Nov 11, 2024
1d5f85b
OK FINAL COMMIT IM FR FR
PubliclyExecutedPig Nov 11, 2024
51e7396
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 12, 2024
c6ebaf8
lol- LAST ONE I PROMISE I JUST HAD TO FIX ONE DOOR WITH THE WRONG ACC…
PubliclyExecutedPig Nov 13, 2024
d073675
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 14, 2024
6c4b656
deleted invalid stuff
PubliclyExecutedPig Nov 14, 2024
07478de
Merge branch 'map-testing' of https://github.com/PubliclyExecutedPig/…
PubliclyExecutedPig Nov 14, 2024
7a723db
botanist job spawn
PubliclyExecutedPig Nov 14, 2024
ade7bb3
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 14, 2024
c8e1b7d
Update lobster.yml
PubliclyExecutedPig Nov 14, 2024
9b183d4
Merge branch 'map-testing' of https://github.com/PubliclyExecutedPig/…
PubliclyExecutedPig Nov 14, 2024
bd22cca
invalid fix
PubliclyExecutedPig Nov 14, 2024
2123956
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 14, 2024
3dfb8d5
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 15, 2024
efbb547
Update lobster.yml
PubliclyExecutedPig Nov 15, 2024
251a914
Merge branch 'map-testing' of https://github.com/PubliclyExecutedPig/…
PubliclyExecutedPig Nov 15, 2024
da9e8a9
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 17, 2024
cb384f4
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 19, 2024
f83ae75
Update lobster.yml
PubliclyExecutedPig Nov 19, 2024
00f6c0a
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 20, 2024
fa5fb95
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 22, 2024
cfd9935
Update lobster.yml
PubliclyExecutedPig Nov 22, 2024
4d8df73
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 23, 2024
fc59d1f
made lobster not 80 pop
PubliclyExecutedPig Nov 23, 2024
43aa80c
Merge branch 'map-testing' of https://github.com/PubliclyExecutedPig/…
PubliclyExecutedPig Nov 23, 2024
ded7b1d
Update lobster.yml
PubliclyExecutedPig Nov 23, 2024
9f55c48
fixed bridge wiring
PubliclyExecutedPig Nov 23, 2024
98347f5
fixed justice beacons
PubliclyExecutedPig Nov 23, 2024
2623b36
added more rechargers to sec
PubliclyExecutedPig Nov 23, 2024
3563af7
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 24, 2024
f4affb8
removed all window lights
PubliclyExecutedPig Nov 24, 2024
07eaff5
Update lobster.yml
PubliclyExecutedPig Nov 24, 2024
ddcc1a6
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 24, 2024
0fd806e
Update lobster.yml
PubliclyExecutedPig Nov 24, 2024
8076e9c
Update lobster.yml
PubliclyExecutedPig Nov 24, 2024
08d7121
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 25, 2024
dda2a3e
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 26, 2024
29a0fd3
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 27, 2024
da3723e
minor QoL
PubliclyExecutedPig Nov 27, 2024
18baa29
Updates maints
PubliclyExecutedPig Nov 27, 2024
5051a63
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 27, 2024
2e957f0
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 28, 2024
db58174
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 28, 2024
1c28164
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 28, 2024
adf2bf2
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 29, 2024
6d16da1
Added interrogation and reinforced some walls
PubliclyExecutedPig Nov 29, 2024
5d64fcd
fixed new pipe colours and added some lights to maints rooms
PubliclyExecutedPig Nov 29, 2024
7454725
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 29, 2024
12f54de
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 30, 2024
6b9f352
Update lobster.yml
PubliclyExecutedPig Nov 30, 2024
9ec87c9
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 30, 2024
6aa09d0
maybe fixes stuff
PubliclyExecutedPig Nov 30, 2024
7a8a5a5
Merge branch 'master' into map-testing
PubliclyExecutedPig Nov 30, 2024
fa415bf
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 1, 2024
debfc4e
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 1, 2024
c822df5
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 2, 2024
50d9a35
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 2, 2024
8cb65c0
random super weapon
PubliclyExecutedPig Dec 2, 2024
ea02e3f
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 2, 2024
1af8e6e
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 3, 2024
8899dbf
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 4, 2024
a58f517
adds roboticist, portable scrubbers, and other minor QoL
PubliclyExecutedPig Dec 4, 2024
823c5ad
Update lobster.yml
PubliclyExecutedPig Dec 4, 2024
3d5a23f
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 5, 2024
7af135e
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 6, 2024
6b7630d
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 6, 2024
9f8855e
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 6, 2024
ed10a52
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 7, 2024
ff00f52
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 7, 2024
9378ed3
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 8, 2024
1e2a24b
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 8, 2024
7a541ba
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 9, 2024
42398d2
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 10, 2024
38d6644
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 11, 2024
dd1227c
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 12, 2024
fb44f38
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 12, 2024
dc71d97
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 13, 2024
c03b3f4
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 14, 2024
7ab59ff
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 14, 2024
fb5a0d7
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 15, 2024
d93a555
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 16, 2024
dd0ed67
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 17, 2024
24fbde9
added lavaland
PubliclyExecutedPig Dec 17, 2024
d4a11c7
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 18, 2024
cdb1730
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 19, 2024
a4a47e2
Merge branch 'master' into map-testing
PubliclyExecutedPig Dec 21, 2024
67eb3e7
fixed arrivals
PubliclyExecutedPig Dec 21, 2024
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: 2 additions & 1 deletion Content.IntegrationTests/Tests/PostMapInitTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ public sealed class PostMapInitTest
"Hammurabi", //DeltaV
"Lighthouse", //DeltaV
"Micro", //DeltaV
"Chibi" //DeltaV
"Chibi", //DeltaV
"Lobster", //DeltaV
};

/// <summary>
Expand Down
Loading
Loading