Skip to content

Commit

Permalink
Merge pull request #38395 from snipercup/Tool_armor-name-to-object
Browse files Browse the repository at this point in the history 
Tool_armor name to object
  • Loading branch information
@ZhilkinSerg
ZhilkinSerg authored Feb 27, 2020
2 parents c294746 + 57146e5 commit f2e0310
Showing 1 changed file with 22 additions and 22 deletions.
44 changes: 22 additions & 22 deletions data/json/items/tool_armor.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@
{
"id": "holo_cloak",
"type": "TOOL_ARMOR",
"name": "hologram cloak",
"name": { "str": "hologram cloak" },
"description": "A cloak woven with metallic fibers and covered with hexagonal sheets of reflective carbide. When activated, it will create a holographic decoy of its wearer.",
"weight": "1552 g",
"volume": "3500 ml",
Expand All @@ -335,7 +335,7 @@
"type": "TOOL_ARMOR",
"category": "clothing",
"id": "fedora",
"name": "fedora",
"name": { "str": "fedora" },
"weight": "350 g",
"color": "brown",
"covers": [ "HEAD" ],
Expand Down Expand Up @@ -607,7 +607,7 @@
"category": "clothing",
"symbol": "[",
"color": "blue",
"name": "headlamp",
"name": { "str": "headlamp" },
"description": "This is an LED headlamp with an adjustable strap so as to be comfortably worn on your head or attached to your helmet. Use it to turn it on.",
"price": 4000,
"material": [ "plastic", "aluminum" ],
Expand Down Expand Up @@ -722,7 +722,7 @@
"symbol": "[",
"color": "blue",
"looks_like": "survivor_light_on",
"name": "atomic headlamp",
"name": { "str": "atomic headlamp" },
"description": "This is a custom-made reinforced headlamp powered by the magic of nuclear decay, focused for more usable brightness. The adjustable strap allows it to be comfortably worn on your head or attached to your helmet. Use it to close the cover and hide the light.",
"price": 4000,
"material": [ "steel", "plastic" ],
Expand Down Expand Up @@ -764,7 +764,7 @@
"category": "armor",
"symbol": "[",
"color": "dark_gray",
"name": "RM13 combat armor",
"name": { "str": "RM13 combat armor" },
"description": "Internally powered by a maximum of ten plutonium fuel cells, this full-body suit of sleek black military armor represents the pinnacle of Rivtech's non-rigid powered armor technology. Use it to turn it on.",
"flags": [ "VARSIZE", "STURDY", "WATERPROOF", "RAINPROOF", "WATCH", "ALARMCLOCK", "SWIM_GOGGLES", "SUN_GLASSES", "RAD_RESIST" ],
"price": 50000000,
Expand Down Expand Up @@ -821,7 +821,7 @@
"category": "clothing",
"symbol": "[",
"color": "light_gray",
"name": "5-point anchor",
"name": { "str": "5-point anchor" },
"looks_like": "chestguard_hard",
"description": "A featureless, disc-shaped device mounted on a harness. The words \"X.E.D.R.A\" and \"5-point anchor\" are inscribed on its front and back.",
"price": 150000,
Expand Down Expand Up @@ -997,7 +997,7 @@
"category": "clothing",
"symbol": "[",
"color": "dark_gray",
"name": "XL rebreather mask",
"name": { "str": "XL rebreather mask" },
"description": "A mask worn over your mouth which, when loaded with the proper filters, recycles your exhaled breath for rebreathing while underwater. This model has been expanded substantially and can accommodate exotic anatomy. Use it to turn it on.",
"flags": [ "WATER_FRIENDLY", "OVERSIZE" ],
"price": 25000,
Expand Down Expand Up @@ -1042,7 +1042,7 @@
{
"id": "mask_filter",
"type": "TOOL_ARMOR",
"name": "filter mask",
"name": { "str": "filter mask" },
"description": "A mask that straps over your mouth and nose and filters air. Protects from smoke, dust, and other contaminants quite well. It must be prepared before use.",
"weight": "260 g",
"volume": "500 ml",
Expand All @@ -1066,7 +1066,7 @@
{
"id": "mask_gas",
"type": "TOOL_ARMOR",
"name": "gas mask",
"name": { "str": "gas mask" },
"category": "clothing",
"description": "A full gas mask that covers the face and eyes. Provides excellent protection from smoke, teargas, and other contaminants. It must be prepared before use.",
"weight": "897 g",
Expand All @@ -1091,7 +1091,7 @@
{
"id": "mask_gas_xl",
"type": "TOOL_ARMOR",
"name": "XL gas mask",
"name": { "str": "XL gas mask" },
"category": "clothing",
"description": "A rather roomy mask with filters attached, designed to accommodate exotic anatomy. Provides excellent protection from smoke, teargas, and other contaminants. It must be prepared before use.",
"weight": "1397 g",
Expand Down Expand Up @@ -1145,7 +1145,7 @@
"id": "mask_fsurvivorxl",
"type": "TOOL_ARMOR",
"category": "armor",
"name": "XL survivor firemask",
"name": { "str": "XL survivor firemask" },
"description": "A custom-built, Nomex-insulated gas mask that covers the face and eyes regardless of your state of mutation. It provides excellent protection from heat, smoke, teargas, and shrapnel. It must be prepared before use.",
"weight": "1108 g",
"volume": "1250 ml",
Expand Down Expand Up @@ -1175,7 +1175,7 @@
"category": "armor",
"symbol": "[",
"color": "light_gray",
"name": "firefighter PBA mask",
"name": { "str": "firefighter PBA mask" },
"description": "A full-face mask commonly used by firefighters. The protective breathing apparatus provides excellent protection from smoke, flame, and other dangers. It must be prepared before use.",
"flags": [ "VARSIZE", "WATERPROOF", "STURDY", "SUN_GLASSES" ],
"price": 100000,
Expand All @@ -1200,7 +1200,7 @@
"id": "mask_hsurvivor",
"type": "TOOL_ARMOR",
"category": "armor",
"name": "heavy survivor mask",
"name": { "str": "heavy survivor mask" },
"description": "A custom-built, steel reinforced gas mask that covers the face and eyes. Provides excellent protection from smoke, teargas, and shrapnel. It must be prepared before use.",
"weight": "1612 g",
"volume": "1250 ml",
Expand Down Expand Up @@ -1282,7 +1282,7 @@
"id": "mask_survivorxl",
"type": "TOOL_ARMOR",
"category": "armor",
"name": "XL survivor mask",
"name": { "str": "XL survivor mask" },
"description": "A custom-built, reinforced gas mask that covers the face and eyes regardless of your state of mutation. Provides excellent protection from smoke, teargas, and shrapnel. It must be prepared before use.",
"weight": "982 g",
"volume": "1250 ml",
Expand Down Expand Up @@ -1336,7 +1336,7 @@
"id": "mask_wsurvivorxl",
"type": "TOOL_ARMOR",
"category": "armor",
"name": "XL winter survivor mask",
"name": { "str": "XL winter survivor mask" },
"description": "A custom-built, fur-trimmed gas mask that covers the face and eyes regardless of your state of mutation. Quite warm, it still provides excellent protection from smoke, teargas, and shrapnel. It must be prepared before use.",
"weight": "1062 g",
"volume": "1250 ml",
Expand Down Expand Up @@ -1575,7 +1575,7 @@
"category": "armor",
"symbol": "[",
"color": "dark_gray",
"name": "XL survivor divemask",
"name": { "str": "XL survivor divemask" },
"description": "A custom-built, armored rebreather mask that covers the face and eyes. It provides excellent protection from harm as well providing breathing gas while underwater. Use it to turn it on.",
"flags": [ "VARSIZE", "STURDY", "WATER_FRIENDLY", "SWIM_GOGGLES", "OVERSIZE" ],
"price": 40000,
Expand Down Expand Up @@ -1671,7 +1671,7 @@
"category": "clothing",
"symbol": "[",
"color": "light_gray",
"name": "emergency blanket",
"name": { "str": "emergency blanket" },
"description": "A blanket made of space-age material that covers your most important body parts. Use it to fold for storage.",
"price": 425,
"material": "plastic",
Expand Down Expand Up @@ -1760,7 +1760,7 @@
"category": "clothing",
"symbol": "[",
"color": "brown",
"name": "hairpin",
"name": { "str": "hairpin" },
"description": "A plain hairpin to keep your hair in place.",
"price": 50,
"material": [ "iron" ],
Expand All @@ -1773,7 +1773,7 @@
"category": "clothing",
"symbol": "[",
"color": "pink",
"name": "fancy hairpin",
"name": { "str": "fancy hairpin" },
"description": "A pink hairpin with cute flower textures.",
"price": 1000,
"material": [ "plastic" ],
Expand Down Expand Up @@ -2428,7 +2428,7 @@
{
"type": "TOOL_ARMOR",
"id": "guitar_electric",
"name": "electric guitar",
"name": { "str": "electric guitar" },
"category": "tools",
"weight": "2250 g",
"color": "red",
Expand Down Expand Up @@ -2932,7 +2932,7 @@
{
"id": "electric_blanket",
"type": "TOOL_ARMOR",
"name": "electric blanket",
"name": { "str": "electric blanket" },
"description": "A heated blanket made of polyester. The most comfortable thing on Earth. Its cost is usually negligible, but with the power out, it chews through batteries insanely quickly.",
"weight": "1123 g",
"volume": "2500 ml",
Expand Down Expand Up @@ -2982,7 +2982,7 @@
"id": "foodperson_mask",
"repairs_like": "miner_hat",
"type": "TOOL_ARMOR",
"name": "Foodperson mask",
"name": { "str": "Foodperson mask" },
"description": "Foodperson, the mascot your stomach deserves!",
"weight": "1500 g",
"volume": "16L",
Expand Down

0 comments on commit f2e0310

Please sign in to comment.