Merge branch 'Fix_radio-combat' into 'dev'

Fix Radio Combat display & furniture store

See merge request !1852

game/base-combat/actions-hands.twee

@@ -500,8 +500,8 @@ $NPCList[5].lefthand is "pen" or $NPCList[5].righthand is "pen">>
 :: Widgets Actions Right Hand [widget]
 
 <<widget "rightdefault">>
-<<if $righttarget isnot "self">>
-	<<set _rightaction["Stroke"] to "rightchest" and $punishmentposition isnot "gloryhole">>
+<<if $righttarget isnot "self" and $punishmentposition isnot "gloryhole">>
+	<<set _rightaction["Stroke"] to "rightchest">>
 	<<if $consensual isnot 1 and ($fightTargets is undefined or $fightTargets.includes($righttarget))>>
 		<<set _rightaction["Punch"] to "righthit">>
 	<</if>>

game/overworld-town/loc-shop/furniture.twee

@@ -320,11 +320,11 @@ You approach the paperhangings corner. Samples of pre-made posters and wallpaper
 					<</capture>>
 				<</if>>
 				<<if $money gte $_cost>>
-					<<capture $_furnishing $_cost>>
+					<<capture $_key $_furnishing $_cost>>
 						<<link [["£" + $_cost/100|Furniture Shop Catalogue]]>>
 							<<if ($_furnishing.tier or 0) lt ($currentFurnishing.tier or 0)>>
 								<<set $furnitureDowngrade to {
-									key: $_furnishing.key,
+									key: $_key,
 									cost: $_cost,
 									name: $_furnishing.name,
 									nameCap: $_furnishing.nameCap,
@@ -333,7 +333,7 @@ You approach the paperhangings corner. Samples of pre-made posters and wallpaper
 								}>>
 							<<else>>
 								<<set $money -= $_cost>>
-								<<run Furniture.set($_furnishing.key, $chosenFurnitureCategory)>>
+								<<run Furniture.set($_key, $chosenFurnitureCategory)>>
 								<<set $boughtfurniturename to $_furnishing.name>>
 								<<run Furniture.wardrobeUpdate()>>
 							<</if>>