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

Makes the metastation brig shuttle area have an exit. #11224

Merged
merged 8 commits into from
Jul 30, 2024
Merged

Makes the metastation brig shuttle area have an exit. #11224

merged 8 commits into from
Jul 30, 2024

Conversation

XeonMations
Copy link
Contributor

About The Pull Request

Did some mapping changes to the metastation's brig shuttle area, allows prisoners to now leave on their own accord once their sentence is over, as it should be. Also made it look nicer.

Why It's Good For The Game

Labor camp prisoners should be able to leave the gulag shuttle area on their own accord, like on delta station.

Testing Photographs and Procedure

Screenshots&Videos

image

Changelog

🆑 XeonMations
fix: Fixed metastation's brig shuttle area not having an exit for prisoners.
/:cl:

@XeonMations XeonMations requested a review from a team as a code owner July 22, 2024 11:34
@github-actions github-actions bot added the Mapping DMM Change label Jul 22, 2024
@MarkusLarsson421
Copy link
Contributor

MarkusLarsson421 commented Jul 22, 2024 •
edited
Loading

To be fair, I don't think any station other than Delta, Kilo or Fland has this standard seeing as they are usually very deep into the Brig. But given the ideal situation this is a good change.

@github-actions GitHub Actions
Copy link

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

@XeonMations
Revert "Merge remote-tracking branch 'upstream/master' into metastati…
0ce56dd 
…on-brig-shuttle"

This reverts commit 9db291c, reversing
changes made to ab7a980.
@XeonMations
Copy link
Contributor Author

what the fuck happened here, please hold-

@XeonMations XeonMations marked this pull request as draft July 23, 2024 22:27
@XeonMations XeonMations marked this pull request as ready for review July 23, 2024 22:41
@XeonMations
Copy link
Contributor Author

there we go, fixed it

Tsar-Salat
Tsar-Salat requested changes Jul 23, 2024
View reviewed changes
Copy link
Contributor

@Tsar-Salat Tsar-Salat left a comment

Choose a reason for hiding this comment

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

Can you keep the beige tiles? We did some color coordinating for the specific areas of brig.

Thanks

@XeonMations
Copy link
Contributor Author

Can you keep the beige tiles? We did some color coordinating for the specific areas of brig.

I think i did right? I'm not sure about this, but if it looks nicer for you then i suppose it will have to do.

@PestoVerde322 PestoVerde322 added this pull request to the merge queue Jul 30, 2024
Merged via the queue into BeeStation:master with commit 1a3fadd Jul 30, 2024
8 checks passed
ss13-beebot added a commit that referenced this pull request Jul 30, 2024
@ss13-beebot
Automatic changelog generation for PR #11224 [ci skip]
ba3dfad
@XeonMations XeonMations deleted the metastation-brig-shuttle branch July 30, 2024 22:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Tsar-Salat Tsar-Salat Tsar-Salat requested changes

@PestoVerde322 PestoVerde322 PestoVerde322 approved these changes

Assignees
No one assigned
Labels
Fix Mapping DMM Change
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@XeonMations @MarkusLarsson421 @Tsar-Salat @PestoVerde322