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

Moves integrity to the atom level #11290

Merged
merged 32 commits into from
Oct 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
e8aa1a2
blastcannon buff
Tsar-Salat Aug 3, 2024
edf535b
Revert "blastcannon buff"
Tsar-Salat Aug 3, 2024
09dad7b
tank integrity refactor
Tsar-Salat Aug 3, 2024
7468f00
before threading into turf integrity
Tsar-Salat Aug 4, 2024
70bc981
hmmm, nearly there.
Tsar-Salat Aug 4, 2024
9a36400
Revert "hmmm, nearly there."
Tsar-Salat Aug 5, 2024
c954fb9
better
Tsar-Salat Aug 5, 2024
1b74e4f
finished
Tsar-Salat Aug 5, 2024
a46777b
Merge remote-tracking branch 'BeeStation/master' into atom_integrity2
Tsar-Salat Aug 14, 2024
e37d037
merge skew
Tsar-Salat Aug 14, 2024
19212a5
Merge remote-tracking branch 'BeeStation/master' into atom_integrity2
Tsar-Salat Aug 25, 2024
c27872b
Merge remote-tracking branch 'Upstream/master' into atom_integrity2
Tsar-Salat Aug 28, 2024
01a435a
Merge remote-tracking branch 'BeeStation/master' into atom_integrity2
Tsar-Salat Aug 29, 2024
6ac12f8
merge skew
Tsar-Salat Aug 29, 2024
99e04ef
Merge remote-tracking branch 'BeeStation/master' into atom_integrity2
Tsar-Salat Sep 6, 2024
670f4ff
merge
Tsar-Salat Sep 8, 2024
f37b828
search&replace
Tsar-Salat Sep 8, 2024
5307420
Merge branch 'master' into atom_integrity2
Tsar-Salat Sep 20, 2024
290f5b9
Merge remote-tracking branch 'BeeStation/master' into atom_integrity2
Tsar-Salat Sep 21, 2024
de0d91e
Merge remote-tracking branch 'BeeStation/master' into atom_integrity2
Tsar-Salat Sep 26, 2024
df0425e
ifndef
Tsar-Salat Sep 29, 2024
309ee55
reviews
Tsar-Salat Oct 3, 2024
483f245
Merge remote-tracking branch 'BeeStation/master' into atom_integrity2
Tsar-Salat Oct 4, 2024
f349c47
Merge remote-tracking branch 'BeeStation/master' into atom_integrity2
Tsar-Salat Oct 5, 2024
50b1376
Merge remote-tracking branch 'BeeStation/master' into atom_integrity2
Tsar-Salat Oct 17, 2024
a58964f
REALBASELINE
Tsar-Salat Oct 17, 2024
bbdbf9d
convert fland
Tsar-Salat Oct 17, 2024
9a5b9da
REALBASELINE
Tsar-Salat Oct 18, 2024
7549bf1
meta & echo
Tsar-Salat Oct 18, 2024
e3c3edd
i like to singa
Tsar-Salat Oct 18, 2024
599068b
Merge remote-tracking branch 'BeeStation/master' into atom_integrity2
Tsar-Salat Oct 19, 2024
e2a1672
please fix yourself
Tsar-Salat Oct 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
56 changes: 28 additions & 28 deletions _maps/RuinGeneration/13x13_ai-lab.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading