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

Deconstructing a water heater yields a 100L tank instead of 60L #68359

Merged
merged 2 commits into from
Sep 28, 2023
Merged

Deconstructing a water heater yields a 100L tank instead of 60L #68359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7eb0253
Deconstructing a water heater yields a 100L tank instead of 60L
db48x Sep 27, 2023
f37d04c
bugfix: keg_capacity is measured in cups, not liters
db48x Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion data/json/furniture_and_terrain/furniture-plumbing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,9 @@
"coverage": 55,
"required_str": -1,
"flags": [ "CONTAINER", "PLACE_ITEM", "LIQUIDCONT", "NOITEM", "SEALED", "EASY_DECONSTRUCT", "SMALL_HIDE" ],
"//": "keg_capacity assumed to be from model XE36S06ST45U0 water heater <https://images.thdstatic.com/catalog/pdfImages/2d/2d7ed116-1a8c-439d-b7fe-a62a0a98f806.pdf>",
"examine_action": "keg",
"keg_capacity": 240,
"keg_capacity": 400,
"deconstruct": { "items": [ { "item": "household_water_heater", "count": 1 } ] },
"bash": {
"str_min": 18,
Expand Down
1 change: 1 addition & 0 deletions data/json/items/generic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1271,6 +1271,7 @@
"price": 0,
"price_postapoc": 10,
"material": [ "steel" ],
"//": "weight and volume assumed to be from model XE36S06ST45U0 water heater <https://images.thdstatic.com/catalog/pdfImages/2d/2d7ed116-1a8c-439d-b7fe-a62a0a98f806.pdf>",
"weight": "54431 g",
"volume": "240 L",
"to_hit": -5,
Expand Down
5 changes: 3 additions & 2 deletions data/json/recipes/recipe_deconstruction.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4183,8 +4183,9 @@
[ [ "thermostat", 1 ] ],
[ [ "water_faucet", 1 ] ],
[ [ "pipe_fittings", 6 ] ],
[ [ "metal_tank", 1 ] ]
]
[ [ "30gal_drum", 1 ] ]
],
"//": "drum assumed to be from model XE36S06ST45U0 water heater <https://images.thdstatic.com/catalog/pdfImages/2d/2d7ed116-1a8c-439d-b7fe-a62a0a98f806.pdf>"
},
{
"result": "television",
Expand Down