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

Jump to bottom

Moves the ai into sat and comms into the center. (Boxstation big changes) #8531

Merged
merged 33 commits into from Jun 6, 2020
Merged

Moves the ai into sat and comms into the center. (Boxstation big changes) #8531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
802b692
onion?
smorgli May 12, 2020
ae4f4b4
grav&board
smorgli May 14, 2020
81ad66e
changes and areas
smorgli May 15, 2020
0a97509
more map
smorgli May 15, 2020
0e113c6
tele and range
smorgli May 15, 2020
7b24b9c
ai sat and final changes
smorgli May 16, 2020
244a4d9
merge you fuck
smorgli May 16, 2020
96b80f3
Merge branch 'master' of https://github.com/yogstation13/Yogstation i…
smorgli May 16, 2020
778004a
why did i change this?
smorgli May 16, 2020
aabedd5
removes some apc, shortens carpet
smorgli May 16, 2020
a023f06
pretty tcomms
smorgli May 16, 2020
d797553
intercom
smorgli May 16, 2020
253640e
minor fixes
smorgli May 16, 2020
d97f48b
changes, duh
smorgli May 17, 2020
6f03bff
things and engine
smorgli May 18, 2020
bd5ae28
pipes and shit
smorgli May 18, 2020
42a60f9
final changes, review complete
smorgli May 20, 2020
85a113d
i hate bibby
smorgli May 20, 2020
dc18269
Merge branch 'master' of https://github.com/yogstation13/Yogstation i…
smorgli May 20, 2020
fe0057d
shitty altar
smorgli May 20, 2020
bba1533
conflict resolved
smorgli May 20, 2020
33440fe
moved comms apc, changed upload a bit
smorgli May 24, 2020
ee75710
sat changes
smorgli May 26, 2020
ef3c22f
Merge branch 'master' of https://github.com/yogstation13/Yogstation i…
smorgli May 26, 2020
f560ea5
status displays fixed and foamer under core?
smorgli May 26, 2020
c86cf34
CONFLICT FUCKING RESOLVED
smorgli Jun 2, 2020
eff09e1
REEEEEEEEEEEEEEEEEEEEE
smorgli Jun 2, 2020
d677b77
comms fixed
smorgli Jun 2, 2020
7d6da0c
board
smorgli Jun 2, 2020
063697c
Merge branch 'master' of https://github.com/yogstation13/Yogstation i…
smorgli Jun 2, 2020
bab5df1
Merge branch 'master' of https://github.com/yogstation13/Yogstation i…
smorgli Jun 2, 2020
d186d01
merge this already im tired of conflicts
smorgli Jun 5, 2020
aa7c326
Merge branch 'master' of https://github.com/yogstation13/Yogstation i…
smorgli Jun 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view