Skip to content

Commit b3f0237

Browse files
henry-thomsonghost
andauthored
Finish removal of "pair of" and "pairs of" wording from all of the clothing and items (#82469)
* Fix accidental (pair) wording in glasses * Remove pair of and pairs of wording from misc items * Remove pair of and pairs of wording from swimming items * Remove pair of and pairs of wording from undergarment items * Remove pair of and pairs of wording from fireproof items * Remove pair of and pairs of wording from gambeson items * Remove pair of and pairs of wording from leg armor * Remove pair of and pairs of wording from leg clothing * Remove pair of and pairs of wording from swimming items * Remove pair of and pairs of wording from undergarment clothing * Fix goggles, binoculars, some leggings not supposed to be having (pair) naming * Fix some chitinous items having plural wordings * Add (pair) naming to knuckles that didnt have it * Fix chainmail half leggings missing NO_I18N tag --------- Co-authored-by: Ghost <[email protected]>
1 parent f7ab453 commit b3f0237

22 files changed

+294
-294
lines changed

data/json/items/armor/arms_armor.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
"type": "ITEM",
108108
"subtypes": [ "ARMOR" ],
109109
"category": "armor",
110-
"name": { "str": "chitinous scale mail sleeves (pair)", "str_pl": "chitinous scale mail sleeves (pairs)" },
110+
"name": { "str_sp": "chitinous scale mail sleeves (pair)" },
111111
"description": "A pair of sleeves of chitin sections overlapping with each other, secured to a leather backing. The odd irregular shapes make full coverage impossible, not helped by how poor of a material chitin is. Seems to be made more out of desperation than anything, and would benefit greatly from some underlying armor.",
112112
"weight": "1501 g",
113113
"volume": "1330 ml",
@@ -141,7 +141,7 @@
141141
"copy-from": "armguard_chitin",
142142
"type": "ITEM",
143143
"subtypes": [ "ARMOR" ],
144-
"name": { "str": "chitinous scale mail sleeves (pair)", "str_pl": "chitinous scale mail sleeves (pairs)" },
144+
"name": { "str_sp": "chitinous scale mail sleeves (pair)" },
145145
"proportional": { "weight": 1.25, "volume": 1.23 },
146146
"extend": { "flags": [ "OVERSIZE", "PREFIX_XL" ] }
147147
},
@@ -150,7 +150,7 @@
150150
"type": "ITEM",
151151
"subtypes": [ "ARMOR" ],
152152
"copy-from": "armguard_chitin",
153-
"name": { "str": "chitinous scale mail sleeves (pair)", "str_pl": "chitinous scale mail sleeves (pairs)" },
153+
"name": { "str_sp": "chitinous scale mail sleeves (pair)" },
154154
"proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
155155
"extend": { "flags": [ "UNDERSIZE", "PREFIX_XS" ] }
156156
},

data/json/items/armor/belts.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@
538538
"id": "suspenders_cloth",
539539
"type": "ITEM",
540540
"subtypes": [ "ARMOR" ],
541-
"name": { "str": "suspenders", "str_pl": "pairs of suspenders" },
541+
"name": { "str_sp": "suspenders" },
542542
"description": "A pair of black suspenders, which reach over the wearer's shoulders and hook to their waist. Gives a wonderful western feel!",
543543
"weight": "250 g",
544544
"volume": "500 ml",
@@ -557,7 +557,7 @@
557557
"id": "suspenders_leather",
558558
"type": "ITEM",
559559
"subtypes": [ "ARMOR" ],
560-
"name": { "str": "leather suspenders", "str_pl": "pairs of leather suspenders" },
560+
"name": { "str_sp": "leather suspenders" },
561561
"description": "A pair of leather suspenders, which reach over the wearer's shoulders and hook to their waist. Gives a wonderful western feel!",
562562
"material": [ "leather", "steel" ],
563563
"color": "brown",
@@ -567,7 +567,7 @@
567567
"id": "suspenders_holster",
568568
"type": "ITEM",
569569
"subtypes": [ "ARMOR" ],
570-
"name": { "str": "holster suspenders", "str_pl": "pairs of holster suspenders" },
570+
"name": { "str_sp": "holster suspenders" },
571571
"description": "A pair of leather suspenders with a holster placed near the stomach.",
572572
"copy-from": "suspenders_leather",
573573
"use_action": { "type": "holster", "holster_prompt": "Store tool or blade", "holster_msg": "You put your %1$s in your %2$s" },

data/json/items/armor/bespoke_armor/cuttingroom.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"type": "ITEM",
55
"subtypes": [ "ARMOR" ],
66
"category": "armor",
7-
"name": { "str": "pair of survivor fireboots", "str_pl": "pairs of survivor fireboots" },
7+
"name": { "str_sp": "survivor fireboots (pair)" },
88
"description": "A pair of customized, Kevlar-armored Nomex boots. These will keep you alive, even when knee-deep in the flames.",
99
"weight": "1980 g",
1010
"volume": "3 L",
@@ -26,7 +26,7 @@
2626
"id": "xl_boots_fsurvivor",
2727
"type": "ITEM",
2828
"subtypes": [ "ARMOR" ],
29-
"name": { "str": "pair of survivor fireboots", "str_pl": "pairs of survivor fireboots" },
29+
"name": { "str_sp": "survivor fireboots (pair)" },
3030
"copy-from": "boots_fsurvivor",
3131
"proportional": { "weight": 1.5, "volume": 1.5 },
3232
"extend": { "flags": [ "OVERSIZE", "PREFIX_XL" ] }
@@ -36,7 +36,7 @@
3636
"type": "ITEM",
3737
"subtypes": [ "ARMOR" ],
3838
"copy-from": "boots_fsurvivor",
39-
"name": { "str": "pair of survivor fireboots", "str_pl": "pairs of survivor fireboots" },
39+
"name": { "str_sp": "survivor fireboots (pair)" },
4040
"proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
4141
"extend": { "flags": [ "UNDERSIZE", "PREFIX_XS" ] }
4242
},
@@ -45,7 +45,7 @@
4545
"type": "ITEM",
4646
"subtypes": [ "ARMOR" ],
4747
"category": "armor",
48-
"name": { "str": "pair of heavy survivor boots", "str_pl": "pairs of heavy survivor boots" },
48+
"name": { "str_sp": "heavy survivor boots (pair)" },
4949
"description": "A pair of customized Kevlar boots that are heavily armored with steel. Favoring protection over comfort, these will keep you alive, especially when knee-deep in the dead.",
5050
"weight": "2254 g",
5151
"volume": "3 L",
@@ -96,7 +96,7 @@
9696
"id": "xl_boots_hsurvivor",
9797
"type": "ITEM",
9898
"subtypes": [ "ARMOR" ],
99-
"name": { "str": "pair of heavy survivor boots", "str_pl": "pairs of heavy survivor boots" },
99+
"name": { "str_sp": "heavy survivor boots (pair)" },
100100
"copy-from": "boots_hsurvivor",
101101
"proportional": { "weight": 1.2, "volume": 1.2 },
102102
"extend": { "flags": [ "OVERSIZE", "PREFIX_XL" ] }
@@ -106,7 +106,7 @@
106106
"type": "ITEM",
107107
"subtypes": [ "ARMOR" ],
108108
"copy-from": "boots_hsurvivor",
109-
"name": { "str": "pair of heavy survivor boots", "str_pl": "pairs of heavy survivor boots" },
109+
"name": { "str_sp": "heavy survivor boots (pair)" },
110110
"proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
111111
"extend": { "flags": [ "UNDERSIZE", "PREFIX_XS" ] }
112112
},
@@ -115,7 +115,7 @@
115115
"type": "ITEM",
116116
"subtypes": [ "ARMOR" ],
117117
"category": "armor",
118-
"name": { "str": "pair of heavy survivor gloves", "str_pl": "pairs of heavy survivor gloves" },
118+
"name": { "str_sp": "heavy survivor gloves (pair)" },
119119
"description": "A pair of customized, steel-backed Kevlar gloves. These are designed for protection first.",
120120
"weight": "1344 g",
121121
"volume": "1 L",
@@ -170,7 +170,7 @@
170170
"id": "xl_gloves_hsurvivor",
171171
"type": "ITEM",
172172
"subtypes": [ "ARMOR" ],
173-
"name": { "str": "pair of heavy survivor gloves", "str_pl": "pairs of heavy survivor gloves" },
173+
"name": { "str_sp": "heavy survivor gloves (pair)" },
174174
"copy-from": "gloves_hsurvivor",
175175
"proportional": { "weight": 1.5, "volume": 1.5 },
176176
"extend": { "flags": [ "OVERSIZE", "PREFIX_XL" ] }
@@ -180,7 +180,7 @@
180180
"type": "ITEM",
181181
"subtypes": [ "ARMOR" ],
182182
"copy-from": "gloves_hsurvivor",
183-
"name": { "str": "pair of heavy survivor gloves", "str_pl": "pairs of heavy survivor gloves" },
183+
"name": { "str_sp": "heavy survivor gloves (pair)" },
184184
"proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
185185
"extend": { "flags": [ "UNDERSIZE", "PREFIX_XS" ] }
186186
},
@@ -189,7 +189,7 @@
189189
"type": "ITEM",
190190
"subtypes": [ "ARMOR" ],
191191
"category": "armor",
192-
"name": { "str": "pair of survivor firegloves", "str_pl": "pairs of survivor firegloves" },
192+
"name": { "str_sp": "survivor firegloves (pair)" },
193193
"description": "A pair of customized, Kevlar-armored Nomex gloves. These are a post-apocalyptic extension of what firefighters wore pre-Cataclysm.",
194194
"weight": "410 g",
195195
"volume": "1 L",
@@ -209,7 +209,7 @@
209209
"id": "xl_gloves_fsurvivor",
210210
"type": "ITEM",
211211
"subtypes": [ "ARMOR" ],
212-
"name": { "str": "pair of survivor firegloves", "str_pl": "pairs of survivor firegloves" },
212+
"name": { "str_sp": "survivor firegloves (pair)" },
213213
"copy-from": "gloves_fsurvivor",
214214
"proportional": { "weight": 1.5, "volume": 1.5 },
215215
"extend": { "flags": [ "OVERSIZE", "PREFIX_XL" ] }
@@ -219,7 +219,7 @@
219219
"type": "ITEM",
220220
"subtypes": [ "ARMOR" ],
221221
"copy-from": "gloves_fsurvivor",
222-
"name": { "str": "pair of survivor firegloves", "str_pl": "pairs of survivor firegloves" },
222+
"name": { "str_sp": "survivor firegloves (pair)" },
223223
"proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
224224
"extend": { "flags": [ "UNDERSIZE", "PREFIX_XS" ] }
225225
},

