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

Shoukou maintenance update.... again. #695

Merged
merged 9 commits into from
Jan 28, 2024

Conversation

Adrian16199
Copy link
Contributor

@Adrian16199 Adrian16199 commented Jan 19, 2024

Fixes camera in cryo
Added a techmaint floor under Armoury level 2 door.
Adds mirror to cloning.
Adds maintenance behind robotics, giving access to atmos if someone wanted to break in.
Adds a TV in bar.

second patch
Adds extinguisher in medical, cargo's loading bay.
Adds atmos maintenance door to the new maints.
Adds couple of signs to help move around.
Adds additional places for navigation map (Bar, court)
Adds janitorial service light to command, logistics.
Adjusted the engineering's janitorial service light

About the PR

Map

Why / Balance

Just heard some complaints, might aswell fix em.

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase
    image
    image
    image

Breaking changes

Changelog

Fixes camera in cryo
Added a techmaint floor under Armoury level 2 door.
Adds mirror to cloning.
Adds maintenance behind robotics, giving access to atmos if someone wanted to break in.
Adds a TV in bar.
@deltav-mapserver
Copy link

deltav-mapserver bot commented Jan 19, 2024

This PR contains new or changed maps:

Shoukou

image

01/28/24 16:28

@IamVelcroboy
Copy link
Member

Might as well give atmos access to maints too. Somewhere on this wall.
image

@Adrian16199
Copy link
Contributor Author

Might as well give atmos access to maints too. Somewhere on this wall. image

Thats a fair point.

@IamVelcroboy
Copy link
Member

This is approved to merge when upstream stuff is settled.

@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Jan 28, 2024
Copy link
Contributor

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

@Adrian16199
Copy link
Contributor Author

"These conflicts are too complex to fix in the web editor"

Oh boy!

@github-actions github-actions bot removed the S: Merge Conflict Fix your PR! label Jan 28, 2024
@IamVelcroboy IamVelcroboy merged commit 666194b into DeltaV-Station:master Jan 28, 2024
10 checks passed
@Adrian16199 Adrian16199 deleted the Shoukou-must-live branch February 10, 2024 18:57
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.

3 participants