Skip to content

Commit

Permalink
Generic modern json (#37342)
Browse files Browse the repository at this point in the history
  • Loading branch information
snipercup authored and I-am-Erk committed Jan 24, 2020
1 parent 070588e commit e258c46
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion data/json/items/generic/ammolink.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"id": "ammolink40mm",
"copy-from": "ammolink",
"type": "GENERIC",
"name": "40mm grenade belt linkage",
"name": { "str": "40mm grenade belt linkage" },
"weight": "10 g",
"volume": "10ml",
"use_action": { "type": "ammobelt", "belt": "belt40mm" }
Expand Down
14 changes: 7 additions & 7 deletions data/json/items/generic/casing.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
"id": "40x46mm_m212_casing",
"type": "GENERIC",
"category": "spare_parts",
"name": "40x46mm M212 casing",
"name": { "str": "40x46mm M212 casing" },
"description": "A large canister from a spent 40mm cartridge.",
"weight": "50 g",
"volume": "55ml",
Expand All @@ -145,7 +145,7 @@
"id": "40x46mm_m118_casing",
"type": "GENERIC",
"category": "spare_parts",
"name": "40x46mm M118 casing",
"name": { "str": "40x46mm M118 casing" },
"description": "A large canister from a spent 40mm cartridge.",
"weight": "50 g",
"volume": "58ml",
Expand All @@ -157,7 +157,7 @@
"id": "40x46mm_m199_casing",
"type": "GENERIC",
"category": "spare_parts",
"name": "40x46mm M199 casing",
"name": { "str": "40x46mm M199 casing" },
"description": "A large canister from a spent 40mm cartridge.",
"weight": "50 g",
"volume": "59ml",
Expand All @@ -169,7 +169,7 @@
"id": "40x46mm_m195_casing",
"type": "GENERIC",
"category": "spare_parts",
"name": "40x46mm M195 casing",
"name": { "str": "40x46mm M195 casing" },
"description": "A large canister from a spent 40mm cartridge.",
"weight": "50 g",
"volume": "45ml",
Expand All @@ -181,7 +181,7 @@
"id": "40x53mm_m169_casing",
"type": "GENERIC",
"category": "spare_parts",
"name": "40x53mm M169 casing",
"name": { "str": "40x53mm M169 casing" },
"description": "A large canister from a spent 40mm cartridge.",
"weight": "50 g",
"volume": "64ml",
Expand Down Expand Up @@ -355,7 +355,7 @@
"id": "9mm_casing",
"copy-from": "casing",
"type": "GENERIC",
"name": "9x19mm casing",
"name": { "str": "9x19mm casing" },
"description": "An empty casing from a 9x19mm round.",
"weight": "3 g",
"volume": "5ml"
Expand Down Expand Up @@ -404,7 +404,7 @@
"id": "atgm_spent",
"copy-from": "casing",
"type": "GENERIC",
"name": "152mm ATGM tube",
"name": { "str": "152mm ATGM tube" },
"color": "dark_gray",
"description": "An empty steel tube which once contained a 152mm ATGM. Now it's essentially just a huge pipe.",
"material": "steel",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gunmod/underbarrel.json
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@
{
"id": "pipe_launcher40mm",
"type": "GUNMOD",
"name": "40mm pipe launcher",
"name": { "str": "40mm pipe launcher" },
"description": "This is a home built launcher tube that can be attached to almost any weapon except handguns. It allows a single 40mm grenade to be loaded and fired.",
"weight": "2080 g",
"volume": "750 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/robot_parts.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
{
"type": "GENERIC",
"id": "ai_module",
"name": "AI core",
"name": { "str": "AI core" },
"description": "This module is responsible for decision making, it basically runs the AI of the robot.",
"copy-from": "robot_module_abstract"
},
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/vehicle/alternator.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"id": "generator_7500w",
"copy-from": "vehicle_alternator",
"type": "GENERIC",
"name": "7.5kW generator",
"name": { "str": "7.5kW generator" },
"description": "A bulky but efficient electrical generator designed to be attached to an engine.",
"weight": "48000 g",
"volume": "7500 ml",
Expand Down

0 comments on commit e258c46

Please sign in to comment.