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 json syntax (2019-09-10) #33940

Merged
merged 2 commits into from Sep 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/mods/CRT_EXPANSION/crt_materials.json
Expand Up @@ -11,7 +11,7 @@
"fire_resist": 1,
"elec_resist": 20,
"chip_resist": 9,
"repaired_with": [ "plastic_chunk", "chunk_rubber" ],
"repaired_with": "plastic_chunk",
"salvaged_into": "chunk_rubber",
"dmg_adj": [ "ripped", "torn", "shredded", "tattered" ],
"bash_dmg_verb": "ripped",
Expand Down
4 changes: 2 additions & 2 deletions data/mods/Modular_Turrets/corpses.json
Expand Up @@ -2,7 +2,7 @@
{
"abstract": "broken_turret_base",
"type": "GENERIC",
"override": "true",
"override": true,
"symbol": ",",
"looks_like": "bot_turret",
"color": "light_gray",
Expand Down Expand Up @@ -245,7 +245,7 @@
{
"abstract": "broken_hack_base",
"type": "GENERIC",
"override": "true",
"override": true,
"symbol": ",",
"color": "light_green",
"name": "broken hack",
Expand Down
6 changes: 3 additions & 3 deletions data/mods/Modular_Turrets/items.json
Expand Up @@ -261,7 +261,7 @@
"id": "bot_turret",
"type": "TOOL",
"copy-from": "bot_turret_base",
"override": "true",
"override": true,
"name": "inactive 9mm defense turret",
"description": "An inactive 9mm defense turret. Up to 100 standard 9mm rounds will be automatically loaded from your inventory into the turret upon activation. Place the turret and it will ID you as friendly with its advanced IFF software. Consult your safety manual in the event of a malfunction.",
"color": "red",
Expand Down Expand Up @@ -352,7 +352,7 @@
"id": "bot_rifleturret",
"copy-from": "bot_turret_base",
"type": "TOOL",
"override": "true",
"override": true,
"name": "inactive 5.56mm military turret",
"description": "An inactive 5.56mm military turret. Up to 100 standard 5.56mm NATO rounds will be automatically loaded from your inventory into the turret upon activation. Place the turret and it will ID you as friendly with its advanced IFF software. Consult your safety manual in the event of a malfunction.",
"color": "green",
Expand Down Expand Up @@ -515,7 +515,7 @@
"id": "bot_laserturret",
"type": "TOOL",
"copy-from": "bot_turret_base",
"override": "true",
"override": true,
"name": "inactive advanced laser turret",
"description": "An inactive advanced laser turret. Place the turret and it will ID you as friendly with its advanced IFF software. Consult your safety manual in the event of a malfunction.",
"color": "yellow",
Expand Down
4 changes: 2 additions & 2 deletions data/mods/Modular_Turrets/recipe.json
Expand Up @@ -2,7 +2,7 @@
{
"abstract": "bot_hack_base",
"type": "recipe",
"override": "true",
"override": true,
"category": "CC_ELECTRONIC",
"subcategory": "CSC_ELECTRONIC_OTHER",
"skill_used": "electronics",
Expand Down Expand Up @@ -284,7 +284,7 @@
{
"type": "recipe",
"result": "bot_laserturret",
"override": "true",
"override": true,
"copy-from": "bot_turret_base",
"category": "CC_ELECTRONIC",
"subcategory": "CSC_ELECTRONIC_PARTS",
Expand Down
18 changes: 9 additions & 9 deletions data/mods/Modular_Turrets/uncraft_corpse.json
Expand Up @@ -2,7 +2,7 @@
{
"result": "broken_manhack",
"type": "uncraft",
"override": "true",
"override": true,
"skill_used": "electronics",
"difficulty": 4,
"time": 2000,
Expand All @@ -13,7 +13,7 @@
{
"result": "broken_flashbang_hack",
"type": "uncraft",
"override": "true",
"override": true,
"skill_used": "electronics",
"difficulty": 4,
"time": 2000,
Expand All @@ -24,7 +24,7 @@
{
"result": "broken_gasbomb_hack",
"type": "uncraft",
"override": "true",
"override": true,
"skill_used": "electronics",
"difficulty": 4,
"time": 2000,
Expand All @@ -35,7 +35,7 @@
{
"result": "broken_EMP_hack",
"type": "uncraft",
"override": "true",
"override": true,
"skill_used": "electronics",
"difficulty": 4,
"time": 2000,
Expand All @@ -46,7 +46,7 @@
{
"result": "broken_grenade_hack",
"type": "uncraft",
"override": "true",
"override": true,
"skill_used": "electronics",
"difficulty": 4,
"time": 2000,
Expand All @@ -57,7 +57,7 @@
{
"result": "broken_c4_hack",
"type": "uncraft",
"override": "true",
"override": true,
"skill_used": "electronics",
"difficulty": 4,
"time": 2000,
Expand All @@ -68,7 +68,7 @@
{
"result": "broken_mininuke_hack",
"type": "uncraft",
"override": "true",
"override": true,
"skill_used": "electronics",
"difficulty": 5,
"time": 2000,
Expand Down Expand Up @@ -147,7 +147,7 @@
"difficulty": 2,
"time": 3000,
"qualities": [ { "id": "SCREW", "level": 1 } ],
"override": "true",
"override": true,
"components": [ [ [ "broken_turret_disarmed", 1 ] ], [ [ "robopart_9mm", 1 ] ] ]
},
{
Expand Down Expand Up @@ -274,7 +274,7 @@
"difficulty": 2,
"time": 3000,
"qualities": [ { "id": "SCREW", "level": 1 } ],
"override": "true",
"override": true,
"components": [ [ [ "broken_advturret_disarmed", 1 ] ], [ [ "robopart_laser", 1 ] ] ]
},
{
Expand Down
8 changes: 4 additions & 4 deletions data/mods/Salvaged_Robots/uncraft_corpse.json
Expand Up @@ -11,7 +11,7 @@
{
"result": "broken_light_hack",
"type": "uncraft",
"override": "true",
"override": true,
"skill_used": "electronics",
"difficulty": 4,
"time": 2000,
Expand All @@ -29,7 +29,7 @@
{
"result": "broken_distract_hack",
"type": "uncraft",
"override": "true",
"override": true,
"skill_used": "electronics",
"difficulty": 4,
"time": 2000,
Expand All @@ -47,7 +47,7 @@
{
"result": "broken_arson_hack",
"type": "uncraft",
"override": "true",
"override": true,
"skill_used": "electronics",
"difficulty": 4,
"time": 2000,
Expand All @@ -65,7 +65,7 @@
{
"result": "broken_spore_hack",
"type": "uncraft",
"override": "true",
"override": true,
"skill_used": "electronics",
"difficulty": 4,
"time": 2000,
Expand Down