feature/imp-112-dialogues-and-asc-4-7 #58

Merged
mr.two merged 4 commits from feature/imp-112-dialogues-and-asc-4-7 into develop 2026-04-27 23:02:52 +00:00

4 Commits

Author SHA1 Message Date
Zoltan Timar
53c95bf17d lint fix
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2026-04-28 01:01:15 +02:00
Zoltan Timar
9fc659c819 lint fix
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-04-28 01:00:23 +02:00
Zoltan Timar
133980f569 Merge branch 'develop' into feature/imp-112-dialogues-and-asc-4-7
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-04-28 00:52:22 +02:00
Zoltan Timar
efe903110b feat: added ascension logic 4-7, added new decision (eating fast food), indicating meter changes better, added discussions (needs more work, but meh ... fine like this)
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2026-04-28 00:51:42 +02:00