Merge branch 'Eisbison:main' into bait_show_kill_flash

author gendelo3 <gendelo3@gmail.com>

Sun, 28 Nov 2021 14:19:33 +0000 (15:19 +0100)

committer GitHub <noreply@github.com>

Sun, 28 Nov 2021 14:19:33 +0000 (15:19 +0100)
author gendelo3 <gendelo3@gmail.com>
Sun, 28 Nov 2021 14:19:33 +0000 (15:19 +0100)
committer GitHub <noreply@github.com>
Sun, 28 Nov 2021 14:19:33 +0000 (15:19 +0100)
diff --cc TheOtherRoles/CustomOptionHolder.cs
Simple merge
diff --cc TheOtherRoles/Patches/PlayerControlPatch.cs
Simple merge
author	gendelo3 <gendelo3@gmail.com>
	Sun, 28 Nov 2021 14:19:33 +0000 (15:19 +0100)
committer	GitHub <noreply@github.com>
	Sun, 28 Nov 2021 14:19:33 +0000 (15:19 +0100)
		1	2
TheOtherRoles/CustomOptionHolder.cs	patch \|	diff1 \|	diff2 \|	blob \| history
TheOtherRoles/Patches/PlayerControlPatch.cs	patch \|	diff1 \|	diff2 \|	blob \| history