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

Hotfix babyproof arrivals terminal and arrivals shuttle #33538

Merged
merged 2 commits into from
Nov 25, 2024
Merged

Hotfix babyproof arrivals terminal and arrivals shuttle #33538

merged 2 commits into from
Nov 25, 2024

Conversation

Errant-4
Copy link
Member

@Errant-4 Errant-4 commented Nov 25, 2024 •
edited
Loading

About the PR

Merge #33284 and #33281 into staging, as a hotfix. Make arrivals terminal and arrivals shuttle invulnerable to most damage

Why / Balance

Admins wanted this out on live faster than the next release cycle

Requirements

Changelog

🆑 IProduceWidgets

  • fix: The terminal is more tamper proof.
  • fix: Arrivals shuttle is more tamper proof.

IProduceWidgets and others added 2 commits November 25, 2024 07:59
@IProduceWidgets @Errant-4
baby proof the terminal (space-wizards#33281)
86a3d16 
* baby proof the terminal

* Make a couple exceptions for items that you might take with you.

* alwayspoweredlights

* Uncuttable cables since cablecomp is a snowflake construction system

* chairs and vendors

* rerun heisentests

* rerun tests again
@IProduceWidgets @slarticodefast @Errant-4
babyproof arrivals shuttle (space-wizards#33284)
9a898bb 
* babyproof arrivals shuttle

* always powered lights

* uncuttable cables from terminal PR.

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
@github-actions github-actions bot added size/XL Denotes a PR that changes 5000+ lines. S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. Changes: Map Changes: Might require knowledge of mapping. Branch: Staging Intended to be merged into Staging. and removed size/XL Denotes a PR that changes 5000+ lines. labels Nov 25, 2024
@Errant-4
Copy link
Member Author

  1. Does this actually need a CL entry, or will the one on master be already in the changelog?
  2. Squash or not?
  3. Needs 2 more approvals due to being hotfix

@Errant-4 Errant-4 added the Intent: Hotfix PR Intent: Something that should be applied via hotfix procedure. label Nov 25, 2024
SaphireLattice
SaphireLattice approved these changes Nov 25, 2024
View reviewed changes
Copy link
Contributor

@SaphireLattice SaphireLattice left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Axe the changelog entry in the PR description itself cherry-pick the change of existing ones
  2. Squash should be fine, conflict resolution will suck but nothing too awful. Honestly not sure what procedures are for messing with changelog. We'll need to document this later
  3. Approved with condition this passes tests, as the two PRs have already been approved

@SaphireLattice SaphireLattice added the P1: High Priority: Higher priority than other items, but isn't an emergency. label Nov 25, 2024
@Errant-4
Copy link
Member Author

Added CL entries from the original PRs, I guess we will undupe that bridge when we get there

@SaphireLattice
Copy link
Contributor

Note: Check failure is due to the labeler

Something to fix as I've noted in #maintainers on Discord

@SaphireLattice
Copy link
Contributor

Not required for now, I suppose

@SaphireLattice SaphireLattice removed P1: High Priority: Higher priority than other items, but isn't an emergency. Changes: Map Changes: Might require knowledge of mapping. Intent: Hotfix PR Intent: Something that should be applied via hotfix procedure. Branch: Staging Intended to be merged into Staging. labels Nov 25, 2024
@SaphireLattice
Copy link
Contributor

And I'm a dumbass and did a wrong pr

@github-actions github-actions bot added Changes: Map Changes: Might require knowledge of mapping. size/XL Denotes a PR that changes 5000+ lines. labels Nov 25, 2024
@SaphireLattice SaphireLattice added P1: High Priority: Higher priority than other items, but isn't an emergency. S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval. Intent: Hotfix PR Intent: Something that should be applied via hotfix procedure. Branch: Staging Intended to be merged into Staging. and removed size/XL Denotes a PR that changes 5000+ lines. labels Nov 25, 2024
@SaphireLattice SaphireLattice removed the S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. label Nov 25, 2024
@Errant-4 Errant-4 merged commit 14103e7 into space-wizards:staging Nov 25, 2024
17 of 19 checks passed
@Errant-4 Errant-4 deleted the nanomachines_son branch January 8, 2025 16:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SaphireLattice SaphireLattice SaphireLattice approved these changes

@slarticodefast slarticodefast slarticodefast approved these changes

Assignees
No one assigned
Labels
Branch: Staging Intended to be merged into Staging. Changes: Map Changes: Might require knowledge of mapping. Intent: Hotfix PR Intent: Something that should be applied via hotfix procedure. P1: High Priority: Higher priority than other items, but isn't an emergency. S: Approved Status: Reviewed and approved by at least one maintainer; a PR may require another approval.
Projects
None yet
Milestone
No milestone
Development

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