Feature/event rework and fork pull request test

[Toffer90]

Seems good, have you experienced all these events in game and seen that they work as expected?

[SimoCvijic0]

I will fix this then continue with other events in a separate branch in the fork