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.

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

Fix some Britishisms in the JSON files. #76981

Merged
merged 2 commits into from
Oct 12, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion data/json/furniture_and_terrain/furniture-alien.json
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@
"id": "f_exodii_pump",
"name": "clanking fluid pump",
"looks_like": "t_machinery_heavy",
"description": "The huge, sweating pipes and large tank reveal this clanking and tortuous piece of equipment to be some sort of fluid pump. It is cobbled together from several apparently ill-fitting parts that have been fitted with some very strange-looking but surprisingly clever adaptors.",
"description": "The huge, sweating pipes and large tank reveal this clanking and tortuous piece of equipment to be some sort of fluid pump. It is cobbled together from several apparently ill-fitting parts that have been fitted with some very strange-looking but surprisingly clever adapters.",
"symbol": "0",
"color": "light_gray",
"move_cost_mod": -1,
Expand Down
6 changes: 3 additions & 3 deletions data/json/furniture_and_terrain/furniture-storage.json
Original file line number Diff line number Diff line change
Expand Up @@ -1022,7 +1022,7 @@
"id": "f_displaycase",
"name": "display case",
"looks_like": "f_rack",
"description": "A secure wooden case at about waist-height, with glass panelling on top. Useful for storing valuable things while still showing them off. Not actually as secure as it looks, as the display windows are easily broken.",
"description": "A secure wooden case at about waist-height, with glass paneling on top. Useful for storing valuable things while still showing them off. Not actually as secure as it looks, as the display windows are easily broken.",
"symbol": "#",
"color": "light_cyan",
"move_cost_mod": 2,
Expand All @@ -1049,7 +1049,7 @@
"id": "f_displaycase_o",
"name": "open display case",
"looks_like": "f_rack",
"description": "A secure wooden case at about waist-height, with glass panelling on top. Useful for storing valuable things while still showing them off. Not actually as secure as it looks, as the display windows are easily broken. This one has had its lock picked and is open.",
"description": "A secure wooden case at about waist-height, with glass paneling on top. Useful for storing valuable things while still showing them off. Not actually as secure as it looks, as the display windows are easily broken. This one has had its lock picked and is open.",
"symbol": "#",
"color": "light_cyan",
"move_cost_mod": 2,
Expand All @@ -1073,7 +1073,7 @@
"id": "f_displaycase_b",
"name": "broken display case",
"looks_like": "f_rack",
"description": "A secure wooden case at about waist-height, with glass panelling on top. Would be useful for storing valuable things while still showing them off, if the glass hadn't been shattered. Careful not to cut yourself when looting.",
"description": "A secure wooden case at about waist-height, with glass paneling on top. Would be useful for storing valuable things while still showing them off, if the glass hadn't been shattered. Careful not to cut yourself when looting.",
"symbol": "#",
"color": "light_gray",
"move_cost_mod": 2,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"symbol": "LINE_OXOX",
"color": "light_gray",
"name": "bullet trailer interior wall",
"description": "A simple wall panelled in a coarsely textured grey laminate of some sort."
"description": "A simple wall paneled in a coarsely textured gray laminate of some sort."
},
{
"type": "terrain",
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/ammo/3006.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "3006",
"type": "AMMO",
"name": { "str_sp": ".30-06 FMJ" },
"description": "Jacketed .30-06 Springfield M2 Ball ammunition with a 150gr spitzer bullet. The .30-06 cartridge was adopted in 1906 by the US military, where it served for some 50 years, and it remains popular today amongst collectors and hunters for its range, versatility, and power.",
"description": "Jacketed .30-06 Springfield M2 Ball ammunition with a 150gr spitzer bullet. The .30-06 cartridge was adopted in 1906 by the US military, where it served for some 50 years, and it remains popular today among collectors and hunters for its range, versatility, and power.",
"ascii_picture": "3006",
"weight": "25 g",
"volume": "192 ml",
Expand Down Expand Up @@ -87,7 +87,7 @@
"copy-from": "3006",
"type": "AMMO",
"name": { "str_sp": ".30-06 JSP" },
"description": ".30-06 Springfield ammunition with a 165gr soft point bullet. The .30-06 cartridge was adopted in 1906 by the US military, where it served for some 50 years, and it remains popular today amongst collectors and hunters for its range, versatility, and power.",
"description": ".30-06 Springfield ammunition with a 165gr soft point bullet. The .30-06 cartridge was adopted in 1906 by the US military, where it served for some 50 years, and it remains popular today among collectors and hunters for its range, versatility, and power.",
"relative": { "damage": { "damage_type": "bullet", "amount": 4, "armor_penetration": -4 } }
},
{
Expand Down Expand Up @@ -127,7 +127,7 @@
"copy-from": "3006",
"type": "AMMO",
"name": { "str_sp": ".30-06 M2 AP" },
"description": "Armor piercing .30-06 M2 ammunition with a 166gr hardened steel core bullet. The .30-06 cartridge was adopted in 1906 by the US military, where it served for some 50 years, and it remains popular today amongst collectors and hunters for its range, versatility, and power.",
"description": "Armor piercing .30-06 M2 ammunition with a 166gr hardened steel core bullet. The .30-06 cartridge was adopted in 1906 by the US military, where it served for some 50 years, and it remains popular today among collectors and hunters for its range, versatility, and power.",
"material": [ "brass", "steel", "lead", "powder" ],
"ascii_picture": "3006fmj",
"relative": { "damage": { "damage_type": "bullet", "amount": -4, "armor_penetration": 8 } }
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/ammo/338lapua.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "338lapua_hpbt",
"type": "AMMO",
"name": { "str_sp": ".338 Lapua HPBT" },
"description": ".338 Lapua ammunition, loaded with a 300-grain hollow-point boat-tailed bullet. Developed as a joint venture between Accuracy International, SAKO, and Lapua, the .338 round is a long-range sniping cartridge that boasts impressive accuracy and devastating terminal ballistics. With burgeoning interest amongst military, law enforcement, and civilian circles before the Cataclysm, the .338 cartridge filled the gap between lighter infantry munitions and anti-material rounds, although its potential utility as a hunting cartridge was somewhat diminished due to its high cost.",
"description": ".338 Lapua ammunition, loaded with a 300-grain hollow-point boat-tailed bullet. Developed as a joint venture between Accuracy International, SAKO, and Lapua, the .338 round is a long-range sniping cartridge that boasts impressive accuracy and devastating terminal ballistics. With burgeoning interest among military, law enforcement, and civilian circles before the Cataclysm, the .338 cartridge filled the gap between lighter infantry munitions and anti-material rounds, although its potential utility as a hunting cartridge was somewhat diminished due to its high cost.",
"weight": "16200 mg",
"volume": "327 ml",
"longest_side": "94 mm",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/ammo/38super.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "38super_fmj",
"type": "AMMO",
"name": { "str_sp": ".38 Super FMJ" },
"description": ".38 Super ammunition with a 124gr FMJ bullet. The .38 Super round was developed from .38 ACP in 1929 to penetrate body armor of the era. The caliber saw some resurgence in popularity amongst competition shooters in the 1980's prior to the proliferation of double stack 9mm pistols.",
"description": ".38 Super ammunition with a 124gr FMJ bullet. The .38 Super round was developed from .38 ACP in 1929 to penetrate body armor of the era. The caliber saw some resurgence in popularity among competition shooters in the 1980's prior to the proliferation of double stack 9mm pistols.",
"ascii_picture": "38super_fmj",
"weight": "13 g",
"volume": "97 ml",
Expand Down Expand Up @@ -54,7 +54,7 @@
"copy-from": "38super_fmj",
"type": "AMMO",
"name": { "str_sp": ".38 Super JHP" },
"description": ".38 Super ammunition with a 115gr JHP bullet. The .38 Super round was developed from .38 ACP in 1929 to penetrate body armor of the era. The caliber saw some resurgence in popularity amongst competition shooters in the 1980's prior to the proliferation of double stack 9mm pistols.",
"description": ".38 Super ammunition with a 115gr JHP bullet. The .38 Super round was developed from .38 ACP in 1929 to penetrate body armor of the era. The caliber saw some resurgence in popularity among competition shooters in the 1980's prior to the proliferation of double stack 9mm pistols.",
"price": "2 USD 40 cent",
"price_postapoc": "6 USD",
"flags": [ "IRREPLACEABLE_CONSUMABLE" ],
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/ammo/40.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "40fmj",
"type": "AMMO",
"name": { "str_sp": ".40 S&W FMJ" },
"description": ".40 S&W ammunition with a 180gr FMJ bullet. The .40 S&W round is descended from the 10mm Auto cartridge and maintains most of its predecessor's strengths while reducing recoil. It was popular amongst law enforcement before the FBI switched to 9mm.",
"description": ".40 S&W ammunition with a 180gr FMJ bullet. The .40 S&W round is descended from the 10mm Auto cartridge and maintains most of its predecessor's strengths while reducing recoil. It was popular among law enforcement before the FBI switched to 9mm.",
"ascii_picture": "40sw",
"weight": "15 g",
"volume": "106 ml",
Expand Down Expand Up @@ -55,7 +55,7 @@
"copy-from": "40fmj",
"type": "AMMO",
"name": { "str_sp": ".40 S&W JHP" },
"description": ".40 S&W ammunition with a 135gr JHP bullet. The .40 S&W round is descended from the 10mm Auto cartridge and maintains most of its predecessor's strengths while reducing recoil. It was popular amongst law enforcement before the FBI switched to 9mm.",
"description": ".40 S&W ammunition with a 135gr JHP bullet. The .40 S&W round is descended from the 10mm Auto cartridge and maintains most of its predecessor's strengths while reducing recoil. It was popular among law enforcement before the FBI switched to 9mm.",
"relative": { "damage": { "damage_type": "bullet", "amount": 3, "armor_penetration": -6 } }
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/ammo_pouch.json
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@
"id": "tacvest",
"type": "ARMOR",
"name": { "str": "tac vest" },
"description": "This light vest is meant to carry your magazines, shells and pistols. They are popular amongst law enforcement, but less so than combination tactical vests incorporating Kevlar.",
"description": "This light vest is meant to carry your magazines, shells and pistols. They are popular among law enforcement, but less so than combination tactical vests incorporating Kevlar.",
"weight": "1750 g",
"volume": "1250 ml",
"looks_like": "vest",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/boots.json
Original file line number Diff line number Diff line change
Expand Up @@ -928,7 +928,7 @@
"type": "ARMOR",
"category": "armor",
"name": { "str": "pair of steeltoed sneakers", "str_pl": "pairs of steeltoed sneakers" },
"description": "A descendant of the classic steeltoed boot, this modern footwear has become popular amongst working class people over the last couple of decades.",
"description": "A descendant of the classic steeltoed boot, this modern footwear has become popular among working class people over the last couple of decades.",
"weight": "900 g",
"volume": "1500 ml",
"longest_side": "254 mm",
Expand Down
10 changes: 5 additions & 5 deletions data/json/items/armor/cloaks.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
{
"id": "agender_pride_flag",
"name": { "str": "agender flag" },
"description": "A large green grey and black agender flag. The black and white stripes represent complete absence of gender, grey represents being semi-genderless, and green represents non-binary gender.",
"description": "A large green gray and black agender flag. The black and white stripes represent complete absence of gender, gray represents being semi-genderless, and green represents non-binary gender.",
"weight": 2
},
{
Expand Down Expand Up @@ -80,13 +80,13 @@
{
"id": "asexual_pride_flag",
"name": { "str": "asexual flag" },
"description": "A large purple, white, grey and black asexual flag. Black for asexuality (feeling no sexual attraction), grey for grey-asexuality and demisexuality (feeling sexual attraction only sometimes), white for non-asexual partners and allies, and purple for community.",
"description": "A large purple, white, gray and black asexual flag. Black for asexuality (feeling no sexual attraction), gray for gray-asexuality and demisexuality (feeling sexual attraction only sometimes), white for non-asexual partners and allies, and purple for community.",
"weight": 2
},
{
"id": "aromantic_pride_flag",
"name": { "str": "aromantic flag" },
"description": "A large black, grey, white and green aromantic flag. The green and light green stripes cover everyone under the aromantic spectrum, while represents nonromantic forms of love and attraction, and the gray and black represent all sexualities under the aromantic spectrum.",
"description": "A large black, gray, white and green aromantic flag. The green and light green stripes cover everyone under the aromantic spectrum, while represents nonromantic forms of love and attraction, and the gray and black represent all sexualities under the aromantic spectrum.",
"weight": 2
},
{
Expand Down Expand Up @@ -116,7 +116,7 @@
{
"id": "agender_pride_flag",
"name": { "str": "agender flag" },
"description": "A large green, white, grey and black agender flag. The black and white stripes represent complete absence of gender, grey represents being semi-genderless, and green represents non-binary gender. The symmetry of the pattern makes it so that it's correct no matter how it flies.",
"description": "A large green, white, gray and black agender flag. The black and white stripes represent complete absence of gender, gray represents being semi-genderless, and green represents non-binary gender. The symmetry of the pattern makes it so that it's correct no matter how it flies.",
"weight": 2
},
{
Expand Down Expand Up @@ -1423,7 +1423,7 @@
{
"id": "ugandan_flag",
"name": { "str": "Ugandan flag" },
"description": "A flag that features six equal horizontal bands of black, yellow, red, black, yellow, and red, a white disc is superimposed at the center with a grey crowned crane, facing the hoist side.",
"description": "A flag that features six equal horizontal bands of black, yellow, red, black, yellow, and red, a white disc is superimposed at the center with a gray crowned crane, facing the hoist side.",
"weight": 10,
"append": true
},
Expand Down
Loading
Loading