Skip to content

Commit

Permalink
Merge pull request #54888 from haveric/ordnance
Browse files Browse the repository at this point in the history
ordinance -> ordnance
  • Loading branch information
ZhilkinSerg authored Jan 29, 2022
2 parents 560160c + 9052c41 commit 1bba9b7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions data/json/items/armor/torso_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@
"type": "TOOL_ARMOR",
"category": "armor",
"name": { "str": "EOD jacket" },
"description": "A thick armored jacket constructed from Kevlar and Nomex for use by explosive ordinance disposal technicians.",
"description": "A thick armored jacket constructed from Kevlar and Nomex for use by explosive ordnance disposal technicians.",
"weight": "16300 g",
"volume": "15 L",
"price": 200000,
Expand All @@ -679,7 +679,7 @@
"type": "TOOL_ARMOR",
"category": "armor",
"name": { "str": "light EOD jacket" },
"description": "An armored jacket constructed from Kevlar and Nomex for use by explosive ordinance disposal technicians. It is lighter than normal EOD armor to provide more maneuverability and can be worn over ballistic armor.",
"description": "An armored jacket constructed from Kevlar and Nomex for use by explosive ordnance disposal technicians. It is lighter than normal EOD armor to provide more maneuverability and can be worn over ballistic armor.",
"weight": "7000 g",
"volume": "15 L",
"price": 200000,
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Generic_Guns/gg_ammunition_types.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
{
"type": "ammunition_type",
"id": "ammo_rocket",
"//": "any rocket, missile, or rocket-like ordinance, like recoilless ammo",
"//": "any rocket, missile, or rocket-like ordnance, like recoilless ammo",
"name": "rocket ammo",
"default": "rocket_hedp"
},
Expand Down

0 comments on commit 1bba9b7

Please sign in to comment.