Merge branch 'pregmod-master' of ssh.gitgud.io:pregmodfan/fc-pregmod into release-rules

src/gui/css/mainStyleSheet.css

@@ -345,3 +345,6 @@ table.corporate td {
 	margin-top: 0.5em;
 	margin-bottom: 1.5em;
 }
+div.tab {
+	margin-left: 20px;
+}
\ No newline at end of file

src/uncategorized/bodyModification.tw

@@ -403,26 +403,26 @@ Piercings:
 <<if _piercingCount == 0>>
 	$His smooth $activeSlave.skin skin is completely unpierced.
 <</if>>
-
-<<if $activeSlave.earPiercing > 0 >><br>&nbsp;&nbsp;&nbsp;&nbsp;<<= App.Desc.piercing($activeSlave, "ear")>><</if>>
-<<if $activeSlave.nosePiercing > 0 >><br>&nbsp;&nbsp;&nbsp;&nbsp;<<= App.Desc.piercing($activeSlave, "nose")>><</if>>
-<<if $activeSlave.eyebrowPiercing > 0 >><br>&nbsp;&nbsp;&nbsp;&nbsp;<<= App.Desc.piercing($activeSlave, "eyebrow")>><</if>>
-<<if $activeSlave.lipsPiercing > 0 >><br>&nbsp;&nbsp;&nbsp;&nbsp;<<= App.Desc.piercing($activeSlave, "lips")>><</if>>
-<<if $activeSlave.tonguePiercing > 0 >><br>&nbsp;&nbsp;&nbsp;&nbsp;<<= App.Desc.piercing($activeSlave, "tongue")>><</if>>
-<<if $activeSlave.nipplesPiercing > 0 >><br>&nbsp;&nbsp;&nbsp;&nbsp;<<= App.Desc.piercing($activeSlave, "nipple")>><</if>>
-<<if $activeSlave.areolaePiercing > 0 >><br>&nbsp;&nbsp;&nbsp;&nbsp;<<= App.Desc.piercing($activeSlave, "areolae")>><</if>>
-<<if $activeSlave.navelPiercing > 0 >><br>&nbsp;&nbsp;&nbsp;&nbsp;<<= App.Desc.piercing($activeSlave, "navel")>><</if>>
-<<if $activeSlave.corsetPiercing > 0 >><br>&nbsp;&nbsp;&nbsp;&nbsp;<<= App.Desc.piercing($activeSlave, "corset")>><</if>>
-<<if $activeSlave.clitPiercing > 0 >><br>&nbsp;&nbsp;&nbsp;&nbsp;<<= App.Desc.piercing($activeSlave, "clit")>><</if>>
-<<if $activeSlave.vaginaPiercing > 0 >><br>&nbsp;&nbsp;&nbsp;&nbsp;<<= App.Desc.piercing($activeSlave, "vagina")>><</if>>
-<<if $activeSlave.dickPiercing > 0 >><br>&nbsp;&nbsp;&nbsp;&nbsp;<<= App.Desc.piercing($activeSlave, "dick")>><</if>>
-<<if $activeSlave.anusPiercing > 0 >><br>&nbsp;&nbsp;&nbsp;&nbsp;<<= App.Desc.piercing($activeSlave, "anus")>><</if>>
-
-<br><<= App.Desc.piercing($activeSlave, "chastity")>>
+<div class="tab">
+<<if $activeSlave.earPiercing > 0 >><div><<= App.Desc.piercing($activeSlave, "ear")>></div><</if>>
+<<if $activeSlave.nosePiercing > 0 >><div><<= App.Desc.piercing($activeSlave, "nose")>></div><</if>>
+<<if $activeSlave.eyebrowPiercing > 0 >><div><<= App.Desc.piercing($activeSlave, "eyebrow")>></div><</if>>
+<<if $activeSlave.lipsPiercing > 0 >><div><<= App.Desc.piercing($activeSlave, "lips")>></div><</if>>
+<<if $activeSlave.tonguePiercing > 0 >><div><<= App.Desc.piercing($activeSlave, "tongue")>></div><</if>>
+<<if $activeSlave.nipplesPiercing > 0 >><div><<= App.Desc.piercing($activeSlave, "nipple")>></div><</if>>
+<<if $activeSlave.areolaePiercing > 0 >><div><<= App.Desc.piercing($activeSlave, "areolae")>></div><</if>>
+<<if $activeSlave.navelPiercing > 0 >><div><<= App.Desc.piercing($activeSlave, "navel")>></div><</if>>
+<<if $activeSlave.corsetPiercing > 0 >><div><<= App.Desc.piercing($activeSlave, "corset")>></div><</if>>
+<<if $activeSlave.clitPiercing > 0 >><div><<= App.Desc.piercing($activeSlave, "clit")>></div><</if>>
+<<if $activeSlave.vaginaPiercing > 0 >><div><<= App.Desc.piercing($activeSlave, "vagina")>></div><</if>>
+<<if $activeSlave.dickPiercing > 0 >><div><<= App.Desc.piercing($activeSlave, "dick")>></div><</if>>
+<<if $activeSlave.anusPiercing > 0 >><div><<= App.Desc.piercing($activeSlave, "anus")>></div><</if>>
+
+<div><<= App.Desc.piercing($activeSlave, "chastity")>></div>
 
 /* Apply piercings */
 
-<br>&nbsp;&nbsp;&nbsp;&nbsp;
+<br>
 Choose piercing style:
 <<if $piercingLevel != 1>>[[Light|Body Modification][$piercingLevel = 1]]<<else>>Light<</if>>
 <<if $piercingLevel != 2>>| [[Heavy|Body Modification][$piercingLevel = 2]]<<else>>| Heavy<</if>>
@@ -431,7 +431,7 @@ Choose piercing style:
 
 
 <<if $piercingLevel == 1>>
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;
+	<br>
 	//Lightly// pierce $his:
 
 	<<link "Entire body">>
@@ -487,7 +487,7 @@ Choose piercing style:
 <</if>>
 
 <<if $piercingLevel == 2>>
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;
+	<br>
 	''Heavily'' pierce $his:
 
 	<<link "Entire body">>
@@ -545,17 +545,17 @@ Choose piercing style:
 <<if $piercingLevel == 3>>
 	<<if ($activeSlave.vagina != -1) || ($activeSlave.dick != 0)>>
 		<<if $activeSlave.clitPiercing != 3>>
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
+			<br>
 			Give $him a [[smart piercing?|Body Modification][$activeSlave.clitPiercing = 3,$activeSlave.clitSetting = "all",cashX(forceNeg($SPcost), "slaveMod", $activeSlave),$degradation += 1]] //Costs <<print cashFormat($SPcost)>>, unlocks options to mold sexuality//
 		<<else>>
-			<br>&nbsp;&nbsp;&nbsp;&nbsp;
+			<br>
 			$He already has a smart piercing!
 		<</if>>
 	<</if>>
 <</if>>
 
 <<if $piercingLevel == 0>>
-	<br>&nbsp;&nbsp;&nbsp;&nbsp;
+	<br>
 	Remove piercings from:
 
 	/* no dick/vagina checks in 'remove' so stealth piercings can be cleaned. Check only for piercings. */
@@ -595,8 +595,9 @@ Choose piercing style:
 	<<if $activeSlave.dickPiercing > 0>>		| [[Dick|Body Modification][$activeSlave.dickPiercing = 0, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>>
 	<<if $activeSlave.anusPiercing > 0>>		| [[Anus|Body Modification][$activeSlave.anusPiercing = 0, cashX(forceNeg($modCost), "slaveMod", $activeSlave)]]<</if>>
 <</if>>
+</div>
 
-<br><br>
+<br>
 
 /* TATTOOS */
 
@@ -1347,4 +1348,4 @@ Or a custom site: <<textbox "$scarTarget.local" $scarTarget.local "Body Modifica
 		<<goto "Body Modification">>
 	<</link>>
 	with $scarDesign.local on the $scarTarget.local<<if $activeSlave.scar[$scarTarget.local]>>, adding to the scars that are already there?<<else>>.<</if>>
-<</if>>
+<</if>>
\ No newline at end of file