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

Generic name to object #38716

Merged
merged 1 commit into from
Mar 12, 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
2 changes: 1 addition & 1 deletion data/json/items/book/maps.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"id": "trailmap",
"copy-from": "abstractmap",
"type": "GENERIC",
"name": "trail guide",
"name": { "str": "trail guide" },
"description": "This is a printed guide to the best local trails. It has general details about the trails, trailhead amenities, suggestions for the best thru-hikes, and advice on interacting with local wildlife in a responsible and respectful manner.",
"color": "green",
"use_action": {
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -549,13 +549,13 @@
"id": "tree_spile",
"symbol": ".",
"color": "light_gray",
"name": "tree spile",
"name": { "str": "tree spile" },
"description": "A hollow metal cylinder which is inserted in a tree crust in order to slowly harvest its sap. Can be used on a maple tree in between late winter and early spring to harvest maple sap.",
"category": "tools",
"price": 5,
"material": "steel",
"weight": "11 g",
"volume": 0
"volume": "50 ml"
},
{
"type": "GENERIC",
Expand Down Expand Up @@ -1295,7 +1295,7 @@
"id": "transponder",
"symbol": ",",
"color": "light_gray",
"name": "transponder circuit",
"name": { "str": "transponder circuit" },
"category": "spare_parts",
"description": "A circuit designed to repeat a signal. Useful for crafting communications equipment.",
"price": 14000,
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@
"id": "umbrella",
"type": "GENERIC",
"category": "tools",
"name": "umbrella",
"name": { "str": "umbrella" },
"description": "An umbrella with a pointy end, useful for keeping dry when wielded.",
"weight": "141 g",
"volume": "1500 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/vehicle/alternator.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"abstract": "vehicle_alternator",
"type": "GENERIC",
"name": "vehicle alternator",
"name": { "str": "vehicle alternator" },
"category": "veh_parts",
"material": [ "steel", "copper" ],
"symbol": ",",
Expand Down Expand Up @@ -42,7 +42,7 @@
"id": "alternator_truck",
"copy-from": "vehicle_alternator",
"type": "GENERIC",
"name": "truck alternator",
"name": { "str": "truck alternator" },
"description": "A larger and more powerful alternator used to power vehicle electrical systems.",
"weight": "5800 g",
"volume": "3 L",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/vehicle/controls.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
{
"type": "GENERIC",
"id": "veh_tracker",
"name": "vehicle tracking device",
"name": { "str": "vehicle tracking device" },
"description": "A vehicle tracking device. When installed on a vehicle it allows you track the vehicle.",
"weight": "400 g",
"color": "red",
Expand Down Expand Up @@ -127,7 +127,7 @@
{
"type": "GENERIC",
"id": "turret_controls",
"name": "turret control unit",
"name": { "str": "turret control unit" },
"description": "A set of motor, camera, and various electronic modules banded together to allow for tracking targets, friend-or-foe identification, and firing the connected turret in full automatic mode.",
"weight": "4000 g",
"color": "white",
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/vehicle/rigs.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"abstract": "vehicle_rig",
"type": "GENERIC",
"category": "veh_parts",
"name": "vehicle crafting rig",
"name": { "str": "vehicle crafting rig" },
"weight": "40000 g",
"volume": "20 L",
"price": 40000,
Expand All @@ -29,14 +29,14 @@
"id": "forgerig",
"copy-from": "vehicle_rig",
"type": "GENERIC",
"name": "vehicle forge rig",
"name": { "str": "vehicle forge rig" },
"description": "A forge rig made to run off a vehicle's storage battery with integrated tool storage for metalworking equipment."
},
{
"id": "kilnrig",
"copy-from": "vehicle_rig",
"type": "GENERIC",
"name": "vehicle kiln",
"name": { "str": "vehicle kiln" },
"description": "An electric kiln made to run off a vehicle's storage battery."
},
{
Expand All @@ -50,7 +50,7 @@
"id": "weldrig",
"copy-from": "vehicle_rig",
"type": "GENERIC",
"name": "vehicle welding rig",
"name": { "str": "vehicle welding rig" },
"description": "A welding rig made to run off a vehicle's storage battery. It has a soldering iron attachment for delicate work, and a compartment to store your extra tools in."
}
]
4 changes: 2 additions & 2 deletions data/json/items/vehicle/solar.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
{
"type": "GENERIC",
"id": "solar_panel_v2",
"name": "upgraded solar panel",
"name": { "str": "upgraded solar panel" },
"description": "Electronic device that can convert solar radiation into electric power. This panel has been upgraded to convert more sunlight into power. Useful for a vehicle.",
"weight": "18494 g",
"volume": "4500 ml",
Expand All @@ -40,7 +40,7 @@
{
"type": "GENERIC",
"id": "reinforced_solar_panel_v2",
"name": "upgraded reinforced solar panel",
"name": { "str": "upgraded reinforced solar panel" },
"description": "An upgraded solar panel that has been covered with a pane of reinforced glass to protect the delicate solar cells from zombies or errant baseballs. The glass causes this panel to produce slightly less power than a normal upgraded panel. Useful for a vehicle.",
"weight": "29062 g",
"to_hit": -5,
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/vehicle/turrets.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"id": "turret_mount",
"type": "GENERIC",
"name": "turret mount",
"name": { "str": "turret mount" },
"description": "A universal mount for weapons intended to be installed as turrets.",
"color": "cyan",
"symbol": "X",
Expand Down