Merge branch 'Eisbison:main' into bait_show_kill_flash

author gendelo3 <gendelo3@gmail.com>

Tue, 30 Nov 2021 09:19:08 +0000 (10:19 +0100)

committer GitHub <noreply@github.com>

Tue, 30 Nov 2021 09:19:08 +0000 (10:19 +0100)
author gendelo3 <gendelo3@gmail.com>
Tue, 30 Nov 2021 09:19:08 +0000 (10:19 +0100)
committer GitHub <noreply@github.com>
Tue, 30 Nov 2021 09:19:08 +0000 (10:19 +0100)
diff --cc TheOtherRoles/Patches/PlayerControlPatch.cs
Simple merge
author	gendelo3 <gendelo3@gmail.com>
	Tue, 30 Nov 2021 09:19:08 +0000 (10:19 +0100)
committer	GitHub <noreply@github.com>
	Tue, 30 Nov 2021 09:19:08 +0000 (10:19 +0100)