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(port): Bionics can require another bionic #5484

Merged
merged 11 commits into from
Oct 2, 2024
Merged

feat(port): Bionics can require another bionic #5484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
dbc45c0
initial commit
Zlorthishen Oct 1, 2024
3896d55
style(autofix.ci): automated formatting
autofix-ci[bot] Oct 1, 2024
52a584e
Update bionics.cpp
Zlorthishen Oct 1, 2024
9164ff7
style(autofix.ci): automated formatting
autofix-ci[bot] Oct 1, 2024
0f70895
Update bionics.cpp
Zlorthishen Oct 1, 2024
6509777
Merge branch 'required-bionics' of https://github.com/Zlorthishen/Cat…
Zlorthishen Oct 1, 2024
3323220
Update json_info.md
Zlorthishen Oct 1, 2024
ffbc004
style(autofix.ci): automated formatting
autofix-ci[bot] Oct 1, 2024
c3a641e
Update doc/src/content/docs/en/mod/json/reference/json_info.md
scarf005 Oct 2, 2024
b00ca76
style(autofix.ci): automated formatting
autofix-ci[bot] Oct 2, 2024
949ae82
Woe, profession update upon thee
chaosvolt Oct 2, 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
3 changes: 2 additions & 1 deletion data/json/bionics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,8 @@
"flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ],
"act_cost": "10 kJ",
"react_cost": "10 kJ",
"time": 1
"time": 1,
"required_bionic": "bio_weight"
},
{
"id": "bio_infolink",
Expand Down
4 changes: 3 additions & 1 deletion data/json/professions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2353,6 +2353,7 @@
"bio_tools",
"bio_sunglasses",
"bio_flashlight",
"bio_weight",
"bio_hydraulics",
"bio_cable",
"bio_power_storage_mkII",
Expand Down Expand Up @@ -2381,7 +2382,7 @@
"name": "Bionic Athlete",
"description": "It's a shame the apocalypse happened; you'll never get a shot at the Cyberolympics. Now the only thing between you and death by zombie is your freakish cyborg strength.",
"points": 5,
"CBMs": [ "bio_str_enhancer", "bio_adrenaline", "bio_hydraulics", "bio_metabolics", "bio_power_storage_mkII" ],
"CBMs": [ "bio_str_enhancer", "bio_weight", "bio_adrenaline", "bio_hydraulics", "bio_metabolics", "bio_power_storage_mkII" ],
"items": {
"both": [
"socks_ankle",
Expand Down Expand Up @@ -5407,6 +5408,7 @@
"bio_power_storage_mkII",
"bio_claws",
"bio_digestion",
"bio_weight",
"bio_hydraulics"
],
"skills": [
Expand Down
Loading
Loading