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

Fixes bugs from be37603 #1194

Merged
merged 2 commits into from
Aug 29, 2024

Conversation

SaraSayomi
Copy link

@SaraSayomi SaraSayomi commented Aug 28, 2024

About The Pull Request

Removes bugs from be37603 on Box station AI module room, merge conflict marker from 13cd269

Why It's Good For The Game

Fixes mapping errors

A Port?

Nope

Pre-Merge Checklist

  • You tested this on a local server.
  • This code did not runtime during testing. (Existing bugs that Mosley is fixing from upstream)
  • You documented all of your changes.

Changelog

🆑
del: Removes merge conflict marker from aimodules rather than AI_modules
del: Removes double layer on core modules
/:cl:

xhianil added 2 commits August 27, 2024 21:41
Removes bugs from be37603 on Box station
Removes merge conflict marker from aimodules rather tan AI_modules
Removes double layer
Lambda, meta, pubby
Double floor tile on Lambda
@MosleyTheMalO MosleyTheMalO merged commit ea531df into SPLURT-Station:master Aug 29, 2024
5 of 6 checks passed
github-actions bot pushed a commit that referenced this pull request Aug 29, 2024
@SaraSayomi SaraSayomi deleted the be37603-mapping-fix branch September 1, 2024 17:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants