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

tool Name to object, leave the s #37792

Merged
merged 1 commit into from
Feb 7, 2020
Merged

tool Name to object, leave the s #37792

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/melee/swords_and_blades.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,7 @@
"id": "knife_trench",
"type": "TOOL",
"category": "weapons",
"name": "trench knife",
"name_plural": "trench knives",
"name": { "str": "trench knife", "str_pl": "trench knives" },
"description": "This stout combat knife features a steel guard to protect the user's knuckles. The guard can also be used for striking or blocking, and the knife can also be used to butcher corpses.",
"weight": "608 g",
"volume": "500 ml",
Expand Down
9 changes: 3 additions & 6 deletions data/json/items/tool/electronics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,8 +351,7 @@
"id": "mp3_on",
"copy-from": "mp3",
"type": "TOOL",
"name": "mp3 player (on)",
"name_plural": "mp3 players (on)",
"name": { "str": "mp3 player (on)", "str_pl": "mp3 players (on)" },
"description": "This mp3 player is turned on and playing some great tunes, raising your morale steadily while on your person. It runs through batteries quickly; you can turn it off by using it. It also obscures your hearing.",
"power_draw": 1000,
"revert_to": "mp3",
Expand Down Expand Up @@ -435,8 +434,7 @@
{
"id": "smart_phone",
"type": "TOOL",
"name": "smartphone",
"name_plural": "smartphones",
"name": { "str": "smartphone" },
"description": "A popular, fancy smartphone. Capable of making photos due to integrated camera and illuminating an area as per flashlight app, assuming it has enough charge. The smartphone also has a clock app that includes an alarm. Runs on a small, rechargeable power cell compatible with Unified Power Supply.",
"weight": "230 g",
"volume": "100 ml",
Expand Down Expand Up @@ -480,8 +478,7 @@
"id": "smart_phone_flashlight",
"copy-from": "smart_phone",
"type": "TOOL",
"name": "smartphone - Flashlight",
"name_plural": "smartphones - Flashlight",
"name": { "str": "smartphone - Flashlight", "str_pl": "smartphones - Flashlight" },
"power_draw": 1500,
"revert_to": "smart_phone",
"use_action": {
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/tool/knives.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
"id": "diveknife",
"type": "TOOL",
"category": "weapons",
"name": "dive knife",
"name_plural": "dive knives",
"name": { "str": "dive knife", "str_pl": "dive knives" },
"//": "Too small to be effectively used for butchering, still not bad at it due to serrated edge.",
"description": "This is a short, sturdy knife with a serrated edge for cutting lines and straps, and a blunt tip for prying. Used primarily by divers, it is very light and takes up virtually no space in one's pockets.",
"weight": "226 g",
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/tool/workshop.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,8 +822,7 @@
{
"id": "toolbox_workshop",
"type": "TOOL",
"name": "workshop toolbox",
"name_plural": "workshop toolboxes",
"name": { "str": "workshop toolbox", "str_pl": "workshop toolboxes" },
"description": "This is a stout metal box containing a complete tool kit suitable for most household maintenance and construction activities, as well as additional tools used in workshops for advanced fabrication jobs.",
"looks_like": "toolbox",
"weight": "3994 g",
Expand Down