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.

Sign up for GitHub

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

feat: mainline some craftable bionics with consistency updates #4119

Merged
merged 4 commits into from
Jan 20, 2024
Merged

feat: mainline some craftable bionics with consistency updates #4119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c532b06
feat: mainline some craftable bionics with consistency updates
chaosvolt Jan 17, 2024
5152f84
Almost forgot that
chaosvolt Jan 17, 2024
fdae292
Update cbms.json
chaosvolt Jan 17, 2024
68c351d
Merge branch 'main' into mainline-cbm-crafting
chaosvolt Jan 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions data/json/bionics.json
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading