Skip to content

Commit

Permalink
Generic name to object (#38411)
Browse files Browse the repository at this point in the history
* Generic name to object

* Update data/json/items/generic.json

Co-Authored-By: I-am-Erk <[email protected]>

* Update data/json/items/generic.json

Co-Authored-By: I-am-Erk <[email protected]>

* Update data/json/items/generic.json

Co-Authored-By: I-am-Erk <[email protected]>

Co-authored-by: I-am-Erk <[email protected]>
  • Loading branch information
snipercup and I-am-Erk authored Feb 27, 2020
1 parent 834cc93 commit a11c098
Showing 1 changed file with 29 additions and 29 deletions.
58 changes: 29 additions & 29 deletions data/json/items/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -850,7 +850,7 @@
"id": "broken_eyebot",
"symbol": ",",
"color": "green",
"name": "broken eyebot",
"name": { "str": "broken eyebot" },
"category": "other",
"description": "A broken eyebot. Much less threatening now that it won't be calling for backup. Could be gutted for parts.",
"price": 1000,
Expand All @@ -867,7 +867,7 @@
"id": "broken_skitterbot",
"symbol": ",",
"color": "green",
"name": "broken skitterbot",
"name": { "str": "broken skitterbot" },
"category": "other",
"description": "A broken skitterbot. Much less threatening now that it lies limp on solid ground. Could be gutted for parts.",
"price": 1000,
Expand All @@ -884,7 +884,7 @@
"id": "broken_science_bot",
"symbol": ",",
"color": "green",
"name": "broken lab defense bot",
"name": { "str": "broken lab defense bot" },
"category": "other",
"description": "A broken lab defense bot, with its casing broken and fluid drained. Could be gutted for parts.",
"price": 1000,
Expand All @@ -901,7 +901,7 @@
"id": "broken_copbot",
"symbol": ",",
"color": "green",
"name": "broken police bot",
"name": { "str": "broken police bot" },
"category": "other",
"description": "A broken police bot. Much less threatening now that it's quiet and still. Could be gutted for parts.",
"price": 30000,
Expand All @@ -919,7 +919,7 @@
"id": "broken_nursebot",
"symbol": ",",
"color": "dark_gray",
"name": "broken nurse bot",
"name": { "str": "broken nurse bot" },
"category": "other",
"description": "A broken nurse bot. Its smooth face staring vacantly into empty space. Could be gutted for parts.",
"price": 30000,
Expand All @@ -937,7 +937,7 @@
"id": "broken_grocerybot",
"symbol": ",",
"color": "dark_gray",
"name": "broken grocery bot",
"name": { "str": "broken grocery bot" },
"category": "other",
"description": "A broken grocery bot. Its smiling face staring vacantly into empty space. Could be gutted for parts.",
"price": 30000,
Expand All @@ -955,7 +955,7 @@
"id": "broken_grocerybot_busted",
"symbol": ",",
"color": "dark_gray",
"name": "broken grocery bot",
"name": { "str": "broken grocery bot" },
"category": "other",
"description": "The body of a busted grocery bot. Its tarnished face is still smiling. Could be gutted for parts.",
"price": 30000,
Expand All @@ -971,15 +971,15 @@
{
"type": "GENERIC",
"id": "broken_nursebot_defective",
"name": "broken nurse bot",
"name": { "str": "broken nurse bot" },
"copy-from": "broken_nursebot"
},
{
"type": "GENERIC",
"id": "broken_riotbot",
"symbol": ",",
"color": "green",
"name": "broken riot control bot",
"name": { "str": "broken riot control bot" },
"category": "other",
"description": "A broken riot control bot. Much less threatening now that it's out of gas. Could be gutted for parts.",
"price": 30000,
Expand All @@ -997,7 +997,7 @@
"id": "broken_robofac_prototype",
"symbol": ",",
"color": "green",
"name": "broken prototype robot",
"name": { "str": "broken prototype robot" },
"category": "other",
"description": "A broken prototype robot, well more broken than before. Could be gutted for parts.",
"price": 30000,
Expand All @@ -1015,7 +1015,7 @@
"id": "broken_molebot",
"symbol": ",",
"color": "green",
"name": "broken miner bot",
"name": { "str": "broken miner bot" },
"category": "other",
"description": "A broken miner bot. Much less threatening now that it's no longer capable of drilling anything. Could be gutted for parts.",
"price": 20000,
Expand All @@ -1031,7 +1031,7 @@
{
"type": "GENERIC",
"id": "broken_mech_recon",
"name": "broken recon mech",
"name": { "str": "broken recon mech" },
"description": "This is a broken mech exoskeleton suit, it looks beyond repair.",
"weight": "700388 g",
"volume": "125 L",
Expand All @@ -1046,7 +1046,7 @@
{
"type": "GENERIC",
"id": "broken_mech_lifter",
"name": "broken mech lifter",
"name": { "str": "broken mech lifter" },
"description": "This is a broken mech exoskeleton suit, it looks beyond repair.",
"weight": "1280388 g",
"volume": "250 L",
Expand All @@ -1061,7 +1061,7 @@
{
"type": "GENERIC",
"id": "broken_mech_combat",
"name": "broken combat mech",
"name": { "str": "broken combat mech" },
"description": "This is a broken mech exoskeleton suit, it looks beyond repair.",
"weight": "1480388 g",
"volume": "250 L",
Expand Down Expand Up @@ -1112,7 +1112,7 @@
"id": "broken_manhack",
"symbol": ",",
"color": "light_green",
"name": "broken manhack",
"name": { "str": "broken manhack" },
"category": "other",
"description": "A broken manhack. Much less threatening now that it lies limp on solid ground. Could be gutted for parts.",
"price": 1000,
Expand All @@ -1129,7 +1129,7 @@
"id": "broken_grenade_hack",
"symbol": ",",
"color": "green",
"name": "broken grenade hack",
"name": { "str": "broken grenade hack" },
"category": "other",
"description": "A broken grenade hack. Much less threatening now that it lies quiet on solid ground. Could be gutted for parts.",
"price": 9000,
Expand All @@ -1147,7 +1147,7 @@
"id": "broken_mininuke_hack",
"symbol": ",",
"color": "magenta",
"name": "broken mininuke hack",
"name": { "str": "broken mininuke hack" },
"category": "other",
"description": "A broken magenta hack. Just looking at the wreck makes you shiver. Could be gutted for parts.",
"price": 18000,
Expand All @@ -1165,7 +1165,7 @@
"id": "broken_gasbomb_hack",
"symbol": ",",
"color": "dark_gray",
"name": "broken tear gas hack",
"name": { "str": "broken tear gas hack" },
"category": "other",
"description": "A broken tear gas hack. Much less threatening now that it lies quiet on solid ground. Could be gutted for parts.",
"price": 9000,
Expand All @@ -1183,7 +1183,7 @@
"id": "broken_EMP_hack",
"symbol": ",",
"color": "cyan",
"name": "broken EMP hack",
"name": { "str": "broken EMP hack" },
"category": "other",
"description": "A broken EMP hack. Much less threatening now that it lies quiet on solid ground. Could be gutted for parts.",
"price": 9000,
Expand All @@ -1201,7 +1201,7 @@
"id": "broken_flashbang_hack",
"symbol": ",",
"color": "dark_gray",
"name": "broken flashbang hack",
"name": { "str": "broken flashbang hack" },
"category": "other",
"description": "A broken flashbang hack. Much less threatening now that it lies quiet on solid ground. Could be gutted for parts.",
"price": 9000,
Expand All @@ -1219,7 +1219,7 @@
"id": "broken_c4_hack",
"symbol": ",",
"color": "light_gray",
"name": "broken C-4 hack",
"name": { "str": "broken C-4 hack" },
"category": "other",
"description": "A broken C-4 hack. Much less threatening now that it lies quiet on solid ground. Could be gutted for parts.",
"price": 9000,
Expand Down Expand Up @@ -2811,7 +2811,7 @@
"id": "broken_turret",
"symbol": ",",
"color": "green",
"name": "broken turret",
"name": { "str": "broken turret" },
"category": "other",
"description": "A broken turret. Much less threatening now that it's laid limp on solid ground. Could be gutted for parts.",
"price": 1000,
Expand All @@ -2828,7 +2828,7 @@
"id": "broken_turret_riot",
"symbol": ",",
"color": "blue",
"name": "broken riot control turret",
"name": { "str": "broken riot control turret" },
"description": "A broken riot control turret. Much less threatening now that it's laid limp on solid ground. Could be gutted for parts.",
"copy-from": "broken_turret"
},
Expand All @@ -2837,7 +2837,7 @@
"id": "broken_turret_rifle",
"symbol": ",",
"color": "green",
"name": "broken M249 autonomous CROWS II",
"name": { "str": "broken M249 autonomous CROWS II", "str_pl": "broken M249 autonomous CROWS II turrets" },
"weight": "75 kg",
"copy-from": "broken_turret"
},
Expand All @@ -2846,7 +2846,7 @@
"id": "broken_crows_m240",
"symbol": ",",
"color": "green",
"name": "broken M240 autonomous CROWS II",
"name": { "str": "broken M240 autonomous CROWS II", "str_pl": "broken M240 autonomous CROWS II turrets" },
"weight": "75 kg",
"copy-from": "broken_turret"
},
Expand All @@ -2855,7 +2855,7 @@
"id": "broken_turret_bmg",
"symbol": ",",
"color": "green",
"name": "broken M2 autonomous CROWS II",
"name": { "str": "broken M2 autonomous CROWS II", "str_pl": "broken M2 autonomous CROWS II turrets" },
"weight": "100 kg",
"copy-from": "broken_turret"
},
Expand All @@ -2864,7 +2864,7 @@
"id": "broken_laserturret",
"symbol": ",",
"color": "green",
"name": "broken laser turret",
"name": { "str": "broken laser turret" },
"weight": "110 kg",
"copy-from": "broken_turret"
},
Expand All @@ -2873,7 +2873,7 @@
"id": "broken_secubot",
"symbol": ",",
"color": "green",
"name": "broken secubot",
"name": { "str": "broken secubot" },
"category": "other",
"description": "A broken secubot, with its casing broken and fluid drained. Could be gutted for parts.",
"price": 1000,
Expand All @@ -2890,7 +2890,7 @@
"id": "broken_talon_m202a1",
"symbol": ",",
"color": "green",
"name": "broken M202A1 TALON",
"name": { "str": "broken M202A1 TALON" },
"category": "other",
"description": "A broken TALON UGV, with its casing broken and fluid drained. Could be gutted for parts.",
"price": 1000,
Expand Down

0 comments on commit a11c098

Please sign in to comment.