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

Failed to cherry-pick PR #26055: Origin Station Update 12.03.2024 #366

Closed
SimpleStation14 opened this issue May 3, 2024 · 0 comments
Closed
Labels
Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot

Comments

@SimpleStation14
Copy link
Member

Failed to cherry-pick PR: cannot create a tree from a not fully merged index.; class=Index (10); code=Unmerged (-10)

PR body below

Mirror of PR #26055: Origin Station Update 12.03.2024 from space-wizards space-wizards/space-station-14

af6a2d7792beb6636a87044293e33ee88bff41f3

PR opened by brainfood1183 at 2024-03-12 21:02:54 UTC


PR changed 1 files with 34981 additions and 34184 deletions.

The PR had the following labels:

  • No C#
  • Changes: Map

Original Body

Added - Dartboard (with 3 darts) to bar.
Added - Chem Windoor to south chem counter.
Added - New Signs ( Psychology, Reporter, Arcade).
Changed - Vault now has command access instead of captain access.
Added - Wooden Benches
Changed - AP magnum rounds in command bar replaced with standard magnum rounds.

PJB requested Medbay changes.

fixes #26220 #26246 #14017

Added - Another stasisbed (now 3)
Changed - Split up the power gird in Medbay, now uses 1 substation and more APCs.
Added - nanomed closets to Medbay
Removed - Records computer from main Med room.
Removed - Body scanner from paramedics room.
Added - Cell Recharger.
Changed - Smart Fridge (ChemFridge??) now sits between Med and Chem.
Changed - Virology now uses medbay substation.
Changed - Crew Monitor Server now in Telecoms room.
Fixed - Power issue in CMO room.
Removed - Airlock between surgery and CMO office.
Changed - APC that was visible in maints from Medbay moved to not be visible.

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase
@SimpleStation14 SimpleStation14 added the Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot label May 3, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT closed this as not planned Won't fix, can't repro, duplicate, stale May 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot
Projects
None yet
Development

No branches or pull requests

2 participants