Skip to content

Commit

Permalink
Merge pull request #38346 from snipercup/Gun-name-to-object
Browse files Browse the repository at this point in the history
Gun name to object
  • Loading branch information
ZhilkinSerg authored Feb 25, 2020
2 parents 5fa9146 + 83cc924 commit bba7578
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 18 deletions.
6 changes: 3 additions & 3 deletions data/json/items/gun/20x66mm.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"type": "GUN",
"reload_noise_volume": 10,
"reload_noise": "chuk chuk.",
"name": "RM120c shotgun",
"name": { "str": "RM120c shotgun" },
"description": "Utilizing a powerful and unusual caliber, the Rivtech RM120c caseless pump-action shotgun was designed for hunting big game, with durability and ease of use as priorities.",
"weight": "1880 g",
"volume": "2250 ml",
Expand Down Expand Up @@ -41,7 +41,7 @@
"looks_like": "remington_870",
"type": "GUN",
"reload_noise_volume": 10,
"name": "RM20 autoshotgun",
"name": { "str": "RM20 autoshotgun" },
"description": "Utilizing a powerful and unusual caliber, the Rivtech RM20 caseless automatic combat shotgun was designed with durability and overwhelming power in mind.",
"weight": "2820 g",
"volume": "1750 ml",
Expand Down Expand Up @@ -76,7 +76,7 @@
"looks_like": "remington_870",
"type": "GUN",
"reload_noise_volume": 10,
"name": "RM228 PDW",
"name": { "str": "RM228 PDW" },
"description": "Chambering the powerful 20x66mm caseless shotgun cartridge, the Rivtech RM228 PDW was designed for the civilian personal defense market with durability and ease of use as priorities. While lauded for its small size and light weight, its hefty price tag kept it out of the reach of casual collectors.",
"weight": "780 g",
"volume": "750 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/22.json
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
"looks_like": "ar15",
"type": "GUN",
"reload_noise_volume": 10,
"name": "RM360 rotary carbine",
"name": { "str": "RM360 rotary carbine" },
"description": "This unusual Rivtech carbine features five rotating barrels and a large capacity helical magazine. Durable and easy to handle, it was designed to overcome the deficiencies of its low power .22LR cartridge by rapidly delivering a large number of projectiles.",
"weight": "1620 g",
"volume": "1 L",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/gun/223.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"copy-from": "rifle_auto",
"looks_like": "ar15",
"type": "GUN",
"name": "Remington ACR",
"name": { "str": "Remington ACR" },
"description": "This carbine was developed for military use in the early 21st century. It is damaging and accurate, though its rate of fire is a bit slower than competing .223 carbines.",
"weight": "3590 g",
"volume": "2 L",
Expand Down Expand Up @@ -368,7 +368,7 @@
"copy-from": "rifle_semi",
"looks_like": "ar15",
"type": "GUN",
"name": "Ruger Mini-14",
"name": { "str": "Ruger Mini-14" },
"description": "A small, lightweight semi-auto carbine designed for civilian and police use. Its superb accuracy and low recoil makes it more suitable than full-auto rifles for some situations.",
"weight": "3180 g",
"volume": "2 L",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/300BLK.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"copy-from": "rifle_auto",
"looks_like": "ar15",
"type": "GUN",
"name": "Remington ACR .300BLK",
"name": { "str": "Remington ACR .300BLK" },
"description": "This carbine was developed for military use in the early 21st century. It is damaging and accurate, though its rate of fire is a bit slower than competing carbines. This version is chambered for the .300 AAC Blackout round.",
"weight": "3590 g",
"volume": "2 L",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/380.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"copy-from": "pistol_backup",
"looks_like": "glock_17",
"type": "GUN",
"name": "Ruger LCP",
"name": { "str": "Ruger LCP" },
"description": "One of the best-selling modern day 'pocket pistol's, the LCP is an affordable, polymer framed pistol chambered in .380 ACP. Despite the round's relatively low power, the pistol's low weight and short sight radius make for a moderately poor handling pistol.",
"weight": "267 g",
"volume": "160 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/40x46mm.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
"copy-from": "launcher_base",
"looks_like": "m79",
"type": "GUN",
"name": "RM802 grenade launcher",
"name": { "str": "RM802 grenade launcher" },
"//": "Either Rivtech or milspec would make it Expensive. Combined, you could buy a half-decent car for the price.",
"description": "The Rivtech RM802 pump-action 40mm grenade launcher was designed to be a step ahead of single-shot grenade launchers by allowing sustained heavy firepower. However, its capacity is fairly limited so it must be used with careful planning.",
"weight": "3120 g",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/gun/5x50.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"looks_like": "hk_mp5",
"type": "GUN",
"reload_noise_volume": 10,
"name": "RM216 SPIW",
"name": { "str": "RM216 SPIW" },
"description": "This light carbine fires 5x50mm armor-piercing flechette cartridges. Classified as a special purpose individual weapon, this advanced firearm was developed by Rivtech for the US military shortly before the end of the world. Designed to be fired in bursts, it excels in close combat.",
"weight": "1302 g",
"volume": "1250 ml",
Expand Down Expand Up @@ -44,7 +44,7 @@
"looks_like": "glock_17",
"type": "GUN",
"reload_noise_volume": 10,
"name": "RM232 IDW",
"name": { "str": "RM232 IDW" },
"description": "This lightweight machine pistol fires 5x50mm armor-piercing flechette cartridges. Classified as an individual defense weapon, this advanced firearm was developed by Rivtech for the US military shortly before the end of the world. Designed to be fired in bursts, it excels in close combat.",
"weight": "682 g",
"volume": "750 ml",
Expand Down
6 changes: 3 additions & 3 deletions data/json/items/gun/8x40mm.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"looks_like": "glock_17",
"type": "GUN",
"reload_noise_volume": 10,
"name": "RM103A automagnum",
"name": { "str": "RM103A automagnum" },
"//": "Rivtech don't come cheap.",
"description": "Considered overkill by many, the Rivtech M103A remains one of the most powerful sidearms ever developed. Accepts stick magazines.",
"weight": "1450 g",
Expand Down Expand Up @@ -39,7 +39,7 @@
"looks_like": "ar15",
"type": "GUN",
"reload_noise_volume": 10,
"name": "RM11B scout rifle",
"name": { "str": "RM11B scout rifle" },
"description": "Intended to function as a long-range sharpshooter support weapon for the military, the Rivtech RM11B scout rifle was designed for durability and accuracy under less than ideal circumstances. Its bullpup layout, integrated suppressor and digital scope, and two round burst mode allows it to deliver precise long-range takedowns, utilizing the proprietary Rivtech 8mm caseless round. Accepts stick magazines.",
"weight": "3100 g",
"volume": "2 L",
Expand Down Expand Up @@ -76,7 +76,7 @@
"looks_like": "hk_mp5",
"type": "GUN",
"reload_noise_volume": 10,
"name": "RM2000 submachine gun",
"name": { "str": "RM2000 submachine gun" },
"description": "Utilizing a powerful and unusual caliber, the Rivtech RM2000 submachine gun was designed for durability and ease of carrying under less than ideal circumstances. Accepts stick magazines.",
"weight": "1900 g",
"volume": "1 L",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/flammable.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"copy-from": "flamethrower_base",
"looks_like": "m79",
"type": "GUN",
"name": "RM451 flamethrower",
"name": { "str": "RM451 flamethrower" },
"description": "A military-grade combat flamethrower designed by Rivtech, the RM451 flamethrower incorporates a cycling pressure rapid-feed fuel system with a high-speed piezoelectric igniter. Solidly built with durability in mind, it serves as an incredibly destructive weapon in the right hands.",
"weight": "1320 g",
"volume": "3500 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/items/gun/shot.json
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@
"id": "remington_870_breacher",
"copy-from": "remington_870",
"type": "GUN",
"name": "Remington 870 MCS",
"name": { "str": "Remington 870 MCS" },
"description": "This Remington 870 Modular Combat System shotgun is currently setup for breaching operations, with a 10 inch barrel and no stock. It is small enough to carry as a secondary weapon, specifically to pop open any pesky doors you might come across. The grip's design makes for controllable yet unpleasant recoil, and the barrel lacks any sights.",
"weight": "2812 g",
"volume": "1427 ml",
Expand Down Expand Up @@ -341,7 +341,7 @@
"id": "remington_1100",
"copy-from": "shotgun_base",
"type": "GUN",
"name": "Remington 1100 competiton",
"name": { "str": "Remington 1100 competiton" },
"description": "This semi-automatic shotgun features a self compensating gas system that will feed a wide array of shells while also reducing recoil. Introduced in 1963, it is favored by law enforcement, hunters and competition shooters, and has been the best-selling autoloading shotgun in U.S. history. This is the nickel finished, teflon coated competition model, with a full length magazine tube and 30 inch barrel.",
"weight": "3742 g",
"volume": "3285 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/ups.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"looks_like": "ar15",
"type": "GUN",
"reload_noise_volume": 2,
"name": "RMES marksman system",
"name": { "str": "RMES marksman system" },
"description": "This is the integral weapon system for the RMES exoskeleton mech-suit, a quiet and accurate marksman laser rifle.",
"weight": "12500 g",
"volume": "5500 ml",
Expand Down

0 comments on commit bba7578

Please sign in to comment.