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

Submarine Patches 2/10 #809

Merged
merged 90 commits into from
Mar 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
6f38a4e
various retooling
rosieposieeee Feb 10, 2024
d028372
minor touchups
rosieposieeee Feb 10, 2024
7b8c6a9
Update submarine.yml
rosieposieeee Feb 10, 2024
e78266e
remove unnecessary extra SMESs
rosieposieeee Feb 10, 2024
eaa5856
fix erroneous tiles
rosieposieeee Feb 10, 2024
097a472
fixgridatmos & variantize
rosieposieeee Feb 10, 2024
9e8946a
Merge remote-tracking branch 'upstream/master' into submarine
rosieposieeee Feb 11, 2024
b8bb0ac
Merge remote-tracking branch 'upstream/master' into submarine
rosieposieeee Feb 11, 2024
cbe84ed
Update submarine.yml
rosieposieeee Feb 11, 2024
fd062a3
sorry prototypes file
rosieposieeee Feb 11, 2024
1bc526f
Update submarine.yml
rosieposieeee Feb 11, 2024
f017483
minor fixes again
rosieposieeee Feb 11, 2024
a7acf47
cave time
rosieposieeee Feb 11, 2024
a767f35
further refinement of cave area
rosieposieeee Feb 11, 2024
3d72e56
Merge remote-tracking branch 'upstream/master' into submarine
rosieposieeee Feb 12, 2024
12a0b20
old xenobio lab
rosieposieeee Feb 12, 2024
8991d63
decal'd up
rosieposieeee Feb 12, 2024
50b6f1a
1 more light
rosieposieeee Feb 12, 2024
9fb6d6c
glass airlocks in xenolab
rosieposieeee Feb 12, 2024
5961123
ICU door & cave prison
rosieposieeee Feb 12, 2024
7b6b854
Update submarine.yml
rosieposieeee Feb 13, 2024
5099024
Merge remote-tracking branch 'upstream/master' into submarine
rosieposieeee Feb 13, 2024
8ae9b2c
signage babeyyyyy
rosieposieeee Feb 13, 2024
3148797
Update submarine.yml
rosieposieeee Feb 14, 2024
6f43a2f
Update submarine.yml
rosieposieeee Feb 15, 2024
695dae5
button fixes
rosieposieeee Feb 16, 2024
271741a
stuff
rosieposieeee Feb 17, 2024
df3caf5
custom escape pod
rosieposieeee Feb 17, 2024
8459d50
custom evac shuttle - NTES Propeller
rosieposieeee Feb 18, 2024
f5da090
fix some wiring on evac shuttle
rosieposieeee Feb 18, 2024
8fad115
rotate some items & telecomms added
rosieposieeee Feb 18, 2024
2af1135
more room at arrivals in case evac shuttle flips
rosieposieeee Feb 18, 2024
9f233fb
Merge remote-tracking branch 'upstream/master' into submarine
rosieposieeee Feb 18, 2024
abcedd4
swap to metem machines
rosieposieeee Feb 18, 2024
d7ff61b
strengthen armory
rosieposieeee Feb 18, 2024
26bc3ef
armory touch-ups
rosieposieeee Feb 18, 2024
800effd
a treat for the warden
rosieposieeee Feb 18, 2024
ef14683
fix stinky decals
rosieposieeee Feb 19, 2024
acb1d9d
Merge remote-tracking branch 'upstream/master' into submarine
rosieposieeee Feb 19, 2024
9caf55d
added laser box
rosieposieeee Feb 19, 2024
08666db
add secondary sec entrance
rosieposieeee Feb 20, 2024
29e46f4
swap armory & wardens room
rosieposieeee Feb 21, 2024
11e8865
Merge remote-tracking branch 'upstream/master' into submarine
rosieposieeee Feb 21, 2024
e3cdd00
armory touchups
rosieposieeee Feb 21, 2024
422f8ee
Update submarine.yml
rosieposieeee Feb 22, 2024
a3c48f2
fix some connections
rosieposieeee Feb 22, 2024
33444e9
Merge remote-tracking branch 'upstream/master' into submarine
rosieposieeee Feb 24, 2024
02725b4
Merge remote-tracking branch 'upstream/master' into submarine
rosieposieeee Feb 25, 2024
1ce4e20
Update submarine.yml
rosieposieeee Feb 26, 2024
94b9f70
Update submarine.yml
rosieposieeee Feb 26, 2024
a7944b9
Update submarine.yml
rosieposieeee Feb 26, 2024
68d5b3e
Update submarine.yml
rosieposieeee Feb 26, 2024
6fdd5cd
Update submarine.yml
rosieposieeee Feb 26, 2024
af11982
Update submarine.yml
rosieposieeee Feb 26, 2024
0053283
Update submarine.yml
rosieposieeee Feb 26, 2024
d247851
Update submarine.yml
rosieposieeee Feb 26, 2024
1e13565
Merge remote-tracking branch 'upstream/master' into submarine
rosieposieeee Mar 1, 2024
1c3d398
Update submarine.yml
rosieposieeee Mar 1, 2024
f972b34
Update submarine.yml
rosieposieeee Mar 1, 2024
60f9e17
Merge remote-tracking branch 'upstream/master' into submarine
rosieposieeee Mar 4, 2024
5bab8ef
Update submarine.yml
rosieposieeee Mar 4, 2024
9ef5b7e
Merge remote-tracking branch 'upstream/master' into submarine
rosieposieeee Mar 6, 2024
58452e7
sec checkpoint 2
rosieposieeee Mar 6, 2024
027c051
minor fixes + panopticon
rosieposieeee Mar 6, 2024
89e65a6
fix power near arrivals
rosieposieeee Mar 6, 2024
b60b643
missed two wires fuck
rosieposieeee Mar 6, 2024
51dab8d
Update submarine.yml
rosieposieeee Mar 6, 2024
29ae502
atmos maint changes
rosieposieeee Mar 6, 2024
38bb319
more external access points
rosieposieeee Mar 6, 2024
c092bcb
camera monitor fixes
rosieposieeee Mar 6, 2024
0b86751
fix area around camera router a bit
rosieposieeee Mar 6, 2024
c729066
fix test failure
rosieposieeee Mar 6, 2024
acb40b3
inconsistent windows at bars
rosieposieeee Mar 6, 2024
5ed4773
Merge remote-tracking branch 'upstream/master' into submarine
rosieposieeee Mar 7, 2024
bfe08e4
Update submarine.yml
rosieposieeee Mar 7, 2024
ee08aea
Merge branch 'master' into submarine
rosieposieeee Mar 8, 2024
5abe2f3
Update submarine.yml
rosieposieeee Mar 9, 2024
73d70d5
Merge remote-tracking branch 'upstream/master' into submarine
rosieposieeee Mar 10, 2024
1e9a4c0
retool cargo dock significantly
rosieposieeee Mar 10, 2024
d230cd8
single tile that was gonna annoy me
rosieposieeee Mar 10, 2024
808f36c
forgot lights oops
rosieposieeee Mar 10, 2024
111f71c
Update submarine.yml
rosieposieeee Mar 11, 2024
1b0da33
Merge remote-tracking branch 'upstream/master' into submarine
rosieposieeee Mar 16, 2024
6be64bc
improved ICU way more
rosieposieeee Mar 18, 2024
389dc58
Merge remote-tracking branch 'upstream/master' into submarine
rosieposieeee Mar 18, 2024
1c4cdf9
Update submarine.yml
rosieposieeee Mar 18, 2024
13044e9
minor fixes
rosieposieeee Mar 18, 2024
d65a74c
cloning room tweaks
rosieposieeee Mar 18, 2024
8324167
decal'd up the bar
rosieposieeee Mar 18, 2024
10d87e8
Merge remote-tracking branch 'upstream/master' into submarine
rosieposieeee Mar 19, 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
Loading
Loading