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

Brings Kilostation back into the rotation #1417

Merged
merged 74 commits into from
May 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
291d7af
basic layout for missing rooms and full cryo/bitrunning den
KnigTheThrasher Mar 16, 2024
48d496e
finishes pathology rooms and its maint
KnigTheThrasher Mar 16, 2024
50e4021
puts nanites back into their rightful place
KnigTheThrasher Mar 16, 2024
a9fcb37
botany
KnigTheThrasher Mar 16, 2024
b0e245f
stray decal
KnigTheThrasher Mar 16, 2024
2eca4a1
total tesla engine makeover and removal of singulo (it breaks everyth…
KnigTheThrasher Mar 16, 2024
46fb2af
final tweaks (i think)
KnigTheThrasher Mar 16, 2024
eb431a4
fixes linters
KnigTheThrasher Mar 16, 2024
d4bd94a
oops
KnigTheThrasher Mar 16, 2024
0d5d34f
fixes it fr fr this time
KnigTheThrasher Mar 16, 2024
a1611f7
kilo artsci, move the russians a little to prevent a deathtrap
KnigTheThrasher Mar 16, 2024
c52e272
stops a warcrime
KnigTheThrasher Mar 16, 2024
a821c34
bruh
KnigTheThrasher Mar 16, 2024
309df64
i forgor mining gear
KnigTheThrasher Mar 16, 2024
f869f61
removes a stray apc
KnigTheThrasher Mar 16, 2024
b30f536
forgot a plating under windows
KnigTheThrasher Mar 16, 2024
94e4824
removed weird map artifacts, made maint a little more dangerous, cryo…
KnigTheThrasher Mar 16, 2024
ac61cfb
firelocks and removes one fire alarm
KnigTheThrasher Mar 16, 2024
11a637e
brig rework, dead body placers near dangerous locations
KnigTheThrasher Mar 17, 2024
799f1f8
fixes pipes (i think)
KnigTheThrasher Mar 17, 2024
658d65a
more pipes
KnigTheThrasher Mar 17, 2024
83bbc70
modifies dets office, changes brig entrance a bit, reruns the test cu…
KnigTheThrasher Mar 17, 2024
d5ad164
small changes everywhere, adds dedicated cryo room to perma
KnigTheThrasher Mar 17, 2024
bdc60ca
bar maint
KnigTheThrasher Mar 17, 2024
5e2bf75
adds a missing cable
KnigTheThrasher Mar 17, 2024
f0a8e7d
dorms rework, moves bathroom to above medbay near chapel entrance
KnigTheThrasher Mar 18, 2024
18305a1
linters fix
KnigTheThrasher Mar 18, 2024
3aa1518
removes a pipe
KnigTheThrasher Mar 18, 2024
3c097d1
medbay rework, think that's all for now
KnigTheThrasher Mar 19, 2024
f3c3cb9
removes a pipe (again)
KnigTheThrasher Mar 19, 2024
fce13ec
added showers and tweaked qm's office a bit
KnigTheThrasher Mar 19, 2024
e981d11
medbay tweaks, more cameras in updated areas
KnigTheThrasher Mar 19, 2024
0f56f24
adds cryoxadone beakers and mannitol to cryo (lol)
KnigTheThrasher Mar 19, 2024
5a166b7
remakes the artsci lab because it was ugly, cupcake upgrade
KnigTheThrasher Mar 20, 2024
16a42e4
decorations
KnigTheThrasher Mar 20, 2024
708efd6
Merge branch 'master' into kilo
KnigTheThrasher Mar 26, 2024
5e10489
console conflicts
KnigTheThrasher Mar 26, 2024
5ddde13
Merge branch 'master' into kilo
KnigTheThrasher Mar 26, 2024
e94fb74
changed windows color in qm's office
KnigTheThrasher Mar 27, 2024
a4e7e6a
Merge branch 'master' into kilo
KnigTheThrasher Mar 28, 2024
e7d8422
changed floor in ranch, oops I synced too fast
KnigTheThrasher Mar 28, 2024
2142d6c
Merge branch 'master' into kilo
KnigTheThrasher Apr 5, 2024
96c2f8f
null wars + crate shelves in cargo
KnigTheThrasher Apr 5, 2024
b1d5f3e
adds a composter in perma
KnigTheThrasher Apr 8, 2024
a13894c
Merge branch 'master' into kilo
KnigTheThrasher Apr 8, 2024
f830e0c
xenobio ranching
KnigTheThrasher Apr 8, 2024
6af4bfa
removes stray decals and fixes a wall
KnigTheThrasher Apr 8, 2024
20eddb9
Merge branch 'master' into kilo
KnigTheThrasher Apr 8, 2024
0a3954b
tiny fans + solar panels qol
KnigTheThrasher Apr 9, 2024
3aac369
new vacant commissary (old one is a maint project nao)
KnigTheThrasher Apr 9, 2024
bb82105
i forgor, oops
KnigTheThrasher Apr 9, 2024
3c25dee
Merge branch 'master' into kilo
KnigTheThrasher Apr 9, 2024
30f5319
fix tests
KnigTheThrasher Apr 9, 2024
87be8df
also the pipes
KnigTheThrasher Apr 9, 2024
774004d
Merge branch 'master' into kilo
KnigTheThrasher Apr 10, 2024
99037db
Merge branch 'master' into kilo
KnigTheThrasher Apr 16, 2024
d96e809
protection just in case you spawn in the upper right corner
KnigTheThrasher Apr 16, 2024
0e4998c
Merge branch 'master' into kilo
KnigTheThrasher Apr 22, 2024
6c14fde
turned vacant commissary into smithing section
KnigTheThrasher Apr 22, 2024
0669d5c
small pipe changes
KnigTheThrasher Apr 22, 2024
69d3fe0
adds decals back in
KnigTheThrasher Apr 22, 2024
2455502
Merge branch 'master' into kilo
KnigTheThrasher Apr 22, 2024
dc67707
Merge branch 'master' into kilo
KnigTheThrasher May 3, 2024
f2e9c5c
craig my beloved
KnigTheThrasher May 3, 2024
2513baa
Merge branch 'master' into kilo
KnigTheThrasher May 3, 2024
11e07c9
updated perma kitchen, config file and one other thingy
KnigTheThrasher May 11, 2024
d021a72
fix linters
KnigTheThrasher May 11, 2024
863da56
another one
KnigTheThrasher May 11, 2024
3bf38f8
Merge branch 'master' into kilo
KnigTheThrasher May 11, 2024
a3fad74
perma botany edits
KnigTheThrasher May 11, 2024
9e87f8d
adds the book
KnigTheThrasher May 11, 2024
96b8371
Merge branch 'master' into kilo
KnigTheThrasher May 12, 2024
e4c8f31
fixes before a round starts on it
KnigTheThrasher May 22, 2024
0faf073
improved solars, made a certain person a bit more visible, more drone…
KnigTheThrasher May 23, 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