Skip to content

Commit

Permalink
Merge branch 'cardboard-boxes1' of github.com:I-am-Erk/Cataclysm-DDA …
Browse files Browse the repository at this point in the history
…into cardboard-boxes1
  • Loading branch information
I-am-Erk committed Dec 7, 2019
2 parents fc27b73 + 1a3dacd commit b9192f2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions data/json/itemgroups/collections_trades.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"//2": "often spawns a box to hold everything, sometimes a plastic sheet to cover it, and then some stuff in the box.",
"subtype": "collection",
"items": [
{ "distribution": [ { "item": "box_medium", "prob": 75 }, { "item": "box_large", "prob": 25 } ], "prob": 60 },
[ "plastic_sheet", 25 ],
{ "distribution": [ { "item": "box_medium", "prob": 75 }, { "item": "box_large", "prob": 25 } ], "prob": 25 },
[ "plastic_sheet", 10 ],
{
"distribution": [
{ "group": "tools_general", "prob": 90 },
Expand Down

0 comments on commit b9192f2

Please sign in to comment.