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

Already on GitHub? Sign in to your account

Jump to bottom

Vegan Trait #66511

Merged
merged 136 commits into from
Jun 29, 2023
Merged

Vegan Trait #66511

merged 136 commits into from
Jun 29, 2023

Conversation

Holli-Git
Copy link
Contributor

Summary

Content "Vegan Trait"

Purpose of change

I've always liked the challenge of going without animal products in game, but found it very difficult to impose restrictions myself, as items would often have animal products without me even knowing. So, this PR adds a vegan trait, along with some miscellaneous fixes such as human blood now being cannibalistic.

Describe the solution

Adds a vegan trait, along with some vegan friendly options for the more important clothing items.

Describe alternatives you've considered

Not doing this?

Testing

Compiled, tested, no errors.

Additional context

Holli-Git and others added 30 commits July 13, 2021 14:13
@Holli-Git
Create polymer_plant
2a836e1
@Holli-Git
Merge branch 'master' of https://github.com/Paprika-H/Cataclysm-DDA
1d70a6a
@Holli-Git
Merge branch 'master' of https://github.com/Paprika-H/Cataclysm-DDA
f786c19
@Holli-Git
Update character_attire.cpp
7d17941
@Holli-Git
Update mutations.json
5b93ca4
@Holli-Git
Update character_attire.cpp
51d106d
@Holli-Git
faux fur gloves
82f8f35
@Holli-Git
faux fur feet styuff
fe993c1
@Holli-Git
faux fur scarfs
ad9fdfb
@Holli-Git
faux fur boots recipes
60cf281
@Holli-Git
Update hands.json
93f988c
@Holli-Git
Update feet.json
82c9c23
@Holli-Git
Update hands.json
0d69444
@Holli-Git
Update character_attire.cpp
a8cb3a1
@Holli-Git
Update flag.h
020c6be
@Holli-Git
Update flag.cpp
e6d2239
@Holli-Git
Update consumption.cpp
c203308
@Holli-Git
Update flags.json
3569ad8
@Holli-Git
Update dairy.json
82c0a04
@Holli-Git
Update consumption.cpp
ff6653b
@Holli-Git
Update flag.cpp
c3ce82e
@Holli-Git
Update consumption.cpp
776e4d0
@Holli-Git
Update flags.json
f6b787c
@Holli-Git
Update boots.json
b0fcf08
@Holli-Git
Update gloves.json
ec572d7
@Holli-Git
Update suits_protection.json
ec10d7d
@Holli-Git
Update suit.json
9f0b6e4
@Holli-Git
Update flag.h
99eb999
@Holli-Git
Update flag.cpp
b0af7ca
@Holli-Git
Update flags.json
68394c7
@github-actions github-actions bot added Items: Armor / Clothing Armor and clothing Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies Spawn Creatures, items, vehicles, locations appearing on map labels Jun 28, 2023
github-actions[bot]
github-actions bot reviewed Jun 28, 2023
View reviewed changes
data/json/items/armor/holster.json Outdated Show resolved Hide resolved
data/json/recipes/armor/storage.json Outdated Show resolved Hide resolved
@Holli-Git @github-actions
Apply suggestions from code review
7670c39 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Jun 28, 2023
@anoobindisguise
Copy link
Contributor

anoobindisguise commented Jun 28, 2023 •
edited
Loading

You should add gutskin to the list of vegan non wearables. There are like 2 items in the game that have it and they don't show up naturally, but it is made from stomach.
Make sure to add flag_URSINE_HONEY to the food blacklist!

@Holli-Git
Copy link
Contributor Author

You should add gutskin to the list of vegan non wearables. There are like 2 items in the game that have it and they don't show up naturally, but it is made from stomach. Make sure to add flag_URSINE_HONEY to the food blacklist!

Good catch!

@github-actions
Copy link
Contributor

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • nylon scabbards

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Jun 28, 2023
dseguin
dseguin reviewed Jun 29, 2023
View reviewed changes
src/character_attire.cpp Outdated Show resolved Hide resolved
src/item_factory.cpp Outdated Show resolved Hide resolved
src/consumption.cpp Show resolved Hide resolved
src/consumption.cpp Outdated Show resolved Hide resolved
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jun 29, 2023
github-actions[bot]
github-actions bot reviewed Jun 29, 2023
View reviewed changes
src/consumption.cpp Outdated Show resolved Hide resolved
@github-actions github-actions bot removed the astyled astyled PR, label is assigned by github actions label Jun 29, 2023
@Holli-Git @github-actions
Update src/consumption.cpp
97a6a8d 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Jun 29, 2023
@dseguin dseguin merged commit f0cadfe into CleverRaven:master Jun 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

@dseguin dseguin dseguin left review comments

Assignees
No one assigned
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions [C++] Changes (can be) made in C++. Previously named `Code` Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Armor / Clothing Armor and clothing [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mutations / Traits / Professions/ Hobbies Mutations / Traits / Professions/ Hobbies Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Holli-Git @anoobindisguise @dseguin