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

[MDB IGNORE] Baytiles/the great ship prettyfication #108

Merged
merged 61 commits into from
Sep 19, 2021
Merged

[MDB IGNORE] Baytiles/the great ship prettyfication #108

merged 61 commits into from
Sep 19, 2021

Conversation

rye-rice
Copy link
Member

@rye-rice rye-rice commented Jul 31, 2021 •
edited
Loading

About The Pull Request

Revives baytiles from here.
updates a lot of ships to use the new aesthetics
Makes the refrences in the shetland more obvious
image
example

Why It's Good For The Game

eye candy, seperates aesthetically from a certain abomination

Changelog

🆑
add: baytiles
soundadd: swifterjackie
/:cl:

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Jul 31, 2021
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added DME Edit Map Change Tile placing is hard. Thank you for your service. Sound USSR Anthem 2.66 MB file. Sprites A bikeshed full of soulless bikes. labels Jul 31, 2021
@rye-rice
Copy link
Member Author

already?

@keywordlabeler keywordlabeler bot added Feature REALLY causes more bugs in the future that we won't know about. Removal We hate fun. labels Jul 31, 2021
@triplezeta
Copy link
Contributor

i wonder why

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Jul 31, 2021
@MarkSuckerberg MarkSuckerberg mentioned this pull request Sep 13, 2021
Merged
@ZephyrTFA
Copy link
Member

This is good to merge, you just need to fix your null icons so that integration tests succeed

@MarkSuckerberg
Copy link
Member

Fixed that, it's just atmos runtimes now

@ZephyrTFA
Copy link
Member

Gonna cry

@MarkSuckerberg
Copy link
Member

atmos runtimes my beloathed 😭😭😭

@rye-rice rye-rice marked this pull request as ready for review September 13, 2021 23:05
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Sep 15, 2021
@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Merge branch 'master' into wallsorsomeshit
a7f6eaa 
I HATE MERGE CONFLICTS I HATE MERGE CONFLICTS
@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Sep 15, 2021
@terg-but-ius terg-but-ius mentioned this pull request Sep 18, 2021
Closed
@PrefabQuasar PrefabQuasar mentioned this pull request Sep 18, 2021
Closed
@github-actions github-actions bot added the Admin They do it for free. label Sep 18, 2021
@MarkSuckerberg
Copy link
Member

LGTM, YOLO, LMAO, etcetera

@MarkSuckerberg MarkSuckerberg merged commit 318a661 into shiptest-ss13:master Sep 19, 2021
@rye-rice
Copy link
Member Author

YES FDKSJLHOIPBHNA MJK<ALDHIUSHBMNLIU<JHBMNKJ S:FSF><LKSJO IPF(*DLPM:<SDPKFJMNODF:PI(JUKDLSUNO

@Pontenerd Pontenerd mentioned this pull request Sep 19, 2021
Closed
@rye-rice rye-rice mentioned this pull request Nov 18, 2021
Closed
@rye-rice rye-rice mentioned this pull request Mar 18, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ZephyrTFA ZephyrTFA ZephyrTFA requested changes

Assignees

@MarkSuckerberg MarkSuckerberg

Labels
Admin They do it for free. DME Edit Feature REALLY causes more bugs in the future that we won't know about. Fix Causes more bugs in the future that we won't know about. Map Change Tile placing is hard. Thank you for your service. Removal We hate fun. Sound USSR Anthem 2.66 MB file. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet