Revert "Revert "Civilian round-start fix""
Revert "Revert "Civilian round-start fix""

ZomgPonies/Paradise64,ZomgPonies/Paradise64,ZomgPonies/Paradise64,ZomgPonies/Paradise64,ZomgPonies/Paradise64,ZomgPonies/Paradise64