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

Revert "Subpatch 4-2-24 (#1050)" #1051

Merged
merged 1 commit into from
Apr 3, 2024

Conversation

rosieposieeee
Copy link
Contributor

This reverts commit 4f91d7a.

About the PR

MY LOCAL COPY DID NOT HAVE THE TEG CHANGES FROM THE OTHER PATCH

distant sobs

@deltav-mapserver
Copy link

This PR contains new or changed maps:

  • submarine.yml

Maps are being rendered. This comment will be updated if rendering them is done.
04/03/24 04:56

@rosieposieeee rosieposieeee reopened this Apr 3, 2024
@IamVelcroboy IamVelcroboy merged commit 2c8cb54 into DeltaV-Station:master Apr 3, 2024
23 of 24 checks passed
nearlyNonexistent referenced this pull request in nearlyNonexistent/Horizon-Station Apr 14, 2024
This reverts commit 4f91d7ab4192ad591ff39608453e4e4f7fdfe69b.
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
* Check for flavor text equality in profile.

* Fix some characters being deleted from flavor text

Sometimes the last few characters of the flavor text would get deleted.
This fixes this issue.

(cherry picked from commit 9f1d95e)

# Description

This PR fixes some database issues present in The Wizmerge.

# Changelog

No changelog, this isn't player facing.

---------

Co-authored-by: Pieter-Jan Briers <[email protected]>
Co-authored-by: Evgencheg <[email protected]>
Co-authored-by: beck-thompson <[email protected]>
Co-authored-by: dffdff2423 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants