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

Put player under during CBM surgery initiated from Rubik's dialogue #76120

Merged
merged 1 commit into from
Sep 2, 2024
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions data/json/npcs/exodii/exodii_merchant_missions.json
Original file line number Diff line number Diff line change
Expand Up @@ -480,19 +480,34 @@
"responses": [
{
"text": "[Install Air Filtration CBM] I like the look of that air filtration thingy. Does it come with pine-fresh scent?",
"effect": [ { "u_add_bionic": "bio_purifier" }, { "u_assign_activity": "ACT_CBM_SURGERY", "duration": "30 minutes" } ],
"effect": [
{ "u_add_effect": "narcosis", "duration": "30 minutes" },
{ "u_add_effect": "sleep", "duration": "30 minutes" },
{ "u_assign_activity": "ACT_CBM_SURGERY", "duration": "30 minutes" },
{ "u_add_bionic": "bio_purifier" }
],
"opinion": { "trust": 4, "value": 3 },
"topic": "TALK_DONE"
},
{
"text": "[Install Blood Analysis CBM] I've always wondered what's in my veins. Let's try that blood analysis module.",
"effect": [ { "u_add_bionic": "bio_blood_anal" }, { "u_assign_activity": "ACT_CBM_SURGERY", "duration": "30 minutes" } ],
"effect": [
{ "u_add_effect": "narcosis", "duration": "30 minutes" },
{ "u_add_effect": "sleep", "duration": "30 minutes" },
{ "u_assign_activity": "ACT_CBM_SURGERY", "duration": "30 minutes" },
{ "u_add_bionic": "bio_blood_anal" }
],
"opinion": { "trust": 4, "value": 3 },
"topic": "TALK_DONE"
},
{
"text": "[Install Radiation Scrubber CBM] I have nightmares about ending up like Marie Curie. Radiation scrubber it has to be.",
"effect": [ { "u_add_bionic": "bio_radscrubber" }, { "u_assign_activity": "ACT_CBM_SURGERY", "duration": "30 minutes" } ],
"effect": [
{ "u_add_effect": "narcosis", "duration": "30 minutes" },
{ "u_add_effect": "sleep", "duration": "30 minutes" },
{ "u_assign_activity": "ACT_CBM_SURGERY", "duration": "30 minutes" },
{ "u_add_bionic": "bio_radscrubber" }
],
"opinion": { "trust": 4, "value": 3 },
"topic": "TALK_DONE"
},
Expand Down
14 changes: 8 additions & 6 deletions data/json/npcs/exodii/exodii_merchant_talk_exodization.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
{
"text": "[Install CBM Interface] Let's do it.",
"effect": [
{ "u_add_bionic": "bio_power_storage" },
{ "u_add_bionic": "bio_cable" },
{ "u_add_effect": "narcosis", "duration": "2 hours" },
{ "u_add_effect": "sleep", "duration": "2 hours" },
{ "u_assign_activity": "ACT_CBM_SURGERY", "duration": "2 hours" },
{ "u_add_effect": "blind", "duration": "2 hours" },
{ "u_add_effect": "deaf", "duration": "2 hours" },
{ "u_add_trait": "CBM_Interface" }
{ "u_add_trait": "CBM_Interface" },
{ "u_add_bionic": "bio_power_storage" },
{ "u_add_bionic": "bio_cable" }
],
"topic": "TALK_EXODII_MERCHANT_Exodized"
},
Expand Down Expand Up @@ -203,9 +203,11 @@
{
"text": "[Install CBM Interface] All right. Let's do this.",
"effect": [
{ "u_add_effect": "narcosis", "duration": "2 hours" },
{ "u_add_effect": "sleep", "duration": "2 hours" },
{ "u_assign_activity": "ACT_CBM_SURGERY", "duration": "2 hours" },
{ "u_add_bionic": "bio_power_storage" },
{ "u_add_bionic": "bio_cable" },
{ "u_assign_activity": "ACT_CBM_SURGERY", "duration": "2 hours" },
{ "u_add_trait": "CBM_Interface" }
],
"topic": "TALK_EXODII_MERCHANT_Exodized"
Expand Down
Loading