Merge branch 'Combat-Extended' into dev

game/base-combat/actions.twee

@@ -130,7 +130,4 @@
 			<br><br>
 		<</for>>
 	<</if>>
-	<<if $combatExtended.reverseRape is 1 and $pain lt 100 and $combatExtended.reverseRapeEnd is 0 and $enemyhealth lte 0>>
-		<span id="cestop"><<link [[Stop|$passage]]>><<set $combatExtended.reverseRapeEnd to 1>><</link>></span>
-	<</if>>	
 <</widget>>

game/base-combat/init.twee

@@ -1280,6 +1280,12 @@
 			<p>Combat menu</p>
 		</label>
 		<hr>
+		<<if $combatExtended.reverseRape is 1 and $pain lt 100 and $combatExtended.reverseRapeEnd is 0 and $enemyhealth lte 0>>
+			<label class="cbtOption">
+				<p>End Reverse Rape</p>
+				<<link [[Stop|$passage]]>><<set $combatExtended.reverseRapeEnd to 1>><</link>>
+			</label>
+		<</if>>	
 		<label class="cbtOption">
 			<p>Control types</p>
 			<<listbox "$options.combatControls" autoselect>>