Skip to content

Commit

Permalink
American Spelling (#75734)
Browse files Browse the repository at this point in the history
* AmericanSpelling

* Apply suggestions from code review

---------

Co-authored-by: Maleclypse <[email protected]>
  • Loading branch information
klorpa and Maleclypse authored Aug 21, 2024
1 parent cdd78ab commit 3548e83
Show file tree
Hide file tree
Showing 36 changed files with 71 additions and 71 deletions.
2 changes: 1 addition & 1 deletion data/json/achievements.json
Original file line number Diff line number Diff line change
Expand Up @@ -1999,7 +1999,7 @@
"is": "==",
"target": [ "overmap_special_id", "New England Church Retreat" ],
"visible": "when_achievement_completed",
"description": "Do you have a few minutes to talk about our lord and saviour Jesus Christ?"
"description": "Do you have a few minutes to talk about our lord and savior Jesus Christ?"
}
]
},
Expand Down
4 changes: 2 additions & 2 deletions data/json/faults/faults_vehicles.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
{
"id": "fault_engine_immobiliser",
"type": "fault",
"name": { "str": "Active immobiliser" },
"description": "An immobiliser device prevents starting of the vehicle without the appropriate key.",
"name": { "str": "Active immobilizer" },
"description": "An immobilizer device prevents starting of the vehicle without the appropriate key.",
"item_prefix": "faulty",
"price_modifier": 0.25,
"flags": [ "IMMOBILIZER" ]
Expand Down
4 changes: 2 additions & 2 deletions data/json/faults/fixes_vehicles.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
{
"type": "fault_fix",
"id": "mend_fault_engine_immobiliser_deactivate",
"name": "Deactivate immobiliser",
"success_msg": "You successfully deactivate the immobiliser of the %s.",
"name": "Deactivate immobilizer",
"success_msg": "You successfully deactivate the immobilizer of the %s.",
"time": "5 m",
"faults_removed": [ "fault_engine_immobiliser" ],
"skills": { "mechanics": 2, "electronics": 5 },
Expand Down
4 changes: 2 additions & 2 deletions data/json/hobbies.json
Original file line number Diff line number Diff line change
Expand Up @@ -892,8 +892,8 @@
"type": "profession",
"subtype": "hobby",
"id": "modelling",
"name": "Modelling",
"description": "You were deep into the fashion scene, keeping up on the latest trends and even modelling clothes yourself. Having style and good looks is just as, if not more, important to you than practicality.",
"name": "Modeling",
"description": "You were deep into the fashion scene, keeping up on the latest trends and even modeling clothes yourself. Having style and good looks is just as, if not more, important to you than practicality.",
"points": 2,
"skills": [ { "level": 2, "name": "speech" }, { "level": 1, "name": "tailor" } ],
"traits": [ "STYLISH" ],
Expand Down
6 changes: 3 additions & 3 deletions data/json/itemgroups/collections_domestic.json
Original file line number Diff line number Diff line change
Expand Up @@ -1414,7 +1414,7 @@
},
{
"id": "untidy_floor_clutter",
"//": "Items you might find on the floor in a disorganised house.",
"//": "Items you might find on the floor in a disorganized house.",
"type": "item_group",
"subtype": "distribution",
"items": [
Expand Down Expand Up @@ -1449,7 +1449,7 @@
},
{
"id": "messy_floor_clutter",
"//": "Items you might find on the floor in a disorganised and dirty house.",
"//": "Items you might find on the floor in a disorganized and dirty house.",
"type": "item_group",
"subtype": "distribution",
"items": [
Expand All @@ -1468,7 +1468,7 @@
},
{
"id": "untidy_workbench_clutter",
"//": "Items you might find on the floor in a disorganised house.",
"//": "Items you might find on the floor in a disorganized house.",
"type": "item_group",
"subtype": "distribution",
"items": [ { "item": "splinter", "prob": 10 }, { "item": "nail", "prob": 10, "charges": [ 1, 3 ] } ]
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/ammo.json
Original file line number Diff line number Diff line change
Expand Up @@ -1183,7 +1183,7 @@
"id": "gasfilter_m",
"category": "tool_magazine",
"name": { "str_sp": "activated carbon" },
"description": "A small amount of coal-derived carbon material with many small pores, used for the adsorption of harmful chemicals. Most commonly employed within respirator filters, it traps and retains chemical gases and vapour contaminants while allowing filtered air to pass unhindered. Once all the carbon has been bonded to intruding chemicals, the filter is expired and must be replaced.",
"description": "A small amount of coal-derived carbon material with many small pores, used for the adsorption of harmful chemicals. Most commonly employed within respirator filters, it traps and retains chemical gases and vapor contaminants while allowing filtered air to pass unhindered. Once all the carbon has been bonded to intruding chemicals, the filter is expired and must be replaced.",
"volume": "1 ml",
"price": "1 cent",
"price_postapoc": "1 cent",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/ammo/84x246mm.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"type": "AMMO",
"id": "84x246mm_he",
"//": "84mm HE 441D RS. Ref:TC 3-22.84. 35494gr projectile travelling at 787.4fps.",
"//": "84mm HE 441D RS. Ref:TC 3-22.84. 35494gr projectile traveling at 787.4fps.",
"price": "700 USD",
"price_postapoc": "120 USD",
"flags": [ "IRREPLACEABLE_CONSUMABLE" ],
Expand Down Expand Up @@ -47,7 +47,7 @@
"type": "AMMO",
"id": "84x246mm_smoke",
"copy-from": "84x246mm_he",
"//": "84mm SMOKE 469C. 35340gr projectile travelling at 787.4 fps.",
"//": "84mm SMOKE 469C. 35340gr projectile traveling at 787.4 fps.",
"price": "450 USD",
"price_postapoc": "120 USD",
"name": { "str_sp": "84x245mm smoke" },
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/armor/coats.json
Original file line number Diff line number Diff line change
Expand Up @@ -888,7 +888,7 @@
},
{
"id": "jacket_army",
"//": "Intended to be, and modelled off of, an M65 combat jacket.",
"//": "Intended to be, and modeled off of, an M65 combat jacket.",
"//2": "Considering that this is a stand-in for both original and reproduction M65 jackets, we're basing our overall dimensions and price on: https://www.helikon-tex.com/en_eur/ku-c65-dc-covert-m-65-jacket.html",
"type": "ARMOR",
"looks_like": "coat_winter",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/bionics.json
Original file line number Diff line number Diff line change
Expand Up @@ -1400,7 +1400,7 @@
"type": "BIONIC_ITEM",
"name": { "str": "Throwing Assist CBM" },
"looks_like": "bio_int_enhancer",
"description": "The culmination of decades of research into hominid palaeoanthropology and biomechanical modelling, the throwing assist CBM was brought to market to revolutionize Beqball tournaments, soon becoming exhibitions of cybernetic human effort and engineering. A network of neurostimulators and sensors, mostly in the arms and hands, work in tandem with the eyes for a significant increase in throwing accuracy and precision. When the Exodii came upon this cybernetic enhancement suite, they found it to be an economical way to ensure precise grenade placement in partial cyborgs.",
"description": "The culmination of decades of research into hominid palaeoanthropology and biomechanical modeling, the throwing assist CBM was brought to market to revolutionize Beqball tournaments, soon becoming exhibitions of cybernetic human effort and engineering. A network of neurostimulators and sensors, mostly in the arms and hands, work in tandem with the eyes for a significant increase in throwing accuracy and precision. When the Exodii came upon this cybernetic enhancement suite, they found it to be an economical way to ensure precise grenade placement in partial cyborgs.",
"price": "2 kUSD 200 USD",
"weight": "1000 g",
"difficulty": 3
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/containers/containers.json
Original file line number Diff line number Diff line change
Expand Up @@ -4137,7 +4137,7 @@
"type": "GENERIC",
"category": "container",
"name": { "str": "maker kit box", "str_pl": "maker kit boxes" },
"description": "A small box with an image of children building things. It's labelled 'Makerspace Learner Kit'.",
"description": "A small box with an image of children building things. It's labeled 'Makerspace Learner Kit'.",
"ascii_picture": "maker_kit_box",
"weight": "400 g",
"volume": "3200 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/containers/military.json
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@
"type": "GENERIC",
"name": { "str": "ammo box", "str_pl": "ammo boxes" },
"//": "20x308mm, 100x9mm, ex ammunition_box_308",
"description": "A lightweight box, labelled with a big, shiny image of an ammunition cartridge.",
"description": "A lightweight box, labeled with a big, shiny image of an ammunition cartridge.",
"category": "container",
"symbol": "#",
"color": "brown",
Expand Down Expand Up @@ -658,7 +658,7 @@
"type": "GENERIC",
"name": { "str": "small ammo box", "str_pl": "small ammo boxes" },
"//": "10x50bmg, 20x12 gauge, ex ammunition_box_50bmg",
"description": "A lightweight box, labelled with a big, shiny image of an ammunition cartridge.",
"description": "A lightweight box, labeled with a big, shiny image of an ammunition cartridge.",
"category": "container",
"symbol": "#",
"color": "brown",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/fluff.json
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@
"type": "GENERIC",
"category": "other",
"name": { "str": "Knight Mage", "str_pl": "sets of Knight Mage" },
"description": "A highly strategic board game that combines elements of role-playing games with deck-building and traditional board game mechanics. Players (or a solo player) take on the roles of powerful Knights Mages who explore the land, conquer cities, and engage in epic battles against various enemies. The game features an intricate levelling system where players can enhance their characters' abilities and acquire new skills as they progress through the game.",
"description": "A highly strategic board game that combines elements of role-playing games with deck-building and traditional board game mechanics. Players (or a solo player) take on the roles of powerful Knights Mages who explore the land, conquer cities, and engage in epic battles against various enemies. The game features an intricate leveling system where players can enhance their characters' abilities and acquire new skills as they progress through the game.",
"weight": "1120 g",
"volume": "1850 ml",
"price": "70 USD 50 cent",
Expand Down
12 changes: 6 additions & 6 deletions data/json/items/gun/44.json
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,13 @@
"looks_like": "sw_619",
"type": "GUN",
"name": { "str": ".44 long barrel hunting revolver" },
"description": "A large-frame revolver with a modern plastic handle. Too large for law enforcement, it was mostly used by sport shooters and hunters, for the manufacturer deemed it to be the most accurate .44-calibre revolver in their line. This one has an extended 8-inch barrel.",
"description": "A large-frame revolver with a modern plastic handle. Too large for law enforcement, it was mostly used by sport shooters and hunters, for the manufacturer deemed it to be the most accurate .44-caliber revolver in their line. This one has an extended 8-inch barrel.",
"variant_type": "gun",
"variants": [
{
"id": "colt_anaconda_8",
"name": { "str": "Colt Anaconda" },
"description": "A large-frame double-action revolver with a modern plastic handle. Too large for law enforcement, it was mostly used by sport shooters and hunters, for Colt deemed it to be the most accurate .44-calibre revolver in their line. This one has an extended 8-inch barrel."
"description": "A large-frame double-action revolver with a modern plastic handle. Too large for law enforcement, it was mostly used by sport shooters and hunters, for Colt deemed it to be the most accurate .44-caliber revolver in their line. This one has an extended 8-inch barrel."
}
],
"weight": "1672 g",
Expand Down Expand Up @@ -222,13 +222,13 @@
"copy-from": "colt_anaconda_8",
"type": "GUN",
"name": { "str": ".44 hunting revolver" },
"description": "A large-frame revolver with a modern plastic handle. Too large for law enforcement, it was mostly used by sport shooters and hunters, for the manufacturer deemed it to be the most accurate .44-calibre revolver in their line. This one has a 6-inch barrel.",
"description": "A large-frame revolver with a modern plastic handle. Too large for law enforcement, it was mostly used by sport shooters and hunters, for the manufacturer deemed it to be the most accurate .44-caliber revolver in their line. This one has a 6-inch barrel.",
"variant_type": "gun",
"variants": [
{
"id": "colt_anaconda",
"name": { "str": "Colt Anaconda" },
"description": "A large-frame double-action revolver with a modern plastic handle. Too large for law enforcement, it was mostly used by sport shooters and hunters, for Colt deemed it to be the most accurate .44-calibre revolver in their line. This one has a 6-inch barrel."
"description": "A large-frame double-action revolver with a modern plastic handle. Too large for law enforcement, it was mostly used by sport shooters and hunters, for Colt deemed it to be the most accurate .44-caliber revolver in their line. This one has a 6-inch barrel."
}
],
"weight": "1499 g",
Expand All @@ -245,13 +245,13 @@
"copy-from": "colt_anaconda_8",
"type": "GUN",
"name": { "str": ".44 short barrel hunting revolver" },
"description": "A large-frame revolver with a modern plastic handle. Too large for law enforcement, it was mostly used by sport shooters and hunters, for the manufacturer deemed it to be the most accurate .44-calibre revolver in their line. This one has a shortened 4-inch barrel.",
"description": "A large-frame revolver with a modern plastic handle. Too large for law enforcement, it was mostly used by sport shooters and hunters, for the manufacturer deemed it to be the most accurate .44-caliber revolver in their line. This one has a shortened 4-inch barrel.",
"variant_type": "gun",
"variants": [
{
"id": "colt_anaconda",
"name": { "str": "Colt Anaconda" },
"description": "A large-frame double-action revolver with a modern plastic handle. Too large for law enforcement, it was mostly used by sport shooters and hunters, for Colt deemed it to be the most accurate .44-calibre revolver in their line. This one has a shortened 4-inch barrel."
"description": "A large-frame double-action revolver with a modern plastic handle. Too large for law enforcement, it was mostly used by sport shooters and hunters, for Colt deemed it to be the most accurate .44-caliber revolver in their line. This one has a shortened 4-inch barrel."
}
],
"weight": "1499 g",
Expand Down
10 changes: 5 additions & 5 deletions data/json/items/gun/50.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"looks_like": "modular_ar15",
"type": "GUN",
"name": { "str": "semi-automatic anti-materiel rifle" },
"description": "A mahoosive rifle of military pedigree, fitted with a telescopic gun scope peeking over its giant cocking mechanism and resting upon a bipod to control recoil from the equally big .50-calibre munitions it is designed for. Originally employed for detonating unexploded ordnance in combat conditions and defeating light vehicular and structural targets, in the post-Cataclysm it serves as an admirable conduit of kinetic energy to the biggest and baddest of the new world's critters.",
"description": "A mahoosive rifle of military pedigree, fitted with a telescopic gun scope peeking over its giant cocking mechanism and resting upon a bipod to control recoil from the equally big .50-caliber munitions it is designed for. Originally employed for detonating unexploded ordnance in combat conditions and defeating light vehicular and structural targets, in the post-Cataclysm it serves as an admirable conduit of kinetic energy to the biggest and baddest of the new world's critters.",
"variant_type": "gun",
"variants": [
{
Expand Down Expand Up @@ -40,7 +40,7 @@
"looks_like": "m107a1",
"type": "GUN",
"name": { "str_sp": ".50-caliber heavy machine gun" },
"description": "Essentially a giant steel box with a long barrel peering from one end and dual spade grips mounted upon the other, this venerable machine gun design served the United States military since the First World War, mounted on everything from tanks to patrol boats to aircraft, and even tripod-mounted for stand-alone use. Part and parcel with its size and munition payload of .50-calibre ammo belts, however, is the fact that, to operate it, one must mount it upon suitable furniture, terrain features, or vehicles.",
"description": "Essentially a giant steel box with a long barrel peering from one end and dual spade grips mounted upon the other, this venerable machine gun design served the United States military since the First World War, mounted on everything from tanks to patrol boats to aircraft, and even tripod-mounted for stand-alone use. Part and parcel with its size and munition payload of .50-caliber ammo belts, however, is the fact that, to operate it, one must mount it upon suitable furniture, terrain features, or vehicles.",
"variant_type": "gun",
"variants": [
{
Expand Down Expand Up @@ -84,7 +84,7 @@
"looks_like": "m107a1",
"type": "GUN",
"name": { "str": ".50-caliber precision rifle" },
"description": "Pin-point accurate out to one and a half kilometres and cycling its .50-calibre feed from detachable, 10-round magazines, this combat sniper's weapon provides users with a comfortable window to engage targets at a distance. Its imposing bullets ensure that it is more than capable of delivering an adequate account of itself at such ranges.",
"description": "Pin-point accurate out to one and a half kilometers and cycling its .50-caliber feed from detachable, 10-round magazines, this combat sniper's weapon provides users with a comfortable window to engage targets at a distance. Its imposing bullets ensure that it is more than capable of delivering an adequate account of itself at such ranges.",
"variant_type": "gun",
"variants": [
{
Expand Down Expand Up @@ -120,7 +120,7 @@
"looks_like": "m107a1",
"type": "GUN",
"name": { "str": "bolt-action anti-materiel rifle" },
"description": "Serving both anti-materiel and high-priority sniping roles in their service with various militaries, bolt-action rifles, such as this one, were known for their long ranges of engagement, recoil, and armour-defeating ordinance. Essentially a step below light cannonry, as far as shoulder-arms are concerned, this weapon's mix of power and accuracy meet hands to ensure that, before the cataclysm, one shot was synonymous with one very, very dead target.",
"description": "Serving both anti-materiel and high-priority sniping roles in their service with various militaries, bolt-action rifles, such as this one, were known for their long ranges of engagement, recoil, and armor-defeating ordinance. Essentially a step below light cannonry, as far as shoulder-arms are concerned, this weapon's mix of power and accuracy meet hands to ensure that, before the Cataclysm, one shot was synonymous with one very, very dead target.",
"variant_type": "gun",
"variants": [
{
Expand Down Expand Up @@ -156,7 +156,7 @@
"looks_like": "m107a1",
"type": "GUN",
"name": { "str": "single-shot .50-caliber rifle" },
"description": "Relatively trim as far as .50-calibre rifles go, this single-shot firearm was a reasonably affordable entry-level gun for civilians wishing to play with some very large, very punchy toys. Now, at the world's Armageddon, it would be wise to make that singular round-capacity count on some high-priority craniums.",
"description": "Relatively trim as far as .50-caliber rifles go, this single-shot firearm was a reasonably affordable entry-level gun for civilians wishing to play with some very large, very punchy toys. Now, at the world's Armageddon, it would be wise to make that singular round-capacity count on some high-priority craniums.",
"variant_type": "gun",
"variants": [
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/545x39.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"volume": "2418 ml",
"longest_side": "895 mm",
"barrel_length": "413 mm",
"//": "Based off of the Riley Defence RAK74-C and RAK74-C-SF, respectively.",
"//": "Based off of the Riley Defense RAK74-C and RAK74-C-SF, respectively.",
"price": "1 kUSD 115 USD",
"price_postapoc": "35 USD",
"to_hit": -1,
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/magazine/filter.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"type": "MAGAZINE",
"category": "tool_magazine",
"name": { "str": "CBRN filter canister" },
"description": "A cylindrical, black-finished filter canister packed with charcoal retained between dual particulate membranes, rated to protect against chemical weapons, nerve agents, biological contaminants, radioactive dust, and all manner of other unpleasant vapours or particles. That is, though, only if you screw it into an appropriate respirator before hand and the charcoal isn't expired.",
"description": "A cylindrical, black-finished filter canister packed with charcoal retained between dual particulate membranes, rated to protect against chemical weapons, nerve agents, biological contaminants, radioactive dust, and all manner of other unpleasant vapors or particles. That is, though, only if you screw it into an appropriate respirator before hand and the charcoal isn't expired.",
"weight": "365 g",
"volume": "910 ml",
"longest_side": "111 mm",
Expand Down
Loading

0 comments on commit 3548e83

Please sign in to comment.