Merge pull request #80701 from Termineitor244/Armor-considered-armor

Maleclypse · web-flow · commit 1bfd9c66ab1e · 2025-04-25T14:20:54.000-04:00
More Armor is now considered proper Armor!
diff --git a/data/json/items/armor/bespoke_armor/utility.json b/data/json/items/armor/bespoke_armor/utility.json
@@ -92,6 +92,7 @@
     "id": "survivor_goggles",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
+    "category": "armor",
     "name": { "str": "survivor goggles", "str_pl": "pairs of survivor goggles" },
     "description": "A custom-built pair of armored goggles with tinted lenses.  Comfortable and built to last, they provide excellent protection from environmental dangers.",
     "weight": "212 g",
diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json
@@ -434,6 +434,7 @@
     "id": "toecaps",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
+    "category": "armor",
     "name": { "str": "pair of toecaps", "str_pl": "pairs of toecaps" },
     "description": "Rubbery overshoes that cover your toes with sturdy, OSHA compliant steel toes.",
     "weight": "907 g",
@@ -1754,6 +1755,7 @@
     "id": "motor_police_boots",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
+    "category": "armor",
     "name": { "str": "pair of motorcycle police boots", "str_pl": "pairs of motorcycle police boots" },
     "description": "Custom-made knee-high leather boots issued to motor officers.  Warm, durable and quite tough.",
     "weight": "1520 g",
diff --git a/data/json/items/armor/coats.json b/data/json/items/armor/coats.json
@@ -2059,6 +2059,7 @@
     "id": "leather_police_jacket",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
+    "category": "armor",
     "name": { "str": "motorcycle jacket" },
     "description": "A thick and heavy leather jacket used most commonly by motorcyclists, equestrians and Australian vigilantes.",
     "weight": "2700 g",
diff --git a/data/json/items/armor/eyewear.json b/data/json/items/armor/eyewear.json
@@ -269,6 +269,7 @@
     "id": "goggles_welding",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
+    "category": "armor",
     "name": { "str": "pair of welding goggles", "str_pl": "pairs of welding goggles" },
     "description": "A dark pair of goggles.  They make seeing very difficult, but protect you from bright flashes.",
     "weight": "153 g",
diff --git a/data/json/items/armor/gambesons.json b/data/json/items/armor/gambesons.json
diff --git a/data/json/items/armor/gloves.json b/data/json/items/armor/gloves.json
@@ -338,6 +338,7 @@
     "id": "gauntlet_fencing",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
+    "category": "armor",
     "name": { "str": "fencing gauntlet" },
     "description": "A single suede glove with a sturdy cotton wrist, padded back, and well-fitting fingers.",
     "weight": "175 g",
@@ -357,6 +358,7 @@
     "id": "gauntlet_fencing_l",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
+    "category": "armor",
     "name": { "str": "fencing gauntlet (left)", "str_pl": "fencing gauntlets (left)" },
     "description": "A single suede glove with a sturdy cotton wrist, padded back, and well-fitting fingers.  This one is left-handed.",
     "weight": "175 g",
diff --git a/data/json/items/armor/legs_armor.json b/data/json/items/armor/legs_armor.json
@@ -761,6 +761,7 @@
     "id": "fencing_pants",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
+    "category": "armor",
     "name": { "str_sp": "fencing pants" },
     "description": "A pair of reinforced pants used by fencers to prevent injuries.  They don't cover the lower leg.",
     "weight": "450 g",
@@ -1339,6 +1340,7 @@
     "id": "motorbike_pants",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
+    "category": "armor",
     "name": { "str": "motorcycle jeans", "str_pl": "pairs of motorcycle jeans" },
     "description": "A pair of thick jeans interwoven with Kevlar for added durability and sporting integrated kneepads and flank protection, typically worn by motorcyclists to protect from road rash.",
     "weight": "1340 g",
diff --git a/data/json/items/armor/masks.json b/data/json/items/armor/masks.json
@@ -112,6 +112,7 @@
     "id": "fencing_mask",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
+    "category": "armor",
     "name": { "str": "fencing mask" },
     "description": "A tough hood made of steel mesh used by fencers.",
     "weight": "520 g",
diff --git a/data/json/items/armor/robofac_armor.json b/data/json/items/armor/robofac_armor.json
@@ -3,7 +3,7 @@
     "id": "robofac_armor_rig",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
-    "category": "ARMOR",
+    "category": "armor",
     "looks_like": "poncho",
     "name": { "str": "Hub 01 modular defense system" },
     "description": "A custom-designed poncho for the true frontier explorer, made with aramid fibers and robust ripstop nylon.  Striped in brown and blue, the white seal of Hub 01 is emblazoned proudly on the front.  It features several quick access pouches attached to a waist drawstring, and two waterproof dry bags for carrying liquids.  It also features several tight clamps and velcro strips around the waist and shoulders; perhaps something attaches to them.",
diff --git a/data/json/items/armor/suits_protection.json b/data/json/items/armor/suits_protection.json
@@ -2768,6 +2768,7 @@
     "id": "entry_suit",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
