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

ports possums from desert rose #9452

Merged
merged 10 commits into from
Aug 17, 2020
Merged

ports possums from desert rose #9452

merged 10 commits into from
Aug 17, 2020

Conversation

boodaliboo
Copy link
Contributor

@boodaliboo boodaliboo commented Aug 13, 2020 •
edited by Partheo

https://github.com/judgex/desertrose/pull/82

Intent of your Pull Request

adds possums and a special one called poppy the safety possum to engineering

Changelog

馃啈
rscadd: Added possum
/:cl:

@Yogbot-13 Yogbot-13 added DME Edit This PR affects the yogstation.DME file Feature This adds new content to the game Mapping Will result in a change to a map. Sprites This PR has spriting changes labels Aug 13, 2020
@ynot01
Copy link
Contributor

ynot01 commented Aug 13, 2020

image

@ynot01
Copy link
Contributor

ynot01 commented Aug 13, 2020

where do we see possum_aaa

@boodaliboo
Copy link
Contributor Author

where do we see possum_aaa

i uh had to remove the interactions to make it pass travis

@boodaliboo
Copy link
Contributor Author

where do we see possum_aaa

i uh had to remove the interactions to make it pass travis

may look on adding them backj using petting for it or soemthing

Partheo
Partheo suggested changes Aug 13, 2020
View reviewed changes
Copy link
Contributor

@Partheo Partheo left a comment •
edited

Choose a reason for hiding this comment

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

Don't put two changelog entries for the same thing.

smorgli
smorgli suggested changes Aug 13, 2020
View reviewed changes
Copy link
Contributor

@smorgli smorgli left a comment

Choose a reason for hiding this comment

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

Pet oversaturation again. Map is fine but honestly i would prefer if you put Poppy in both the engines instead of just outside the CE office where Poly is.

@boodaliboo
Copy link
Contributor Author

Pet oversaturation again. Map is fine but honestly i would prefer if you put Poppy in both the engines instead of just outside the CE office where Poly is.

that can be done

@JamieD1
Copy link
Contributor

JamieD1 commented Aug 15, 2020

Merge when mappers are happy.

@boodaliboo
Copy link
Contributor Author

Merge when mappers are happy.

did requesteed changes

Partheo
Partheo approved these changes Aug 16, 2020
View reviewed changes
Copy link
Contributor

@Partheo Partheo left a comment

Choose a reason for hiding this comment

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

Fixed it for you

smorgli
smorgli approved these changes Aug 17, 2020
View reviewed changes
Copy link
Contributor

@smorgli smorgli left a comment

Choose a reason for hiding this comment

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

mappers are happy

@smorgli smorgli merged commit 6cde40f into yogstation13:master Aug 17, 2020
Yogbot-13 added a commit that referenced this pull request Aug 17, 2020
@Yogbot-13
Automatic changelog generation #9452 [ci skip]
63aaf18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JamieD1 JamieD1 JamieD1 approved these changes

@Partheo Partheo Partheo approved these changes

@smorgli smorgli smorgli approved these changes

@Ktlwjec1 Ktlwjec1 Awaiting requested review from Ktlwjec1

Assignees
No one assigned
Labels
DME Edit This PR affects the yogstation.DME file Feature This adds new content to the game Mapping Will result in a change to a map. Sprites This PR has spriting changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@boodaliboo @ynot01 @JamieD1 @Partheo @smorgli @Yogbot-13