changed NPC talk key to f and resolved merge conflicts #77
2 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4ccc2dde11 | ||
|
|
67a0937c4b |
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4ccc2dde11 | ||
|
|
67a0937c4b |