(cherry picked from commit 218d8c63d22997695a1a7e0b9f43c06ddc5fcc34)
(cherry picked from commit f7f0ecb566194b39898328560d1576577bae66a8)
* Converted Tonks' public requests into the new system, and cleaned up relevant code. * Added missing repeat dialogue for one of the events * Added event flags