From 04db26198f8fb113ae2b5e13cce928abb6ac6ee9 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Mon, 3 Feb 2020 18:54:58 +0100 Subject: [PATCH] Tool armor names to objects (#37674) --- data/json/items/tool_armor.json | 51 +++++++++++---------------------- 1 file changed, 17 insertions(+), 34 deletions(-) diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json index a1b45905105b8..6920e5e5af4ca 100644 --- a/data/json/items/tool_armor.json +++ b/data/json/items/tool_armor.json @@ -181,8 +181,7 @@ "copy-from": "miner_hat", "repairs_like": "miner_hat", "type": "TOOL_ARMOR", - "name": "mining helmet (on)", - "name_plural": "mining helmets (on)", + "name": { "str": "mining helmet (on)", "str_pl": "mining helmets (on)" }, "description": "This is a mining helmet with a heavy duty LED flashlight. The flashlight is turned on, and continually draining its batteries. Use it to turn it off.", "flags": [ "LIGHT_450", "CHARGEDIM", "WATERPROOF", "TRADER_AVOID" ], "power_draw": 15000, @@ -404,8 +403,7 @@ "copy-from": "thermal_socks", "repairs_like": "thermal_socks", "type": "TOOL_ARMOR", - "name": "pair of thermal electric socks (on)", - "name_plural": "pairs of thermal electric socks (on)", + "name": { "str": "pair of thermal electric socks (on)", "str_pl": "pairs of thermal electric socks (on)" }, "description": "This is a pair of socks with internal battery-powered heating elements. They are currently on, and continually draining batteries. Use it to turn them off.", "flags": [ "VARSIZE", "SKINTIGHT", "TRADER_AVOID" ], "power_draw": 7500, @@ -462,8 +460,7 @@ "copy-from": "thermal_suit", "repairs_like": "thermal_suit", "type": "TOOL_ARMOR", - "name": "thermal electric suit (on)", - "name_plural": "thermal electric suits (on)", + "name": { "str": "thermal electric suit (on)", "str_pl": "thermal electric suits (on)" }, "description": "This is a full-body suit of thin thermal underwear equipped with internal battery-powered heating elements. It is currently on, and continually draining batteries. Use it to turn it off.", "flags": [ "VARSIZE", "SKINTIGHT", "TRADER_AVOID" ], "power_draw": 120000, @@ -520,8 +517,7 @@ "copy-from": "thermal_gloves", "repairs_like": "thermal_gloves", "type": "TOOL_ARMOR", - "name": "pair of thermal electric gloves (on)", - "name_plural": "pairs of thermal electric gloves (on)", + "name": { "str": "pair of thermal electric gloves (on)", "str_pl": "pairs of thermal electric gloves (on)" }, "description": "This is a pair of gloves with internal battery-powered heating elements. They are currently on, and continually draining batteries. Use it to turn them off.", "flags": [ "VARSIZE", "SKINTIGHT", "TRADER_AVOID" ], "power_draw": 7500, @@ -578,8 +574,7 @@ "copy-from": "thermal_mask", "repairs_like": "thermal_mask", "type": "TOOL_ARMOR", - "name": "thermal electric balaclava (on)", - "name_plural": "thermal electric balaclavas (on)", + "name": { "str": "thermal electric balaclava (on)", "str_pl": "thermal electric balaclavas (on)" }, "description": "This is a snug cloth mask with internal battery-powered heating elements. It is are currently on, and continually draining batteries. Use it to turn it off.", "flags": [ "VARSIZE", "SKINTIGHT", "TRADER_AVOID" ], "power_draw": 7500, @@ -657,8 +652,7 @@ "copy-from": "wearable_light", "repairs_like": "wearable_light", "type": "TOOL_ARMOR", - "name": "headlamp (on)", - "name_plural": "headlamps (on)", + "name": { "str": "headlamp (on)", "str_pl": "headlamps (on)" }, "description": "This is an LED headlamp with an adjustable strap so as to be comfortably worn on your head or attached to your helmet. It is turned on, and continually draining batteries. Use it to turn it off.", "flags": [ "LIGHT_300", "CHARGEDIM", "OVERSIZE", "BELTED", "ALLOWS_NATURAL_ATTACKS", "TRADER_AVOID" ], "power_draw": 10000, @@ -715,8 +709,7 @@ "copy-from": "survivor_light", "repairs_like": "survivor_light", "type": "TOOL_ARMOR", - "name": "survivor headlamp (on)", - "name_plural": "survivor headlamps (on)", + "name": { "str": "survivor headlamp (on)", "str_pl": "survivor headlamps (on)" }, "description": "This is a custom made LED headlamp reinforced to be more durable, brighter, and with a larger and more efficient battery pack. The adjustable strap allows it to be comfortably worn on your head or attached to your helmet. It is turned on, and continually draining batteries. Use it to turn it off.", "flags": [ "LIGHT_350", "CHARGEDIM", "OVERSIZE", "BELTED", "ALLOWS_NATURAL_ATTACKS" ], "power_draw": 10000, @@ -800,8 +793,7 @@ "copy-from": "rm13_armor", "repairs_like": "rm13_armor", "type": "TOOL_ARMOR", - "name": "RM13 combat armor (on)", - "name_plural": "RM13 combat armors (on)", + "name": { "str": "RM13 combat armor (on)", "str_pl": "RM13 combat armors (on)" }, "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. It is turned on, and continually draining power. Use it to turn it off.", "flags": [ "VARSIZE", @@ -997,8 +989,7 @@ "copy-from": "rebreather", "repairs_like": "rebreather", "type": "TOOL_ARMOR", - "name": "rebreather mask (on)", - "name_plural": "rebreather masks (on)", + "name": { "str": "rebreather mask (on)", "str_pl": "rebreather masks (on)" }, "description": "A mask worn over your mouth which, when loaded with the proper filters, recycles your exhaled breath for rebreathing while underwater. It is turned on, and continually consuming its filter. Use it to turn it off.", "flags": [ "WATER_FRIENDLY", "REBREATHER", "TRADER_AVOID" ], "turns_per_charge": 30, @@ -1045,8 +1036,7 @@ "copy-from": "rebreather_xl", "repairs_like": "rebreather_xl", "type": "TOOL_ARMOR", - "name": "XL rebreather mask (on)", - "name_plural": "XL rebreather masks (on)", + "name": { "str": "XL rebreather mask (on)", "str_pl": "XL rebreather masks (on)" }, "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. It is turned on, and continually consuming its filter. Use it to turn it off.", "flags": [ "WATER_FRIENDLY", "REBREATHER", "OVERSIZE", "TRADER_AVOID" ], "turns_per_charge": 30, @@ -1427,8 +1417,7 @@ "copy-from": "goggles_nv", "repairs_like": "goggles_nv", "type": "TOOL_ARMOR", - "name": "pair of light amp goggles (on)", - "name_plural": "pairs of light amp goggles (on)", + "name": { "str_pl": "pairs of light amp goggles (on)", "str": "pair of light amp goggles (on)" }, "description": "A pair of battery-powered light amplifying goggles with an infrared illuminator, allowing you to see in the dark. It is turned on, and continually draining batteries. Use it to turn them off.", "flags": [ "GNV_EFFECT", "FRAGILE", "TRADER_AVOID" ], "//": "2019 commercial models can operate at under 0.375W with the IR illuminator on", @@ -1490,8 +1479,7 @@ "copy-from": "goggles_ir", "repairs_like": "goggles_ir", "type": "TOOL_ARMOR", - "name": "pair of infrared goggles (on)", - "name_plural": "pairs of infrared goggles (on)", + "name": { "str": "pair of infrared goggles (on)", "str_pl": "pairs of infrared goggles (on)" }, "description": "A pair of battery-powered goggles that grant infrared vision, allowing you to see warm-blooded creatures in the dark. Use it to turn them off.", "flags": [ "IR_EFFECT", "FRAGILE", "TRADER_AVOID" ], "power_draw": 1000, @@ -1578,8 +1566,7 @@ "copy-from": "mask_h20survivor", "repairs_like": "mask_h20survivor", "type": "TOOL_ARMOR", - "name": "survivor divemask (on)", - "name_plural": "survivor divemasks (on)", + "name": { "str": "survivor divemask (on)", "str_pl": "survivor divemasks (on)" }, "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. It is turned on, and continually consuming its filter. Use it to turn it off.", "flags": [ "VARSIZE", "STURDY", "WATER_FRIENDLY", "REBREATHER", "SWIM_GOGGLES" ], "turns_per_charge": 30, @@ -1626,8 +1613,7 @@ "copy-from": "mask_h20survivorxl", "repairs_like": "mask_h20survivorxl", "type": "TOOL_ARMOR", - "name": "XL survivor divemask (on)", - "name_plural": "XL survivor divemasks (on)", + "name": { "str": "XL survivor divemask (on)", "str_pl": "XL survivor divemasks (on)" }, "description": "A custom-built, armored rebreather mask that covers the face and eyes regardless of your state of mutation. It provides excellent protection from harm as well providing breathing gas while underwater. It is turned on, and continually consuming its filter. Use it to turn it off.", "flags": [ "VARSIZE", "STURDY", "WATER_FRIENDLY", "REBREATHER", "SWIM_GOGGLES", "OVERSIZE", "TRADER_AVOID" ], "turns_per_charge": 30, @@ -2293,8 +2279,7 @@ "copy-from": "thermal_outfit", "repairs_like": "thermal_outfit", "type": "TOOL_ARMOR", - "name": "thermal electric outfit (on)", - "name_plural": "thermal electric outfits (on)", + "name": { "str": "thermal electric outfit (on)", "str_pl": "thermal electric outfits (on)" }, "description": "This suit of thin thermal underwear covers you from head to toe and is equipped with internal battery-powered heating elements. It is currently on, and continually draining batteries. Use it to turn it off.", "flags": [ "VARSIZE", "SKINTIGHT", "TRADER_AVOID" ], "power_draw": 130000, @@ -2994,8 +2979,7 @@ "id": "electric_blanket_on", "type": "TOOL_ARMOR", "repairs_like": "electric_blanket", - "name": "electric blanket (on)", - "name_plural": "electric blankets (on)", + "name": { "str": "electric blanket (on)", "str_pl": "electric blankets (on)" }, "description": "A heated blanket made of polyster. It's turned on, making it nice and toasty while it lasts.", "copy-from": "electric_blanket", "warmth": 90, @@ -3046,8 +3030,7 @@ "id": "foodperson_mask_on", "type": "TOOL_ARMOR", "repairs_like": "foodperson_mask", - "name": "Foodperson mask (on)", - "name_plural": "Foodperson masks (on)", + "name": { "str": "Foodperson mask (on)", "str_pl": "Foodperson masks (on)" }, "copy-from": "foodperson_mask", "turns_per_charge": 60, "revert_to": "foodperson_mask",