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

Already on GitHub? Sign in to your account

adds the flaming moe a new animated bar drink #8630

Merged
merged 8 commits into from Jun 12, 2020

Conversation

boodaliboo
Copy link
Contributor

a drink ive wanted to make for months
https://cdn.discordapp.com/attachments/713291733303164938/713302316224086026/2020-05-22_14-08-00.mp4
moe 2 is the one in use
it currently suppreses hallucinations and lessens stuns slightly and heats you up
and has a small chance to remove some toxins damage
made with tequila creme de menthe and synaptizine heated to 500

Changelog

馃啈
rscadd: Added a new bar drink
mageadd: added animated icons for the flaming moe
/:cl:

@boodaliboo
Copy link
Contributor Author

can someone rerun travis

@github-actions github-actions bot added the Sprites This PR has spriting changes label May 22, 2020
@Hopekz Hopekz added the Awaiting - Action - Maintainer This PR is awaiting an action from a maintainer label May 23, 2020
@iWuna
Copy link

iWuna commented May 23, 2020

lol, nice

Copy link

@iWuna iWuna left a comment

Choose a reason for hiding this comment

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

Checked code etc, looks fine, but i still dunno why it shold remove LCD from hooman

@alexkar598
Copy link
Member

Not a fan of stun reduction

@MacHac
Copy link
Contributor

MacHac commented May 25, 2020

Chug Flaming Moes before a fight and be immune to go horizontal for a few minutes?

Also, shouldn't it be the Flaming Homer?

@boodaliboo
Copy link
Contributor Author

Chug Flaming Moes before a fight and be immune to go horizontal for a few minutes?

Also, shouldn't it be the Flaming Homer?

it technically should be but flaming moe sounds better

@Hopekz
Copy link
Contributor

Hopekz commented May 28, 2020

Why is this PR adding like 40 icons to icons/drinks.dmi?

@iWuna
Copy link

iWuna commented Jun 3, 2020

Why is this PR adding like 40 icons to icons/drinks.dmi?

because it's contains over 40 icon animations?

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.

Code good, ident needs to review sprites.

@JamieD1 JamieD1 added Awaiting - Merge This PR is ready for merge and removed Awaiting - Action - Maintainer This PR is awaiting an action from a maintainer labels Jun 6, 2020
@fluffe9911 fluffe9911 merged commit e864398 into yogstation13:master Jun 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Awaiting - Merge This PR is ready for merge Sprites This PR has spriting changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants