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.

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

Refridgerated Tank Fix #40235

Merged
merged 7 commits into from
Jul 26, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 12 additions & 3 deletions data/json/items/vehicle/utilities.json
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,18 @@
"id": "fridgetank",
"name": { "str": "refrigerated tank" },
"description": "A 60L refrigerated tank for keeping liquids cool. Provides some insulation from outside weather.",
"insulation": 2,
"volume": "60 L",
"weight": "48 kg"
"insulation": 10,
"volume": "72 L",
"weight": "48 kg",
"pocket_data": [
{
"pocket_type": "CONTAINER",
"rigid": true,
"watertight": true,
"max_contains_volume": "60 L",
"max_contains_weight": "400 kg"
}
]
},
{
"type": "GENERIC",
Expand Down
30 changes: 30 additions & 0 deletions data/json/vehicleparts/tanks.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,36 @@
"flags": [ "FLUIDTANK" ],
"damage_reduction": { "all": 28, "stab": 12 }
},
{
"id": "fridgetank",
"type": "vehicle_part",
"name": { "str": "refrigerated tank (60L)" },
"item": "fridgetank",
"location": "fuel_source",
"symbol": "O",
"broken_color": "red",
"durability": 150,
"description": "A 60L refrigerated tank. When turned on, it will cool the liquid inside, extending the time until the food spoils.",
"size": 600500,
"damage_modifier": 80,
"epower": -40,
"breaks_into": [
{ "item": "steel_lump", "count": [ 2, 2 ] },
{ "item": "steel_chunk", "count": [ 1, 2 ] },
{ "item": "scrap", "count": [ 1, 5 ] }
],
"requirements": {
"install": {
"skills": [ [ "mechanics", 1 ] ],
"time": "90 m",
"qualities": [ { "id": "WRENCH", "level": 2 }, { "id": "DRILL", "level": 2 } ]
},
"removal": { "skills": [ [ "mechanics", 1 ] ], "time": "45 m", "qualities": [ { "id": "WRENCH", "level": 2 } ] },
"repair": { "skills": [ [ "mechanics", 1 ] ], "time": "45 m", "using": [ [ "welding_standard", 5 ] ] }
},
"flags": [ "FLUIDTANK", "FRIDGE", "ENABLED_DRAINS_EPOWER" ],
"damage_reduction": { "all": 28, "stab": 12 }
},
{
"id": "external_tank_small",
"type": "vehicle_part",
Expand Down
32 changes: 0 additions & 32 deletions data/json/vehicleparts/vehicle_parts.json
Original file line number Diff line number Diff line change
Expand Up @@ -3623,37 +3623,5 @@
"removal": { "skills": [ [ "mechanics", 3 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ] }
},
"breaks_into": "ig_vp_device"
},
{
"type": "vehicle_part",
"id": "fridgetank",
"name": { "str": "refrigerated tank (60L)" },
"symbol": "O",
"looks_like": "f_fridge",
"color": "light_gray",
"broken_symbol": "#",
"broken_color": "light_blue",
"damage_modifier": 80,
"durability": 100,
"description": "A 60L refrigerated tank. When turned on, it will cool the liquid inside, extending the time until the food spoils.",
"//": "Use average consumption, not the max on the appliance rating plate. 30W ~ 260kWh per annum",
"epower": -30,
"size": 300,
"item": "fridgetank",
"location": "fuel_source",
"requirements": {
"install": { "skills": [ [ "mechanics", 4 ] ], "time": "60 m", "using": [ [ "vehicle_bolt", 1 ] ] },
"removal": { "skills": [ [ "mechanics", 2 ] ], "time": "30 m", "using": [ [ "vehicle_bolt", 1 ] ] },
"repair": { "skills": [ [ "mechanics", 5 ] ], "time": "60 m", "using": [ [ "welding_standard", 5 ] ] }
},
"flags": [ "FLUIDTANK", "FRIDGE", "ENABLED_DRAINS_EPOWER" ],
"breaks_into": [
{ "item": "steel_lump", "count": [ 8, 13 ] },
{ "item": "steel_chunk", "count": [ 8, 13 ] },
{ "item": "scrap", "count": [ 8, 13 ] },
{ "item": "hose", "prob": 50 },
{ "item": "motor_tiny", "prob": 25 }
],
"damage_reduction": { "all": 32 }
}
]