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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

adds atmos to engine pipes to omegastation #8795

Closed
wants to merge 1 commit into from
Closed

adds atmos to engine pipes to omegastation #8795

wants to merge 1 commit into from

Conversation

athena413
Copy link
Contributor

@athena413 athena413 commented Jun 3, 2020 •
edited

see title, its messy but better than nothing

Changelog

馃啈
rscadd: Added atmos to engine pipes to omegastation
/:cl:

@athena413 athena413 requested a review from Ktlwjec1 as a code owner June 3, 2020 13:14
@yogstation13-bot yogstation13-bot added Feature This adds new content to the game Fix This fixes an issue. Please link issues in fix PRs Mapping Will result in a change to a map. Revert / Deletion Altoids is probably mad about this Tweak This PR contains changes to the game. labels Jun 3, 2020
@smorgli
Copy link
Contributor

smorgli commented Jun 3, 2020

cool changelog btw

JamieD1
JamieD1 requested changes Jun 4, 2020
View reviewed changes
Copy link
Contributor

@JamieD1 JamieD1 left a comment

Choose a reason for hiding this comment

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

Fix your changelog

@athena413
Copy link
Contributor Author

Fix your changelog

done

Ktlwjec1
Ktlwjec1 approved these changes Jun 6, 2020
View reviewed changes
Copy link
Contributor

@Ktlwjec1 Ktlwjec1 left a comment •
edited

Choose a reason for hiding this comment

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

honk she says then notices merge conflicts

@Ktlwjec1 Ktlwjec1 added Awaiting - Action - Author This PR is awaiting an action from the author Merge conflict Files are conflicting with current live changes. and removed Feature This adds new content to the game Fix This fixes an issue. Please link issues in fix PRs Revert / Deletion Altoids is probably mad about this Tweak This PR contains changes to the game. labels Jun 6, 2020
@JamieD1
Copy link
Contributor

JamieD1 commented Jun 14, 2020

@Flme Conflicts then it will be merged after recheck by KTL

@athena413
Copy link
Contributor Author

i dont know what the problem is aaaaaaaaaaa

@smorgli smorgli mentioned this pull request Jun 21, 2020
Merged
@smorgli smorgli closed this Jun 22, 2020
@Yogbot-13 Yogbot-13 added the Feature This adds new content to the game label Jun 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JamieD1 JamieD1 JamieD1 requested changes

@Ktlwjec1 Ktlwjec1 Ktlwjec1 approved these changes

Assignees

@smorgli smorgli

Labels
Awaiting - Action - Author This PR is awaiting an action from the author Feature This adds new content to the game Mapping Will result in a change to a map. Merge conflict Files are conflicting with current live changes.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@athena413 @smorgli @JamieD1 @Ktlwjec1 @yogstation13-bot @Yogbot-13