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

Lambda reversion, meta general fixes #1196

Open
wants to merge 13 commits into
base: master
Choose a base branch
from

Conversation

SaraSayomi
Copy link

@SaraSayomi SaraSayomi commented Sep 1, 2024

About The Pull Request

Fixes lambda for upstream
More general meta fixins, to try to make it work

Why It's Good For The Game

Fixes are good, no?

A Port?

Yes but also no

Pre-Merge Checklist

  • You tested this on a local server.
  • This code did not runtime during testing.
  • You documented all of your changes.

Changelog

🆑 Sara
fix: Revert lambda to our old one with my fixes
fix: Remove airlock errors from meta whiteship
fix: Fix meta pipenet errors
fix: Fix Lambda pipenets
fix: Fix lambda double turf
add: Lambda now has a psychology office near the park
del: Remove merge conflict that is over 2 years old from upstream (because it's clearly not missed)
add: Annoyance at upstream
fix: rearrange Lambda medical, add a limb grower and paramed locker
fix: lambda is no longer affected by upstream
/:cl:

Revert lambda to upstream with my fixes
Remove airlock errors from meta whiteship
Fix meta pipenet errors
Remove merge conflict that is over 2 years old from upstream (because it's clearly not missed)
@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Deployed

Details
Server Instance

SPLURT

Revision

Origin: 7f51928
Pull Request: 3f458ed
Server: d2ac32a26c2b1a8f15726be041e59e638f3b44c5

Comment

xhianil added 5 commits September 1, 2024 14:56
LuizLeFish Ver.
Adds psychology
99 pipenet errors on the wall, 99 pipenet errors on the wall, track one down, pass it around, 98 pipenet errors on the wall...
Removed golden katana and armor
@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 7f51928
Pull Request: c79f321
Server: 0c8a336ca221ad4452f630c57f7d7c87ac39d9d5

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: 9c6ef0c
Pull Request: c79f321
Server: 2a1aec62ceb4074f9dc2bb60223ebd2136c9aa70

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: dd7eba9
Pull Request: c79f321
Server: de95520d01295c8de9346b9dc7971d837896b505

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: dd7eba9
Pull Request: 82f1d44
Server: 0a89ede73acb56c460f0b592e936982f7b05edfb

Comment

@SPLURT-Station-Bot
Copy link
Collaborator

Test Merge Updated

Details
Server Instance

SPLURT

Revision

Origin: dd7eba9
Pull Request: 82f1d44
Server: f22e2580bd12092cbae51ed1ccf229a70305dcc1

Comment

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