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

Tool name to object #38561

Merged
merged 2 commits into from
Mar 4, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
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/ammo.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"id": "RTG_coffee",
"category": "spare_parts",
"price": 20000,
"name": "radioisotope thermoelectric generator",
"name": { "str": "radioisotope thermoelectric generator" },
"symbol": "=",
"color": "green",
"description": "Did your neighbors brag about their cool beta-decay powered nightlights? Do them one better! The CuppaTech 4 radioisotope thermoelectric generator is a three kilogram chunk of metal - mostly lead - with a slug of curium-244 encased within. It is capable of generating somewhere between 100-150 Watts of thermal energy, although its electrical generation capacity is minimal at only 2 Watts. Careful! Curium is great at making heat, and also releases deadly gamma radiation. Keep away from cellular life forms.",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -2476,13 +2476,13 @@
"type": "TOOL",
"symbol": ",",
"color": "yellow",
"name": "prototype I/O recorder",
"name": { "str": "prototype I/O recorder" },
"description": "This small transparent card was attached to the prototype robot's CPU. It might contain the data the intercom spoke of.",
"category": "other",
"price": 500,
"material": "plastic",
"weight": "6 g",
"volume": 0,
"volume": "5 ml",
"to_hit": -3
},
{
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/melee/swords_and_blades.json
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@
"type": "TOOL",
"symbol": "/",
"color": "light_gray",
"name": "scimitar",
"name": { "str": "scimitar" },
"description": "This is a curved sword associated with various Middle Eastern and Central Asian countries. Designed for slashing, and quite deadly against unarmored targets.",
"price": 93000,
"material": "iron",
Expand All @@ -410,7 +410,7 @@
"type": "TOOL",
"symbol": "/",
"color": "light_gray",
"name": "scimitar",
"name": { "str": "scimitar" },
"description": "This is a curved sword associated with various Middle Eastern and Central Asian countries. This one seems oddly dull and worn.",
"price": 93000,
"material": "budget_steel",
Expand Down Expand Up @@ -1179,7 +1179,7 @@
"id": "rapier",
"type": "TOOL",
"category": "weapons",
"name": "rapier",
"name": { "str": "rapier" },
"description": "This is a thin sword with an ornate hand guard. It looks like the preferred weapon of gentlemen and swashbucklers. Light and quick, it makes any battle a stylish battle.",
"weight": "1000 g",
"volume": "1500 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/tool/cooking.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
{
"id": "butter_churn",
"type": "TOOL",
"name": "pseudo butter churn",
"name": { "str": "pseudo butter churn" },
"description": "This is a crafting_pseudo_item if you have it something is wrong.",
"weight": "6464 g",
"volume": "9 L",
Expand Down Expand Up @@ -769,7 +769,7 @@
{
"id": "rock_quern",
"type": "TOOL",
"name": "quern",
"name": { "str": "quern" },
"description": "This is a simple hand-powered stone quern for grinding grain.",
"weight": "3264 g",
"volume": "2 L",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/tool/deployable.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,9 @@
{
"id": "generic_folded_vehicle",
"type": "TOOL",
"name": "seeing this is a bug",
"name": { "str": "seeing this is a bug" },
snipercup marked this conversation as resolved.
Show resolved Hide resolved
"description": "seeing this is a bug",
"volume": 0,
"volume": "0 ml",
"price": 0,
"symbol": "/",
"color": "light_gray",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/explosives.json
Original file line number Diff line number Diff line change
Expand Up @@ -1070,7 +1070,7 @@
"id": "scrambler",
"type": "TOOL",
"category": "weapons",
"name": "scrambler grenade",
"name": { "str": "scrambler grenade" },
"description": "This is a specialized grenade, designed to scramble robots' IFF control chips. This converts the robot to your side for a short time, before the backup systems kick in. Use this item to pull the pin and light the fuse, turning it into an active scrambler grenade.",
"weight": "500 g",
"volume": "250 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/fire.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
{
"id": "ref_lighter",
"type": "TOOL",
"name": "refillable lighter",
"name": { "str": "refillable lighter" },
"description": "This is a lighter featuring a flip top cover and refuelable tank. A lighter must be carried to use various drugs, like cigarettes, or to light things like Molotov cocktails. You can also use a lighter to light nearby items on fire.",
"weight": "20 g",
"volume": "31 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/landscaping.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
{
"id": "scythe",
"type": "TOOL",
"name": "scythe",
"name": { "str": "scythe" },
"description": "This is an old-fashioned farming tool used to cut tall grass. While it may be a giant blade on the end of a stick, it is incredibly awkward to use for anything but its intended purpose.",
"weight": "3013 g",
"volume": "3250 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/med.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
{
"id": "scalpel",
"type": "TOOL",
"name": "scalpel",
"name": { "str": "scalpel" },
"description": "This is a very sharp knife designed for surgical cutting. Its small, sharp blade allows for precision strikes in the hands of the skilled.",
"weight": "23 g",
"volume": "15 ml",
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/tool/misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@
{
"id": "rollmat",
"type": "TOOL",
"name": "rollmat",
"name": { "str": "rollmat" },
"description": "This is a sheet of foam which can be rolled tightly for storage. It insulates you from the floor, making it easier to sleep. Use it to unroll and place on the ground.",
"weight": "250 g",
"volume": "1 L",
Expand Down Expand Up @@ -435,10 +435,10 @@
{
"id": "sarcophagus_access_code",
"type": "TOOL",
"name": "sarcophagus access code",
"name": { "str": "sarcophagus access code" },
"description": "This printout is a string of numbers to access the elevator in the hazardous waste sarcophagus.",
"weight": "5 g",
"volume": 0,
"volume": "4 ml",
"price": 0,
"to_hit": -1,
"bashing": 1,
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/tool/radio_tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"id": "radio_mod",
"type": "TOOL",
"category": "spare_parts",
"name": "radio activation mod",
"name": { "str": "radio activation mod" },
"description": "This small piece of electronics can be attached to certain items and activate them after receiving a radio signal.",
"weight": "142 g",
"volume": "250 ml",
Expand Down Expand Up @@ -160,7 +160,7 @@
{
"id": "remotevehcontrol",
"type": "TOOL",
"name": "remote vehicle controller",
"name": { "str": "remote vehicle controller" },
"description": "A remote controller for real cars. Can turn onboard devices on and off. Some cars can be driven remotely.",
"weight": "907 g",
"volume": "1 L",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/tool/science.json
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@
"id": "funnel_separation",
"type": "TOOL",
"category": "tools",
"name": "separation funnel",
"name": { "str": "separation funnel" },
"description": "This thing doesn't look much like a funnel. It's a teardrop shaped piece of glass with a stopper at the wide end and a valve at the other. It can be used to wash one liquid with another, like water and an oil, and then draw off whichever of the two liquids contains a higher amount of whatever compound you're trying to isolate. With a high level of skill it can also be used to make juvenile farting noises.",
"weight": "200 g",
"volume": "700ml",
Expand Down Expand Up @@ -565,7 +565,7 @@
"id": "rotovap",
"type": "TOOL",
"category": "tools",
"name": "rotary evaporator",
"name": { "str": "rotary evaporator" },
"description": "Just looking at this thing makes you feel like a proper mad scientist. It's a series of glass tubes and round flasks, connected to a central motor and a heating element. The heating element warms one flask, kept rotating by the motor, evaporating the contents. The vapour is then condensed in the tubes and collected in another flask, in case you wanted to save it for later.",
"weight": "18000 g",
"volume": "60000ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/tailoring.json
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
{
"id": "sewing_kit",
"type": "TOOL",
"name": "sewing kit",
"name": { "str": "sewing kit" },
"description": "This is a plastic kit with a variety of needles, some plastic spools for thread, and a few other useful textile tools. Use a sewing kit on an article of clothing to attempt to repair or reinforce that clothing. This uses your tailoring skill.",
"weight": "85 g",
"volume": "250 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/toileteries.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"id": "rag",
"type": "TOOL",
"category": "spare_parts",
"name": "rag",
"name": { "str": "rag" },
"description": "This is a largish piece of cloth, useful in crafting and possibly for staunching bleeding.",
"weight": "80 g",
"volume": "250 ml",
Expand Down
8 changes: 4 additions & 4 deletions data/json/items/tool/workshop.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@
{
"id": "hose",
"type": "TOOL",
"name": "rubber hose",
"name": { "str": "rubber hose" },
"description": "This is a flexible rubber hose. It could be used for crafting, or siphoning fuel from a vehicle.",
"weight": "544 g",
"volume": "500 ml",
Expand Down Expand Up @@ -345,7 +345,7 @@
{
"id": "jack_small",
"type": "TOOL",
"name": "scissor jack",
"name": { "str": "scissor jack" },
"description": "A compact scissor jack used for lifting vehicles.",
"material": "steel",
"symbol": ";",
Expand Down Expand Up @@ -675,7 +675,7 @@
{
"id": "screwdriver",
"type": "TOOL",
"name": "screwdriver",
"name": { "str": "screwdriver" },
"description": "This is a Philips-head screwdriver. It is important for almost all electronics crafting, most mechanics crafting, and has many more uses.",
"weight": "170 g",
"volume": "40 ml",
Expand All @@ -692,7 +692,7 @@
{
"id": "screwdriver_set",
"type": "TOOL",
"name": "screwdriver set",
"name": { "str": "screwdriver set" },
"description": "This is a set of screwdrivers in several sizes and blade types. Guaranteed to have the right tools for more precise work.",
"weight": "340 g",
"volume": "500 ml",
Expand Down