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

Jump to bottom

Tool Names to object #37672

Merged
merged 1 commit into from
Feb 3, 2020
Merged

Tool Names to object #37672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 2 deletions data/json/items/fake.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@
"id": "fake_goggles",
"copy-from": "fake_item",
"type": "TOOL",
"name": "bionic goggles",
"name_plural": "bionic goggles",
"name": { "str": "bionic goggles", "str_pl": "bionic goggles" },
"qualities": [ [ "GLARE", 2 ] ]
},
{
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/melee/swords_and_blades.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,7 @@
"id": "knife_combat_mod",
"copy-from": "knife_combat",
"type": "TOOL",
"name": "modified combat knife",
"name_plural": "modified combat knives",
"name": { "str": "modified combat knife", "str_pl": "modified combat knives" },
"description": "This is a military combat knife. It is light and extremely sharp, and could be deadly in either the right hands or when attached as a bayonet. This one was modified and customized to mount on pretty much any weapon other than pistols, if you so want.",
"gunmod_data": {
"location": "underbarrel",
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/tool/lighting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,8 +448,7 @@
"//": "This doesn't make too much sense, flavor-wise, but it's the best I can come up with. Put it on the todo list.",
"id": "lightstrip_inactive",
"type": "TOOL",
"name": "lightstrip (inactive)",
"name_plural": "lightstrips (inactive)",
"name": { "str": "lightstrip (inactive)", "str_pl": "lightstrips (inactive)" },
"copy-from": "lightstrip_base",
"description": "This is a light-emitting circuit that can be wired directly to a battery. It provides some weak light and can't be turned off until the battery dies.",
"color": "white",
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/vehicle/utilities.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
"type": "TOOL",
"id": "black_box",
"category": "other",
"name": "military black box",
"name_plural": "military black boxes",
"name": { "str": "military black box", "str_pl": "military black boxes" },
"description": "This is a black box, seemingly pulled from some sort of military vehicle wreckage. If you can find a system to analyze this you may find something of interest.",
"weight": "4535 g",
"volume": "2 L",
Expand Down