Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Adding enum with trigger flags for peeps
Merge branch 'master' of https://github.com/MaciekBaron/OpenRCT2 into MaciekBaron-master
clean peep.h
Merge branch 'MaciekBaron-master'