Skip to content

Commit

Permalink
feat: mainline some craftable bionics with consistency updates (#4119)
Browse files Browse the repository at this point in the history
* feat: mainline some craftable bionics with consistency updates

Co-Authored-By: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Co-Authored-By: John Candlebury <johncandlebury@gmail.com>

* Almost forgot that

* Update cbms.json

---------

Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Co-authored-by: John Candlebury <johncandlebury@gmail.com>
  • Loading branch information
3 people authored Jan 20, 2024
1 parent 38c6f90 commit 93cdb20
Show file tree
Hide file tree
Showing 7 changed files with 601 additions and 555 deletions.
4 changes: 2 additions & 2 deletions data/json/bionics.json
Original file line number Diff line number Diff line change
Expand Up @@ -1177,8 +1177,8 @@
{
"id": "bio_weight",
"type": "bionic",
"name": { "str": "Titanium Skeletal Bracing" },
"description": "Titanium bracing has been installed onto your elbows, knees, and spine, making them far better at handling strain. Your carrying capacity is increased by 20 kilograms, or about 44 pounds.",
"name": { "str": "Skeletal Bracing" },
"description": "A framework of lightweight alloy bracing has been installed onto your elbows, knees, and spine, making them far better at handling strain. Your carrying capacity is increased by 20 kilograms, or about 44 pounds.",
"occupied_bodyparts": [ [ "torso", 8 ], [ "arm_l", 3 ], [ "arm_r", 3 ], [ "leg_l", 3 ], [ "leg_r", 3 ] ],
"weight_capacity_bonus": "20 kg",
"flags": [ "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF" ]
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/bionics.json
Original file line number Diff line number Diff line change
Expand Up @@ -1021,7 +1021,7 @@
"id": "bio_weight",
"copy-from": "bionic_general_npc_usable",
"type": "BIONIC_ITEM",
"name": { "str": "Titanium Skeletal Bracing CBM" },
"name": { "str": "Skeletal Bracing CBM" },
"looks_like": "bio_int_enhancer",
"description": "A set of hinges, springs, and other synthetic augments for the skeletal structure. These artificial enhancers strengthen the knees and elbows, allowing the user to carry more weight.",
"price": "500 USD",
Expand Down
50 changes: 0 additions & 50 deletions data/json/obsoletion/recipes.json
Original file line number Diff line number Diff line change
Expand Up @@ -658,11 +658,6 @@
"result": "binocularsuncraft",
"obsolete": true
},
{
"type": "recipe",
"result": "bio_batteries",
"obsolete": true
},
{
"type": "recipe",
"result": "bio_blood_filteruncraft",
Expand All @@ -673,21 +668,11 @@
"result": "bio_digestionuncraft",
"obsolete": true
},
{
"type": "recipe",
"result": "bio_evap",
"obsolete": true
},
{
"type": "recipe",
"result": "bio_face_maskuncraft",
"obsolete": true
},
{
"type": "recipe",
"result": "bio_flashlight",
"obsolete": true
},
{
"type": "recipe",
"result": "bio_ground_sonaruncraft",
Expand Down Expand Up @@ -718,26 +703,11 @@
"result": "bio_power_armor_interface_mkII",
"obsolete": true
},
{
"type": "recipe",
"result": "bio_power_storage",
"obsolete": true
},
{
"type": "recipe",
"result": "bio_power_storage_mkII",
"obsolete": true
},
{
"type": "recipe",
"result": "bio_recycleruncraft",
"obsolete": true
},
{
"type": "recipe",
"result": "bio_water_extractor",
"obsolete": true
},
{
"type": "recipe",
"result": "bladefrom steel",
Expand Down Expand Up @@ -2088,26 +2058,6 @@
"result": "wristwatchuncraft",
"obsolete": true
},
{
"type": "recipe",
"result": "bio_armor_head",
"obsolete": true
},
{
"type": "recipe",
"result": "bio_armor_arms",
"obsolete": true
},
{
"type": "recipe",
"result": "bio_armor_torso",
"obsolete": true
},
{
"type": "recipe",
"result": "bio_armor_legs",
"obsolete": true
},
{
"type": "recipe",
"result": "years_old_newspaperuncraft",
Expand Down
Loading

0 comments on commit 93cdb20

Please sign in to comment.