diff --git a/src/art/vector/Arm.tw b/src/art/vector/Arm.tw
deleted file mode 100644
index d289aee6cd80c425950273e0886b3c12e6465eee..0000000000000000000000000000000000000000
--- a/src/art/vector/Arm.tw
+++ /dev/null
@@ -1,176 +0,0 @@
-:: Art_Vector_Arm_ [nobr]
-
-/* Arms position switch courtesy of Nov-X */
-/* Updated 2018-10-25 by Fr0g */
-/* - changed arm calculation block position*/
-/* - added brackets to make boolean logic run */
-
-<<if _artSlave.amp == 1>>
- <<set _leftArmType = "None">>
- <<set _rightArmType = "None">>
- <<set _art = "Art_Vector_Arm_Right_"+_rightArmType >>
- <<include _art>>
- <<set _art = "Art_Vector_Arm_Left_"+_leftArmType >>
- <<include _art>>
-<<else>> /* not amputee so running arm calculation block */
- <<if _artSlave.weight <= 20>>
- <<if $args[0].devotion > 50>>
- <<set _leftArmType = "High">>
- <<set _rightArmType = "High">>
- <<elseif $args[0].trust >= -20>>
- <<if $args[0].devotion < -20>>
- <<set _leftArmType = "Rebel">>
- <<set _rightArmType = "Low">>
- <<elseif $args[0].devotion <= 20>>
- <<set _leftArmType = "Low">>
- <<set _rightArmType = "Low">>
- <<else>>
- <<set _leftArmType = "Mid">>
- <<set _rightArmType = "High">>
- <</if>>
- <<else>>
- <<set _leftArmType = "Mid">>
- <<set _rightArmType = "Mid">>
- <</if>>
- <<elseif _artSlave.weight > 20>>
- <<if $args[0].devotion > 50>>
- <<set _leftArmType = "High">>
- <<set _rightArmType = "High">>
- <<elseif $args[0].trust >= -20>>
- <<if $args[0].devotion < -20>>
- <<set _leftArmType = "Rebel">>
- <<set _rightArmType = "Low">>
- <<elseif $args[0].devotion <= 20>>
- <<set _leftArmType = "Low">>
- <<set _rightArmType = "Low">>
- <<else>>
- <<set _leftArmType = "Mid">>
- <<set _rightArmType = "High">>
- <</if>>
- <<else>>
- <<set _leftArmType = "Mid">>
- <<set _rightArmType = "Mid">>
- <</if>>
- <</if>>
-<</if>>
-
-<<if _artSlave.amp == 0>>
- <<set _art = "Art_Vector_Arm_Right_"+_rightArmType >>
- <<include _art>>
- <<set _art = "Art_Vector_Arm_Left_"+_leftArmType >>
- <<include _art>>
-<</if>>
-
-<<if _artSlave.amp == 0>>
- <<if _artSlave.muscles >= 6>>
- <<if _leftArmType == "High">>
- <<include Art_Vector_Arm_Left_High_MLight>>
- <<elseif _leftArmType == "Mid">>
- <<include Art_Vector_Arm_Left_Mid_MLight>>
- <<elseif _leftArmType == "Low">>
- <<include Art_Vector_Arm_Left_Low_MLight>>
- <<elseif _leftArmType == "Rebel">>
- <<include Art_Vector_Arm_Left_Rebel_MLight>>
- <</if>>
- <</if>>
- <<if _artSlave.muscles >= 6>>
- <<if _rightArmType == "High">>
- <<include Art_Vector_Arm_Right_High_MLight>>
- <<elseif _rightArmType == "Mid">>
- <<include Art_Vector_Arm_Right_Mid_MLight>>
- <<elseif _rightArmType == "Low">>
- <<include Art_Vector_Arm_Right_Low_MLight>>
- <</if>>
- <</if>>
-<</if>>
-
-
-<<if _artSlave.amp == -1 && (_artSlave.PLimb == 1 || _artSlave.PLimb == 2)>>
- <<set _art = "Art_Vector_Arm_Right_ProstheticBasic_"+_rightArmType >>
- <<include _art>>
- <<set _art = "Art_Vector_Arm_Left_ProstheticBasic_"+_leftArmType >>
- <<include _art>>
-<</if>>
-
-<<if _artSlave.amp == -2 && (_artSlave.PLimb == 1 || _artSlave.PLimb == 2)>>
- <<set _art = "Art_Vector_Arm_Right_ProstheticSexy_"+_rightArmType >>
- <<include _art>>
- <<set _art = "Art_Vector_Arm_Left_ProstheticSexy_"+_leftArmType >>
- <<include _art>>
-<</if>>
-
-<<if _artSlave.amp == -3 && (_artSlave.PLimb == 1 || _artSlave.PLimb == 2)>>
-/* Reverting beauty limbs to regular SVG */
- <<set _art = "Art_Vector_Arm_Right_ProstheticBeauty_"+_rightArmType >>
- <<include _art>>
- <<set _art = "Art_Vector_Arm_Left_ProstheticBeauty_"+_leftArmType >>
- <<include _art>>
-<</if>>
-
-<<if _artSlave.amp == -4 && (_artSlave.PLimb == 1 || _artSlave.PLimb == 2)>>
- <<set _art = "Art_Vector_Arm_Right_ProstheticCombat_"+_rightArmType >>
- <<include _art>>
- <<set _art = "Art_Vector_Arm_Left_ProstheticCombat_"+_leftArmType >>
- <<include _art>>
-<</if>>
-
-<<if _artSlave.amp == -5 && (_artSlave.PLimb == 1 || _artSlave.PLimb == 2)>>
- <<set _art = "Art_Vector_Arm_Right_ProstheticSwiss_"+_rightArmType >>
- <<include _art>>
- <<set _art = "Art_Vector_Arm_Left_ProstheticSwiss_"+_leftArmType >>
- <<include _art>>
-<</if>>
-
-/* shiny clothing */
-<<if $seeVectorArtHighlights == 1>>
- <<if _artSlave.fuckdoll != 0 || _artSlave.clothes == "restrictive latex" || _artSlave.clothes == "a latex catsuit" || _artSlave.clothes == "body oil">>
- /* only some arm positions have art (feel free to add more) */
- <<switch _leftArmType>>
- <<case "High">>
- <<include Art_Vector_Arm_Outfit_Shine_Left_High>>
- <<case "Mid">>
- <<include Art_Vector_Arm_Outfit_Shine_Left_Mid>>
- <<case "Low">>
- <<include Art_Vector_Arm_Outfit_Shine_Left_Low>>
- <<default>>
- /* no art for this arm position */
- <</switch>>
- <</if>>
-<</if>>
-
-/* TODO: simplify selection (select prefix, infix and suffix and combine instead of using switch statements) */
-
-<<switch _artSlave.clothes>>
-
-<<case "a biyelgee costume" "a burkini" "a button-up shirt and panties" "a button-up shirt" "a cheerleader outfit" "a dirndl" "a gothic lolita dress" "a hanbok" "a hijab and abaya" "a hijab and blouse" "a huipil" "a kimono" "a klan robe" "a long qipao" "a military uniform" "a mounty outfit" "a nice maid outfit" "a nice nurse outfit" "a police uniform" "a red army uniform" "a schoolgirl outfit" "a schutzstaffel uniform" "a slutty klan robe" "a slutty nurse outfit" "a slutty qipao" "a sweater and cutoffs" "a sweater and panties" "a sweater" "a t-shirt and jeans" "a t-shirt and panties" "a t-shirt and thong" "a t-shirt" "an oversized t-shirt and boyshorts" "an oversized t-shirt" "battlearmor" "battledress" "clubslut netting" "conservative clothing" "cutoffs and a t-shirt" "lederhosen" "nice business attire" "slutty business attire" "slutty jewelry" "sport shorts and a t-shirt" "Western clothing">>
- <<set _rightArmArt = "Art_Vector_Arm_Outfit_" + clothing2artSuffix(_artSlave.clothes) + "_Right_" + _rightArmType>>
- <<set _leftArmArt = "Art_Vector_Arm_Outfit_" + clothing2artSuffix(_artSlave.clothes) + "_Left_" + _leftArmType>>
- <<include _rightArmArt>>
- <<include _leftArmArt>>
-
-<<case "a slutty schutzstaffel uniform">>
- <<set _rightArmArt = "Art_Vector_Arm_Outfit_SchutzstaffelUniform_Right_" + _rightArmType>>
- <<set _leftArmArt = "Art_Vector_Arm_Outfit_SchutzstaffelUniform_Left_" + _leftArmType>>
- <<include _rightArmArt>>
- <<include _leftArmArt>>
-
-<<case "a niqab and abaya" "a burqa">>
- <<set _rightArmArt = "Art_Vector_Arm_Outfit_HijabAndAbaya_Right_" + _rightArmType>>
- <<set _leftArmArt = "Art_Vector_Arm_Outfit_HijabAndAbaya_Left_" + _leftArmType>>
- <<include _rightArmArt>>
- <<include _leftArmArt>>
-
-<<case "a slave gown">>
- /* only some arm positions have art (feel free to add more) */
- <<switch _leftArmType>>
- <<case "High">>
- <<include Art_Vector_Arm_Outfit_SlaveGown_Left_High>>
- <<case "Mid">>
- <<include Art_Vector_Arm_Outfit_SlaveGown_Left_Mid>>
- <<case "Low">>
- <<include Art_Vector_Arm_Outfit_SlaveGown_Left_Low>>
- <<default>>
- /* no art for this arm position */
- <</switch>>
-
-<</switch>>
diff --git a/src/art/vector/Feet.tw b/src/art/vector/Feet.tw
deleted file mode 100644
index a9522242a8b97231f4576f519ef48799a3cd6348..0000000000000000000000000000000000000000
--- a/src/art/vector/Feet.tw
+++ /dev/null
@@ -1,309 +0,0 @@
-:: Art_Vector_Feet_ [nobr]
-
-/* BEWARE: Uses _legSize set by Art_Vector_Leg_ */
-/* Updated 2018-10-25 by Fr0g */
-/* - added brackets to make boolean logic run */
-
-<<if _artSlave.amp == 0>>
- <<switch _artSlave.shoes>>
- <<case "heels">>
- <<include Art_Vector_Shoes_Heel>>
- <<case "pumps">>
- <<include Art_Vector_Shoes_Pump>>
- <<case "extreme heels">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Extreme_Heel_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Extreme_Heel_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Extreme_Heel_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Extreme_Heel_Thick>>
- <</if>>
- <<case "boots">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Boot_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Boot_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Boot_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Boot_Thick>>
- <</if>>
- <<case "flats">>
- <<include Art_Vector_Shoes_Flat>>
- <<default>>
- <<include Art_Vector_Feet_Normal>>
- <</switch>>
-<<elseif _artSlave.amp == -1 && (_artSlave.PLimb == 1 || _artSlave.PLimb == 2)>>
- <<switch _artSlave.shoes>>
- <<case "heels">>
- <<include Art_Vector_Shoes_Heel>>
- <<case "pumps">>
- <<include Art_Vector_Shoes_Pump>>
- <<case "extreme heels">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Extreme_Heel_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Extreme_Heel_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Extreme_Heel_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Extreme_Heel_Thick>>
- <</if>>
- <<case "boots">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Boot_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Boot_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Boot_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Boot_Thick>>
- <</if>>
- <<case "flats">>
- <<include Art_Vector_Shoes_Flat>>
- <<default>>
- <<include Art_Vector_Feet_ProstheticBasic>>
- <</switch>>
-<<elseif _artSlave.amp == -2 && (_artSlave.PLimb == 1 || _artSlave.PLimb == 2)>>
- <<switch _artSlave.shoes>>
- <<case "heels">>
- <<include Art_Vector_Shoes_Heel>>
- <<case "pumps">>
- <<include Art_Vector_Shoes_Pump>>
- <<case "extreme heels">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Extreme_Heel_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Extreme_Heel_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Extreme_Heel_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Extreme_Heel_Thick>>
- <</if>>
- <<case "boots">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Boot_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Boot_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Boot_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Boot_Thick>>
- <</if>>
- <<case "flats">>
- <<include Art_Vector_Shoes_Flat>>
- <<default>>
- <<include Art_Vector_Feet_ProstheticSexy>>
- <</switch>>
-<<elseif _artSlave.amp == -3 && (_artSlave.PLimb == 1 || _artSlave.PLimb == 2)>>
- <<switch _artSlave.shoes>>
- <<case "heels">>
- <<include Art_Vector_Shoes_Heel>>
- <<case "pumps">>
- <<include Art_Vector_Shoes_Pump>>
- <<case "extreme heels">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Extreme_Heel_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Extreme_Heel_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Extreme_Heel_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Extreme_Heel_Thick>>
- <</if>>
- <<case "boots">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Boot_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Boot_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Boot_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Boot_Thick>>
- <</if>>
- <<case "flats">>
- <<include Art_Vector_Shoes_Flat>>
- <<default>>
- <<include Art_Vector_Feet_ProstheticBeauty>>
- <</switch>>
-<<elseif _artSlave.amp == -4 && (_artSlave.PLimb == 1 || _artSlave.PLimb == 2)>>
- <<switch _artSlave.shoes>>
- <<case "heels">>
- <<include Art_Vector_Shoes_Heel>>
- <<case "pumps">>
- <<include Art_Vector_Shoes_Pump>>
- <<case "extreme heels">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Extreme_Heel_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Extreme_Heel_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Extreme_Heel_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Extreme_Heel_Thick>>
- <</if>>
- <<case "boots">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Boot_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Boot_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Boot_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Boot_Thick>>
- <</if>>
- <<case "flats">>
- <<include Art_Vector_Shoes_Flat>>
- <<default>>
- <<include Art_Vector_Feet_ProstheticCombat>>
- <</switch>>
-<<elseif _artSlave.amp == -5 && (_artSlave.PLimb == 1 || _artSlave.PLimb == 2)>>
- <<switch _artSlave.shoes>>
- <<case "heels">>
- <<include Art_Vector_Shoes_Heel>>
- <<case "pumps">>
- <<include Art_Vector_Shoes_Pump>>
- <<case "extreme heels">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Extreme_Heel_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Extreme_Heel_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Extreme_Heel_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Extreme_Heel_Thick>>
- <</if>>
- <<case "boots">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Boot_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Boot_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Boot_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Boot_Thick>>
- <</if>>
- <<case "flats">>
- <<include Art_Vector_Shoes_Flat>>
- <<default>>
- <<include Art_Vector_Feet_ProstheticSwiss>>
- <</switch>>
-<</if>>
-
-<<if _artSlave.legAccessory == "short stockings" && _artSlave.amp != 1>>
- <<if _artSlave.shoes == "heels">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Heel_SS_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Heel_SS_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Heel_SS_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Heel_SS_Thick>>
- <</if>>
- <<elseif _artSlave.shoes == "pumps">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Pump_SS_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Pump_SS_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Pump_SS_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Pump_SS_Thick>>
- <</if>>
- <<elseif _artSlave.shoes == "flats">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Flat_SS_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Flat_SS_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Flat_SS_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Flat_SS_Thick>>
- <</if>>
- <<elseif _artSlave.shoes == "none">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Stockings_SS_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Stockings_SS_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Stockings_SS_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Stockings_SS_Thick>>
- <</if>>
- <</if>>
-<<elseif _artSlave.legAccessory == "long stockings" && _artSlave.amp != 1>>
- <<if _artSlave.shoes == "heels">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Heel_LL_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Heel_LL_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Heel_LL_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Heel_LL_Thick>>
- <</if>>
- <<elseif _artSlave.shoes == "pumps">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Pump_LL_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Pump_LL_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Pump_LL_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Pump_LL_Thick>>
- <</if>>
- <<elseif _artSlave.shoes == "flats">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Flat_LL_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Flat_LL_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Flat_LL_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Flat_LL_Thick>>
- <</if>>
- <<elseif _artSlave.shoes == "none">>
- <<if _legSize == "Narrow">>
- <<include Art_Vector_Shoes_Stockings_LL_Narrow>>
- <<elseif _legSize == "Normal">>
- <<include Art_Vector_Shoes_Stockings_LL_Normal>>
- <<elseif _legSize == "Wide">>
- <<include Art_Vector_Shoes_Stockings_LL_Wide>>
- <<elseif _legSize == "Thick">>
- <<include Art_Vector_Shoes_Stockings_LL_Thick>>
- <</if>>
- <</if>>
-<</if>>
-
-<<unset _art_outfit >> /* clean up variable possibly already set by prior widget run */
-
-<<switch _artSlave.clothes>> /* select available clothes */
- <<case "a ball gown" "a biyelgee costume" "a bunny outfit" "a burkini" "a burqa" "a cheerleader outfit" "a dirndl" "a fallen nuns habit" "a halter top dress" "a hijab and abaya" "a hijab and blouse" "a huipil" "a kimono" "a klan robe" "a latex catsuit" "a long qipao" "a maternity dress" "a military uniform" "a mini dress" "a monokini" "a mounty outfit" "a nice maid outfit" "a nice nurse outfit" "a niqab and abaya" "a police uniform" "a red army uniform" "a schoolgirl outfit" "a schutzstaffel uniform" "a slave gown" "a slutty maid outfit" "a slutty nurse outfit" "a slutty qipao" "a slutty schutzstaffel uniform" "a succubus outfit" "a sweater and cutoffs" "a t-shirt and jeans" "a toga" "an apron" "an oversized t-shirt and boyshorts" "attractive lingerie" "battlearmor" "battledress" "boyshorts" "clubslut netting" "conservative clothing" "cutoffs" "cutoffs and a t-shirt" "jeans" "leather pants" "leather pants and a tube top" "leather pants and pasties" "lederhosen" "nice business attire" "restrictive latex" "slutty business attire" "spats and a tank top" "sport shorts" "sport shorts and a sports bra" "sport shorts and a t-shirt" "stretch pants and a crop-top" "Western clothing">>
- <<set _art_outfit = clothing2artSuffix(_artSlave.clothes) >>
-<</switch>>
-
-/* special case for shiny clothing */
-<<if $seeVectorArtHighlights == 1>>
- /* this one is leg and partly butt-related, but needs to be here as shoes are drawn over legs and butt */
- <<if _artSlave.fuckdoll != 0 || _artSlave.clothes == "restrictive latex" || _artSlave.clothes == "a latex catsuit" || _artSlave.clothes == "body oil">>
- <<set _art_outfit = "Shine" >>
- <</if>>
-<</if>>
-
-<<if def _art_outfit >>
- <<if _artSlave.amp != 1>>
- <<if ["a ball gown", "a biyelgee costume", "a bunny outfit", "a burkini", "a burqa", "a chattel habit", "a cheerleader outfit", "a dirndl", "a fallen nuns habit", "a halter top dress", "a hijab and abaya", "a hijab and blouse", "a huipil", "a kimono", "a klan robe", "a latex catsuit", "a long qipao", "a maternity dress", "a military uniform", "a mini dress", "a monokini", "a mounty outfit", "a nice maid outfit", "a nice nurse outfit", "a niqab and abaya", "a niqab and abaya", "a police uniform", "a red army uniform", "a schoolgirl outfit", "a schutzstaffel uniform", "a slave gown", "a slutty maid outfit", "a slutty nurse outfit", "a slutty schutzstaffel uniform", "a succubus outfit", "a sweater and cutoffs", "a t-shirt and jeans", "a toga", "an apron", "an oversized t-shirt and boyshorts", "attractive lingerie", "battlearmor", "battledress", "body oil", "boyshorts", "clubslut netting", "conservative clothing", "cutoffs and a t-shirt", "cutoffs", "jeans", "leather pants and a tube top", "leather pants and pasties", "leather pants", "lederhosen", "nice business attire", "restrictive latex", "slutty business attire", "spats and a tank top", "sport shorts and a sports bra", "sport shorts and a t-shirt", "sport shorts", "stretch pants and a crop-top"].includes(_artSlave.clothes)>>
- <<set _art = "Art_Vector_Butt_Outfit_"+_art_outfit+"_"+_buttSize >><<include _art >>
- <</if>>
- <<if _artSlave.clothes != "a schoolgirl outfit">>
- <<set _art = "Art_Vector_Leg_Outfit_"+_art_outfit+"_"+_legSize >><<include _art >>
- <</if>>
- <<else>>
- <<if _artSlave.clothes != "a schoolgirl outfit">>
- <<set _art = "Art_Vector_Leg_Outfit_"+_art_outfit+"_Stump" >><<include _art >>
- <</if>>
- <</if>>
-<</if>>
diff --git a/src/art/vector/Torso_Outfit.tw b/src/art/vector/Torso_Outfit.tw
deleted file mode 100644
index 8c9e5ccc4c74f029588d655e25aafbd3917444ff..0000000000000000000000000000000000000000
--- a/src/art/vector/Torso_Outfit.tw
+++ /dev/null
@@ -1,40 +0,0 @@
-:: Art_Vector_Torso_Outfit_ [nobr]
-
-/* BEWARE: _torsoSize is set by Art_Vector_Torso_ */
-
-/* TODO: latex catsuit should cover vagina and its piercings, too */
-
-<<unset _art>>
-
-<<set _clothes = _artSlave.clothes>>
-<<switch _artSlave.clothes >>
-/* handling special cases */
-<<case "a cybersuit" >>
- <<set _clothes = "restrictive latex">> /* cybersuit uses restrictive latex art */
-<<case "a slutty schutzstaffel uniform" >>
- <<set _clothes = "a schutzstaffel uniform">> /* slutty schutzstaffel uniform uses schutzstaffel uniform art */
-<<case "a niqab and abaya" "a burqa">>
- <<set _clothes = "a hijab and abaya">>
-<<case "a hijab and blouse">>
- <<set _clothes = "a hijab and blouse">>
-<</switch>>
-<<switch _clothes >> /* select available clothes */
-<<case "a ball gown" "a biyelgee costume" "a bra" "a bunny outfit" "a burkini" "a button-up shirt and panties" "a button-up shirt" "a chattel habit" "a cheerleader outfit" "a comfortable bodysuit" "a cybersuit" "a dirndl" "a fallen nuns habit" "a gothic lolita dress" "a halter top dress" "a hanbok" "a hijab and abaya" "a hijab and blouse" "a huipil" "a kimono" "a klan robe" "a leotard" "a long qipao" "a maternity dress" "a military uniform" "a mini dress" "a monokini" "a mounty outfit" "a nice maid outfit" "a nice nurse outfit" "a one-piece swimsuit" "a penitent nuns habit" "a police uniform" "a red army uniform" "a scalemail bikini" "a schoolgirl outfit" "a schutzstaffel uniform" "a skimpy loincloth" "a slave gown" "a slutty klan robe" "a slutty maid outfit" "a slutty nurse outfit" "a slutty outfit" "a slutty qipao" "a slutty schutzstaffel uniform" "a sports bra" "a string bikini" "a striped bra" "a succubus outfit" "a sweater and cutoffs" "a sweater and panties" "a sweater" "a t-shirt and jeans" "a t-shirt and panties" "a t-shirt and thong" "a t-shirt" "a tank-top and panties" "a tank-top" "a thong" "a toga" "a tube top and thong" "a tube top" "an apron" "an oversized t-shirt and boyshorts" "an oversized t-shirt" "attractive lingerie for a pregnant woman" "attractive lingerie" "battlearmor" "battledress" "body oil" "boyshorts" "chains" "clubslut netting" "conservative clothing" "cutoffs and a t-shirt" "cutoffs" "harem gauze" "jeans" "kitty lingerie" "leather pants and a tube top" "leather pants and pasties" "leather pants" "lederhosen" "nice business attire" "panties and pasties" "panties" "restrictive latex" "shibari ropes" "slutty business attire" "slutty jewelry" "spats and a tank top" "sport shorts and a sports bra" "sport shorts and a t-shirt" "sport shorts" "stretch pants and a crop-top" "striped panties" "striped underwear" "uncomfortable straps" "Western clothing">>
- <<set _art = "Art_Vector_Torso_Outfit_"+clothing2artSuffix(_clothes)+"_"+_torsoSize >>
- <<include _art >>
-<</switch>>
-
-/* shiny clothing */
-<<if $seeVectorArtHighlights == 1>>
- <<if _artSlave.fuckdoll != 0 || _artSlave.clothes == "restrictive latex" || _artSlave.clothes == "a latex catsuit">>
- <<if _artSlave.amp != 0>>
- /* this shiny shoulder only looks sensible on amputees */
- <<include Art_Vector_Torso_Outfit_Shine_Shoulder>>
- <</if>>
- <<if _artSlave.preg <= 0>>
- /* the hip can be hidden by pregnant belly */
- <<set _art = "Art_Vector_Torso_Outfit_Shine_"+_torsoSize >>
- <<include _art >>
- <</if>>
- <</if>>
-<</if>>
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index 1b4803a66b5a64bae265ea6ec9362831a997dfc5..d56bb67b0345e13b04972a287a623639f7ccb355 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -150,11 +150,7 @@ My favorite part of my body i<<s>>
<<if $activeSlave.lips > 40>>
my <<if $activeSlave.lips > 70>>huge <</if>>lip<<s>>, I like how everyone expect<<s>> to fa<<c>>efuck me, and how my lip<<s>> wrap around their dick<<s>> to keep all that yummy cum in my belly. Oh! I like my belly, too, and that warm, <<s>>lo<<sh>>y feeling a<<s>> it'<<s>> packed full of baby jui<<c>>e. It'<<s>> <<s>>o — I'm <<s>>orry, <<Master>>. I think my mouth i<<s>> watering. Plea<<s>>e give me a moment to collect my<<s>>elf.
<<elseif $PC.dick == 1>>
-<<<<<<< HEAD
- my tummy--and my womb! The <<s>>lo<<sh>>y feeling when I'm all packed full of cum in both end<<s>> get<<s>> me <<s>>o incredibly horny. <<S>>ometime<<s>> I wonder what it would be like if I were ju<<s>>t a puffed up, cum-balloon of a $woman, helple<<ss>> and filled with cum, over, and over, and — I'm <<s>>orry, <<Master>>. I'm being weird again, aren't I?
-=======
my tummy — and my womb! The <<s>>lo<<sh>>y feeling when I'm all packed full of cum in both end<<s>> get<<s>> me <<s>>o incredibly horny. <<S>>ometime<<s>> I wonder what it would be like if I were ju<<s>>t a puffed up, cum-balloon of a $woman, helple<<ss>> and filled with cum, over, and over, and — I'm <<s>>orry, <<Master>>. I'm being weird again, aren't I?
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
<<else>>
my mouth, I love how it feel<<s>> to — to eat pu<<ss>>y, <<Master>>. I love eating out your pu<<ss>>y. E<<s>>pe<<c>>ially when it<<s>> been filled up with <<s>>ome yummy cum. Maybe you could let me eat cum out of your pu<<ss>>y <<s>>oon?
<</if>>
diff --git a/src/npc/fSlaveImpregConsummate.tw b/src/npc/fSlaveImpregConsummate.tw
index 945ca03cfe803f6f7a88f55cc110341d2e9ae672..7acc6c2456d334e58447545e27b57397a9a804e0 100644
--- a/src/npc/fSlaveImpregConsummate.tw
+++ b/src/npc/fSlaveImpregConsummate.tw
@@ -127,11 +127,7 @@ Next, you see to $activeSlave.slaveName.
<<elseif $activeSlave.devotion < 10>>
$He obeys your orders, arranging $himself for <<if $activeSlave.mpreg == 1>>anal<<else>>vaginal<</if>> sex despite $his slight hesitation at the idea of being made a breeder.
<<else>>
-<<<<<<< HEAD
- $He happily obeys your orders, getting ready to serve $his <<= WrittenMaster()>> by making _himP another slave.
-=======
$He happily obeys your orders, getting ready to serve $his <<= WrittenMaster($activeSlave)>> by making _himP another slave.
->>>>>>> 32fdb96882fb70c6dbecaa454463c7000d16d0e7
<</if>>
diff --git a/src/player/actions/fEmbrace.tw b/src/player/actions/fEmbrace.tw
index 2b6161cdc2834e1f8bbce7ff0a1300da043c3e3e..5b0269c8cd0e090e1744612a7efce6a9a28b4cd7 100644
--- a/src/player/actions/fEmbrace.tw
+++ b/src/player/actions/fEmbrace.tw
@@ -19,11 +19,7 @@ You tell $activeSlave.slaveName to
<<if $activeSlave.fetish == "mindbroken">>
$He complies mechanically. $He remembers that when <<= WrittenMaster()>>'s commands are not obeyed, there is punishment. Once $he's close, you hold $his face in your palms and look into $his blank $activeSlave.eyeColor eyes. $He shows no reaction.
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
-<<<<<<< HEAD
- $He lovingly complies, hurrying to come close to the _womanP who married $him. Once $he's close, you take your willing wife's head in your hands and gaze deeply into $his $activeSlave.eyeColor eyes. $He finds the intense look from the <<if $PC.title == 1>>man<<else>>woman<</if>> $he's married to affirming, and looks down with a smile<<if canSee($activeSlave)>>, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><</if>>.
-=======
$He lovingly complies, hurrying to come close to the _womanP who married $him. Once $he's close, you take your willing wife's head in your hands and gaze deeply into $his $activeSlave.eyeColor eyes. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile<<if canSee($activeSlave)>>, running $his eyes over your <<if $PC.boobs == 1>>bosom<<else>>chest<</if>><</if>>.
->>>>>>> 32fdb96882fb70c6dbecaa454463c7000d16d0e7
<<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
$He complies. Once $he's close, you take your reluctant wife's head in your hands and gaze deeply into $his $activeSlave.eyeColor eyes. $He finds the intense look from the _womanP $he's forcibly married to disturbing, and <<if canSee($activeSlave)>> breaks eye contact<<else>> turns $his face away<</if>>.
<<elseif $activeSlave.devotion < -20>>
diff --git a/src/pregmod/eliteTakeOverFight.tw b/src/pregmod/eliteTakeOverFight.tw
index 272fdc47ea268937b4ad52ba9ac72cd99d7ab6e1..2ee4a261a94ad7b6b0b2a07f63f89f4b2523b653 100644
--- a/src/pregmod/eliteTakeOverFight.tw
+++ b/src/pregmod/eliteTakeOverFight.tw
@@ -210,19 +210,9 @@
/* enslaved = 1 */
/* had fun (and enslaved) = 2 */
<<if $BodyguardHasSucessfullyRecivedSignal == 1>>
-<<<<<<< HEAD
-<<<<<<< HEAD
<<setLocalPronouns $Bodyguard>>
<<run Enunciate($Bodyguard)>>
$Bodyguard.slaveName asks, "<<Master>>, what <<sh>>ould I do with the <<if $eliteLeft < $eliteTotal>>remaining<</if>> 'elite' left?"
-=======
- $Bodyguard.slaveName asks "<<Master>>, what should I do with the <<if $eliteLeft < $eliteTotal>>remaining<</if>> 'elite'?"
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
-=======
- <<setLocalPronouns $Bodyguard>>
- <<run Enunciate($Bodyguard)>>
- $Bodyguard.slaveName asks, "<<Master>>, what <<sh>>ould I do with the <<if $eliteLeft < $eliteTotal>>remaining<</if>> 'elite' left?"
->>>>>>> 32fdb96882fb70c6dbecaa454463c7000d16d0e7
<br>
<<link "Open fire">>
<<set $eliteFate = 0>>
@@ -275,15 +265,7 @@
<<setLocalPronouns $Bodyguard>>
<<run Enunciate($Bodyguard)>>
It is now that $Bodyguard.slaveName makes $his entrance, pointing $his guns at the <<if $eliteLeft < $eliteTotal>>remaining<</if>> elite.
-<<<<<<< HEAD
-<<<<<<< HEAD
- $He then asks, "<<Master>>, what <<sh>>ould I do with the <<if $eliteLeft < $eliteTotal>>remaining<</if>> 'elite' left?"
-=======
- $He then asks, "<<Master>>, what should I do with the <<if $eliteLeft < $eliteTotal>>remaining<</if>> 'elite' left?"
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
-=======
$He then asks "<<Master>>, what <<sh>>ould I do with the <<if $eliteLeft < $eliteTotal>>remaining<</if>> 'elite' left?"
->>>>>>> 32fdb96882fb70c6dbecaa454463c7000d16d0e7
<br>
<<link "Open fire">>
<<set $eliteFate = 0>>
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index 67554dc70afbd32c21eba9bed1d992b73ecf5969..22a7db119815afcfa3b2468f37626137eca93863 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -1039,16 +1039,7 @@ You beckon the curious girl to your hefty breasts, having noticed how hungrily $
<<set $activeSlave.trust -= 10>>
<<setNonlocalPronouns $seeDicks>>
<<replace "#result">>
-<<<<<<< HEAD
-<<<<<<< HEAD
- <<setNonlocalPronouns $seeDicks>>
- You tell $him that it's in $his interests to be a good girl. $He smiles happily, taking it as a compliment. You point behind $him; $he turns, and beholds a live feed from the Industrial Dairy. $He gazes spellbound at the interleaved row of bodies intertwined with machines in embraces far more intimate than any lover could hope to match. The gently heaving masses of breastflesh hold $his fascinated and horrified attention until one of the machines fortuitously chooses this moment to cycle its occupant's anal hydration regimen. It withdraws its horse-sized phallus from the slave's anus, leaving _hisU gape pulsing gently as it awaits the resumption of the endless assrape.<<if $dairyPregSetting > 0>> $His attention is caught by another slave in the throes of birth, gasping as _heU watches _hisU newborns taken away. _HeU begins to cry as the machine inserts its inseminator and pumps the cow's womb full of fresh cum, leaving _himU bloated.<</if>> $activeSlave.slaveName lets out a huge sob and turns to you, @@.gold;fear suffusing $him@@ as $he promises to @@.hotpink;be a good girl.@@
-=======
You tell $him that it's in $his interests to be a good $girl. $He smiles happily, taking it as a compliment. You point behind $him; $he turns, and beholds a live feed from the Industrial Dairy. $He gazes spellbound at the interleaved row of bodies intertwined with machines in embraces far more intimate than any lover could hope to match. The gently heaving masses of breastflesh hold $his fascinated and horrified attention until one of the machines fortuitously chooses this moment to cycle its occupant's anal hydration regimen. It withdraws its horse-sized phallus from the slave's anus, leaving _hisU gape pulsing gently as it awaits the resumption of the endless assrape.<<if $dairyPregSetting > 0>> $His attention is caught by another slave in the throes of birth, gasping as _heU watches _hisU newborns taken away. _HeU begins to cry as the machine inserts its inseminator and pumps the cow's womb full of fresh cum, leaving _himU bloated.<</if>> $activeSlave.slaveName lets out a huge sob and turns to you, @@.gold;fear suffusing $him@@ as $he promises to @@.hotpink;be a good $girl.@@
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
-=======
- You tell $him that it's in $his interests to be a good $girl. $He smiles happily, taking it as a compliment. You point behind $him; $he turns, and beholds a live feed from the Industrial Dairy. $He gazes spellbound at the interleaved row of bodies intertwined with machines in embraces far more intimate than any lover could hope to match. The gently heaving masses of breastflesh hold $his fascinated and horrified attention until one of the machines fortuitously chooses this moment to cycle its occupant's anal hydration regimen. It withdraws its horse-sized phallus from the slave's anus, leaving _hisU gape pulsing gently as it awaits the resumption of the endless assrape.<<if $dairyPregSetting > 0>> $His attention is caught by another slave in the throes of birth, gasping as _heU watches _hisU newborns taken away. _HeU begins to cry as the machine inserts its inseminator and pumps the cow's womb full of fresh cum, leaving _himU bloated.<</if>> $activeSlave.slaveName lets out a huge sob and turns to you, @@.gold;fear suffusing $him@@ as $he promises to @@.hotpink;be a good $girl.@@
->>>>>>> 32fdb96882fb70c6dbecaa454463c7000d16d0e7
<</replace>>
<</link>>
<<if ($activeSlave.lactation > 0 || (($dairySlimMaintainUpgrade == 0 || $dairySlimMaintain == 0) && ($activeSlave.boobs > 300 || $activeSlave.dick == 0 || $dairyImplantsSetting == 1) && $dairyImplantsSetting != 2)) || ($activeSlave.balls > 0)>>
diff --git a/src/pregmod/rePregInventor.tw b/src/pregmod/rePregInventor.tw
index 2d188c3d959f228d479153f97f7ea0bc44523e13..f8451baa1d2171f0d2b23866ae8d816092ca1189 100644
--- a/src/pregmod/rePregInventor.tw
+++ b/src/pregmod/rePregInventor.tw
@@ -351,11 +351,7 @@
<br><<link "Organize a televised demonstration of $his skills.">>
<<replace "#result2">>
You are so impressed by $his ideas that you arrange to have $him demonstrate $his discoveries on a prominent FCTV talk show. It will take some time, and you'll have to insure that $he's at least reasonably well known before the show's executives will agree to allow $him on-air, but you're certain that $activeSlave.slaveName's name will soon be on the lips of pregnancy-loving slaveowners and Free Cities citizens around the world. In the meantime, you implement $his ideas around the arcology. $He is @@.hotpink;thrilled@@ to have pleased you so much that you would @@.mediumaquamarine;put such faith in $his ideas.@@
-<<<<<<< HEAD
- <<set $cash -= 10000>>
-=======
<<run cashX(-10000, "event", $activeSlave)>>
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
<<set $pregInventor = 2>>
<<set $pregInventions = 1>>
<<set $activeSlave.trust += 4, $activeSlave.devotion += 10>>
@@ -544,11 +540,7 @@
<br><<link "Organize a televised demonstration of $his skills.">>
<<replace "#result2">>
You are so impressed by $his ideas that you arrange to have $him demonstrate $his discoveries on a prominent FCTV talk show. It will take some time, and you'll have to insure that $he's at least reasonably well known before the show's executives will agree to allow $him on-air, but you're certain that $activeSlave.slaveName's name will soon be on the lips of pregnancy-loving slaveowners and Free Cities citizens around the world. In the meantime, you implement $his ideas around the arcology. $He is @@.hotpink;thrilled@@ to have pleased you so much that you would @@.mediumaquamarine;put such faith in $his ideas.@@
-<<<<<<< HEAD
- <<set $cash -= 10000>>
-=======
<<run cashX(-10000, "event", $activeSlave)>>
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
<<set $pregInventor = 2>>
<<set $pregInventions = 1>>
<<set $activeSlave.trust += 4, $activeSlave.devotion += 10>>
@@ -767,11 +759,7 @@
<br><<link "Organize a televised demonstration of $his skills.">>
<<replace "#result2">>
You are so impressed by $his ideas that you arrange to have $him demonstrate $his discoveries on a prominent FCTV talk show. It will take some time, and you'll have to insure that $he's at least reasonably well known before the show's executives will agree to allow $him on-air, but you're certain that $activeSlave.slaveName's name will soon be on the lips of pregnancy-loving slaveowners and Free Cities citizens around the world. In the meantime, you implement $his ideas around the arcology. $He is @@.hotpink;thrilled@@ to have pleased you so much that you would @@.mediumaquamarine;put such faith in $his ideas.@@
-<<<<<<< HEAD
- <<set $cash -= 10000>>
-=======
<<run cashX(-10000, "event", $activeSlave)>>
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
<<set $pregInventor = 2>>
<<set $pregInventions = 1>>
<<set $activeSlave.trust += 4, $activeSlave.devotion += 10>>
diff --git a/src/pregmod/rePregInventorText.tw b/src/pregmod/rePregInventorText.tw
index e426d3281fa239c6519310ed692d925a9522acb3..09c7cb53e6288b0a8aaff87b827eb0b3b5a25d10 100644
--- a/src/pregmod/rePregInventorText.tw
+++ b/src/pregmod/rePregInventorText.tw
@@ -137,15 +137,7 @@
Your slave's speaking assistant explains that the pool is designed to allow slaves and women to care for their bodies no matter how large they inflate. Meanwhile, your slave has been slowly rotating in the pool until $he is pressed conspicuously close to the host. The assistant asks if the host is feeling well, a look of mock concern on her face.
<</if>>
<br><br>
-<<<<<<< HEAD
-<<<<<<< HEAD
- "Ah! Um, yes — yep! I'm feeling just fine," Millie says. She's blushing furiously and squirming, and you can just make out the outline of your slave performing some form of teasing shenanigans under the distorting effect of the pool's goo. "So — oooh, yes... $activeSlave.slaveName, how did you, um, come up with the idea for this pool?
-=======
"Ah! Um, yes — yep! I'm feeling just fine," Millie says. She's blushing furiously and squirming, and you can just make out the outline of your slave performing some form of teasing shenanigans under the distorting effect of the pool's goo. "So — oooh, yes... $activeSlave.slaveName, how did you, um, come up with the idea for this pool?"
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
-=======
- "Ah! Um, yes — yep! I'm feeling just fine," Millie says. She's blushing furiously and squirming, and you can just make out the outline of your slave performing some form of teasing shenanigans under the distorting effect of the pool's goo. "So — oooh, yes... $activeSlave.slaveName, how did you, um, come up with the idea for this pool?"
->>>>>>> 32fdb96882fb70c6dbecaa454463c7000d16d0e7
<br><br>
<<if canTalk($activeSlave)>>
"I'm alway<<s>> trying to think of way<<s>> to keep my<<s>>elf pretty for — oh! — my <<Master>>," your slave <<say>>s, suddenly squirming $himself. Millie has slouched down into the pool and is grinning wickedly as she apparently gets revenge. "Thi<<s>> wa<<s>> ju<<s>>t the be<<s>>t — um — I mean — the be<<s>>t — oh //fuck, keep// — I mean, the be<<s>>t method I could think of for doing that."
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index 0c4389bd77159e894b7fe413be618627e9452b07..3d368fb07c24595cdd67e033dd5c1d4aead54a1e 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -1060,15 +1060,7 @@ The offered price is <<print cashFormat($slaveCost)>>.
*/
You're greeted by a man with an eyepatch, a bushy black beard, and a crimson bandanna around his head. He's sitting behind a crude looking bamboo desk. Behind him is the backdrop of a sun rising over the ocean and two slaves in tight revealing sailor outfits swabbing the deck. The whole set looks like some sort of tropical pirate theme and you almost change the channel mistaking the show for a kids show when it catches up to you what the pirate is talking about.
<br><br>
-<<<<<<< HEAD
-<<<<<<< HEAD
- "-An that be concludin' our special report on the dangers o' dealin' with old world customs agencies an' how to find a scallywag'll right proper let you sneak a bound wench through fer the right bribe. If'n you missed it or be needin' a refresher, catch our rebroadcast in 12 bells time. Now afore the turn of the hourglass we go to our weatherwench Lusty Pearl who's been keepin' a weather eye on the horizon. Lusty?"
-=======
"- An' that be concludin' our special report on the dangers o' dealin' with old world customs agencies an' how to find a scallywag'll right proper let you sneak a bound wench through fer the right bribe. If'n you missed it or be needin' a refresher, catch our rebroadcast in 12 bells time. Now afore the turn of the hourglass we go to our weatherwench Lusty Pearl who's been keepin' a weather eye on the horizon. Lusty?"
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
-=======
- "- An' that be concludin' our special report on the dangers o' dealin' with old world customs agencies an' how to find a scallywag'll right proper let you sneak a bound wench through fer the right bribe. If'n you missed it or be needin' a refresher, catch our rebroadcast in 12 bells time. Now afore the turn of the hourglass we go to our weatherwench Lusty Pearl who's been keepin' a weather eye on the horizon. Lusty?"
->>>>>>> 32fdb96882fb70c6dbecaa454463c7000d16d0e7
<br><br>
The camera cuts to a young blonde girl with her hair braided back in rows. She's wearing a white blouse that's unbuttoned all the way down to her leather corset showing much of her very large rack while hiding little.
<br><br>
diff --git a/src/uncategorized/RECI.tw b/src/uncategorized/RECI.tw
index 6be9918bd03d4d15d2020829042b4369996c8e02..4997f3b980bf9eafe98ecf71ed8230f02333adb0 100644
--- a/src/uncategorized/RECI.tw
+++ b/src/uncategorized/RECI.tw
@@ -441,14 +441,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
<<link "Then $he can appreciate a nice struggle fuck">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
-<<<<<<< HEAD
- When $he <<if canSee($activeSlave)>>sees<<elseif canHear($activeSlave)>>hears<<else>>senses<</if>> you stand up from behind your desk<<if ($PC.dick == 0)>> and pull on a strap-on<</if>>, $he smiles invitingly at you and relaxes. But as you approach, $he <<if canSee($activeSlave)>>sees a dangerous glint in your eyes<<elseif canHear($activeSlave)>>hears a menacing cadence to your footstep<else>>realizes the reason for your delay<</if>>. One corner of $his mouth flaws upward with anticipation, and $he plays along. $He immediately curls up into a ball on the couch, managing to end up with $his <<if ($activeSlave.weight > 30)>>fat ass squashed enticingly against the seat back<<elseif ($activeSlave.butt > 5)>>absurd ass squashed enticingly against the seat back<<elseif ($activeSlave.butt > 2)>>healthy ass pushed against the seat back<<else>>trim ass against the seat back<</if>>. $He looks up at you with feigned terror and begs, "Plea<<s>>e, <<Master>>, I'm ju<<s>>t an inno<<c>>ent little $girl. Plea<<s>>e don't rape my poor little butt!" You grab an ankle and haul $his <<if ($activeSlave.weight > 10)>>plush<<elseif ($activeSlave.muscles > 5)>>toned<<else>>slender<</if>> $activeSlave.skin body toward you, dragging $him across the couch, and then half-fall atop $him, pushing <<if ($PC.dick == 0)>>the strap-on<<else>>your hard cock<</if>> up the wriggling girl's butt. $He keeps begging and whining, but $he's managed to bring a hand under $himself and is
-=======
- When $he <<if canSee($activeSlave)>>sees<<elseif canHear($activeSlave)>>hears<<else>>senses<</if>> you stand up from behind your desk<<if ($PC.dick == 0)>> and pull on a strap-on<</if>>, $he smiles invitingly at you and relaxes. But as you approach, $he <<if canSee($activeSlave)>>sees a dangerous glint in your eyes<<elseif canHear($activeSlave)>>hears a menacing cadence to your footstep<<else>>realizes the reason for your delay<</if>>. One corner of $his mouth flaws upward with anticipation, and $he plays along. $He immediately curls up into a ball on the couch, managing to end up with $his <<if ($activeSlave.weight > 30)>>fat ass squashed enticingly against the seat back<<elseif ($activeSlave.butt > 5)>>absurd ass squashed enticingly against the seat back<<elseif ($activeSlave.butt > 2)>>healthy ass pushed against the seat back<<else>>trim ass against the seat back<</if>>. $He looks up at you with feigned terror and begs, "Plea<<s>>e, <<Master>>, I'm ju<<s>>t an inno<<c>>ent little $girl. Plea<<s>>e don't rape my poor little butt!" You grab an ankle and haul $his <<if ($activeSlave.weight > 10)>>plush<<elseif ($activeSlave.muscles > 5)>>toned<<else>>slender<</if>> $activeSlave.skin body toward you, dragging $him across the couch, and then half-fall atop $him, pushing <<if ($PC.dick == 0)>>the strap-on<<else>>your hard cock<</if>> up the wriggling girl's butt. $He keeps begging and whining, but $he's managed to bring a hand under $himself and is
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
-=======
- When $he <<if canSee($activeSlave)>>sees<<elseif canHear($activeSlave)>>hears<<else>>senses<</if>> you stand up from behind your desk<<if ($PC.dick == 0)>> and pull on a strap-on<</if>>, $he smiles invitingly at you and relaxes. But as you approach, $he <<if canSee($activeSlave)>>sees a dangerous glint in your eyes<<elseif canHear($activeSlave)>>hears a menacing cadence to your footstep<<else>>realizes the reason for your delay<</if>>. One corner of $his mouth flaws upward with anticipation, and $he plays along. $He immediately curls up into a ball on the couch, managing to end up with $his <<if ($activeSlave.weight > 30)>>fat ass squashed enticingly against the seat back<<elseif ($activeSlave.butt > 5)>>absurd ass squashed enticingly against the seat back<<elseif ($activeSlave.butt > 2)>>healthy ass pushed against the seat back<<else>>trim ass against the seat back<</if>>. $He looks up at you with feigned terror and begs, "Plea<<s>>e, <<Master>>, I'm ju<<s>>t an inno<<c>>ent little $girl. Plea<<s>>e don't rape my poor little butt!" You grab an ankle and haul $his <<if ($activeSlave.weight > 10)>>plush<<elseif ($activeSlave.muscles > 5)>>toned<<else>>slender<</if>> $activeSlave.skin body toward you, dragging $him across the couch, and then half-fall atop $him, pushing <<if ($PC.dick == 0)>>the strap-on<<else>>your hard cock<</if>> up the wriggling girl's butt. $He keeps begging and whining, but $he's managed to bring a hand under $himself and is
+ When $he <<if canSee($activeSlave)>>sees<<elseif canHear($activeSlave)>>hears<<else>>senses<</if>> you stand up from behind your desk<<if ($PC.dick == 0)>> and pull on a strap-on<</if>>, $he smiles invitingly at you and relaxes. But as you approach, $he <<if canSee($activeSlave)>>sees a dangerous glint in your eyes<<elseif canHear($activeSlave)>>hears a menacing cadence to your footstep<<else>>realizes the reason for your delay<</if>>. One corner of $his mouth flaws upward with anticipation, and $he plays along. $He immediately curls up into a ball on the couch, managing to end up with $his <<if ($activeSlave.weight > 30)>>fat ass squashed enticingly against the seat back<<elseif ($activeSlave.butt > 5)>>absurd ass squashed enticingly against the seat back<<elseif ($activeSlave.butt > 2)>>healthy ass pushed against the seat back<<else>>trim ass against the seat back<</if>>. $He looks up at you with feigned terror and begs, "Plea<<s>>e, <<Master>>, I'm ju<<s>>t an inno<<c>>ent little $girl. Plea<<s>>e don't rape my poor little butt!" You grab an ankle and haul $his <<if ($activeSlave.weight > 10)>>plush<<elseif ($activeSlave.muscles > 5)>>toned<<else>>slender<</if>> $activeSlave.skin body toward you, dragging $him across the couch, and then half-fall atop $him, pushing <<if ($PC.dick == 0)>>the strap-on<<else>>your hard cock<</if>> up the wriggling $girl's butt. $He keeps begging and whining, but $he's managed to bring a hand under $himself and is
>>>>>>> 32fdb96882fb70c6dbecaa454463c7000d16d0e7
<<if ($activeSlave.dick > 0) && ($activeSlave.dickAccessory == "chastity")>>
frantically rubbing $his taint.
diff --git a/src/uncategorized/REFS.tw b/src/uncategorized/REFS.tw
index 15367debef9ee322d783bb9399537574191fd4a7..00b57420f893ff1bb1014ec8fff0226f2d59ff3b 100644
--- a/src/uncategorized/REFS.tw
+++ b/src/uncategorized/REFS.tw
@@ -319,14 +319,9 @@ On this particular outing you happen to cross paths with a comely female citizen
<<if $cash >= 1000>>
<br><<link "Pay for $his treatment">>
<<replace "#result">>
-<<<<<<< HEAD
It takes a moment for you to convince the $woman that you aren't playing some cruel joke on $him, but once you do $he practically squeals with joy as you take $him through the doors of the clinic and announce your intent to pay to give your loyal citizen the absolute transformative works. When you next see $him it's on a gurney as $he's wheeled out of the surgery, $his patient's gown jutting out from $his chest due to the size of $his new rack. Through swollen lips $he gushes to you about how great $he feels to finally be a veritable bimbo, and how $he's going to tell every citizen $he fucks in $arcologies[0].name @@.green;that they have you to thank for $his new body@@.
- <<set $rep += 1000, $cash -= 1000>>
-=======
- It takes a moment for you to convince the woman that you aren't playing some cruel joke on $him, but once you do $he practically squeals with joy as you take $him through the doors of the clinic and announce your intent to pay to give your loyal citizen the absolute transformative works. When you next see $him it's on a gurney as $he's wheeled out of the surgery, $his patient's gown jutting out from $his chest due to the size of $his new rack. Through swollen lips $he gushes to you about how great $he feels to finally be a veritable bimbo, and how $he's going to tell every citizen $he fucks in $arcologies[0].name @@.green;that they have you to thank for $his new body@@.
<<set $rep += 1000>>
<<run cashX(-1000, "event")>>
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
<</replace>>
<</link>> // The treatment will cost <<print cashFormat(1000)>>. //
<</if>>
@@ -334,11 +329,7 @@ On this particular outing you happen to cross paths with a comely female citizen
<<replace "#result">>
You make your presence known to citizen, and once the usual shock and disbelief have worn off the citizen rapidly agrees to your proposal. $He follows you back to the penthouse where you inform $assistantName that the citizen is to be given the works in the remote surgery. As the citizen passes through the doors to the surgery, $he turns and blows you a kiss of gratitude.
<br><br>
-<<<<<<< HEAD
- When the citizen is later delivered to your private suite to uphold $his end of the bargain, $he does so as the veritable image of a perfect bimbo slut. In $his rush to come thank you for transforming $him from $his plain and plebian appearance $he has evidently neglected to clothe $himself, so you can admire $his new firm tits, plump ass and bee-stung lips from the moment $he enters the room. Despite being fresh from surgery, $he's an exquisite fuck and an enthusiastic partner - citizens like $him often are, given that penetration from a slave would be a social suicide.
-=======
- When the citizen is later delivered to your private suite to uphold $his end of the bargain, $he does so as the veritable image of a perfect bimbo slut. In $his rush to come thank you for transforming $him from $his plain and plebian appearance $he has evidently neglected to clothe herself, so you can admire $his new firm tits, plump ass and bee-stung lips from the moment $he enters the room. Despite being fresh from surgery, $he's an exquisite fuck and an enthusiastic partner — citizens like $him often are, given that penetration from a slave would be a social suicide.
->>>>>>> 0b3b1c5a7366e8a3c24f412e5a1a69bbe768c730
+ When the citizen is later delivered to your private suite to uphold $his end of the bargain, $he does so as the veritable image of a perfect bimbo slut. In $his rush to come thank you for transforming $him from $his plain and plebian appearance $he has evidently neglected to clothe $himself, so you can admire $his new firm tits, plump ass and bee-stung lips from the moment $he enters the room. Despite being fresh from surgery, $he's an exquisite fuck and an enthusiastic partner — citizens like $him often are, given that penetration from a slave would be a social suicide.
<<if $cash >= 10000>>
<br><br>
<span id="result2">
@@ -436,18 +427,9 @@ On this particular outing you happen to cross paths with a comely female citizen
<<if $cash >= 500>>
<br><<link "Fuck $him over dinner">>
<<replace "#result">>
-<<<<<<< HEAD
-<<<<<<< HEAD
- It takes a moment for you to convince the older $woman and $his sons that you aren't playing some cruel joke on them, but once you do $he enthusiastically agrees to be your companion for the evening. With a mature lady on your arm for the rest of the night, and $his sons trailing behind the two of you at a respectful distance, you take $arcologies[0].name by storm amidst a flurry of speculative whispers and contemplative rumors. Later that night, you conclude your date with a pleasant meal at one of $arcologies[0].name's choicest restaurants with fine dining and even finer conversation. To the credit of $his sons, they politely continue eating their dinner without batting an eye when you <<if $PC.dick == 0>>don a strap-on and <</if>>take their mother over the dinner table. When you part ways, the older $woman is clearly smitten with you - so it's no wonder that by the next day the story of your encounter has @@.green;spread across $arcologies[0].name like wildfire@@.
- <<set $rep += 500, $cash -= 500>>
-=======
- It takes a moment for you to convince the older woman and $his sons that you aren't playing some cruel joke on them, but once you do $he enthusiastically agrees to be your companion for the evening. With a mature lady on your arm for the rest of the night, and $his sons trailing behind the two of you at a respectful distance, you take $arcologies[0].name by storm amidst a flurry of speculative whispers and contemplative rumors. Later that night, you conclude your date with a pleasant meal at one of $arcologies[0].name's choicest restaurants with fine dining and even finer conversation. To the credit of $his sons, they politely continue eating their dinner without batting an eye when you <<if $PC.dick == 0>>don a strap-on and <</if>>take their mother over the dinner table. When you part ways, the older woman is clearly smitten with you - so it's no wonder that by the next day the story of your encounter has @@.green;spread across $arcologies[0].name like wildfire@@.
-=======
It takes a moment for you to convince the older $woman and $his sons that you aren't playing some cruel joke on them, but once you do $he enthusiastically agrees to be your companion for the evening. With a mature lady on your arm for the rest of the night, and $his sons trailing behind the two of you at a respectful distance, you take $arcologies[0].name by storm amidst a flurry of speculative whispers and contemplative rumors. Later that night, you conclude your date with a pleasant meal at one of $arcologies[0].name's choicest restaurants with fine dining and even finer conversation. To the credit of $his sons, they politely continue eating their dinner without batting an eye when you <<if $PC.dick == 0>>don a strap-on and <</if>>take their mother over the dinner table. When you part ways, the older $woman is clearly smitten with you — so it's no wonder that by the next day the story of your encounter has @@.green;spread across $arcologies[0].name like wildfire@@.
->>>>>>> 0b3b1c5a7366e8a3c24f412e5a1a69bbe768c730
<<set $rep += 500>>
<<run cashX(-500, "event")>>
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
<</replace>>
<</link>> // This will cost <<print cashFormat(500)>>. //
<</if>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 46d7a917136fee25802bec5ad558bd193cae4fd2..344213b9aacf384536960debe29888c30f032a87 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -14341,15 +14341,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<<else>>
cross-legged
<</if>>
-<<<<<<< HEAD
-<<<<<<< HEAD
- next to you. $He listens raptly, parroting obediently and clearly doing $his best to please, but you notice a certain incredulity that slowly fades as the lesson goes on. $He's obviously having trouble believing that $his owner would trouble _himselfP with $his vocabulary lessons. You work with $his several times a day, and $he's so diligent that by the end of the week $he's @@.green;beginning to make $himself understood,@@ though $his accent is still pretty atrocious.
-=======
next to you. $He <<if canHear($activeSlave)>>listens raptly<<elseif canSee($activeSlave)>>reads along<<else>>focuses intently<</if>>, parroting obediently and clearly doing $his best to please, but you notice a certain incredulity that slowly fades as the lesson goes on. $He's obviously having trouble believing that $his owner would trouble _himselfP with $his vocabulary lessons. You work with $his several times a day, and $he's so diligent that by the end of the week $he's @@.green;beginning to make $himself understood,@@ though $his accent is still pretty atrocious.
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
-=======
- next to you. $He <<if canHear($activeSlave)>>listens raptly<<elseif cansee($activeSlave)>>reads along<<else>>focuses intently<</if>>, parroting obediently and clearly doing $his best to please, but you notice a certain incredulity that slowly fades as the lesson goes on. $He's obviously having trouble believing that $his owner would trouble _himselfP with $his vocabulary lessons. You work with $his several times a day, and $he's so diligent that by the end of the week $he's @@.green;beginning to make $himself understood,@@ though $his accent is still pretty atrocious.
->>>>>>> 32fdb96882fb70c6dbecaa454463c7000d16d0e7
<<set $activeSlave.accent-->>
<</replace>>
<</link>>
@@ -17227,11 +17219,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
<br><<link "Enslave them all">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- You seize a tablet and hurry out of your office, working furiously and using every feature of $assistantName to the utmost. These bitches have offended you, and you quickly frame the structure of an appropriate revenge. By the time you get to where $activeSlave.slaveName is still being heckled by spoiled, drunken harpies, everyone else present in that arcology hall has mysteriously received urgent messages and gone elsewhere. $activeSlave.slaveName <<if canSee($activeSlave)>>sees you approach, and stares at you<<else>>recognizes your dominant footsteps approaching, and turns to face you<</if>>, $his sudden intense look alerting your vile little guests to your presence. One of them attempts to frame an insult for the interloper, but one of her friends pokes her in the side and whispers something in her ear, and she goes silent, staring at you with wide eyes.
-=======
You seize a tablet and hurry out of your office, working furiously and using every feature of $assistantName to the utmost. These bitches have offended you, and you quickly frame the structure of an appropriate revenge. By the time you get to where $activeSlave.slaveName is still being heckled by spoiled, drunken harpies, everyone else present in that arcology hall has mysteriously received urgent messages and gone elsewhere. $activeSlave.slaveName <<if canSee($activeSlave)>>sees you approach, and stares at you<<else>>recognizes your dominant footsteps approaching, and turns to face you<</if>>, $his sudden intense look alerting your vile little guests to your presence. One of them attempts to frame an insult for the interloper, but one of her friends pokes her in the side and whispers something in her ear and she goes silent, staring at you with wide eyes.
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
<<if $PC.title != 1>>She then winces, visibly realizing that you're likely aware that she called $activeSlave.slaveName's owner $his Master. Somehow, the mistake seems important to her now that you're standing here, effortlessly dominating the space for all your femininity.<</if>>
<br><br>
You hold the tablet out to them wordlessly. It's displaying security footage of the three of them, boarding a public VTOL transport for another arcology nearby. The prominent timestamp is thirty minutes in the future. The scene changes, showing them partying in one of that arcology's nightclubs. You clear your throat, dragging their attention away from the counterfeited footage, and describe in detail the other evidence — tickets, identification checks, biometrics — that will prove they left your arcology and visited two others before regrettably disappearing. One of them tries, with utter predictability, to threaten you with her father, but you tell her bluntly that if he does make the effort, he'll be looking in the wrong place.
diff --git a/src/uncategorized/jeSlaveDispute.tw b/src/uncategorized/jeSlaveDispute.tw
index cf7898964f899f139ed2f76b603f04df7d5fcdca..d91b13ba16b39764ca52b4699e9f5982182ff4b9 100644
--- a/src/uncategorized/jeSlaveDispute.tw
+++ b/src/uncategorized/jeSlaveDispute.tw
@@ -368,18 +368,13 @@
<<set $rep -= 500>>
<</replace>>
<</link>>
-<<<<<<< HEAD
<br><<link "Buy out the contract and $his indenture">>
<<set $activeSlave.devotion = random(10,15)>>
<<set $activeSlave.trust = $activeSlave.devotion+4>>
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
<<set $activeSlave.indenture = random(52,78)>>
<<set $activeSlave.indentureRestrictions = 2>>
- <<run cashX(forceNeg($contractCost), "slaveTransaction")>>
-=======
- <br><<link "Buy out the contract and enslave her">>
<<run cashX(forceNeg($contractCost), "slaveTransfer")>>
->>>>>>> 6d41c148a1dbf423d943092342a50604046766d6
<<replace "#result">>
You offer to simply buy out the indenture contract, thereby acquiring $him, to which both parties readily agree. This decision is viewed as @@.green;incredibly generous@@ by both your arcology's romantically-minded and financially-inclined citizens. For their part, your new servant is hopeful that you will be more considerate of $his health, while the former holder is just happy to have $him off his hands.
<br><br>
@@ -393,15 +388,7 @@
<<set $activeSlave.devotion = random(-10,-15)>>
<<set $activeSlave.trust = $activeSlave.devotion+4>>
<<set $activeSlave.oldDevotion = $activeSlave.devotion>>
-<<<<<<< HEAD
- <<set $cash -= $contractCost>>
-=======
- <br><<link "Buy out the contract and enslave her">>
<<run cashX(forceNeg($contractCost), "slaveTransfer")>>
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
-=======
- <<run cashX(forceNeg($contractCost), "slaveTransaction")>>
->>>>>>> 32fdb96882fb70c6dbecaa454463c7000d16d0e7
<<replace "#result">>
You quietly contact the trader and suggest an alternative method of settling the dispute. He is surprised, but agrees readily, chuckling at how the "recalcitrant bitch" is going to be dealt with. To $his horror, $he finds that your near-total power over deals made in your arcology has been employed to saddle $him with additional debts that, under $his indentured servitude, $he cannot hope to repay. It is then the work of ten minutes to demand payment, and when $he cannot pay, demand $his body for enslavement. The story of your cunning @@.green;impresses@@ the slave traders, but is @@.red;booed@@ by fairer-minded citizens.
<br><br>
diff --git a/src/uncategorized/madamSelect.tw b/src/uncategorized/madamSelect.tw
index 8cd887fd66508820fa1bf69e557d8e3a76605efa..2e541d6d7468bdc17895d49d2087d75e29049a24 100644
--- a/src/uncategorized/madamSelect.tw
+++ b/src/uncategorized/madamSelect.tw
@@ -3,19 +3,9 @@
<<set $nextButton = "Back", $nextLink = "Brothel", $showEncyclopedia = 1, $encyclopedia = "Madam">>
<<showallAssignmentFilter>>
<<if ($Madam != 0)>>
-<<<<<<< HEAD
-<<<<<<< HEAD
- <<setLocalPronouns $Madam>>
- ''__@@.pink;<<= SlaveFullName($Madam)>>@@__'' is serving as your Madam.<br><br>$He will manage the brothel.
-=======
- <<set $Madam = getSlave($Madam.ID)>>
- ''__@@.pink;<<= SlaveFullName($Madam)>>@@__'' is serving as your Madam.<br><br>She will manage the brothel.
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
-=======
<<set $Madam = getSlave($Madam.ID)>>
<<setLocalPronouns $Madam>>
''__@@.pink;<<= SlaveFullName($Madam)>>@@__'' is serving as your Madam.<br><br>$He will manage the brothel.
->>>>>>> 32fdb96882fb70c6dbecaa454463c7000d16d0e7
<<else>>
You have not selected a Madam.
<</if>>
diff --git a/src/uncategorized/neighborsFSAdoption.tw b/src/uncategorized/neighborsFSAdoption.tw
index 59e8d53869efad3221ea47485da5b77081762d5b..d8b6a3b8852956fddb7722dedf4026654caa47b8 100644
--- a/src/uncategorized/neighborsFSAdoption.tw
+++ b/src/uncategorized/neighborsFSAdoption.tw
@@ -354,15 +354,6 @@ societal development.
<</if>>
<</if>>
<<if ($arcologies[$i].FSBodyPurist == "unset")>>
-<<<<<<< HEAD
-<<if ($arcologies[$i].FSTransformationFetishist == "unset")>>
- <<if $leaders[$j].chem > 50>>
- Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Body Purism,@@ since $he knows what long term drug damage feels like, and doesn't want any slave to ever experience it again.
- <<set $arcologies[$i].FSBodyPurist = 5>><<break>>
- <<elseif $leaders[$j].boobsImplant > 1000>>
- Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Transformation Fetishism,@@ out of a perverse desire to subject all slaves to massive implants like $hers.
- <<set $arcologies[$i].FSTransformationFetishist = 5>><<break>>
-=======
<<if ($arcologies[$i].FSTransformationFetishist == "unset")>>
<<if $leaders[$j].chem > 50>>
Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Body Purism,@@ since $he knows what long term drug damage feels like, and doesn't want any slave to ever experience it again.
@@ -371,7 +362,6 @@ societal development.
Your agent @@.pink;$leaders[$j].slaveName@@ successfully pushes it to @@.yellow;adopt Transformation Fetishism,@@ out of a perverse desire to subject all slaves to massive implants like $hers.
<<set $arcologies[$i].FSTransformationFetishist = 5>><<break>>
<</if>>
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
<</if>>
<</if>>
<<if ($arcologies[$i].FSYouthPreferentialist == "unset")>>
diff --git a/src/uncategorized/reFSAcquisition.tw b/src/uncategorized/reFSAcquisition.tw
index 010a644fb0b56892da1bdc84d043af0be987bac8..3d05d1ae5b3e312646a58bf31c55706a4aa5d4c5 100644
--- a/src/uncategorized/reFSAcquisition.tw
+++ b/src/uncategorized/reFSAcquisition.tw
@@ -1073,21 +1073,13 @@
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
<br><br>
-<<<<<<< HEAD
-This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness. This proves to be right on the money in this case, though the $woman isn't too terribly bedraggled; $his situation must be recent. $He asks to be enslaved with the crushing sadness most such people experience during their last free hours. "I'm pregnant," $he says through tears. "I know I'm not that pretty, <<= properTitle()>>. But," and $he brings $his sizable chest into view, "I've got pretty big boobs, and I started giving milk yesterday. I was searching the net, and I saw that you milk women, <<= properTitle()>>. It seems like a better life than getting fucked all the time."
-=======
This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness. This proves to be right on the money in this case, though the $woman isn't too terribly bedraggled; $his situation must be recent. $He asks to be enslaved with the crushing sadness most such people experience during their last free hours. "I'm pregnant," $he says through tears. "I know I'm not that pretty, <<if $PC.title != 0>>sir<<else>>ma'am<</if>>. But," and $he brings $his sizable chest into view, "I've got pretty big boobs, and I started giving milk yesterday. I was searching the net, and I saw that you milk women, <<if $PC.title != 0>>sir<<else>>ma'am<</if>>. It seems like a better life than getting fucked all the time."
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
<<case "Pastoralist Two">>
You receive so many messages, as a noted titan of the new Free Cities world, that $assistantName has to be quite draconian in culling them. _HeA lets only the most important through to you. One category of message that always gets through regardless of content, though, is requests for voluntary enslavement. As the new world takes shape, they've become less rare than they once were.
<br><br>
-<<<<<<< HEAD
-This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness. You are understandably surprised when this turns out to not be the case; the $woman in the video call is modestly dressed, so $his newfound situation must be exceedingly recent. Nonetheless, $he asks to be enslaved with the same poignant sadness most people experience during their last free hours. "All my children are gone and my husband left me," $he says through tears. "I know I'm older than most, <<= properTitle()>>. But," $he says as $he brings $his motherly chest into view, "I've still got pretty big breasts, and they still give milk. One of my friends told me that you milk women, <<= properTitle()>>. I can't do anything else to make a living."
-=======
This call is coming from a public kiosk, which is usually an indication that the person on the other end is a transient individual who has decided to take slavery over homelessness. You are understandably surprised when this turns out to not be the case; the $woman in the video call is modestly dressed, so $his newfound situation must be exceedingly recent. Nonetheless, $he asks to be enslaved with the same poignant sadness most people experience during their last free hours. "All my children are gone and my husband left me," $he says through tears. "I know I'm older than most, <<if $PC.title != 0>>sir<<else>>ma'am<</if>>. But," $he says as $he brings $his motherly chest into view, "I've still got pretty big breasts, and they still give milk. One of my friends told me that you milk women, <<if $PC.title != 0>>sir<<else>>ma'am<</if>>. I can't do anything else to make a living."
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
<<case "Supremacist">>
@@ -1411,11 +1403,7 @@ The call comes in from an office, and you suppress the urge to check whether $as
<<case "Maturity Preferentialist Two">>
$He arrives apologizing for $his fine clothing. "I'm sorry," $he apologizes sadly, "but I wanted to wear my best one last time." $He sighs, squares $his shoulders, and visibly steels $himself. "My son's a bastard for selling me to you, and all to save that useless store of his." $He delivers this last with a bitter smile on $his lips. "At least he had the sense to sell me to someone with exquisite taste, like you. After all, you did buy me."
<<case "Chattel Religionist">>
-<<<<<<< HEAD
- $He lets out a convulsive sob when you accept $his servitude, and is painfully obsequious as you complete the formalities of enslavement. Your exam reveals several minor indications of self-harm - chewed nails, bitten lips, and such. But for all that, a remarkable look of peace has settled on the poor $woman's face. $He waits patiently for a hint of your will, <<if canAchieveErection($activeSlave)>>$his cock painfully erect<<elseif $activeSlave.dick > 0>>precum dripping from $his soft dick<<else>>$his pussy visibly moist<</if>> at the prospect of the servile sex $he is convinced is $his duty.
-=======
$He lets out a convulsive sob when you accept $his servitude, and is painfully obsequious as you complete the formalities of enslavement. Your exam reveals several minor indications of self-harm — chewed nails, bitten lips, and such. But for all that, a remarkable look of peace has settled on the poor woman's face. $He waits patiently for a hint of your will, <<if canAchieveErection($activeSlave)>>$his cock painfully erect<<elseif $activeSlave.dick > 0>>precum dripping from $his soft dick<<else>>$his pussy visibly moist<</if>> at the prospect of the servile sex $he is convinced is $his duty.
->>>>>>> 0b3b1c5a7366e8a3c24f412e5a1a69bbe768c730
<<case "Chattel Religionist Two">>
You complete the legalities and a clearly improvised VTOL craft arrives at $arcologies[0].name, broadcasting an erratic array of IFF codes. It seems this group hasn't quite mastered the intricacies of air travel. The aircraft doesn't seem capable of the delicate feat of landing on the pad it had been directed to: it simply hovers <<if $showInches == 2>>six feet<<else>>two meters<</if>> off the pad for the five seconds it takes to shove a canvas bag that obviously contains a struggling human form out of the side door. The condemned prays tirelessly throughout the biometric scanning process, utterly shocked and disgusted by what they've witnessed in just the few minutes they've been in your arcology. Then it's off to the penthouse for basic slave induction.
<<case "Roman Revivalist">>
diff --git a/src/uncategorized/reFormerAbolitionist.tw b/src/uncategorized/reFormerAbolitionist.tw
index 90288247eebd0ce8c87b6f1d45616e69c28029cd..d34bd1f27a2c7e67d126a6238d2f5da90406ce25 100644
--- a/src/uncategorized/reFormerAbolitionist.tw
+++ b/src/uncategorized/reFormerAbolitionist.tw
@@ -42,15 +42,7 @@ You fasten $activeSlave.slaveName in a kneeling position in the center of your c
<<if random(1,100) > 50>>
<<replace "#result">>
You buy media coverage of $him, invest in an ad campaign, and even arrange for $him to give a speech denouncing the abolitionist movement and praising your efforts in fighting against them. Your efforts are a success. $His current extreme popularity will fade in time, but you have managed to arrange for $him a permanent place as an @@.green;example of your slave-breaking skills.@@
-<<<<<<< HEAD
-<<<<<<< HEAD
- <<set $cash -= 5000>>
-=======
<<run cashX(-5000, "event", $activeSlave)>>
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
-=======
- <<run cashX(-5000, "event", $activeSlave)>>
->>>>>>> 32fdb96882fb70c6dbecaa454463c7000d16d0e7
<<set $rep += 200>>
<<set $activeSlave.prestige = 1>>
<<set $activeSlave.prestigeDesc = "She is notorious as a former abolitionist turned devoted slave.">>
@@ -58,15 +50,7 @@ You buy media coverage of $him, invest in an ad campaign, and even arrange for $
<<else>>
<<replace "#result">>
You buy media coverage of $him, invest in an ad campaign, and even arrange for $him to give a speech denouncing the abolitionist movement and praising your efforts in fighting against them. Unfortunately, popularity remains an art, not a science; though you do your best, the public mind's fancy eludes your grasp. As $his owner, your reputation has @@.green;increased,@@ but in a week $he'll be forgotten.
-<<<<<<< HEAD
-<<<<<<< HEAD
- <<set $cash -= 5000>>
-=======
- <<run cashX(-5000, "event", $activeSlave)>>
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
-=======
<<run cashX(-5000, "event", $activeSlave)>>
->>>>>>> 32fdb96882fb70c6dbecaa454463c7000d16d0e7
<<set $rep += 200>>
<</replace>>
<</if>>
@@ -76,15 +60,7 @@ You buy media coverage of $him, invest in an ad campaign, and even arrange for $
<<if random(1,100) > 10>>
<<replace "#result">>
You buy prime media coverage of $him, invest in a lavish ad campaign, and even arrange for $him to give a speech denouncing the abolitionist movement and praising your efforts in fighting against them that is broadcast around the world. Your efforts are a success. $His current extreme popularity will fade in time, but you have managed to arrange for $him a permanent place as an @@.green;example of your slave-breaking skills.@@
-<<<<<<< HEAD
-<<<<<<< HEAD
- <<set $cash -= 10000>>
-=======
- <<run cashX(-10000, "event", $activeSlave)>>
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
-=======
<<run cashX(-10000, "event", $activeSlave)>>
->>>>>>> 32fdb96882fb70c6dbecaa454463c7000d16d0e7
<<set $rep += 400>>
<<set $activeSlave.prestige = 1>>
<<set $activeSlave.prestigeDesc = "She is notorious as a former abolitionist turned devoted slave.">>
@@ -92,15 +68,7 @@ You buy prime media coverage of $him, invest in a lavish ad campaign, and even a
<<else>>
<<replace "#result">>
You buy prime media coverage of $him, invest in a lavish ad campaign, and even arrange for $him to give a speech denouncing the abolitionist movement and praising your efforts in fighting against them that is broadcast around the world. Unfortunately, popularity remains an art, not a science; though you do your best, the public mind's fancy eludes your grasp. As $his owner, your reputation has @@.green;increased,@@ but in a week $he'll be forgotten.
-<<<<<<< HEAD
-<<<<<<< HEAD
- <<set $cash -= 10000>>
-=======
<<run cashX(-10000, "event", $activeSlave)>>
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
-=======
- <<run cashX(-10000, "event", $activeSlave)>>
->>>>>>> 32fdb96882fb70c6dbecaa454463c7000d16d0e7
<<set $rep += 400>>
<</replace>>
<</if>>
@@ -111,15 +79,7 @@ You buy prime media coverage of $him, invest in a lavish ad campaign, and even a
<<if random(1,100) > 50>>
<<replace "#result">>
The world is in love with $activeSlave.slaveName. $His face graces magazine covers the world over and $his passionate arguments (ghostwritten by the best spin doctors money can buy) spark debate everywhere they're heard. $He is mentioned by name in strident denunciations about the immorality of the present day from religious leaders. $He appears on the internet with all sorts of attempts at humor superimposed on $his image. $His loving and overblown descriptions of you spark a new trend in protagonists of badly-written romance novels. When a very popular talk show host attempts to call $his bluff and receives oral sex in front of a live studio audience, @@.yellowgreen;you know for sure that $his fame has stuck.@@
-<<<<<<< HEAD
-<<<<<<< HEAD
- <<set $cash -= 25000>>
-=======
- <<run cashX(-25000, "event", $activeSlave)>>
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
-=======
<<run cashX(-25000, "event", $activeSlave)>>
->>>>>>> 32fdb96882fb70c6dbecaa454463c7000d16d0e7
<<set $rep += 600>>
<<set $activeSlave.prestige = 2>>
<<set $activeSlave.prestigeDesc = "She is world famous as an anti-abolitionist, and has told the world at length of the joys of slavery in general and slavery to you in particular.">>
@@ -127,15 +87,7 @@ The world is in love with $activeSlave.slaveName. $His face graces magazine cove
<<else>>
<<replace "#result">>
The world seems temporarily enamored with $activeSlave.slaveName as $he appears on talk shows and in political debates with millions of watchers, but before long $his fifteen minutes of fame peter out and the only offers coming in are from pornography magnates and local talk radio shows. Though $he achieved @@.yellowgreen;local fame@@ for appearing on the world stage, the rest of the world seems to have gotten bored with $activeSlave.slaveName.
-<<<<<<< HEAD
-<<<<<<< HEAD
- <<set $cash -= 25000>>
-=======
- <<run cashX(-25000, "event", $activeSlave)>>
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
-=======
<<run cashX(-25000, "event", $activeSlave)>>
->>>>>>> 32fdb96882fb70c6dbecaa454463c7000d16d0e7
<<set $activeSlave.prestige = 1>>
<<set $activeSlave.prestigeDesc = "She is notorious as a former abolitionist turned devoted slave.">>
<<set $rep += 400>>
diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw
index 73be35070e8efca383a809dfb041f68188c81607..e6cd2e7d90b68ef832a1a9140896cf044173915b 100644
--- a/src/uncategorized/reRecruit.tw
+++ b/src/uncategorized/reRecruit.tw
@@ -2078,11 +2078,7 @@ A young slave is going door to door offering $himself for sale on behalf of $his
<br><br>
"I was raised and trained by a slave orphanage, <<if $PC.title != 0>>sir<<else>>ma'am<</if>>. It is not legal to own underage <<= $girl>>s, but it is legal to charge an orphan for the costs of raising $him when $he reaches $minimumSlaveAge, and those debts are always high enough to enslave $him. My <<= ordinalSuffix($activeSlave.actualAge)>> birthday was yesterday, <<if $activeSlave.actualAge == $minimumSlaveAge>>so I am a slave and for sale now<<else>>so I'm too old to stay at the orphanage any longer<</if>>."
<br><br>
-<<<<<<< HEAD
"I have been trained for obedience since I came to the orphanage. At <<print Math.min(14, $activeSlave.actualAge - 4)>> they put me on drugs to make sure I'd grow nice T&A. On my <<print ordinalSuffix(Math.min(16, $activeSlave.actualAge - 2))>> birthday I got my first set of implants. Every time my boobs got used to the implants, I got sent in for a bigger set. I'm on my second set." $He unbuttons $his blouse and displays a pair of big fake tits. "I've also had my lips done." $He blows you a wet kiss.
-=======
-"I have been trained for obedience since I came to the orphanage. At <<print Math.min(14, $activeSlave.actualAge - 4)>> they put me on drugs to make sure I'd grow nice T&A. On my <<= ordinalSuffix(Math.min(16, $activeSlave.actualAge - 2))>> birthday I got my first set of implants. Every time my boobs got used to the implants, I got sent in for a bigger set. I'm on my second set." $He unbuttons $his blouse and displays a pair of big fake tits. "I've also had my lips done." $He blows you a wet kiss.
->>>>>>> 32fdb96882fb70c6dbecaa454463c7000d16d0e7
<br><br>
$He hikes up $his skirt and spins around slowly. "The drugs also made my butt bigger, and I've had my butt done too. <<if $activeSlave.actualAge == $minimumSlaveAge>>Since it wasn't okay to fuck me before I had turned $minimumSlaveAge and been made a slave<<else>>Since my owner thought it would make me more desirable<</if>>, I'm a virgin and my anus has never had anything up it, <<if $PC.title != 0>>sir<<else>>ma'am<</if>>." $He pulls $his buttocks apart to prove it.
<br><br>
@@ -2108,11 +2104,7 @@ $He hikes up $his skirt and spins around slowly, displaying a petite, half-hard
<br><br>
The young $girl who is admitted to your office quails a bit at the sight of you, and you believe you can detect a bit of infatuation there, too. You wordlessly query $assistantName, and _heA turns to the massive task of sorting through arcology records to come up with a possible explanation. Meanwhile, you start interviewing the potential slave. It appears that $he left home, in a settlement near the arcology, right after $his <<= ordinalSuffix($activeSlave.actualAge)>> birthday and came straight here. $He's no innocent, and not destitute, and you're surprised $he's done something this foolish.
<br><br>
-<<<<<<< HEAD
After a short while, your assistant whispers in your earpiece, <<if $assistant == 0>><<= properTitle()>>,<<else>>"Sweetheart,<</if>> $he doesn't live here. Look at this." _HeA pulls up footage of a public event several weeks ago, and the $girl is in the crowd, staring at you with limpid eyes. Rather than confronting $him directly, you probe the subject, and after some evasion $he admits that yes, $he did come here out of infatuation with you. "Pretty fuckin' stupid," $he admits. "But I've come too far now. I just really want to live here. With you, I guess. If that means being your slave, that's okay. Can I be your house servant, maybe?"
-=======
-After a short while, your assistant whispers in your earpiece, <<if $assistant == 0>><<= properTitle()>>,<<else>>"Sweetheart,<</if>> $he doesn't live here. Look at this." $He pulls up footage of a public event several weeks ago, and the $girl is in the crowd, staring at you with limpid eyes. Rather than confronting $him directly, you probe the subject, and after some evasion $he admits that yes, $he did come here out of infatuation with you. "Pretty fuckin' stupid," $he admits. "But I've come too far now. I just really want to live here. With you, I guess. If that means being your slave, that's okay. Can I be your house servant, maybe?"
->>>>>>> 32fdb96882fb70c6dbecaa454463c7000d16d0e7
<<case "womanly PC">>
@@ -2195,11 +2187,7 @@ Your desk flags a video message as coming from an... interesting source. It is f
<br><br>
A tough-looking man with multiple tattoos and a wife-beater shirt on appears on the screen, nodding in recognition. "Hey there, boss-<<if def $PC.customTitle>>$PC.customTitle<<elseif $PC.title != 0>>man<<else>>woman<</if>>! Just calling to pay my respects. Those weak-ass punks that were squatting in this section won't bother you anymore... we took care of 'em. Now it's just all law-abiding citizens and shit down here — so you don't have to send your security goons to check us out, you know." Your assistant throws up a list of the gang's numerous criminal activities, as well as the estimates what other enterprises they've just taken over. Nothing much out of the ordinary and with the shape the world is in, you've got bigger problems. The recommendation is to observe but mostly ignore them, which you casually confirm with a flick of your finger.
<br><br>
-<<<<<<< HEAD
-Clearing his throat, the new gang leader on level twenty-five continues, "But that's not all, we got a bit of tribute for ya." Waving his hand, he makes room for two muscular bruisers carrying the unconscious form of another man - easily recognizable from $his muscled build and numerous tattoos as a hardened criminal. The face-recognition software tells you $he is the now overthrown gangster boss in that area of the arcology. "Everyone knows what fun things you do with your slaves, so we thought it'd fit for this guy. Gonna throw $him in an elevator in a minute and send it up, kay? If you make $him into a proper brainless slut, you'll have quite a few guys standing in line to have a go. And well, $he'd make a capable gladiator in a pit fight too. Have fun with the bastard."
-=======
-Clearing his throat, the new gang-leader on level twenty-five continues, "But that's not all, we got a bit of tribute for ya." Waving his hand, he makes room for two muscular bruisers carrying the unconscious form of another man — easily recognizable from $his muscled build and numerous tattoos as a hardened criminal. The face-recognition software tells you $he is the now overthrown gangster boss in that area of the arcology. "Everyone knows what fun things you do with your slaves, so we thought it'd fit for this guy. Gonna throw $him in an elevator in a minute and send it up, kay? If you make $him into a proper brainless slut, you'll have quite a few guys standing in line to have a go. And well, $he'd make a capable gladiator in a pit fight too. Have fun with the bastard."
->>>>>>> 0b3b1c5a7366e8a3c24f412e5a1a69bbe768c730
+Clearing his throat, the new gang leader on level twenty-five continues, "But that's not all, we got a bit of tribute for ya." Waving his hand, he makes room for two muscular bruisers carrying the unconscious form of another man — easily recognizable from $his muscled build and numerous tattoos as a hardened criminal. The facial recognition software tells you $he is the now overthrown gangster boss in that area of the arcology. "Everyone knows what fun things you do with your slaves, so we thought it'd fit for this guy. Gonna throw $him in an elevator in a minute and send it up, kay? If you make $him into a proper brainless slut, you'll have quite a few guys standing in line to have a go. And well, $he'd make a capable gladiator in a pit fight too. Have fun with the bastard."
<br><br>
The signal is cut suddenly, and just a few moments later, your assistant flags an elevator going up containing a person needing medical attention. Anticipating your wishes, the planning interface of the remote surgery opens up right away, indicating available options for the criminal's feminized face.
@@ -2215,11 +2203,7 @@ After the fighting died down, they found a dickgirl inside the compound, harshly
A report about a successful operation by your mercenaries waits at your desk when you come in the office this morning. Turns out they tracked a brutal gang that was waylaying travelers near the Free City and stormed their hideout last night. All of the criminals were killed in the process, preventing proper punishments or more... creative uses for them. From the videos of the raid and the fanatic way the men fought to the last man, it seems that this was unavoidable, so you send a quick note of approval to their commander.
<br><br>
-<<<<<<< HEAD
-After the fighting died down, they found a $woman inside the compound, harshly used and seemingly the center of many gangbangs there. A scan of $his biometric data revealed that $he is in fact a slave that ran away about two months ago - into a much worse situation after being caught by the gang, as it turns out. Countless dicks have stretched $his pussy and ass wide, <<if $activeSlave.physicalAge >= $activeSlave.pubertyAge>> $he is pregnant with some dead criminal's offspring,<</if>> $he has been crudely gelded, and they've decorated $him with numerous piercings. As you notify the owner that her property has been retrieved, the woman is distraught at the state of her merchandise, grumbling that a once quite valuable $girl is now worth almost nothing. Seems she's unwilling to invest her time and money in caring for the slave. With a sigh, the slave-mistress whips out her smart-phone and starts to set up a selling offer in one of the popular slave trading apps.
-=======
After the fighting died down, they found a woman inside the compound, harshly used and seemingly the center of many gang-bangs there. A scan of $his biometric data revealed that $he is in fact a slave that ran away about two months ago — into a much worse situation after being caught by the gang, as it turns out. Countless dicks have stretched $his pussy and ass wide, $he<<if $activeSlave.physicalAge >= $activeSlave.pubertyAge>> is pregnant with some dead criminal's offspring,<</if>> has been crudely gelded, and they've decorated $him with numerous piercings. As you notify the owner that her property has been retrieved, the woman is distraught at the state of her merchandise, grumbling that a once quite valuable $girl is now worth almost nothing. Seems she's unwilling to invest her time and money in caring for the slave. With a sigh, the slave-mistress whips out her smart-phone and starts to set up a selling offer in one of the popular slave trading apps.
->>>>>>> 0b3b1c5a7366e8a3c24f412e5a1a69bbe768c730
<br><br>
//The young dickgirl has been used and abused quite a bit, making $him deathly terrified about what might happen to $him next. $He has partially resigned to be nothing but a fuckhole. You can get $him cheap from the owner, it'll be just <<print cashFormat(1000)>>.//
@@ -2227,11 +2211,7 @@ After the fighting died down, they found a woman inside the compound, harshly us
A report about a successful operation by your mercenaries waits at your desk when you come in the office this morning. Turns out they tracked a brutal gang that was waylaying travelers near the Free City and stormed their hideout last night. All of the criminals were killed in the process, preventing proper punishments or more... creative uses for them. From the videos of the raid and the fanatic way the men fought to the last man, it seems that this was unavoidable, so you send a quick note of approval to their commander.
<br><br>
-<<<<<<< HEAD
-After the fighting died down, your men found a $woman inside the compound, harshly used and seemingly the center of many gangbangs there. A scan of $his biometric data revealed that $he is in fact a slave that ran away about two months ago - into a much worse situation after being caught by the gang, as it turns out. Countless dicks have stretched $his pussy and ass wide,<<if $activeSlave.physicalAge >= $activeSlave.pubertyAge>> $he is pregnant with some dead criminal bastard's offspring,<</if>> and they've decorated $him with numerous piercings. As you notify the owner that her property has been retrieved, the woman is distraught at the state of her merchandise, grumbling that a once quite valuable $girl is now worth almost nothing. Seems she's unwilling to invest her time and money in caring for the slave. With a sigh, the slave-mistress whips out her smart-phone and starts to set up a selling offer in one of the popular slave trading apps.
-=======
-After the fighting died down, your men found a woman inside the compound, harshly used and seemingly the center of many gang-bangs there. A scan of $his biometric data revealed that $he is in fact a slave that ran away about two months ago — into a much worse situation after being caught by the gang, as it turns out. Countless dicks have stretched $his pussy and ass wide,<<if $activeSlave.physicalAge >= $activeSlave.pubertyAge>> $he is pregnant with some dead criminal bastard's offspring and<</if>> they've decorated $him with numerous piercings. As you notify the owner that her property has been retrieved, the woman is distraught at the state of her merchandise, grumbling that a once quite valuable $girl is now worth almost nothing. Seems she's unwilling to invest her time and money in caring for the slave. With a sigh, the slave-mistress whips out her smart-phone and starts to set up a selling offer in one of the popular slave trading apps.
->>>>>>> 0b3b1c5a7366e8a3c24f412e5a1a69bbe768c730
+After the fighting died down, your men found a woman inside the compound, harshly used and seemingly the center of many gangbangs there. A scan of $his biometric data revealed that $he is in fact a slave that ran away about two months ago — into a much worse situation after being caught by the gang, as it turns out. Countless dicks have stretched $his pussy and ass wide,<<if $activeSlave.physicalAge >= $activeSlave.pubertyAge>> $he is pregnant with some dead criminal bastard's offspring and<</if>> they've decorated $him with numerous piercings. As you notify the owner that her property has been retrieved, the woman is distraught at the state of her merchandise, grumbling that a once quite valuable $girl is now worth almost nothing. Seems she's unwilling to invest her time and money in caring for the slave. With a sigh, the slave-mistress whips out her smart-phone and starts to set up a selling offer in one of the popular slave trading apps.
<br><br>
//The young $woman has been used and abused quite a bit, making $him deathly terrified about what might happen to $him next. $He has partially resigned to be nothing but a fuckhole. You can get $him cheap from the owner, it'll be just <<print cashFormat(1000)>>.//
@@ -2289,11 +2269,7 @@ As fate has it, the person calling is the owner of the local race-track, wanting
Coming to your desk in the morning, you see that your assistant has flagged an interesting offer for you to check out in the newsletter of a professional repossession company. Life in the Free Cities being what it is, there are winners and losers of the ever-changing local and global realities... and when someone falls upon hard times, the repo-men and repo-women start their work. Grim-faced and unmoved by sympathy, they go in to seize the debtor's assets to pay off their debts — which does at times include some quite interesting pieces of merchandise, like a nice slave or two.
<br><br>
-<<<<<<< HEAD
-The current sale offer by the company was taken from a college frat-house — apparently being enrolled at the small university in your arcology doesn't mean that the guys know their asses from their elbows in money-management. A few too many parties and frivolous purchases sent an asset reclamation officer to their door, soon leaving with one of those recent purchases — a pretty female slave who doubled as both a housekeeper and fuckhole for the whole bunch of horny students. $He's cute and apparently well-trained, if a bit exhausted right now after numerous gangbangs $his former owners put $him through.
-=======
-The current sale offer by the company was taken from a college frat-house — apparently being enrolled at a rather prestigious university in your arcology doesn't mean that the guys know their asses from their elbows in money-management. A few too many parties and frivolous purchases sent an asset reclamation officer to their door, soon leaving with one of those recent purchases — a pretty female slave who doubled as both a housekeeper and fuckhole for the whole bunch of horny students. $He's cute and apparently well-trained, if a bit exhausted right now after numerous gang-bangs $his former owners put $him through.
->>>>>>> 0b3b1c5a7366e8a3c24f412e5a1a69bbe768c730
+The current sale offer by the company was taken from a college frat-house — apparently being enrolled at a rather prestigious university in your arcology doesn't mean that the guys know their asses from their elbows in money-management. A few too many parties and frivolous purchases sent an asset reclamation officer to their door, soon leaving with one of those recent purchases — a pretty female slave who doubled as both a housekeeper and fuckhole for the whole bunch of horny students. $He's cute and apparently well-trained, if a bit exhausted right now after numerous gangbangs $his former owners put $him through.
<br><br>
//The repo-company doesn't hold on to assets long, they just want to get new cash pretty quickly — which makes this a nice opportunity, as the price for the young woman is set pretty low. It'll just take <<print cashFormat(2500)>> to buy $him off their hands.//
diff --git a/src/uncategorized/reSiblingRevenge.tw b/src/uncategorized/reSiblingRevenge.tw
index f65e96d11e0d505560dea71b9c3e4654cf4fb452..7dce3f1ae3ab118f5412f001960fee8b9c76b98c 100644
--- a/src/uncategorized/reSiblingRevenge.tw
+++ b/src/uncategorized/reSiblingRevenge.tw
@@ -16,18 +16,8 @@ $slaves[$i].slaveName, whose older sister tried to sell $him to you, is up for i
<span id="result">
<br><<link "Turnabout is fair play">>
<<replace "#result">>
-<<<<<<< HEAD
-<<<<<<< HEAD
- $slaves[$j].slaveName is brought in. You gag _him2, throw the resisting bitch down on the couch, and hold _him2 there. Then, you peremptorily order the wide-eyed $slaves[$i].slaveName to <<if canDoAnal($slaves[$j])>>sodomize<<else>>face-fuck<</if>> $his sister. $He stares open mouthed for a moment, but comes over obediently. $His face is a strange mix of vengeful eagerness, revulsion, and even a little lust. $He shoves $himself into the frantically struggling _girl2's <<if canDoAnal($slaves[$j])>>butt<<else>>jaw<</if>> without mercy. $His cock is pathetically small, but by how $slaves[$j].slaveName reacts it might as well be a baseball bat. $slaves[$i].slaveName rarely gets to penetrate anything, mostly serving as an oral slut<<if canDoAnal($slaves[$i])>> and anal cocksleeve<</if>>, so $he comes in no time and takes a turn holding $slaves[$j].slaveName down <<if canDoAnal($slaves[$j])>>so you can claim sloppy seconds on _his2 spasming butthole<</if>>.
- @@.hotpink;$slaves[$i].slaveName has become more devoted to you,@@ while $slaves[$j].slaveName @@.mediumorchid;hates you@@ and has become @@.gold;more afraid of you,@@<<if canDoAnal($slaves[$j])>> and @@.lime;$slaves[$j].slaveName has lost _his2 anal virginity.@@<<else>>.<</if>>
-=======
- $slaves[$j].slaveName is brought in. You gag her, throw the resisting bitch down on the couch, and hold her there. Then, you peremptorily order the wide-eyed $slaves[$i].slaveName to <<if canDoAnal($slaves[$j])>>sodomize<<else>>facefuck<</if>> her sister. She stares open mouthed for a moment, but comes over obediently. Her face is a strange mix of vengeful eagerness, revulsion, and even a little lust. She shoves herself into the frantically struggling girl's <<if canDoAnal($slaves[$j])>>butt<<else>>jaw<</if>> without mercy. Her cock is pathetically small, but by how $slaves[$j].slaveName reacts it might as well be a baseball bat. $slaves[$i].slaveName rarely gets to penetrate anything, mostly serving as an oral slut<<if canDoAnal($slaves[$i])>> and anal cocksleeve<</if>>, so she comes in no time and takes a turn holding $slaves[$j].slaveName down <<if canDoAnal($slaves[$j])>>so you can claim sloppy seconds on her spasming butthole<</if>>.
- @@.hotpink;$slaves[$i].slaveName has become more devoted to you,@@ while $slaves[$j].slaveName @@.mediumorchid;hates you@@ and has become @@.gold;more afraid of you,@@<<if canDoAnal($slaves[$j])>> and @@.lime;$slaves[$j].slaveName has lost her anal virginity.@@<<else>>.<</if>>
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
-=======
$slaves[$j].slaveName is brought in. You gag _him2, throw the resisting bitch down on the couch, and hold _him2 there. Then, you peremptorily order the wide-eyed $slaves[$i].slaveName to <<if canDoAnal($slaves[$j])>>sodomize<<else>>facefuck<</if>> $his sister. $He stares open mouthed for a moment, but comes over obediently. $His face is a strange mix of vengeful eagerness, revulsion, and even a little lust. $He shoves $himself into the frantically struggling _girl2's <<if canDoAnal($slaves[$j])>>butt<<else>>jaw<</if>> without mercy. $His cock is pathetically small, but by how $slaves[$j].slaveName reacts it might as well be a baseball bat. $slaves[$i].slaveName rarely gets to penetrate anything, mostly serving as an oral slut<<if canDoAnal($slaves[$i])>> and anal cocksleeve<</if>>, so $he comes in no time and takes a turn holding $slaves[$j].slaveName down <<if canDoAnal($slaves[$j])>>so you can claim sloppy seconds on _his2 spasming butthole<</if>>.
@@.hotpink;$slaves[$i].slaveName has become more devoted to you,@@ while $slaves[$j].slaveName @@.mediumorchid;hates you@@ and has become @@.gold;more afraid of you,@@<<if canDoAnal($slaves[$j])>> and @@.lime;$slaves[$j].slaveName has lost _his2 anal virginity.@@<<else>>.<</if>>
->>>>>>> 32fdb96882fb70c6dbecaa454463c7000d16d0e7
<<set $slaves[$i].devotion += 4>>
<<set $slaves[$i].penetrativeCount += 1>>
<<set $penetrativeTotal += 1>>
diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw
index 6758f1c4d7a3b279c2ce143fabdcd694a3b46743..0d48b77826c159e65943723870c745496953ba36 100644
--- a/src/uncategorized/reputation.tw
+++ b/src/uncategorized/reputation.tw
@@ -742,22 +742,9 @@ On formal occasions, you are announced as $PCTitle.
<<set $PC.degeneracy -= 1>>
Rumors quelled as planned.
<<else>>
- <<set $cash += 1000>>
+ <<run cashX(1000, "policies")>>
Reputation subsidy reclaimed this week since your reputation is capped.
<</if>>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-<<elseif $PC.degeneracy > 1>>
- <<set $PC.degeneracy -= 1>>
- Rumors quelled as planned.
-<<else>>
- <<run cashX(1000, "policies")>>
- Reputation subsidy reclaimed this week since your reputation is capped.
-<</if>>
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
-=======
->>>>>>> f243c4ad022d8a68d6c82ff6cfee17c910e5d606
<</if>>
<<if $failedElite > 1>>
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index 9f1600853997f6f71b495ff650e563e09a0b87e7..fa856d5c742b84663a7162905d269f5c9d35029e 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -97,11 +97,7 @@
<</for>>
<<if (_DL < $schoolroom)>>
<<set _seed = random(1,10)+(($schoolroom-_DL)*(random(150,170)+(_idleBonus*10)))>>
-<<<<<<< HEAD
- <<set $cash += _seed>>
-=======
<<run cashX(_seed, "school", $Schoolteacher)>>
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
<br> Since $he doesn't have enough students to occupy all of $his time, $schoolroomName takes in citizens' slaves on a contract basis and $he teaches them too, earning @@.yellowgreen;<<print cashFormat(_seed)>>.@@
<</if>>
<<if (_DL > 0)>><br><br><</if>>
@@ -205,11 +201,7 @@
<<else>>
is studying in $schoolroomName.
<</if>>
-<<<<<<< HEAD
- <br> _He2 <<include "SA take classes">>
-=======
<br> $He <<include "SA take classes">>
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
<br>
<<= saChoosesOwnClothes($slaves[$i])>>
<<include "SA rules">>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index e7ebc271eefe4f5bd520383fa74dc55407a685d8..7fe01ef12b77e8195121cb5436eb3a836353eb3d 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -105,11 +105,7 @@
<<set _tableCount = _tableCount || 0>>
<<set _tableCount++>>
/*
-<<<<<<< HEAD
- * we want <button data-quick-index="<<= _tableCount>>"> ...
-=======
* we want <button data-quick-index="<<= _tableCount>>">...
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
*/
<<set _buttonAttributes = { 'data-quick-index': _tableCount }>>
<<htag _buttonAttributes 'button'>>Quick Index<</htag>>
diff --git a/src/uncategorized/wardenessSelect.tw b/src/uncategorized/wardenessSelect.tw
index aabef2498318248835df4b95dd10ef26aeb45d96..216a8802525e08fd840ec6b81458f83b4eb3b78c 100644
--- a/src/uncategorized/wardenessSelect.tw
+++ b/src/uncategorized/wardenessSelect.tw
@@ -3,19 +3,9 @@
<<set $nextButton = "Back", $nextLink = "Cellblock", $showEncyclopedia = 1, $encyclopedia = "Wardeness">>
<<showallAssignmentFilter>>
<<if ($Wardeness != 0)>>
-<<<<<<< HEAD
-<<<<<<< HEAD
- <<setLocalPronouns $Wardeness>>
- ''__@@.pink;<<= SlaveFullName($Wardeness)>>@@__'' is serving as your Wardeness.<br><br>$He will help break your prisoners.
-=======
- <<set $Wardeness = getSlave($Wardeness.ID)>>
- ''__@@.pink;<<= SlaveFullName($Wardeness)>>@@__'' is serving as your Wardeness.<br><br>She will help break your prisoners.
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
-=======
<<set $Wardeness = getSlave($Wardeness.ID)>>
<<setLocalPronouns $Wardeness>>
''__@@.pink;<<= SlaveFullName($Wardeness)>>@@__'' is serving as your Wardeness.<br><br>$He will help break your prisoners.
->>>>>>> 32fdb96882fb70c6dbecaa454463c7000d16d0e7
<<else>>
You have not selected a Wardeness.
<</if>>
diff --git a/src/uncategorized/wardrobe.tw b/src/uncategorized/wardrobe.tw
index 8ebb012054111a4ed6df8e9a443f09412c4636ad..6832539ae089f688c323e167d1580d8a8488250f 100644
--- a/src/uncategorized/wardrobe.tw
+++ b/src/uncategorized/wardrobe.tw
@@ -205,11 +205,7 @@ The room containing all the clothes and accessories you have available to dress
<br>
<<if !isItemAccessible("boyshorts")>>
-<<<<<<< HEAD
- [[Order a shipment of undergarments|Wardrobe][$cash -= 5000, $clothesBoughtUnderwear = 1]]
-=======
[[Order a shipment of undergarments|Wardrobe][cashX(-5000, "capEx"), $clothesBoughtUnderwear = 1]]
->>>>>>> fe13095f60fc168c4ef4e7231308735b475687b6
//Costs <<print cashFormat(5000)>>//
<<else>>
You are well stocked with underwear.