Skip to content
Snippets Groups Projects
Commit da762f4f authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'pregmod-master' into 'pregmod-master'

Pregmod v1021-129

See merge request pregmodfan/fc-pregmod!996
parents 998b76c5 425dfa79
No related branches found
No related tags found
3 merge requests!1155Pregmod master,!1000Sec exp v12.8,!996Pregmod v1021-129
...@@ -4554,4 +4554,7 @@ Pregmod 0.10.3.0 ...@@ -4554,4 +4554,7 @@ Pregmod 0.10.3.0
128 128
-anon's scalemail bikini -anon's scalemail bikini
-fixes
129
-fixes -fixes
\ No newline at end of file
...@@ -1858,6 +1858,7 @@ may accept strings, use at own risk ...@@ -1858,6 +1858,7 @@ may accept strings, use at own risk
"a maternity dress" "a maternity dress"
"stretch pants and a crop-top" "stretch pants and a crop-top"
"spats and a tank top" "spats and a tank top"
"a scalemail bikini"
collar: collar:
......
...@@ -148,6 +148,7 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.'' ...@@ -148,6 +148,7 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.''
<<set $activeSlave.clothes = "a string bikini",$activeSlave.choosesOwnClothes = 0>> <<set $activeSlave.clothes = "a string bikini",$activeSlave.choosesOwnClothes = 0>>
<<replace "#clothes">>$activeSlave.clothes<</replace>> <<replace "#clothes">>$activeSlave.clothes<</replace>>
<<replace "#clothingDescription">><br>//<<ClothingDescription>>//<</replace>> <<replace "#clothingDescription">><br>//<<ClothingDescription>>//<</replace>>
<</link>>
| <<link "Scalemail bikini">> | <<link "Scalemail bikini">>
<<set $activeSlave.clothes = "a scalemail bikini",$activeSlave.choosesOwnClothes = 0>> <<set $activeSlave.clothes = "a scalemail bikini",$activeSlave.choosesOwnClothes = 0>>
<<replace "#clothes">>$activeSlave.clothes<</replace>> <<replace "#clothes">>$activeSlave.clothes<</replace>>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment