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 #38307

Merged
merged 1 commit into from
Feb 24, 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
44 changes: 22 additions & 22 deletions data/json/items/tool/explosives.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "acidbomb",
"type": "TOOL",
"category": "weapons",
"name": "acid bomb",
"name": { "str": "acid bomb" },
"description": "This is a fragile container filled with acid. Throw it to spill out a pool of potent acid.",
"weight": "650 g",
"volume": "500 ml",
Expand Down Expand Up @@ -47,7 +47,7 @@
"id": "can_bomb_act",
"copy-from": "can_bomb",
"type": "TOOL",
"name": "active can bomb",
"name": { "str": "active can bomb" },
"description": "This is a tin can filled to the brim with explosive and with a bit of fuse sticking out of it. Will produce metal shrapnel that can deal with armor… you think. The fuse has been lit, you should throw it.",
"price": 0,
"initial_charges": 5,
Expand All @@ -66,7 +66,7 @@
"id": "c4",
"type": "TOOL",
"category": "weapons",
"name": "C-4 explosive",
"name": { "str": "C-4 explosive" },
"description": "This is military grade RDX composition explosive. A label reads: \"Highly explosive, use with extreme caution!\" It comes with a small timer.",
"weight": "1570 g",
"volume": "1 L",
Expand Down Expand Up @@ -214,7 +214,7 @@
"id": "EMPbomb",
"type": "TOOL",
"category": "weapons",
"name": "EMP bomb",
"name": { "str": "EMP bomb" },
"description": "This substantial device is a bomb that generates an electromagnetic pulse. When activated, the plutonium fuel cell is drained into a flux compression generator, the detonation of which creates a strong magnetic field. When this magnetic field is fed into the antenna, it creates a strong electro-magnetic pulse.",
"weight": "4543 g",
"volume": "15500 ml",
Expand All @@ -240,7 +240,7 @@
"id": "EMPbomb_act",
"type": "TOOL",
"category": "weapons",
"name": "active EMP bomb",
"name": { "str": "active EMP bomb" },
"description": "This EMP bomb is active, and will shortly detonate, creating a large EMP field that damages robots and drains bionic energy, as well as a sizeable explosion. You may not want to be holding it much longer.",
"weight": "19515 g",
"volume": "16 L",
Expand Down Expand Up @@ -415,7 +415,7 @@
"id": "flashbang_act",
"type": "TOOL",
"category": "weapons",
"name": "active flashbang",
"name": { "str": "active flashbang" },
"description": "This flashbang is active, and will soon detonate with intense light and sound, blinding, deafening and disorienting anyone nearby. It may be a good idea to throw it!",
"weight": "236 g",
"volume": "250 ml",
Expand Down Expand Up @@ -468,7 +468,7 @@
"id": "fragment_bomb_act",
"copy-from": "fragment_bomb",
"type": "TOOL",
"name": "active fragment bomb",
"name": { "str": "active fragment bomb" },
"description": "A crude and bulky improvised bomb. Made from a container, an explosive surrounded by small pieces of metal and a fuse. The fuse has been lit, you should throw it.",
"price": 0,
"initial_charges": 5,
Expand Down Expand Up @@ -555,7 +555,7 @@
"id": "gasbomb_makeshift_act",
"type": "TOOL",
"category": "weapons",
"name": "active makeshift gas grenade",
"name": { "str": "active makeshift gas grenade" },
"description": "This homemade canister of poison gas has been unsealed, and is (or will shortly be) expelling highly toxic gas. You should consider getting rid of it soon.",
"weight": "1264 g",
"volume": "250 ml",
Expand Down Expand Up @@ -609,7 +609,7 @@
"id": "grenade_act",
"type": "TOOL",
"category": "weapons",
"name": "active grenade",
"name": { "str": "active grenade" },
"description": "This is an active grenade, and will explode any second now. Better throw it!",
"weight": "397 g",
"volume": "250 ml",
Expand All @@ -635,7 +635,7 @@
"id": "grenade_emp",
"type": "TOOL",
"category": "weapons",
"name": "EMP grenade",
"name": { "str": "EMP grenade" },
"description": "This is a grenade that generates an electromagnetic pulse with a low-inductance capacitor bank discharged into a single-loop antenna. Use this item to pull the pin and light the fuse, turning it into an active EMP grenade. You will then have three turns before it detonates, creating an EMP field that damages robots and drains bionic energy.",
"weight": "400 g",
"volume": "250 ml",
Expand All @@ -662,7 +662,7 @@
"id": "grenade_emp_act",
"type": "TOOL",
"category": "weapons",
"name": "active EMP grenade",
"name": { "str": "active EMP grenade" },
"description": "This EMP grenade is active, and will shortly detonate, creating a large EMP field that damages robots and drains bionic energy. You may not want to be holding it much longer.",
"weight": "400 g",
"volume": "250 ml",
Expand Down Expand Up @@ -714,7 +714,7 @@
"id": "grenade_inc_act",
"type": "TOOL",
"category": "weapons",
"name": "active incendiary grenade",
"name": { "str": "active incendiary grenade" },
"description": "This is an active incendiary grenade, likely to burst into an inferno any second now. Better throw it!",
"weight": "180 g",
"volume": "250 ml",
Expand Down Expand Up @@ -858,7 +858,7 @@
"id": "makeshift_grenade_act",
"copy-from": "makeshift_grenade",
"type": "TOOL",
"name": "active makeshift grenade",
"name": { "str": "active makeshift grenade" },
"description": "This is an active grenade, and will explode any second now. Better throw it!",
"price": 0,
"rand_charges": [ 2, 7 ],
Expand Down Expand Up @@ -924,7 +924,7 @@
"id": "molotov",
"type": "TOOL",
"category": "weapons",
"name": "Molotov cocktail",
"name": { "str": "Molotov cocktail" },
"description": "A bottle of flammable liquid with a rag inserted. Use this item to light the rag. You will, of course, need a lighter or matches in your inventory to do this. After lighting it, throw it to cause fires.",
"weight": "742 g",
"volume": "750 ml",
Expand Down Expand Up @@ -999,7 +999,7 @@
"id": "nail_bomb_act",
"copy-from": "nail_bomb",
"type": "TOOL",
"name": "active nail bomb",
"name": { "str": "active nail bomb" },
"description": "A crude and bulky improvised bomb. Made from a container, an explosive surrounded by nails and a fuse. The fuse has been lit, you should throw it.",
"price": 0,
"initial_charges": 5,
Expand Down Expand Up @@ -1044,7 +1044,7 @@
"id": "pipebomb_act",
"type": "TOOL",
"category": "weapons",
"name": "active pipe bomb",
"name": { "str": "active pipe bomb" },
"description": "This pipe bomb's fuse is lit, and it will explode any second now. Throw it immediately!",
"weight": "1298 g",
"volume": "500 ml",
Expand Down Expand Up @@ -1096,7 +1096,7 @@
"id": "scrambler_act",
"type": "TOOL",
"category": "weapons",
"name": "active scrambler grenade",
"name": { "str": "active scrambler grenade" },
"description": "This scrambler grenade is active, and will soon detonate, releasing a control wave that temporarily converts robots to your side.",
"weight": "500 g",
"volume": "250 ml",
Expand Down Expand Up @@ -1145,7 +1145,7 @@
"id": "tool_anfo_charge",
"type": "TOOL",
"category": "weapons",
"name": "ANFO charge",
"name": { "str": "ANFO charge" },
"description": "This is a large metal keg filled with ANFO pellets and equipped with a dynamite primer. Use this item to light the fuse. You will then have twenty turns before it explodes and creates a large fireball.",
"weight": "77800 g",
"volume": "50 L",
Expand Down Expand Up @@ -1176,7 +1176,7 @@
"id": "tool_anfo_charge_act",
"type": "TOOL",
"category": "weapons",
"name": "active ANFO charge",
"name": { "str": "active ANFO charge" },
"description": "This is a large metal keg filled with ANFO pellets and equipped with a dynamite primer. The fuse has been lit - better run like hell!",
"weight": "77800 g",
"volume": "50 L",
Expand Down Expand Up @@ -1233,7 +1233,7 @@
"id": "tool_black_powder_charge_act",
"type": "TOOL",
"category": "weapons",
"name": "active black gunpowder charge",
"name": { "str": "active black gunpowder charge" },
"description": "This is a home-made explosive device, consisting of a large plastic jug filled with black gunpowder and scrap metal, whose fuse has been lit, its final countdown starting.",
"weight": "6500 g",
"volume": "4 L",
Expand All @@ -1260,7 +1260,7 @@
"id": "tool_rdx_charge",
"type": "TOOL",
"category": "weapons",
"name": "RDX charge",
"name": { "str": "RDX charge" },
"description": "This is a metal keg, filled with 50 liters worth of RDX and scrap metal. Contains a core of primary explosive to ensure that the charge detonates completely and delivers its entire destructive power to everything in sight.",
"weight": "106600 g",
"volume": "50 L",
Expand Down Expand Up @@ -1290,7 +1290,7 @@
"id": "tool_rdx_charge_act",
"type": "TOOL",
"category": "weapons",
"name": "active RDX charge",
"name": { "str": "active RDX charge" },
"description": "This is a metal keg, filled with 50 liters worth of RDX and scrap metal. The fuse has been lit and once it ignites the primary explosive, the charge will detonate and rain fire and steel on everything in sight.",
"weight": "106600 g",
"volume": "50 L",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/firefighting.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
{
"id": "halligan",
"type": "TOOL",
"name": "Halligan bar",
"name": { "str": "Halligan bar" },
"description": "This is a heavy multiple-use tool commonly carried by firefighters, law enforcement, and military rescue units. Use it to open locked doors without destroying them or to lift manhole covers. You could also wield it to bash some heads in.",
"weight": "3600 g",
"volume": "1250 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/tool/lighting.json
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@
{
"id": "glowstick_lit",
"type": "TOOL",
"name": "active glowstick",
"name": { "str": "active glowstick" },
"description": "This is an active glowstick and is producing light. It will last for a few hours before burning out.",
"weight": "29 g",
"volume": "250 ml",
Expand Down Expand Up @@ -347,7 +347,7 @@
"id": "handflare_lit",
"copy-from": "handflare",
"type": "TOOL",
"name": "active flare",
"name": { "str": "active flare" },
"description": "This burning magnesium flare is producing light. It will last for about a half hour before burning out.",
"color": "white",
"turns_per_charge": 6,
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 @@ -59,7 +59,7 @@
{
"id": "rx12_injector",
"type": "TOOL",
"name": "RX12 jet injector",
"name": { "str": "RX12 jet injector" },
"description": "The Rivtech RX12 jet injector is a small pistol-shaped device used to inject advanced fast-healing chemicals through the skin without using a needle. A label on the side warns against using more than two doses per hour.",
"weight": "316 g",
"volume": "500 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/tool/misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@
"id": "kevlar_plate",
"type": "TOOL",
"category": "spare_parts",
"name": "Kevlar plate",
"name": { "str": "Kevlar plate" },
"description": "This is a plate of reinforced Kevlar. It could be used to repair items made of Kevlar.",
"weight": "300 g",
"volume": "250 ml",
Expand Down Expand Up @@ -577,7 +577,7 @@
"id": "tear_gas_payload_act",
"type": "TOOL",
"category": "weapons",
"name": "active tear gas payload",
"name": { "str": "active tear gas payload" },
"description": "This is a dummy item used by tear gas hacks that just so happens to be counting down. You should never see it outside of debug.",
"symbol": "*",
"color": "dark_gray",
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 @@ -17,7 +17,7 @@
"id": "radiocontrol",
"copy-from": "radio_car_box",
"type": "TOOL",
"name": "RC control",
"name": { "str": "RC control" },
"description": "A remote control for RC cars, with joystick to steer the car and colorful buttons that don't seem to do anything. Perhaps they were for the deluxe model?",
"symbol": "#",
"color": "yellow",
Expand Down Expand Up @@ -46,7 +46,7 @@
"id": "radio_car",
"copy-from": "radio_car_box",
"type": "TOOL",
"name": "RC car",
"name": { "str": "RC car" },
"description": "A remote-controlled car. Fun for young and old alike.",
"symbol": "#",
"ammo": "battery",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/science.json
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@
"id": "weather_reader",
"type": "TOOL",
"category": "tools",
"name": "Doppler Radar Turbo 2000",
"name": { "str": "Doppler Radar Turbo 2000" },
"description": "A briefcase with built-in laptop that looks like it's from the 80s. Its vintage monochrome monitor displays a plethora of meteorological data. No sign of the FLDSMDFR, however.",
"weight": "10 g",
"volume": "2500 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/tool/workshop.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
{
"id": "acetylene_machine",
"type": "TOOL",
"name": "acetylene-gas machine",
"name": { "str": "acetylene-gas machine" },
"symbol": "&",
"color": "light_gray",
"description": "This bulky device takes water and calcium carbide and yields unpressurised acetylene.",
Expand Down