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

Duplicate Mouth Fix

See merge request pregmodfan/fc-pregmod!3107

src/art/vector/Head.tw

@@ -188,8 +188,7 @@
 					<<include Art_Vector_Eyebrow_TypeC_Bushy>>
 				<</if>>
 			<</if>>
-		<</if>>
-		<<if _artSlave.race == "asian" || _artSlave.race == "pacific islander" || _artSlave.race == "malay">>
+		<<elseif _artSlave.race == "asian" || _artSlave.race == "pacific islander" || _artSlave.race == "malay">>
 			<<if _artSlave.faceShape == "normal">>
 				<<include Art_Vector_Eyes_TypeA>>
 				<<include Art_Vector_Mouth_TypeC>>
@@ -346,8 +345,7 @@
 					<<include Art_Vector_Eyebrow_TypeA_Bushy>>
 				<</if>>
 			<</if>>
-		<</if>>
-		<<if _artSlave.race == "latina" || _artSlave.race == "amerindian">>
+		<<elseif _artSlave.race == "latina" || _artSlave.race == "amerindian">>
 			<<if _artSlave.faceShape == "normal">>
 				<<include Art_Vector_Eyes_TypeB>>
 				<<include Art_Vector_Mouth_TypeE>>
@@ -504,8 +502,7 @@
 					<<include Art_Vector_Eyebrow_TypeE_Bushy>>
 				<</if>>
 			<</if>>
-		<</if>>
-		<<if _artSlave.race == "black">>
+		<<elseif _artSlave.race == "black">>
 			<<if _artSlave.faceShape == "normal">>
 				<<include Art_Vector_Eyes_TypeD>>
 				<<include Art_Vector_Mouth_TypeB>>
@@ -662,8 +659,7 @@
 					<<include Art_Vector_Eyebrow_TypeA_Bushy>>
 				<</if>>
 			<</if>>
-		<</if>>
-		<<if _artSlave.race == "middle eastern">>
+		<<elseif _artSlave.race == "middle eastern">>
 			<<if _artSlave.faceShape == "normal">>
 				<<include Art_Vector_Eyes_TypeB>>
 				<<include Art_Vector_Mouth_TypeA>>
@@ -978,8 +974,7 @@
 					<<include Art_Vector_Eyebrow_TypeE_Bushy>>
 				<</if>>
 			<</if>>
-		<</if>>
-		<<if _artSlave.race == "indo-aryan">>
+		<<elseif _artSlave.race == "indo-aryan">>
 			<<if _artSlave.faceShape == "normal">>
 				<<include Art_Vector_Eyes_TypeE>>
 				<<include Art_Vector_Mouth_TypeA>>
@@ -1136,8 +1131,7 @@
 					<<include Art_Vector_Eyebrow_TypeC_Bushy>>
 				<</if>>
 			<</if>>
-		<</if>>
-		<<if _artSlave.race == "mixed race">>
+		<<elseif _artSlave.race == "mixed race">>
 			<<if _artSlave.faceShape == "normal">>
 				<<include Art_Vector_Eyes_TypeE>>
 				<<include Art_Vector_Mouth_TypeA>>
@@ -1294,8 +1288,7 @@
 					<<include Art_Vector_Eyebrow_TypeC_Bushy>>
 				<</if>>
 			<</if>>
-		<</if>>
-		<<if _artSlave.race != "white" || _artSlave.race != "southern european" || _artSlave.race != "black" || _artSlave.race != "mixed race" || _artSlave.race != "semitic" || _artSlave.race != "indo-aryan" || _artSlave.race != "latina" || _artSlave.race != "amerindian" || _artSlave.race != "middle eastern" || _artSlave.race != "asian" || _artSlave.race != "pacific islander" || _artSlave.race != "malay">>
+		<<elseif _artSlave.race != "white" && _artSlave.race != "southern european" && _artSlave.race != "black" && _artSlave.race != "mixed race" && _artSlave.race != "semitic" && _artSlave.race != "indo-aryan" && _artSlave.race != "latina" && _artSlave.race != "amerindian" && _artSlave.race != "middle eastern" && _artSlave.race != "asian" && _artSlave.race != "pacific islander" && _artSlave.race != "malay">>
 			<<if _artSlave.faceShape == "normal">>
 				<<include Art_Vector_Eyes_TypeB>>
 				<<include Art_Vector_Mouth_TypeA>>