Skip to content

Commit

Permalink
Fix overwriting already-inherited values
Browse files Browse the repository at this point in the history
  • Loading branch information
RobbieNeko authored Jan 6, 2025
1 parent d8a17cf commit 65ac838
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 5 deletions.
3 changes: 0 additions & 3 deletions data/json/items/tool/electronics.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,10 @@
"revert_to": "cell_phone",
"use_action": { "target": "cell_phone", "msg": "You stop lighting up the screen.", "menu_text": "Turn off", "type": "transform" },
"flags": [ "WATCH", "LIGHT_8", "TRADER_AVOID" ],
"category": "electronics"
},
{
"id": "control_laptop",
"type": "TOOL",
"category": "electronics",
"copy-from": "laptop",
"name": { "str": "control laptop" },
"description": "A modified laptop, now capable of transmitting in the ultra-high frequencies utilized by robots. Activate it to command robots from afar, or to toggle charging via UPS.",
Expand Down Expand Up @@ -273,7 +271,6 @@
"use_action": "GEIGER",
"flags": [ "TRADER_AVOID" ],
"magazine_well": "250 ml",
"category": "electronics"
},
{
"id": "hand_crank_charger",
Expand Down
1 change: 0 additions & 1 deletion data/json/items/tool/pets.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@
"symbol": "#",
"color": "brown",
"looks_like": "pet_carrier",
"category": "tools_farming"
},
{
"id": "dog_whistle_wood",
Expand Down
1 change: 0 additions & 1 deletion data/json/items/tool/tailoring.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"material": [ "steel", "wood" ],
"delete": { "qualities": [ [ "LEATHER_AWL", 1 ] ] },
"extend": { "qualities": [ [ "LEATHER_AWL", 2 ] ] },
"category": "tools_workshop"
},
{
"id": "knitting_needles",
Expand Down

0 comments on commit 65ac838

Please sign in to comment.