Skip to content

Commit

Permalink
Merge pull request #38287 from pjf/poppy_tallow_chems
Browse files Browse the repository at this point in the history
🧈  Move tainted tallow and poppy buds to the chemical category. 🌺
  • Loading branch information
Rivet-the-Zombie authored Feb 25, 2020
2 parents b54b890 + a0f0f0f commit 3166271
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion data/json/items/comestibles/carnivore.json
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,7 @@
"type": "COMESTIBLE",
"id": "tallow_tainted",
"name": "tainted tallow",
"category": "other",
"category": "chems",
"weight": "128 g",
"color": "light_gray",
"use_action": "POISON",
Expand Down
1 change: 1 addition & 0 deletions data/json/items/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -1808,6 +1808,7 @@
"type": "GENERIC",
"id": "poppy_bud",
"name": "poppy bud",
"category": "chems",
"description": "A poppy bud. Contains some substances commonly produced by a mutated poppy flower.",
"weight": "30 g",
"to_hit": -3,
Expand Down

0 comments on commit 3166271

Please sign in to comment.