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

Desk fan audit #78499

Merged
merged 1 commit into from
Dec 12, 2024
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
9 changes: 5 additions & 4 deletions data/json/items/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -2142,16 +2142,17 @@
"name": { "str": "desk fan" },
"description": "A small fan, used to propel air around a room.",
"color": "light_gray",
"price": "10 USD",
"price": "25 USD",
"price_postapoc": "10 cent",
"material": [ "aluminum", "plastic" ],
"flags": [ "WATER_BREAK" ],
"flags": [ "WATER_BREAK", "FRAGILE_MELEE" ],
"ammo": [ "battery" ],
"charges_per_use": 4,
"use_action": [ { "type": "link_up", "cable_length": 3, "charge_rate": "35 W" } ],
"charged_qualities": [ [ "WINNOW", 1 ] ],
"weight": "2857 g",
"volume": "1 L",
"weight": "1588 g",
"volume": "19265 ml",
"//": "Based on https://www.amazon.com/dp/B000U9WXEC, although the volume calculated from package dimensions has been multiplied by 0.5 because there really is not a reasonable way to calculate fan volume without the numbers going into extremes",
"to_hit": { "grip": "none", "length": "short", "surface": "any", "balance": "clumsy" },
"melee_damage": { "bash": 4 }
},
Expand Down
6 changes: 3 additions & 3 deletions data/json/uncraft/recipe_deconstruction.json
Original file line number Diff line number Diff line change
Expand Up @@ -2561,9 +2561,9 @@
"result": "fan",
"type": "uncraft",
"activity_level": "LIGHT_EXERCISE",
"time": "2 m",
"qualities": [ { "id": "SCREW", "level": 1 } ],
"components": [ [ [ "scrap_aluminum", 1 ] ], [ [ "plastic_chunk", 3 ] ], [ [ "motor_micro", 1 ] ], [ [ "cable", 2 ] ] ]
"time": "5 m",
"qualities": [ { "id": "SCREW", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
"components": [ [ [ "scrap_aluminum", 10 ] ], [ [ "plastic_chunk", 15 ] ], [ [ "motor_micro", 1 ] ], [ [ "cable", 30 ] ] ]
},
{
"result": "fancy_sunglasses",
Expand Down
1 change: 0 additions & 1 deletion data/mods/TEST_DATA/known_bad_density.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
"vortex",
"wasp_sting",
"hotdogs_cooked",
"fan",
"poppysyrup",
"broken_lab_security_drone_BM2",
"bot_lab_security_drone_BS",
Expand Down
Loading