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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove table buff/debuff for medicine #39598

Merged
merged 1 commit into from
Apr 17, 2020

Conversation

wapcaplet
Copy link
Contributor

@wapcaplet wapcaplet commented Apr 15, 2020

Summary

SUMMARY: Bugfixes "Remove table buff/debuff for medicine"

Purpose of change

Fixes #39580

Describe the solution

Excludes "comestible type == MED" from consideration for table-related morale effects in consumption.cpp : modify_morale

Describe alternatives you've considered

Considered nuking the rigid table manners trait from the game but was talked down by more level-headed developers.

Testing

Expanded the existing test cases to include aspirin, caffeine, codeine, dayquil, oxycodone and others that were incorrectly getting table-related buffs and debuffs.

@curstwist curstwist added Items / Item Actions / Item Qualities Items and how they work and interact [C++] Changes (can be) made in C++. Previously named `Code` labels Apr 16, 2020
@wapcaplet
Copy link
Contributor Author

wapcaplet commented Apr 16, 2020

Travis CI fails to add apt repository in setup with “Error: retrieving gpg key timed out.”

@ZhilkinSerg
Copy link
Contributor

But I like my aspirin more when it is served properly and fancy.

@ZhilkinSerg ZhilkinSerg merged commit 06edab0 into CleverRaven:master Apr 17, 2020
@wapcaplet wapcaplet deleted the dining-on-drugs branch April 25, 2020 19:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[C++] Changes (can be) made in C++. Previously named `Code` Items / Item Actions / Item Qualities Items and how they work and interact
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Eating/taking non-foods should not trigger Rigid Table Manners debuff
3 participants