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

Merge stable into master: Add [MRP] tag to the hostname for Salamander #33910

Merged
merged 5 commits into from
Dec 17, 2024
Merged

Merge stable into master: Add [MRP] tag to the hostname for Salamander #33910

merged 5 commits into from
Dec 17, 2024

Conversation

slarticodefast
Copy link
Member

@slarticodefast slarticodefast commented Dec 17, 2024 •
edited
Loading

Merging #33909 into master.
Also shows the mapping changes in #33811 in the diff again since those were cherry picked.

Reminder: Don't squash merge, don't delete stable, even if github wants you to.

Errant-4 and others added 2 commits December 14, 2024 16:40
@Errant-4 @southbridge-fur
Cherry-pick to stable: Amber Station - Playtest Fixes (#33773) (#33811)
a3fc690 
Amber Station - Playtest Fixes (#33773)

* Fixed various issued identified during playtests.

* Fixed a firelock stuck closed

* Added more cameras and moved others

* Fixed an issue with disposals

Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
@slarticodefast
HOTFIX: Add [MRP] tag to the hostname for Salamander (#33909)
0fc2cca
@ss14-map-server
Copy link

This PR contains new or changed maps:

  • amber.yml

Maps are being rendered. This comment will be updated if rendering them is done.
12/17/24 13:46

@github-actions github-actions bot added S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. size/XL Denotes a PR that changes 5000+ lines. S: Needs Review Status: Requires additional reviews before being fully accepted Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Map Changes: Might require knowledge of mapping. S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted labels Dec 17, 2024
@github-actions GitHub Actions
Copy link
Contributor

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

@slarticodefast slarticodefast changed the title Merge stable into master: Merge stable into master: Amber Station - Playtest Fixes & Add [MRP] tag to the hostname for Salamander Dec 17, 2024
@slarticodefast slarticodefast changed the title Merge stable into master: Amber Station - Playtest Fixes & Add [MRP] tag to the hostname for Salamander Merge stable into master: Add [MRP] tag to the hostname for Salamander Dec 17, 2024
@Errant-4
Oasis - remove vox box (#33912)
332f870 
remove oasis vox box
@ss14-map-server
Copy link

This PR contains new or changed maps:

  • amber.yml
  • oasis.yml

Maps are being rendered. This comment will be updated if rendering them is done.
12/17/24 19:07

@Errant-4
Core - remove vox box (#33911)
bbf5369 
remove Core vox box
@ss14-map-server
Copy link

This PR contains new or changed maps:

  • amber.yml
  • core.yml
  • oasis.yml

Maps are being rendered. This comment will be updated if rendering them is done.
12/17/24 19:08

@VasilisThePikachu
Test can now run on stable prs (#33914)
fb6e85e 
Make tests also run on stable and staging
@ss14-map-server
Copy link

This PR contains new or changed maps:

  • amber.yml
  • core.yml
  • oasis.yml

Maps are being rendered. This comment will be updated if rendering them is done.
12/17/24 19:41

@SaphireLattice SaphireLattice merged commit 3fe576b into master Dec 17, 2024
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nikthechampiongr nikthechampiongr Awaiting requested review from nikthechampiongr nikthechampiongr is a code owner

Assignees
No one assigned
Labels
Changes: Map Changes: Might require knowledge of mapping. Changes: No C# Changes: Requires no C# knowledge to review or fix this item. S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted S: Needs Review Status: Requires additional reviews before being fully accepted S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. size/XL Denotes a PR that changes 5000+ lines.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@slarticodefast @SaphireLattice @Errant-4 @VasilisThePikachu