Skip to content

Commit

Permalink
Merge pull request CleverRaven#77801 from Night-Pryanik/pillow
Browse files Browse the repository at this point in the history
Increased volume of pillows, body-pillow, and volume capacity of pillowcase
  • Loading branch information
Maleclypse authored Nov 14, 2024
2 parents 65b3721 + 7363294 commit 27b424d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions data/json/items/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -2942,7 +2942,7 @@
"material": [ "cotton" ],
"weight": "514 g",
"container": "pillowcase",
"volume": "1 L",
"volume": "40 L",
"flags": [ "SLEEP_AID" ],
"category": "other"
},
Expand All @@ -2958,7 +2958,7 @@
"material": [ "paper" ],
"weight": "514 g",
"container": "pillowcase",
"volume": "1 L",
"volume": "40 L",
"flags": [ "SLEEP_AID" ],
"category": "other"
},
Expand All @@ -2973,7 +2973,7 @@
"price_postapoc": "1 USD",
"material": [ "cotton" ],
"weight": "774 g",
"volume": "1750 ml",
"volume": "70 L",
"flags": [ "SLEEP_AID" ],
"variant_type": "generic",
"variants": [
Expand Down Expand Up @@ -3069,7 +3069,7 @@
"material": [ "cotton" ],
"weight": "514 g",
"container": "pillowcase",
"volume": "1 L",
"volume": "40 L",
"flags": [ "SLEEP_AID" ],
"category": "other"
},
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/generic/bedding.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "clumsy" },
"material": [ "cotton" ],
"flags": [ "SLEEP_AID_CONTAINER" ],
"pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "15 L", "max_contains_weight": "15 kg", "moves": 400 } ],
"pocket_data": [ { "pocket_type": "CONTAINER", "max_contains_volume": "42 L", "max_contains_weight": "15 kg", "moves": 400 } ],
"symbol": ")",
"color": "white",
"//": "Based on https://www.amazon.com/dp/B01MUDQUN9"
Expand Down

0 comments on commit 27b424d

Please sign in to comment.