+    "category": "armor",
     "name": { "str": "entry suit" },
     "description": "A flame-resistant whole-body garment worn by firefighters as protection against extreme heat.  It requires a separate gas mask for full protection against smoke.",
     "weight": "2900 g",
@@ -2814,6 +2815,7 @@
     "id": "bite_suit",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
+    "category": "armor",
     "name": { "str": "canine bite suit" },
     "description": "Designed to stop the injuries of dog bites, this thick, one piece suit is often used in the rehabilitation of abused animals and in training dogs by the police and military.  A base layer of aramid fabric has had strips of soft body armor sewn into it to mimic quilting, and to soften the blunt of animals jumping, slashing, or pouncing on the wearer.",
     "weight": "11556 g",
@@ -2877,6 +2879,7 @@
     "repairs_like": "ch_steel_lump",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
+    "category": "armor",
     "name": { "str": "hazmat suit" },
     "description": "An impermeable whole-body garment worn as protection against hazardous materials.  Restrictive and fragile, wearing it will provide complete protection against ambient radiation.  It requires a separate gas mask for full protection.",
     "weight": "5000 g",
@@ -2952,6 +2955,7 @@
     "id": "robofac_enviro_suit",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
+    "category": "armor",
     "name": { "str": "Hub 01 environmental suit" },
     "description": "A lightweight environmental suit incorporating Kevlar-lined boots and gloves, worn by Hub personnel in their rare forays aboveground.  Colored brown and blue, the white seal of Hub 01 is embroidered on both of its upper arms.  It requires a separate gas mask for full protection.",
     "weight": "4000 g",
@@ -3314,6 +3318,7 @@
     "id": "touring_suit",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
+    "category": "armor",
     "name": { "str": "track touring suit" },
     "description": "A leather bodysuit with padding in high-impact areas, meant for motorcyclists out on the track.  The leather is stiff but makes the armor much sturdier and more protective than lighter counterparts.",
     "weight": "4700 g",
diff --git a/data/json/items/armor/torso_armor.json b/data/json/items/armor/torso_armor.json
@@ -1035,6 +1035,7 @@
     "id": "fencing_jacket",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
+    "category": "armor",
     "name": { "str": "fencing jacket" },
     "description": "A padded jacket with a zipper on the back, used by fencers to prevent accidents.",
     "weight": "800 g",
@@ -1055,6 +1056,7 @@
     "id": "jacket_leather_mod",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
+    "category": "armor",
     "name": { "str": "armored motorcycle jacket" },
     "description": "A thick motorcycle jacket with metal plates drilled onto various areas for increased protection.",
     "weight": "7500 g",
@@ -1109,6 +1111,7 @@
     "id": "jacket_jean_mod",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
+    "category": "armor",
     "name": { "str": "armored jean jacket" },
     "description": "A denim jacket reinforced with metal plates.  Adequately protective, but not very sturdy.",
     "weight": "6350 g",
@@ -1163,6 +1166,7 @@
     "id": "vest_jean_mod",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
+    "category": "armor",
     "name": { "str": "armored jean vest" },
     "description": "A denim vest reinforced with metal plates.  Adequately protective, but not very sturdy.",
     "weight": "4100 g",
@@ -1360,6 +1364,7 @@
     "id": "lame_foil",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
+    "category": "armor",
     "name": { "str": "lamé (foil)", "str_pl": "lamés (foil)" },
     "description": "A thin, lightweight conductive vest with the zipper on the back used by fencers for electronic scoring.  Its outer layer is a woven mix of sturdy cotton and stainless steel strands.",
     "weight": "843 g",
@@ -1378,6 +1383,7 @@
     "id": "lame_saber",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
+    "category": "armor",
     "name": { "str": "lamé (saber)", "str_pl": "lamés (saber)" },
     "description": "A thin, lightweight conductive jacket used by fencers for electronic scoring.  Its outer layer is a woven mix of sturdy cotton and stainless steel strands.",
     "weight": "1043 g",
@@ -1482,6 +1488,7 @@
     "id": "motorbike_armor",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
+    "category": "armor",
     "name": { "str": "motorcycle armor" },
     "description": "A light jacket made of a stretch mesh covered in plastic pads meant for motorcyclists.  Made to be much more comfortable to wear than leather alternatives, but the underlying Lycra isn't protective at all.",
     "weight": "1066 g",
@@ -1522,6 +1529,7 @@
     "id": "plastron_cotton",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
+    "category": "armor",
     "name": { "str": "underarm protector" },
     "description": "A sturdy cotton plastron that protects much of the torso, the dominant shoulder, and underarm while fencing.",
     "weight": "110 g",
@@ -1540,6 +1548,7 @@
     "id": "plastron_plastic",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
+    "category": "armor",
     "name": { "str": "plastic chest protector" },
     "description": "A rigid plastic plastron with molded cups to be worn by female fencers for protection while fencing.",
     "weight": "194 g",
@@ -1558,6 +1567,7 @@
     "id": "vest_leather_mod",
     "type": "ITEM",
     "subtypes": [ "ARMOR" ],
+    "category": "armor",
     "name": { "str": "armored leather vest" },
     "description": "An armored vest made from thick leather and metal plates.",
     "weight": "4000 g",
