Merge branch 'dev' into 'dev'

Locked the furniture shop

See merge request !2984

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

@@ -15,7 +15,6 @@
 <</if>>
 
 <<getouticon>><<link [[Leave|Shopping Centre Top]]>><</link>>
-<br>
 
 :: Cosmetics Store
 <<set $outside to 0>><<set $location to "shopping_centre">><<effects>>

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

+:: Furniture Shop Lock
+
+<<set $outside to 0>><<effects>><<set $lock to 0>>
+
+<<if currentSkillValue('skulduggery') gte $lock>>
+	<<if $leftarm is "bound" and $rightarm is "bound">>
+		You think you'd be able to pick the lock, <span class="blue">if your arms weren't bound.</span>
+	<<else>>
+		<span class="green">The lock looks easy to pick.</span>
+		<br><br>
+
+		<<lockpickicon>><<link [[Pick it (0:10)|Furniture Shop]]>><<pass 10>><<crimeUp 5 "trespassing">><</link>><<crime "trespassing">>
+	<</if>>
+	<br>
+<<else>>
+	<span class="red">The lock looks beyond your ability to pick.</span>
+	<<skulduggeryrequired>>
+	<br><br>
+<</if>>
+<<getouticon>><<link [[Leave|Shopping Centre Top]]>><</link>>
+
 :: Furniture Shop
 <<set $outside to 0>><<set $location to "shopping_centre">><<effects>>
 

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

@@ -12,7 +12,6 @@
 	<br><br>
 <</if>>
 <<getouticon>><<link [[Leave|Shopping Centre]]>><</link>>
-<br>
 
 :: Hairdressers
 
@@ -74,7 +73,6 @@ You are in the hairdressers. Various hair products are available for sale. You c
 			<br><br>
 		<</if>>
 		<<getouticon>><<link [[Leave|Shopping Centre]]>><</link>>
-		<br>
 	<</if>>
 <</if>>
 

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

@@ -497,7 +497,7 @@ Their bodies shudder in unison as they reach orgasm.
 			<br>
 			<<shopicon "tattoo">><<link [[Tattoo parlour (0:01)|Tattoo Parlour Lock]]>><<pass 1>><</link>>
 			<br>
-			<<wardrobeicon>><<link [[Furniture shop (0:01)|Furniture Shop]]>><<pass 1>><</link>>
+			<<wardrobeicon>><<link [[Furniture shop (0:01)|Furniture Shop Lock]]>><<pass 1>><</link>>
 			<br>
 			/*<<shopicon "closed">><<link [[Empty shop (0:01)|EmptyStore]]>><<pass 1>><<set $shopFloor to "top">><</link>>
 			<br>*/