Merge branch 'patch-9' into 'pregmod-master'

Fix custom dick tattoo check and description.

See merge request !1378

src/cheats/mod_editSlaveCheatNew.tw

@@ -1770,13 +1770,13 @@
 		@@.yellow;false@@
 		<<checkbox "$tempSlave.cSec" 0 1>>
 	<<else>>
-		@@.yellow;false@@
+		@@.yellow;true@@
 		<<checkbox "$tempSlave.cSec" 0 1 checked>>
 	<</if>>
 
 	<br>
 
-	''Breeding mark (only for Eugenic Societies): 
+	''Breeding mark (only for Eugenic Societies):''
 	<<if $tempSlave.breedingMark == 1>>
 		@@.yellow;true@@
 		<<checkbox "$tempSlave.breedingMark" 0 1 checked>>
@@ -2540,6 +2540,7 @@
 	<<radiobutton "$tempSlave.lipsTat" "counting">>Counting
 	<<radiobutton "$tempSlave.lipsTat" "advertisements">>Advertisements
 	<<radiobutton "$tempSlave.lipsTat" "rude words">>Rude words
+	<br>''Custom lips tattoo '' <<textbox "$tempSlave.lipsTat" $tempSlave.lipsTat>>
 	<br>
 	''__Shoulders Tattoo__ ( 
 	<<if $tempSlave.shouldersTat == 0>>@@.yellow;None@@
@@ -2555,6 +2556,7 @@
 	<<radiobutton "$tempSlave.shouldersTat" "counting">>Counting
 	<<radiobutton "$tempSlave.shouldersTat" "advertisements">>Advertisements
 	<<radiobutton "$tempSlave.shouldersTat" "rude words">>Rude words
+	<br>''Custom shoulders tattoo '' <<textbox "$tempSlave.shouldersTat" $tempSlave.shouldersTat>>
 	<br>
 	''__Back Tattoo__ ( 
 	<<if $tempSlave.backTat == 0>>@@.yellow;None@@
@@ -2570,6 +2572,7 @@
 	<<radiobutton "$tempSlave.backTat" "counting">>Counting
 	<<radiobutton "$tempSlave.backTat" "advertisements">>Advertisements
 	<<radiobutton "$tempSlave.backTat" "rude words">>Rude words
+	<br>''Custom back tattoo '' <<textbox "$tempSlave.backTat" $tempSlave.backTat>>
 	<br>
 	''__Belly Tattoo__ ( 
 	<<if $tempSlave.bellyTat == 0>>@@.yellow;None@@
@@ -2580,6 +2583,7 @@
 	<<radiobutton "$tempSlave.bellyTat" "a heart">>Heart
 	<<radiobutton "$tempSlave.bellyTat" "a star">>Star
 	<<radiobutton "$tempSlave.bellyTat" "a butterfly">>Butterfly
+	<br>''Custom belly tattoo '' <<textbox "$tempSlave.bellyTat" $tempSlave.bellyTat>>
 	<br>
 	''__Arms Tattoo__ ( 
 	<<if $tempSlave.armsTat == 0>>@@.yellow;None@@
@@ -2595,6 +2599,7 @@
 	<<radiobutton "$tempSlave.armsTat" "counting">>Counting
 	<<radiobutton "$tempSlave.armsTat" "advertisements">>Advertisements
 	<<radiobutton "$tempSlave.armsTat" "rude words">>Rude words
+	<br>''Custom arms tattoo '' <<textbox "$tempSlave.armsTat" $tempSlave.armsTat>>
 	<br>
 	''__Legs Tattoo__ ( 
 	<<if $tempSlave.legsTat == 0>>@@.yellow;None@@
@@ -2610,6 +2615,7 @@
 	<<radiobutton "$tempSlave.legsTat" "counting">>Counting
 	<<radiobutton "$tempSlave.legsTat" "advertisements">>Advertisements
 	<<radiobutton "$tempSlave.legsTat" "rude words">>Rude words
+	<br>''Custom legs tattoo '' <<textbox "$tempSlave.legsTat" $tempSlave.legsTat>>
 	<br>
 	''__Boobs Tattoo__ ( 
 	<<if $tempSlave.boobsTat == 0>>@@.yellow;None@@
@@ -2625,6 +2631,7 @@
 	<<radiobutton "$tempSlave.boobsTat" "counting">>Counting
 	<<radiobutton "$tempSlave.boobsTat" "advertisements">>Advertisements
 	<<radiobutton "$tempSlave.boobsTat" "rude words">>Rude words
+	<br>''Custom boobs tattoo '' <<textbox "$tempSlave.boobsTat" $tempSlave.boobsTat>>
 	<br>
 	''__Butt Tattoo__ ( 
 	<<if $tempSlave.buttTat == 0>>@@.yellow;None@@
@@ -2640,6 +2647,7 @@
 	<<radiobutton "$tempSlave.buttTat" "counting">>Counting
 	<<radiobutton "$tempSlave.buttTat" "advertisements">>Advertisements
 	<<radiobutton "$tempSlave.buttTat" "rude words">>Rude words
+	<br>''Custom butt tattoo '' <<textbox "$tempSlave.buttTat" $tempSlave.buttTat>>
 	<br>
 	''__Vagina Tattoo__ ( 
 	<<if $tempSlave.vaginaTat == 0>>@@.yellow;None@@
@@ -2655,6 +2663,7 @@
 	<<radiobutton "$tempSlave.vaginaTat" "counting">>Counting
 	<<radiobutton "$tempSlave.vaginaTat" "advertisements">>Advertisements
 	<<radiobutton "$tempSlave.vaginaTat" "rude words">>Rude words
+	<br>''Custom vagina tattoo '' <<textbox "$tempSlave.vaginaTat" $tempSlave.vaginaTat>>
 	<br>
 	''__Anus Tattoo__ ( 
 	<<if $tempSlave.anusTat == 0>>@@.yellow;None@@
@@ -2669,6 +2678,7 @@
 	<<radiobutton "$tempSlave.anusTat" "counting">>Counting
 	<<radiobutton "$tempSlave.anusTat" "advertisements">>Advertisements
 	<<radiobutton "$tempSlave.anusTat" "rude words">>Rude words
+	<br>''Custom anus tattoo '' <<textbox "$tempSlave.anusTat" $tempSlave.anusTat>>
 	<br>
 	''__Dick Tattoo__ ( 
 	<<if $tempSlave.dickTat == 0>>@@.yellow;None@@
@@ -2682,6 +2692,7 @@
 	<<radiobutton "$tempSlave.dickTat" "counting">>Counting
 	<<radiobutton "$tempSlave.dickTat" "advertisements">>Advertisements
 	<<radiobutton "$tempSlave.dickTat" "rude words">>Rude words
+	<br>''Custom dick tattoo '' <<textbox "$tempSlave.dickTat" $tempSlave.dickTat>>
 	<br>
 	''__Tramp Stamp Tattoo__ ( 
 	<<if $tempSlave.stampTat == 0>>@@.yellow;None@@
@@ -2697,6 +2708,7 @@
 	<<radiobutton "$tempSlave.stampTat" "counting">>Counting
 	<<radiobutton "$tempSlave.stampTat" "advertisements">>Advertisements
 	<<radiobutton "$tempSlave.stampTat" "rude words">>Rude words
+	<br>''Custom tramp stamp tattoo '' <<textbox "$tempSlave.stampTat" $tempSlave.stampTat>>
 	<br>
 <</widget>>
 

src/uncategorized/bodyModification.tw

@@ -1629,9 +1629,9 @@ Custom Tats:
 	Give $possessive a custom butt tattoo (lower back tattoo): <<textbox "$activeSlave.buttTat" $activeSlave.buttTat "Slave Interact">>
 <</if>>
 
-<<if $activeSlave.dickTat == 0 && $activeSlave.dick != -1>>
+<<if $activeSlave.dickTat == 0 && $activeSlave.dick != 0>>
 	<br>&nbsp;&nbsp;&nbsp;&nbsp;
-	Give $possessive a custom pubic tattoo: <<textbox "$activeSlave.dickTat" $activeSlave.dickTat "Slave Interact">>
+	Give $possessive a custom dick tattoo: <<textbox "$activeSlave.dickTat" $activeSlave.dickTat "Slave Interact">>
 <</if>>
 
 <<if $activeSlave.vaginaTat == 0 && $activeSlave.vagina != -1>>