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 by FLME #8984

Merged
merged 1 commit into from Jun 22, 2020
Merged

Adds atmos to engine pipes to omegastation by FLME #8984

merged 1 commit into from Jun 22, 2020

Conversation

smorgli
Copy link
Contributor

@smorgli smorgli commented Jun 21, 2020

Fixes the conflict in #8795
All work was done by FLME, i just fixed the conflict

Changelog

馃啈 FLME
tweak: connected atmos to engine pipes on omegastation
/:cl:

@smorgli smorgli requested a review from Ktlwjec1 as a code owner June 21, 2020 22:16
@Yogbot-13 Yogbot-13 added Mapping Will result in a change to a map. Tweak This PR contains changes to the game. labels Jun 21, 2020
@athena413
Copy link
Contributor

thanks

@Ktlwjec1 Ktlwjec1 merged commit ef480f6 into yogstation13:master Jun 22, 2020
Yogbot-13 added a commit that referenced this pull request Jun 22, 2020
@Yogbot-13
Automatic changelog generation #8984 [ci skip]
775d50a
@smorgli smorgli deleted the omegaenginepipes branch August 8, 2020 10:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ktlwjec1 Ktlwjec1 Ktlwjec1 approved these changes

Assignees
No one assigned
Labels
Mapping Will result in a change to a map. Tweak This PR contains changes to the game.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@smorgli @athena413 @Ktlwjec1 @Yogbot-13