changed NPC talk key to f and resolved merge conflicts #77

Merged
Spafi merged 2 commits from Spafi/game:main into Development 2024-03-10 12:46:45 +01:00

2 commits

Author SHA1 Message Date
SpagettiFisch
4ccc2dde11 Merge branch 'main' of https://git.spafi.eu/Spafi/game
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-10 12:42:41 +01:00
SpagettiFisch
67a0937c4b changed NPC talking key to f
Signed-off-by: SpagettiFisch <63868515+SpagettiFisch@users.noreply.github.com>
2024-03-10 12:42:09 +01:00