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

Clarify durations in NPCs.md #27704

Merged
merged 2 commits into from
Jan 18, 2019
Merged

Clarify durations in NPCs.md #27704

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64031ee
Clarify durations in NPC.md
I-am-Erk Jan 18, 2019
ea6266e
Update NPCs.md
I-am-Erk Jan 18, 2019
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
10 changes: 10 additions & 0 deletions doc/NPCs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,6 +726,16 @@ npc_service cash available. Useful to check if the player character can hire an
"topic": "TALK_NONE",
"condition": { "npc_has_effect": "infected" }
},
{
"text": "I'm sorry for offending you. I predict you will feel better in exactly one hour.",
"topic": "TALK_NONE",
"effect": { "npc_add_effect": "deeply_offended", "duration": 600 }
},
{
"text": "Nice to meet you too.",
"topic": "TALK_NONE",
"effect": { "u_add_effect": "has_met_example_NPC", "duration": "PERMANENT" }
},
{
"text": "[INT 11] I'm sure I can organize salvage operations to increase the bounty scavengers bring in!",
"topic": "TALK_EVAC_MERCHANT_NO",
Expand Down