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.

Sign up for GitHub

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

Armor name to object #37796

Merged
merged 3 commits into from
Feb 7, 2020
Merged

Armor name to object #37796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70de8fa
Name to object
snipercup Feb 7, 2020
2cd4312
Name to object
snipercup Feb 7, 2020
016623e
Name to object
snipercup Feb 7, 2020
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
24 changes: 8 additions & 16 deletions data/json/items/armor/ammo_pouch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
{
"id": "ammo_pouch",
"type": "ARMOR",
"name": "ammo pouch",
"name_plural": "ammo pouches",
"name": { "str": "ammo pouch", "str_pl": "ammo pouches" },
"description": "A small pouch that can be used to store most types of small ammunition, rockets will not fit. Activate to store ammunition.",
"weight": "490 g",
"rigid": false,
Expand Down Expand Up @@ -188,8 +187,7 @@
{
"id": "legpouch",
"type": "ARMOR",
"name": "ankle ammo pouch",
"name_plural": "ankle ammo pouches",
"name": { "str": "ankle ammo pouch", "str_pl": "ankle ammo pouches" },
"description": "A small fabric ammo pouch that can be strapped to your ankle which is capable of holding a single small magazine close at hand.",
"volume": "250 ml",
"weight": "60 g",
Expand Down Expand Up @@ -246,8 +244,7 @@
"id": "modularvest",
"type": "ARMOR",
"category": "armor",
"name": "MBR vest (empty)",
"name_plural": "MBR vests (empty)",
"name": { "str": "MBR vest (empty)", "str_pl": "MBR vests (empty)" },
"description": "A Modular Bullet Resistant Vest. It has pouches for extra armor inserts, but without them provides little more protection over a regular vest. It has four pouches capable of carrying magazines.",
"weight": "2860 g",
"volume": "6 L",
Expand Down Expand Up @@ -281,8 +278,7 @@
"id": "modularvestceramic",
"type": "ARMOR",
"category": "armor",
"name": "MBR vest (ceramic plates)",
"name_plural": "MBR vests (ceramic plates)",
"name": { "str": "MBR vest (ceramic plates)", "str_pl": "MBR vests (ceramic plates)" },
"description": "A Modular Bullet Resistant Vest. Ceramic plates have been inserted to improve its protection. The ceramic plates cannot be repaired, only replaced. It has four pouches capable of carrying magazines.",
"weight": "4308 g",
"volume": "6 L",
Expand Down Expand Up @@ -316,8 +312,7 @@
"id": "modularvesthard",
"type": "ARMOR",
"category": "armor",
"name": "MBR vest (hard plates)",
"name_plural": "MBR vests (hard plates)",
"name": { "str": "MBR vest (hard plates)", "str_pl": "MBR vests (hard plates)" },
"description": "A Modular Bullet Resistant Vest. Hardened steel plates have been inserted, greatly increasing its protection at the cost of a great deal of weight and loss of flexibility. It has four pouches capable of carrying magazines.",
"weight": "14860 g",
"volume": "6 L",
Expand Down Expand Up @@ -351,8 +346,7 @@
"id": "modularvestkevlar",
"type": "ARMOR",
"category": "armor",
"name": "MBR vest (Kevlar plates)",
"name_plural": "MBR vests (Kevlar plates)",
"name": { "str": "MBR vest (Kevlar plates)", "str_pl": "MBR vests (Kevlar plates)" },
"description": "A Modular Bullet Resistant Vest. Kevlar plates have been inserted to improve its protection. It has four pouches capable of carrying magazines.",
"weight": "5721 g",
"volume": "6 L",
Expand Down Expand Up @@ -386,8 +380,7 @@
"id": "modularveststeel",
"type": "ARMOR",
"category": "armor",
"name": "MBR vest (steel plating)",
"name_plural": "MBR vests (steel plating)",
"name": { "str": "MBR vest (steel plating)", "str_pl": "MBR vests (steel plating)" },
"description": "A Modular Bullet Resistant Vest. Its armor pouches have steel plates in them; this improves protection, but makes the vest much heavier and encumbering. It has four pouches capable of carrying magazines.",
"weight": "10860 g",
"volume": "6 L",
Expand Down Expand Up @@ -421,8 +414,7 @@
"id": "modularvestsuper",
"type": "ARMOR",
"category": "armor",
"name": "MBR vest (superalloy)",
"name_plural": "MBR vests (superalloy)",
"name": { "str": "MBR vest (superalloy)", "str_pl": "MBR vests (superalloy)" },
"description": "A Modular Bullet Resistant Vest. Its armor pouches have superalloy plating in them, giving it extra protection with marginal flexibility loss and additional weight. It has four pouches capable of carrying magazines.",
"weight": "6460 g",
"volume": "6 L",
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/armor/holster.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@
{
"id": "bow_sling",
"type": "ARMOR",
"name": "bow sling",
"name_plural": "bow slings",
"name": { "str": "bow sling", "str_pl": "bow slings" },
"description": "A somewhat complicated set of straps and fabric to keep your bow close to hand and (mostly) out of harms way. Activate to holster/draw your bow.",
"weight": "320 g",
"volume": "500 ml",
Expand Down
9 changes: 3 additions & 6 deletions data/json/items/armor/legs_clothes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
"id": "b_shorts",
"repairs_like": "jeans",
"type": "ARMOR",
"name": "basketball shorts",
"name_plural": "basketball shorts",
"name": { "str": "basketball shorts", "str_pl": "basketball shorts" },
"description": "A pair of basketball shorts. Comfortable and light.",
"weight": "190 g",
"volume": "1 L",
Expand Down Expand Up @@ -337,8 +336,7 @@
"id": "pants_army",
"repairs_like": "jeans",
"type": "ARMOR",
"name": "army pants",
"name_plural": "army pants",
"name": { "str": "army pants", "str_pl": "army pants" },
"description": "A tough pair of pants lined with pockets. Favored by the military.",
"weight": "720 g",
"volume": "2500 ml",
Expand Down Expand Up @@ -656,8 +654,7 @@
{
"id": "winter_pants_army",
"type": "ARMOR",
"name": "army winter pants",
"name_plural": "army winter pants",
"name": { "str": "army winter pants", "str_pl": "army winter pants" },
"description": "A tough pair of pants lined with pockets, thickly padded for warmth. Favored by the military.",
"weight": "1000 g",
"volume": "2500 ml",
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/armor/torso_armor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
{
"id": "armor_cuirass",
"type": "ARMOR",
"name": "bell cuirass",
"name": { "str": "bell cuirass", "str_pl": "bell cuirasses" },
"category": "armor",
"name_plural": "bell cuirasses",
"description": "An ancient Greek breastplate, made of bronze.",
"weight": "5896 g",
"volume": "6 L",
Expand Down
6 changes: 2 additions & 4 deletions data/json/items/armor/undergarment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,7 @@
{
"id": "boxer_briefs",
"type": "ARMOR",
"name": "boxer briefs",
"name_plural": "boxer briefs",
"name": { "str": "boxer briefs", "str_pl": "boxer briefs" },
"description": "The age-old question, boxers or briefs? Your answer? Yes.",
"weight": "37 g",
"volume": "250 ml",
Expand All @@ -129,8 +128,7 @@
{
"id": "boxer_shorts",
"type": "ARMOR",
"name": "boxer shorts",
"name_plural": "boxer shorts",
"name": { "str": "boxer shorts", "str_pl": "boxer shorts" },
"description": "Men's boxer shorts. More fashionable than briefs and just as comfortable.",
"weight": "42 g",
"volume": "250 ml",
Expand Down