data/json/items/armor/bespoke_armor/utility.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
"type": "ITEM",
9494
"subtypes": [ "ARMOR" ],
9595
"category": "armor",
96-
"name": { "str": "survivor goggles", "str_pl": "pairs of survivor goggles" },
96+
"name": { "str_sp": "survivor goggles" },
9797
"description": "A custom-built pair of armored goggles with tinted lenses. Comfortable and built to last, they provide excellent protection from environmental dangers.",
9898
"weight": "212 g",
9999
"volume": "250 ml",

data/json/items/armor/boots.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
"type": "ITEM",
208208
"subtypes": [ "ARMOR" ],
209209
"category": "armor",
210-
"name": { "str": "chitinous scale foot covers (pair)", "str_pl": "chitinous scale foot covers (pairs)" },
210+
"name": { "str_sp": "chitinous scale foot covers (pair)" },
211211
"description": "Sections of chitin attached to a leather backing meant to drape over existing foot wear. Due to the nature of chitin, it cannot cover everything and isn't very protective. Seems like it was made out of desperation.",
212212
"weight": "239 g",
213213
"volume": "400 ml",
@@ -239,7 +239,7 @@
239239
"id": "xl_boots_chitin",
240240
"type": "ITEM",
241241
"subtypes": [ "ARMOR" ],
242-
"name": { "str": "chitinous scale foot covers (pair)", "str_pl": "chitinous scale foot covers (pairs)" },
242+
"name": { "str_sp": "chitinous scale foot covers (pair)" },
243243
"copy-from": "boots_chitin",
244244
"proportional": { "weight": 1.25, "volume": 1.25 },
245245
"extend": { "flags": [ "OVERSIZE", "PREFIX_XL" ] }
@@ -250,7 +250,7 @@
250250
"subtypes": [ "ARMOR" ],
251251
"copy-from": "boots_chitin",
252252
"looks_like": "boots_chitin",
253-
"name": { "str": "chitinous scale foot covers (pair)", "str_pl": "chitinous scale foot covers (pairs)" },
253+
"name": { "str_sp": "chitinous scale foot covers (pair)" },
254254
"proportional": { "weight": 0.75, "volume": 0.75, "price": 0.5 },
255255
"extend": { "flags": [ "UNDERSIZE", "PREFIX_XS" ] }
256256
},

0 commit comments

Comments
 (0)