From 036c68311701342ace86a49bf823cc46f6f0d5a3 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Mon, 16 Dec 2019 23:13:58 -0600
Subject: [PATCH] PartTwo
---
src/events/intro/introSummary.tw | 26 -
src/events/intro/pcBodyIntro.tw | 5 -
src/init/setupVars.tw | 8 +-
src/npc/acquisition.tw | 4 -
src/npc/descriptions/fBoobs.tw | 28 -
src/npc/descriptions/fButt.tw | 4 -
src/npc/descriptions/fFuckdollWidgets.tw | 41 --
src/npc/descriptions/fLips.tw | 52 --
src/npc/descriptions/fPoolSex.tw | 4 -
src/npc/descriptions/fVagina.tw | 13 -
src/npc/fAbuse.tw | 4 -
src/npc/fBeg.tw | 8 -
src/npc/fDance.tw | 4 -
src/npc/fFeelings.tw | 17 -
src/npc/fKiss.tw | 8 -
src/npc/fRelation.tw | 4 -
src/npc/fSlaveImpregConsummate.tw | 4 -
src/player/actions/fCaress.tw | 6 -
src/player/actions/fEmbrace.tw | 14 -
src/player/electiveSurgery.tw | 21 -
src/player/pcSurgeryDegradation.tw | 9 -
src/pregmod/FSuckle.tw | 18 -
src/pregmod/artificialInsemination.tw | 4 -
src/pregmod/cloningWorkaround.tw | 9 +-
src/pregmod/fDick.tw | 27 -
src/pregmod/fMarry.tw | 4 -
src/pregmod/fPat.tw | 12 -
src/pregmod/fSelf.tw | 4 -
src/pregmod/fSlaveFeed.tw | 23 -
src/pregmod/forceFeeding.tw | 12 -
src/pregmod/managePersonalAffairs.tw | 8 -
src/pregmod/newChildIntro.tw | 20 -
src/pregmod/ovaTransplantWorkaround.tw | 4 -
src/pregmod/pInsemination.tw | 5 -
src/pregmod/personalNotes.tw | 38 --
src/pregmod/reMaleCitizenHookup.tw | 4 -
src/pregmod/rePregInventor.tw | 16 -
src/pregmod/seFCTVshows.tw | 8 -
src/pregmod/sePlayerBirth.tw | 4 -
src/pregmod/surrogacyWorkaround.tw | 8 -
.../widgets/playerDescriptionWidgets.tw | 4 -
src/pregmod/widgets/seBirthWidgets.tw | 4 -
src/uncategorized/PETS.tw | 12 -
src/uncategorized/RECI.tw | 16 -
src/uncategorized/REFI.tw | 39 --
src/uncategorized/RESS.tw | 516 ------------------
src/uncategorized/RETS.tw | 45 --
src/uncategorized/arcmgmt.tw | 4 -
src/uncategorized/assistantEvents.tw | 4 -
src/uncategorized/genericPlotEvents.tw | 4 -
src/uncategorized/longSlaveDescription.tw | 6 -
src/uncategorized/newSlaveIntro.tw | 44 --
src/uncategorized/pHostageAcquisition.tw | 63 ---
src/uncategorized/peHeadgirlConcubine.tw | 25 -
.../personalAssistantAppearance.tw | 8 -
src/uncategorized/ptWorkaround.tw | 19 -
src/uncategorized/randomNonindividualEvent.tw | 28 -
src/uncategorized/reAnalPunishment.tw | 4 -
src/uncategorized/reFullBed.tw | 8 -
src/uncategorized/reRelativeRecruiter.tw | 8 -
src/uncategorized/reShowerPunishment.tw | 4 -
src/uncategorized/reStaffedMorning.tw | 30 -
src/uncategorized/reStandardPunishment.tw | 19 -
src/uncategorized/recETS.tw | 8 -
src/uncategorized/reputation.tw | 12 -
src/uncategorized/resEndowment.tw | 4 -
src/uncategorized/resSale.tw | 6 -
src/uncategorized/saLongTermEffects.tw | 22 -
src/uncategorized/saPleaseYou.tw | 84 ---
src/uncategorized/saRelationships.tw | 4 -
src/uncategorized/saRules.tw | 4 -
src/uncategorized/seNicaeaAnnouncement.tw | 4 -
src/uncategorized/seWeddingDouble.tw | 63 +--
src/uncategorized/seWeddingSingle.tw | 32 +-
src/uncategorized/seWeddingTriple.tw | 25 +-
src/uncategorized/sellSlave.tw | 8 -
src/uncategorized/shops.tw | 11 -
src/uncategorized/slaveInteract.tw | 4 -
src/uncategorized/surgeryDegradation.tw | 8 -
src/uncategorized/tfsFarmUpgrade.tw | 9 -
src/uncategorized/theFutanariSisters.tw | 13 -
src/utility/descriptionWidgetsFlesh.tw | 14 -
src/utility/descriptionWidgetsTattoos.tw | 8 -
src/utility/extendedFamilyWidgets.tw | 8 -
src/utility/saRulesWidgets.tw | 26 +-
85 files changed, 11 insertions(+), 1792 deletions(-)
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 7dd22035710..897333184b6 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -877,15 +877,9 @@ __''Player Character''__
<</options>>
<br>
-<<<<<<< HEAD
- <<if $PC.vagina >= 1 && $PC.dick >= 1>>
- <<set _vagina_penis = 2>>
- <<elseif $PC.vagina >= 1>>
-=======
<<if $PC.vagina != -1 && $PC.dick != 0>>
<<set _vagina_penis = 2>>
<<elseif $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set _vagina_penis = 1>>
<<else>>
<<set _vagina_penis = 0>>
@@ -902,12 +896,7 @@ __''Player Character''__
<</options>>
<br>
-<<<<<<< HEAD
- <<if $PC.vagina >= 1>>
-=======
<<if $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
-
<<if $PC.preg == -1>>
<<options $PC.preg>>
@@ -1089,11 +1078,7 @@ __''Player Character''__
<<case "escort">>
Prior to being an arcology owner, you knew how to survive off your looks and body.
<<case "servant">>
-<<<<<<< HEAD
- Prior to being an arcology owner, you served a well-off master<<if $PC.birthMaster >= 2>> and bore him several children<</if>>.
-=======
Prior to being an arcology owner, you served a well-off master<<if $PC.counter.birthMaster >= 2>> and bore him several children<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<case "gang">>
Prior to being an arcology owner, you were the leader of a ruthless gang.
<</switch>>
@@ -1114,16 +1099,6 @@ __''Player Character''__
<br>
You have a
-<<<<<<< HEAD
- <<if $PC.vagina >= 1 && $PC.dick >= 1>>
- penis and vagina
- <<elseif $PC.dick >= 1>>
- penis.
- <<elseif $PC.vagina >= 1>>
- vagina
- <</if>>
- <<if $PC.vagina >= 1>>
-=======
<<if $PC.vagina != -1 && $PC.dick != 0>>
penis and vagina
<<elseif $PC.dick != 0>>
@@ -1132,7 +1107,6 @@ __''Player Character''__
vagina
<</if>>
<<if $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
and are
<<if $PC.pregWeek < 0>>
recovering from your last pregnancy.
diff --git a/src/events/intro/pcBodyIntro.tw b/src/events/intro/pcBodyIntro.tw
index 7cd72d075bf..74ab2a63410 100644
--- a/src/events/intro/pcBodyIntro.tw
+++ b/src/events/intro/pcBodyIntro.tw
@@ -96,13 +96,8 @@ Preferred method of consumption: ''<<if $PC.refreshmentType == 0>>Smoked<<elseif
<br><br>
-<<<<<<< HEAD
-<<if $PC.vagina >= 1>>
-[[Confirm player character customization|PC Preg Intro]]
-=======
<<if $PC.vagina != -1>>
[[Confirm player character customization|PC Preg Intro]]
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<else>>
[[Confirm player character customization|PC Appearance Intro]]
<</if>>
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index 494bb1cc416..70942c82a04 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -1324,12 +1324,8 @@ equine: {type: "equine", normalOvaMin:1, normalOvaMax: 1, normalBirth: 48, minLi
<<set setup.chineseRevivalistSlaveSurnames = ["Ai", "Ali", "An", "Ao", "Ba", "Bai", "Baili", "Ban", "Bao", "Bei", "Ben", "Bi", "Bian", "Bie", "Bing", "Bo", "Bu", "Cai", "Cang", "Cao", "Ce", "Cen", "Chai", "Chang", "Chanyu", "Chao", "Che", "Chen", "Cheng", "Chi", "Chong", "Chu", "Chunyu", "Cong", "Cui", "Da", "Dai", "Dang", "Deng", "Di", "Diao", "Ding", "Diwu", "Dong", "Dongfang", "Dongguo", "Dongmen", "Dou", "Du", "Duan", "Duangan", "Duanmu", "Dugu", "E", "Fa", "Fan", "Fang", "Fei", "Feng", "Fu", "Gan", "Gang", "Gao", "Ge", "Geng", "Gong", "Gongliang", "Gongsun", "Gongxi", "Gongyang", "Gongye", "Gou", "Gu", "Guan", "Guang", "Guangqiu", "Guanqiu", "Gui", "Guliang", "Guo", "Ha", "Hai", "Han", "Hang", "Hao", "He", "Helian", "Heng", "Hong", "Hou", "Hu", "Hua", "Huai", "Huan", "Huang", "Huangfu", "Hui", "Huo", "Huyan", "Ji", "Jia", "Jiagu", "Jian", "Jiang", "Jiao", "Jie", "Jin", "Jing", "Ju", "Juqu", "Kan", "Kang", "Ke", "Kong", "Kou", "Ku", "Kuai", "Kuang", "Kui", "Kun", "L", "Lai", "Lan", "Lang", "Lao", "Lei", "Leng", "Li", "Lian", "Liang", "Liangqiu", "Liao", "Lin", "Ling", "Linghu", "Liu", "Lo", "Long", "Lou", "Lqiu", "Lu", "Lü", "Luan", "Luo", "Ma", "Man", "Mao", "Mei", "Meng", "Mi", "Mian", "Miao", "Min", "Ming", "Mo", "Moqi", "Mou", "Mu", "Murong", "Na", "Nai", "Nan", "Nangong", "Nanmen", "Ni", "Nian", "Nie", "Ning", "Niu", "Nong", "Ou", "Ouyang", "Pan", "Pang", "Pei", "Peng", "Pi", "Ping", "Pu", "Puyang", "Qi", "Qian", "Qiang", "Qiao", "Qidiao", "Qifu", "Qiguan", "Qin", "Qing", "Qiu", "Qu", "Quan", "Que", "Ran", "Rangsi", "Rao", "Ren", "Rong", "Ru", "Ruan", "Rui", "Ruo", "Sang", "Sha", "Shan", "Shang", "Shangguan", "Shao", "She", "Shen", "Sheng", "Shentu", "Shi", "Shou", "Shu", "Shuai", "Shuang", "Shui", "Shun", "Si", "Sikong", "Sikou", "Sima", "Sishi", "Situ", "Song", "Su", "Sui", "Sun", "Suo", "Suruo", "Tai", "Taishi", "Taishu", "Tan", "Tang", "Tantai", "Tao", "Teng", "Tian", "Tie", "Tong", "Tou", "Tu", "Tufa", "Tuoba", "Wai", "Wan", "Wang", "Wanyan", "Wei", "Weisheng", "Wen", "Weng", "Wenren", "Wo", "Wu", "Wuma", "Xi", "Xia", "Xiahou", "Xian", "Xiang", "Xianyu", "Xiao", "Xie", "Ximen", "Xin", "Xing", "Xiong", "Xu", "Xuan", "Xuanyuan", "Xue", "Xun", "Yan", "Yang", "Yangshe", "Yao", "Ye", "Yelü", "Yi", "Yin", "Ying", "Yong", "You", "Yu", "Yuan", "Yuchi", "Yue", "Yuezheng", "Yun", "Yuwen", "Zai", "Zaifu", "Zan", "Zang", "Zeng", "Zha", "Zhai", "Zhan", "Zhang", "Zhangsun", "Zhao", "Zhen", "Zheng", "Zhi", "Zhong", "Zhonghang", "Zhongli", "Zhongsun", "Zhou", "Zhu", "Zhuang", "Zhuansun", "Zhuge", "Zhuo", "Zi", "Ziju", "Zong", "Zongzheng", "Zou", "Zu", "Zuo", "Zuoqiu"]>>
-<<<<<<< HEAD
-<<set setup.bimboSlaveNames = ["Courtney", "Kaycee", "Alex", "Alexis", "Amber-Louise", "Amber", "Amethyst", "Angel", "Angela", "Angelica", "Ariel", "Ashleigh", "Ashley", "Baby", "Babydoll", "Bambi", "Barbie", "Belle", "Beth", "Betty", "Blossom", "Bonnie", "Brandi", "Brandy", "Brie", "Britney", "Brittani", "Brittany", "Brittney", "Brooke", "Bubbles", "Bunni", "Bunny", "Buttercup", "Callie", "Candi", "Candice", "Candy", "Caprice", "Caramel", "Carmel", "Carmen", "Cashleigh", "Cassie", "Chantelle", "Charity", "Chelsea", "Cherri", "Cherry", "Chloe", "Christina", "Cindi", "Cindy", "Cissy", "Cleopatra", "Clover", "Coco", "Connie", "Cookie", "Courtney", "Crimson", "Crystal", "Cryztal", "Cupcake", "Cutie", "Daisy", "Danielle", "Dazzle", "Deluxe", "Desire", "Destiny", "Diamanda", "Diamond", "Didi", "Diva", "Dolli", "Dolly", "Ebony", "Elisa", "Emerald", "Erika", "Faith", "Fawn", "Felicity", "Femme", "Fifi", "Garnet", "Gigi", "Glimmer", "Glitter", "Goldie", "Gwen", "Haylee", "Hayley", "Holly", "Honey", "Hope", "Ivory", "Jade", "Jasmine", "Jazz", "Jess", "Jessie", "Jewel", "Jezebel", "Jingles", "Jizzelle", "Kandi", "Kandy", "Karma", "Katie", "KeKe", "Kelli", "Kelly", "Kelsi", "Kelsie", "Kelsy", "Khloe", "Kiki", "Kim", "Kimmy", "Kitten", "Kitty", "Kristal", "Kristie", "Krystal", "Kylie", "Lacy", "Lapis Lazuli", "Lee", "Lexi", "Lisa", "Liza", "Lola", "Lolita", "Lolli", "London", "Louise", "Lucy", "Lux", "MacKenzie", "Maddie", "Madison", "Maggie", "Magnolia", "Mandi", "Mandy", "Marcie", "Maria", "Marie", "Marilyn", "May", "Megan", "Meghan", "Melissa", "Mercedes", "Miley", "Mindi", "Mindy", "Missi", "Missy", "Misty", "Monique", "Muffi", "Nicki", "Nicky", "Nikita", "Nikki", "Opal", "Paris", "Parmie", "Peaches", "Penelope", "Peridot", "Petunia", "Pinkie", "Pinky", "Pixie", "Polly", "Poppy", "Precious", "Princess", "Queenie", "Roxanne", "Roxy", "Ruby", "Sammi", "Sammy", "Sandy", "Sapphire", "Scarlette", "Sexxxy", "Shaniqua", "Sindi", "Sinnamon", "Skipper", "Sky", "Skye", "Sophie", "Sparkle", "Sprinkles", "Stacee", "Stacey", "Stacy", "Star", "Sugar", "Sunny", "Sweetie", "Sweetpie", "Sweets", "Tawny", "Taylor", "Tequila", "Tiara", "Tiffani", "Tiffany", "Topaz", "Traci", "Trinity", "Trixie", "Tyler", "Vivi", "Vixen", "Yasmin", "Zhazha"]>>
-=======
-<<set setup.bimboSlaveNames = ["Air", "Amaze", "Amber", "Amethyst", "Angel", "Aphrodite", "April", "Aqua", "Aquamarine", "Art", "Artemis", "Ash", "Autumn", "Babe", "Baby", "Babydoll", "Bambi", "Barbie", "Beauty", "Berry", "Biscuit", "Blossom", "Bolt", "Bountiful", "Bounty", "Brandi", "Brandy", "Bubbles", "Bunni", "Bunny", "Candi", "Candy", "Caramel", "Champagne", "Chance", "Chardonnay", "Cheer", "Cherri", "Cherry", "Cinnamon", "Classy", "Cloud", "Coco", "Comfort", "Cookie", "Crystal", "Cupcake", "Cutie", "Daisy", "Dawn", "Daybreak", "Dazzle", "Deluxe", "Desire", "Destiny", "Diamond", "Diva", "Divine", "Divinity", "Doll", "Dolli", "Dolly", "Dot", "Dotty", "Dream", "Erotica", "Fable", "Fall", "Fantasy", "Felicity", "Flame", "Flash", "Flower", "Flurry", "Forest", "Fox", "Foxxy", "Garnet", "Gem", "Gigi", "Gin", "Glamor", "Glimmer", "Glitter", "Glow", "Goldie", "Grey", "Grove", "Halo", "Handy", "Harvest", "Hazel", "Heart", "Heaven", "Hera", "Honey", "Hope", "Infinity", "Ivory", "Ivy", "Jade", "Jay", "Jazz", "Jewel", "Jingles", "Joy", "July", "June", "Kandi", "Kandy", "Karma", "Kitten", "Kitty", "Lacy", "Lady", "Lapis", "Lass", "Lavender", "Legend", "Lewdity", "Light", "Lightning", "Love", "Lovely", "Luna", "Lusty", "Magnum", "Maple", "Marble", "Marina", "Marshmallow", "Martini", "May", "Meadow", "Melon", "Mercedes", "Mimosa", "Minx", "Miracle", "Misty", "Moon", "Moonbeam", "Mystery", "Myth", "Opal", "Paris", "Passion", "Peach", "Peaches", "Peridot", "Petunia", "Pink", "Pinky", "Pixie", "Polly", "Poni", "Poppy", "Precious", "Princess", "Pussycat", "Quartz", "Queenie", "Radiance", "Robin", "Rose", "Roxy", "Ruby", "Sapphire", "Satin", "Scarlet", "Sea", "Sexxxy", "Shine", "Showtime", "Silk", "Silver", "Sky", "Skye", "Smiles", "Snow", "Snowball", "Sol", "Soul", "Spark", "Sparkle", "Spice", "Spicey", "Spring", "Sprinkles", "Star", "Steamy", "Sugar", "Summer", "Sun", "Sunbeam", "Sunny", "Sunset", "Super", "Surprise", "Sweetie", "Sweetpie", "Sweets", "Tart", "Tea", "Temptation", "Tequila", "Terra", "Thriller", "Tiara", "Topaz", "Toy", "Treasure", "Treat", "Trick", "Twilight", "Ultra", "Valentine", "Velvet", "Venus", "Winter", "Wish", "Wonder"]>>
-<<set setup.bimboMaleNames = ["Stallion", "Zeus", "Steel", "Iron", "Stone"]>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
+<<set setup.bimboSlaveNames = ["Courtney", "Kaycee", "Alex", "Alexis", "Amber-Louise", "Amber", "Amethyst", "Angel", "Angela", "Angelica", "Ariel", "Ashleigh", "Ashley", "Baby", "Babydoll", "Bambi", "Barbie", "Belle", "Beth", "Betty", "Blossom", "Bonnie", "Brandi", "Brandy", "Brie", "Britney", "Brittani", "Brittany", "Brittney", "Brooke", "Bubbles", "Bunni", "Bunny", "Buttercup", "Callie", "Candi", "Candice", "Candy", "Caprice", "Caramel", "Carmel", "Carmen", "Cashleigh", "Cassie", "Chantelle", "Charity", "Chelsea", "Cherri", "Cherry", "Chloe", "Christina", "Cindi", "Cindy", "Cissy", "Cleopatra", "Clover", "Coco", "Connie", "Cookie", "Courtney", "Crimson", "Crystal", "Cryztal", "Cupcake", "Cutie", "Daisy", "Danielle", "Dazzle", "Deluxe", "Desire", "Destiny", "Diamanda", "Diamond", "Didi", "Diva", "Dolli", "Dolly", "Ebony", "Elisa", "Emerald", "Erika", "Faith", "Fawn", "Felicity", "Femme", "Fifi", "Garnet", "Gigi", "Glimmer", "Glitter", "Goldie", "Gwen", "Haylee", "Hayley", "Holly", "Honey", "Hope", "Ivory", "Jade", "Jasmine", "Jazz", "Jess", "Jessie", "Jewel", "Jezebel", "Jingles", "Jizzelle", "Kandi", "Kandy", "Karma", "Katie", "KeKe", "Kelli", "Kelly", "Kelsi", "Kelsie", "Kelsy", "Khloe", "Kiki", "Kim", "Kimmy", "Kitten", "Kitty", "Kristal", "Kristie", "Krystal", "Kylie", "Lacy", "Lapis Lazuli", "Lee", "Lexi", "Lisa", "Liza", "Lola", "Lolita", "Lolli", "London", "Louise", "Lucy", "Lux", "MacKenzie", "Maddie", "Madison", "Maggie", "Magnolia", "Mandi", "Mandy", "Marcie", "Maria", "Marie", "Marilyn", "May", "Megan", "Meghan", "Melissa", "Mercedes", "Miley", "Mindi", "Mindy", "Missi", "Missy", "Misty", "Monique", "Muffi", "Nicki", "Nicky", "Nikita", "Nikki", "Opal", "Paris", "Parmie", "Peaches", "Penelope", "Peridot", "Petunia", "Pinkie", "Pinky", "Pixie", "Polly", "Poppy", "Precious", "Princess", "Queenie", "Roxanne", "Roxy", "Ruby", "Sammi", "Sammy", "Sandy", "Sapphire", "Scarlette", "Sexxxy", "Shaniqua", "Sindi", "Sinnamon", "Skipper", "Sky", "Skye", "Sophie", "Sparkle", "Sprinkles", "Stacee", "Stacey", "Stacy", "Star", "Sugar", "Sunny", "Sweetie", "Sweetpie", "Sweets", "Tawny", "Taylor", "Tequila", "Tiara", "Tiffani", "Tiffany", "Topaz", "Traci", "Trinity", "Trixie", "Tyler", "Vivi", "Vixen", "Yasmin", "Zhazha", "Air", "Amaze", "Amber", "Amethyst", "Angel", "Aphrodite", "April", "Aqua", "Aquamarine", "Art", "Artemis", "Ash", "Autumn", "Babe", "Baby", "Babydoll", "Bambi", "Barbie", "Beauty", "Berry", "Biscuit", "Blossom", "Bolt", "Bountiful", "Bounty", "Brandi", "Brandy", "Bubbles", "Bunni", "Bunny", "Candi", "Candy", "Caramel", "Champagne", "Chance", "Chardonnay", "Cheer", "Cherri", "Cherry", "Cinnamon", "Classy", "Cloud", "Coco", "Comfort", "Cookie", "Crystal", "Cupcake", "Cutie", "Daisy", "Dawn", "Daybreak", "Dazzle", "Deluxe", "Desire", "Destiny", "Diamond", "Diva", "Divine", "Divinity", "Doll", "Dolli", "Dolly", "Dot", "Dotty", "Dream", "Erotica", "Fable", "Fall", "Fantasy", "Felicity", "Flame", "Flash", "Flower", "Flurry", "Forest", "Fox", "Foxxy", "Garnet", "Gem", "Gigi", "Gin", "Glamor", "Glimmer", "Glitter", "Glow", "Goldie", "Grey", "Grove", "Halo", "Handy", "Harvest", "Hazel", "Heart", "Heaven", "Hera", "Honey", "Hope", "Infinity", "Ivory", "Ivy", "Jade", "Jay", "Jazz", "Jewel", "Jingles", "Joy", "July", "June", "Kandi", "Kandy", "Karma", "Kitten", "Kitty", "Lacy", "Lady", "Lapis", "Lass", "Lavender", "Legend", "Lewdity", "Light", "Lightning", "Love", "Lovely", "Luna", "Lusty", "Magnum", "Maple", "Marble", "Marina", "Marshmallow", "Martini", "May", "Meadow", "Melon", "Mercedes", "Mimosa", "Minx", "Miracle", "Misty", "Moon", "Moonbeam", "Mystery", "Myth", "Opal", "Paris", "Passion", "Peach", "Peaches", "Peridot", "Petunia", "Pink", "Pinky", "Pixie", "Polly", "Poni", "Poppy", "Precious", "Princess", "Pussycat", "Quartz", "Queenie", "Radiance", "Robin", "Rose", "Roxy", "Ruby", "Sapphire", "Satin", "Scarlet", "Sea", "Sexxxy", "Shine", "Showtime", "Silk", "Silver", "Sky", "Skye", "Smiles", "Snow", "Snowball", "Sol", "Soul", "Spark", "Sparkle", "Spice", "Spicey", "Spring", "Sprinkles", "Star", "Steamy", "Sugar", "Summer", "Sun", "Sunbeam", "Sunny", "Sunset", "Super", "Surprise", "Sweetie", "Sweetpie", "Sweets", "Tart", "Tea", "Temptation", "Tequila", "Terra", "Thriller", "Tiara", "Topaz", "Toy", "Treasure", "Treat", "Trick", "Twilight", "Ultra", "Valentine", "Velvet", "Venus", "Winter", "Wish", "Wonder"]>>
+<<set setup.bimboMaleNames = ["Brock", "Brick", "Chad", "Tyrone", "Biff", "Flash", "Mongo", "Jock", "Stallion", "Zeus", "Steel", "Iron", "Jack", "Rod", "Stone"]>>
/*
Name pool selector based on nationality and race. Use as follows, given some slave _slave:
diff --git a/src/npc/acquisition.tw b/src/npc/acquisition.tw
index 76b18af6e37..d442e6db74f 100644
--- a/src/npc/acquisition.tw
+++ b/src/npc/acquisition.tw
@@ -119,11 +119,7 @@
<<set WombImpregnate($PC, $PC.pregType, $PC.pregSource, $PC.preg)>>
<</if>>
<</if>>
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $PC.geneticQuirks.wellHung = 2>>
<<else>>
<<set $PC.balls = 0>>
diff --git a/src/npc/descriptions/fBoobs.tw b/src/npc/descriptions/fBoobs.tw
index 3225d16f23c..9f4d4e74931 100644
--- a/src/npc/descriptions/fBoobs.tw
+++ b/src/npc/descriptions/fBoobs.tw
@@ -57,11 +57,7 @@ tits.
<</if>>
<<if $PC.belly >= 5000>>
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
You lay $him down on the couch on $his back, lather oil onto $his breasts and gingerly straddle $his face; your stiff prick between $his tits and under your belly, and your needy cunt over $his mouth.
<<if ($activeSlave.boobs >= 20000)>>
$His breasts are so colossal you can barely maintain this position. They completely devour your dick and threaten to swallow up your pregnant belly as well. Between $his licking, and the fleshy prison surrounding your privates, it doesn't take long for you to soak $his face and plant your seed deep into $his cleavage.
@@ -99,30 +95,18 @@ tits.
<</if>>
<</if>>
<<elseif isAmputee($activeSlave)>>
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
- $His limbless <<if $seeRace == 1>>$activeSlave.race <</if>>torso makes $him a unique appliance for mammary intercourse. You lay $him down on the ground on $his back, lube $his cleavage, and straddle $his torso. With your cock between $his breasts, you <<if ($activeSlave.boobs >= 650)>>squash $his tits together to form a nice lubricated channel,<<else>>hold your cock in place,<</if>> and ride back and forth on $him.<<if $PC.vagina >= 1>> Your pussylips rub deliciously across $his sternum.<</if>> $He has some trouble breathing under the assault, but $he manages. And for the finale, $he's totally unable to avoid a perfect cumshot.
- <<elseif $PC.boobs != 0>>
-=======
<<if $PC.dick != 0>>
$His limbless <<if $seeRace == 1>>$activeSlave.race <</if>>torso makes $him a unique appliance for mammary intercourse. You lay $him down on the ground on $his back, lube $his cleavage, and straddle $his torso. With your cock between $his breasts, you <<if ($activeSlave.boobs >= 650)>>squash $his tits together to form a nice lubricated channel,<<else>>hold your cock in place,<</if>> and ride back and forth on $him.<<if $PC.vagina != -1>> Your pussylips rub deliciously across $his sternum.<</if>> $He has some trouble breathing under the assault, but $he manages. And for the finale, $he's totally unable to avoid a perfect cumshot.
<<elseif $PC.boobs >= 300>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
You set $his limbless torso upright on your lap, facing you, so that your breasts and $hers are resting heavily against one another. $He turns $his head to avoid getting splashed in the eyes as you add a generous coating of oil to the heaving breastflesh. You reach around to grab $him by the hips and slide $him up and down, giving you both a wonderful mammary oil massage.
<<else>>
You set $his limbless torso on the floor, and tease $him for a while until $his nipples are rock hard. This done, you kneel down on $him with each of your legs aside $his torso, and hump your pussy back and forth on the stiff nub of one nipple. $He lies there, unable to do anything but comply, squirming with the stimulation.
<</if>>
<<elseif tooBigBelly($activeSlave)>>
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
- $His excessively large belly makes $him a unique appliance for mammary intercourse. You lay $him down on the ground on $his back, lube $his cleavage, and gingerly fit yourself between $his belly and $his breasts. With your cock between $his breasts, you <<if ($activeSlave.boobs >= 650)>>squash $his tits together to form a nice lubricated channel,<<else>>hold your cock in place,<</if>> and ride back and forth on $him. You blast $him in the face with your cum in no time<<if $PC.vagina >= 1>>, leaving your pussyjuice on $his belly where you rubbed against $him<</if>>.
- <<elseif $PC.boobs != 0>>
-=======
<<if $PC.dick != 0>>
$His excessively large belly makes $him a unique appliance for mammary intercourse. You lay $him down on the ground on $his back, lube $his cleavage, and gingerly fit yourself between $his belly and $his breasts. With your cock between $his breasts, you <<if ($activeSlave.boobs >= 650)>>squash $his tits together to form a nice lubricated channel,<<else>>hold your cock in place,<</if>> and ride back and forth on $him. You blast $him in the face with your cum in no time<<if $PC.vagina != -1>>, leaving your pussyjuice on $his belly where you rubbed against $him<</if>>.
<<elseif $PC.boobs >= 300>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
You lie down on top of $him, face to face, forced high into the air by $his excessively large belly, so that your breasts press into $his<<if ($activeSlave.boobs >= 20000)>> colossal tits.<<elseif ($activeSlave.boobs >= 10000)>> massive tits.<<elseif ($activeSlave.boobs >= 5000)>> monster tits.<<elseif ($activeSlave.boobs >= 1000)>> huge tits.<<elseif ($activeSlave.boobsImplant > 250)>> fake tits.<<elseif ($activeSlave.boobs >= 650)>> big tits.<<elseif ($activeSlave.boobs >= 300)>> small tits.<<else>> flat chest.<</if>> Scooting around to stimulate your nipples against $his warm breastflesh, you kiss the slave while pushing a hand down between you to schlick yourself against $him.
<<else>>
You set $his massively distended body on the floor, and tease $him for a while until $his nipples are rock hard. This done, you kneel down on $him with each of your legs aside $his torso, rear against the top of $his belly, and hump your pussy back and forth on the stiff nub of one nipple. $He lies there, desperately trying to reach around $his bulk to $his own pussy, but unable to do so, resorts to squirming with the stimulation.
@@ -183,15 +167,9 @@ tits.
<</if>>
<<elseif $activeSlave.devotion <= 20>>
$He lies on the couch next to your
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
- desk and rubs lube over $his <<if $seeRace == 1>>$activeSlave.race <</if>>chest so you can fuck $his $activeSlave.skin tits. You straddle $his torso, hold $his boobs together, and fuck $his cleavage. Your cum covers $his reluctant face<<if $PC.vagina >= 1>>, and you hike yourself up a little higher to grind your pussy against $his mouth<</if>>.
- <<elseif $PC.boobs != 0>>
-=======
<<if $PC.dick != 0>>
desk and rubs lube over $his <<if $seeRace == 1>>$activeSlave.race <</if>>chest so you can fuck $his $activeSlave.skin tits. You straddle $his torso, hold $his boobs together, and fuck $his cleavage. Your cum covers $his reluctant face<<if $PC.vagina != -1>>, and you hike yourself up a little higher to grind your pussy against $his mouth<</if>>.
<<elseif $PC.boobs >= 300>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
desk and rubs lube over $his $activeSlave.skin breasts. Then, you lie down atop $him with your breasts meshing with $hers and begin to slide up and down, titillating your nipples wonderfully. $He cannot ignore the slippery stimulation $his nipples are receiving, and you find $his mouth quite willing to receive your insistent tongue.
<<else>>
desk, and you've straddled $his face before $he can do anything more. You begin to grope $his breasts and pinch $his nipples to hardness as $he eats you out, your ministrations producing moans that feel quite nice against your clit. You maul $his boobs without mercy as you reach your climax, leaving $him to massage $his breasts gingerly as you get off $him.
@@ -199,15 +177,9 @@ tits.
<<elseif ($activeSlave.lactation > 0)>>
Since $he's producing milk, $he gets an emotional high from breastfeeding, and $he sits on the edge of your desk for a while so you can use $him as a beverage dispenser while you work. Once $he's empty, $he gets down to <<if ($PC.dick == 0)>>eat you out.<<if hasAnyArms($activeSlave)>> As $he buries $his face between your legs, $he gently rolls $his sore nipples around in $his fingers, quietly moaning and whining.<</if>><<else>>give you a titjob.<<if hasAnyArms($activeSlave)>> As you titfuck $him, $he gently rolls $his sore nipples around in $his fingers, quietly moaning and whining.<</if>> Your cum covers $his <<if $seeRace == 1>>$activeSlave.race <</if>>face in no time, and $he's left with a spectacular mess to clean. $He laps it all up.<</if>>
<<else>>
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
- $He massages and toys with $his chest for your benefit, languidly rubbing lubricant over not only $his cleavage but $his entire chest, making sure every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of $his $activeSlave.skin breasts are nice and shiny. $He gives you a titjob with $his lubricated cleavage while you sit at your desk<<if $PC.vagina >= 1>>, doing $his best to run $his hard nipples between your pussylips whenever $he can<</if>>. Your cum covers $his <<if $seeRace == 1>>$activeSlave.race <</if>>face, and $he carefully licks it all off while continuing to play with $his erect nipples.
- <<elseif $PC.boobs != 0>>
-=======
<<if $PC.dick != 0>>
$He massages and toys with $his chest for your benefit, languidly rubbing lubricant over not only $his cleavage but $his entire chest, making sure every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of $his $activeSlave.skin breasts are nice and shiny. $He gives you a titjob with $his lubricated cleavage while you sit at your desk<<if $PC.vagina != -1>>, doing $his best to run $his hard nipples between your pussylips whenever $he can<</if>>. Your cum covers $his <<if $seeRace == 1>>$activeSlave.race <</if>>face, and $he carefully licks it all off while continuing to play with $his erect nipples.
<<elseif $PC.boobs >= 300>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
$He rubs lube over $his $activeSlave.skin breasts, flirting with you and sticking out $his chest, before lying down on the couch. You lie down atop $him with your breasts meshing with $hers and begin to slide up and down, titillating your nipples wonderfully. You find $his mouth quite willing to receive your insistent tongue<<if hasAnyArms($activeSlave)>>, and while you make out, $he slips <<if hasBothArms($activeSlave)>>a<<else>>$his<</if>> hand down between your legs to give you a handjob, too<</if>>.
<<else>>
$He flirts with you and sticks out $his chest before lying down on the couch. You've straddled $his face before $he can do anything more, and $he begins to eat you out with enthusiasm. You begin to grope $his breasts and pinch $his nipples to hardness as $he gives you oral, your ministrations producing moans that feel quite nice against your clit. You maul $his boobs without mercy as you reach your climax, but $he loves it all.
diff --git a/src/npc/descriptions/fButt.tw b/src/npc/descriptions/fButt.tw
index d67432f0c6b..255722c9561 100644
--- a/src/npc/descriptions/fButt.tw
+++ b/src/npc/descriptions/fButt.tw
@@ -188,11 +188,7 @@ You call $him over so you can
<</if>>
<</if>>
-<<<<<<< HEAD
-<<if ($PC.dick >= 1)>>
-=======
<<if ($PC.dick != 0)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.cervixImplant == 2 || $activeSlave.cervixImplant == 3>>
<<set $activeSlave.bellyImplant += random(10,20)>>
diff --git a/src/npc/descriptions/fFuckdollWidgets.tw b/src/npc/descriptions/fFuckdollWidgets.tw
index b0462a62fca..92c0b84370e 100644
--- a/src/npc/descriptions/fFuckdollWidgets.tw
+++ b/src/npc/descriptions/fFuckdollWidgets.tw
@@ -10,16 +10,6 @@ You decide to use the Fuckdoll's <<if $activeSlave.lips > 95>>facepussy<<else>>f
<<elseif $activeSlave.fuckdoll <= 80>>
$He can follow intermediate commands, so you order $him into a position for use of $his face hole. $He obediently <<if hasBothLegs($activeSlave)>>gets to $his knees<<else>>cranes $his neck up<</if>> and sticks $his tongue out as far as it will go, wiggling it invitingly. You straddle $his face.
<<else>>
-<<<<<<< HEAD
- $He can follow advanced commands, so you order $him into a position for use of $his face hole. $He instantly <<if hasAnyLegs($activeSlave)>><<if $PC.dick >= 1>>bends at the waist and turns $his head upward, placing $his throat horizontally and at waist height.<<else>>gets to $his knees and turns $his head upward at just the right angle for a pussy to ride $his face hole.<</if>><<else>>cranes $his neck up and sticks $his tongue out as far as it will go, wiggling it invitingly.<</if>> You straddle $his face.
-<</if>>
-<<if $activeSlave.fuckdoll <= 20>>
- $He's not fully used to being surprised with face rape, so $he struggles, and $his difficulty breathing <<if $PC.dick >= 1>>makes $his throat spasm around your dickhead<<else>>feels lovely on your cunt<</if>>.
-<<elseif $activeSlave.fuckdoll <= 50>>
- Aware that $he is supposed to relax and let you rape $his face, $he does $his best to let you <<if $PC.dick >= 1>>fuck $his throat<<else>>ride $his face<</if>>.
-<<else>>
- You command $him to <<if $PC.dick >= 1>>milk your dick, and $he begins to suck with almost frightening force<<else>>pleasure your cunt, and $he begins to eat you out with almost frightening hunger<</if>>.
-=======
$He can follow advanced commands, so you order $him into a position for use of $his face hole. $He instantly <<if hasAnyLegs($activeSlave)>><<if $PC.dick != 0>>bends at the waist and turns $his head upward, placing $his throat horizontally and at waist height.<<else>>gets to $his knees and turns $his head upward at just the right angle for a pussy to ride $his face hole.<</if>><<else>>cranes $his neck up and sticks $his tongue out as far as it will go, wiggling it invitingly.<</if>> You straddle $his face.
<</if>>
<<if $activeSlave.fuckdoll <= 20>>
@@ -28,20 +18,14 @@ You decide to use the Fuckdoll's <<if $activeSlave.lips > 95>>facepussy<<else>>f
Aware that $he is supposed to relax and let you rape $his face, $he does $his best to let you <<if $PC.dick != 0>>fuck $his throat<<else>>ride $his face<</if>>.
<<else>>
You command $him to <<if $PC.dick != 0>>milk your dick, and $he begins to suck with almost frightening force<<else>>pleasure your cunt, and $he begins to eat you out with almost frightening hunger<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</if>>
<<if $activeSlave.fuckdoll <= 60>>
<<if $activeSlave.energy > 80>>Denied any other outlet for $his extreme sex drive, $he orgasms from nothing more than oral stimulation.<</if>>
<<else>>
$He's so perfectly tuned that $he begins to orgasm from nothing more than oral stimulation, and $he continues to shiver with repeated orgasms as $he sucks.
<</if>>
-<<<<<<< HEAD
-You climax, <<if $PC.dick >= 1>>blowing your load down $his throat<<else>>giving $him a good amount of femcum to swallow<</if>>, and return $him to <<if hasAnyLegs($activeSlave)>>a standing position<<else>>where $he was resting<</if>>.
-<<if $PC.dick >= 1>>
-=======
You climax, <<if $PC.dick != 0>>blowing your load down $his throat<<else>>giving $him a good amount of femcum to swallow<</if>>, and return $him to <<if hasAnyLegs($activeSlave)>>a standing position<<else>>where $he was resting<</if>>.
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.lips > 95>>$He gives sloppy blowjobs, $his lips being too big for much control, and strings of your cum beribbon $his suit. The Fuckdoll will be cleaned by another slave.
<<else>>$He swallows repeatedly as $he returns to $his resting posture.
<</if>>
@@ -59,19 +43,11 @@ You climax, <<if $PC.dick != 0>>blowing your load down $his throat<<else>>giving
<<run clearSummaryCache($activeSlave)>>
You decide to use the Fuckdoll's <<if $activeSlave.vagina > 3>>cavernous<<elseif $activeSlave.vagina == 3>>soft<<elseif $activeSlave.vagina == 2>>inviting<<elseif $activeSlave.vagina == 1>>tight<</if>> front hole.
<<if $activeSlave.fuckdoll <= 10>>
-<<<<<<< HEAD
- Since $he is not well adapted to life as a living sex toy yet, $he won't respond to position commands. So, you simply <<if hasAnyLegs($activeSlave)>>push $him down to lie on the couch<<else>>set $him on your desk<</if>> and shove <<if $PC.dick >= 1>>your cock<<else>>a strap-on<</if>> inside $his vagina.
-<<elseif $activeSlave.fuckdoll <= 70>>
- $He can follow intermediate commands, so you order $him into a position for use of $his front hole. $He obediently <<if hasAllLimbs($activeSlave)>>gets down on all fours and <<elseif hasAnyLegs($activeSlave)>>bends over and <</if>>cocks $his hips, offering $his cunt until you insert <<if $PC.dick >= 1>>your cock<<else>>a strap-on<</if>> into $his wet channel.
-<<else>>
- $He can follow advanced commands, so you bring $him over to your chair <<if hasAnyLegs($activeSlave)>>and order $him to squat down onto your <<if $PC.dick >= 1>>cock<<else>>strap-on<</if>> and ride.<<else>>and impale $him on <<if $PC.dick >= 1>>your cock<<else>>your strap-on<</if>>, ordering $him to do $his feeble best to bounce.<</if>>
-=======
Since $he is not well adapted to life as a living sex toy yet, $he won't respond to position commands. So, you simply <<if hasAnyLegs($activeSlave)>>push $him down to lie on the couch<<else>>set $him on your desk<</if>> and shove <<if $PC.dick != 0>>your cock<<else>>a strap-on<</if>> inside $his vagina.
<<elseif $activeSlave.fuckdoll <= 70>>
$He can follow intermediate commands, so you order $him into a position for use of $his front hole. $He obediently <<if hasAllLimbs($activeSlave)>>gets down on all fours and <<elseif hasAnyLegs($activeSlave)>>bends over and <</if>>cocks $his hips, offering $his cunt until you insert <<if $PC.dick != 0>>your cock<<else>>a strap-on<</if>> into $his wet channel.
<<else>>
$He can follow advanced commands, so you bring $him over to your chair <<if hasAnyLegs($activeSlave)>>and order $him to squat down onto your <<if $PC.dick != 0>>cock<<else>>strap-on<</if>> and ride.<<else>>and impale $him on <<if $PC.dick != 0>>your cock<<else>>your strap-on<</if>>, ordering $him to do $his feeble best to bounce.<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</if>>
<<if $activeSlave.fuckdoll <= 20>>
$He's not fully used to being raped without warning, so $he struggles, $his muscles spasming delightfully.
@@ -223,30 +199,18 @@ You repeat this ritual throughout the week, ensuring that $he will be an @@.lime
<<run clearSummaryCache($activeSlave)>>
You decide to use the Fuckdoll's <<if $activeSlave.anus > 3>>gaping<<elseif $activeSlave.anus == 3>>loose<<elseif $activeSlave.anus == 2>>relaxed<<elseif $activeSlave.anus == 1>>tight<</if>> rear hole.
<<if $activeSlave.fuckdoll <= 10>>
-<<<<<<< HEAD
- Since $he is not well adapted to life as a living sex toy yet, $he won't respond to position commands. So, you simply <<if hasAnyLegs($activeSlave)>>walk over to $him<<else>>flip $him over<</if>> and ram <<if $PC.dick >= 1>>your cock<<else>>a strap-on<</if>> up $his rear hole.
-<<elseif $activeSlave.fuckdoll <= 80>>
- $He can follow intermediate commands, so you order $him to present $his rear hole. $He obediently <<if hasAnyLegs($activeSlave)>>bends over, arches $his back, and<<else>>flips over and<</if>> winks $his anus until you insert <<if $PC.dick >= 1>>your cock<<else>>a strap-on<</if>>.
-<<else>>
- $He can follow advanced commands, so you bring $him over to your chair <<if hasAnyLegs($activeSlave)>>and order $him to squat down onto your <<if $PC.dick >= 1>>cock<<else>>strap-on<</if>> and slide $his anus up and down <<if $PC.dick >= 1>>your<<else>>the<</if>> shaft.<<else>>and impale $him on <<if $PC.dick >= 1>>your cock<<else>>your strap-on<</if>>, ordering $him to do $his feeble best to bounce.<</if>>
-=======
Since $he is not well adapted to life as a living sex toy yet, $he won't respond to position commands. So, you simply <<if hasAnyLegs($activeSlave)>>walk over to $him<<else>>flip $him over<</if>> and ram <<if $PC.dick != 0>>your cock<<else>>a strap-on<</if>> up $his rear hole.
<<elseif $activeSlave.fuckdoll <= 80>>
$He can follow intermediate commands, so you order $him to present $his rear hole. $He obediently <<if hasAnyLegs($activeSlave)>>bends over, arches $his back, and<<else>>flips over and<</if>> winks $his anus until you insert <<if $PC.dick != 0>>your cock<<else>>a strap-on<</if>>.
<<else>>
$He can follow advanced commands, so you bring $him over to your chair <<if hasAnyLegs($activeSlave)>>and order $him to squat down onto your <<if $PC.dick != 0>>cock<<else>>strap-on<</if>> and slide $his anus up and down <<if $PC.dick != 0>>your<<else>>the<</if>> shaft.<<else>>and impale $him on <<if $PC.dick != 0>>your cock<<else>>your strap-on<</if>>, ordering $him to do $his feeble best to bounce.<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</if>>
<<if $activeSlave.fuckdoll <= 20>>
$He's not fully used to having things suddenly forced up $his ass, so $he struggles, and $his sphincter spasms deliciously.
<<elseif $activeSlave.fuckdoll <= 40>>
Aware that $he is supposed to relax and accept anal rape, $he does $his best to accommodate the sodomy.
<<else>>
-<<<<<<< HEAD
- You command $him to milk your <<if $PC.dick >= 1>>cock<<else>>strap-on<</if>> with $his asshole, and $he obediently tightens $his sphincter against the invading phallus rhythmically.
-=======
You command $him to milk your <<if $PC.dick != 0>>cock<<else>>strap-on<</if>> with $his asshole, and $he obediently tightens $his sphincter against the invading phallus rhythmically.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</if>>
<<if $activeSlave.fuckdoll <= 60>>
<<if $activeSlave.energy > 60>>Denied any other outlet for $his powerful sex drive, $he orgasms.<</if>>
@@ -258,13 +222,8 @@ You decide to use the Fuckdoll's <<if $activeSlave.anus > 3>>gaping<<elseif $act
<<else>>
$He moans, <<if $activeSlave.lips > 95>>and the lips of $his facepussy quiver<<else>>struggling to force the sound past $his mouth insert<</if>>.
<</if>>
-<<<<<<< HEAD
-You climax<<if $PC.dick >= 1>>, filling $his rectum with your cum,<</if>> and return $him to <<if hasAnyLegs($activeSlave)>>a standing position<<else>>where $he was resting<</if>>.
-<<if $PC.dick >= 1>>
-=======
You climax<<if $PC.dick != 0>>, filling $his rectum with your cum,<</if>> and return $him to <<if hasAnyLegs($activeSlave)>>a standing position<<else>>where $he was resting<</if>>.
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.anus > 2>>Your cum flows out of $his gaped rear hole and down the material of $his suit.
<<elseif $activeSlave.anus == 2>>Your cum drips out of $his loosened rear hole and down the material of $his suit.
<<else>>$His tight rear hole retains every drop of your cum.
diff --git a/src/npc/descriptions/fLips.tw b/src/npc/descriptions/fLips.tw
index d58aaf8a056..a82b50f85d1 100644
--- a/src/npc/descriptions/fLips.tw
+++ b/src/npc/descriptions/fLips.tw
@@ -76,11 +76,7 @@ You tell $activeSlave.slaveName to
You set $his limbless torso on the
<<if ($PC.dick != 0)>>
edge of your desk with $him on $his back. $His head dangles off the edge of the desk, leaving $his <<if $seeRace == 1>>$activeSlave.race <</if>>mouth at the perfect angle for use. As an amputee $he has absolutely no control over the depth or quickness of oral sex, so you are careful not to hurt $him. Even so, you take $him to the edge of gagging, enjoying the sight of $his $activeSlave.skin throat bulging. Eventually you shoot your load directly down $his gullet.
-<<<<<<< HEAD
- <<if $PC.vagina >= 1>>If $he thought that was it, $he's soon corrected: you hike yourself up further, and grind your pussy against $his face.<</if>>
-=======
<<if $PC.vagina != -1>>If $he thought that was it, $he's soon corrected: you hike yourself up further, and grind your pussy against $his face.<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<else>>
floor next to your desk and kneel on $him with your legs on either side of $him, so your pussylips are hard against $his <<if $seeRace == 1>>$activeSlave.race <</if>>mouth. $He desperately eats you out, trying to get you off as fast as possible so $he can get a bit more air, but you grind down without mercy, taking your pleasure.
<</if>>
@@ -92,11 +88,7 @@ You tell $activeSlave.slaveName to
<<else>>
$He has absolutely no control over the depth or quickness of oral sex, so you are careful not to hurt $him. Even so, you take $him to the edge of gagging, enjoying the sight of $his $activeSlave.skin throat bulging and every movement within $his overstuffed womb as $he struggles to breathe. Eventually you shoot your load directly down $his gullet.
<</if>>
-<<<<<<< HEAD
- <<if $PC.vagina >= 1>>If $he thought that was it, $he's soon corrected: you hike yourself up further, and grind your pussy against $his face.<</if>>
-=======
<<if $PC.vagina != -1>>If $he thought that was it, $he's soon corrected: you hike yourself up further, and grind your pussy against $his face.<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<else>>
<<if $activeSlave.bellyImplant >= 1500>>
$He has absolutely no control over how hard you grind your cunt against $his face, so you are careful not to suffocate $him. Even so, you take $him to the edge, enjoying the sight of the spasms running through $his stomach as $he struggles to breathe. Eventually you climax, giving $him a good <<if canTaste($activeSlave)>>taste<<else>>dose<</if>> of your femcum.
@@ -109,11 +101,7 @@ You tell $activeSlave.slaveName to
$He has absolutely no control over
<<if ($PC.dick != 0)>>
the depth or quickness of oral sex, so you are careful not to hurt $him. Even so, you take $him to the edge of gagging, enjoying the sight of $his $activeSlave.skin throat bulging and $his absurd boobs jiggling as $he struggles to breathe. Eventually you shoot your load directly down $his gullet.
-<<<<<<< HEAD
- <<if $PC.vagina >= 1>>If $he thought that was it, $he's soon corrected: you hike yourself up further, and grind your pussy against $his face.<</if>>
-=======
<<if $PC.vagina != -1>>If $he thought that was it, $he's soon corrected: you hike yourself up further, and grind your pussy against $his face.<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<else>>
how hard you grind your cunt against $his face, so you are careful not to suffocate $him. Even so, you take $him to the edge, enjoying the sight of $his absurd boobs jiggling as $he struggles to breathe. Eventually you climax, giving $him a good <<if canTaste($activeSlave)>>taste<<else>>dose<</if>> of your femcum.
<</if>>
@@ -121,38 +109,19 @@ You tell $activeSlave.slaveName to
You get $him situated on the edge of your desk, on $his back. This anchors $him, the massive weight of $his ass stopping $him from going anywhere at all. $His head dangles off the edge of the desk, leaving $his <<if $seeRace == 1>>$activeSlave.race <</if>>mouth at the perfect angle for use.
<<if ($PC.dick != 0)>>
$He has absolutely no control over the depth or quickness of oral sex, so you are careful not to hurt $him. Even so, you take $him to the edge of gagging, enjoying the sight of $his $activeSlave.skin throat bulging and $his absurd rear jiggling as $he struggles to breathe. Eventually you shoot your load directly down $his gullet.
-<<<<<<< HEAD
- <<if $PC.vagina >= 1>>If $he thought that was it, $he's soon corrected: you hike yourself up further, and grind your pussy against $his face.<</if>>
-=======
<<if $PC.vagina != -1>>If $he thought that was it, $he's soon corrected: you hike yourself up further, and grind your pussy against $his face.<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<else>>
$He has absolutely no control over how hard you grind your cunt against $his face, so you are careful not to suffocate $him. Even so, you take $him to the edge, enjoying the sight of $his absurd rear jiggling as $he struggles to breathe. Eventually you climax, giving $him a good <<if canTaste($activeSlave)>>taste<<else>>dose<</if>> of your femcum.
<</if>>
<<elseif ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1) && ($activeSlave.dick != 0) && ($PC.dick != 0)>>
-<<<<<<< HEAD
- $He comes over eagerly, with hunger <<if canSee($activeSlave)>>in $his eyes<<else>>on $his face<</if>>. $He gets to $his knees, hurriedly takes you into $his <<if $seeRace == 1>>$activeSlave.race <</if>>mouth, and gives the blowjob $his all. As a cumslut $he's almost desperate to get your cum into $his mouth and <<if ($activeSlave.chastityPenis == 1)>>(since $his cock is off limits) frantically rubs $his nipples and asspussy<<elseif canAchieveErection($activeSlave)>>jacks $himself off<<else>>rubs $his sadly limp member<</if>> in anticipation.<<if $PC.vagina >= 1>> You have more than one variety of deliciousness for $him, and $he's careful not to neglect your wet cunt.<</if>> When you finish, $he sits back with an ecstatic look on $his face and lets your cum rest in $his mouth as $he climaxes into $his $activeSlave.skin hand. $He pours $his own cum from $his hand into $his mouth so it can mingle with yours.
-<<elseif ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1) && ($PC.dick != 0)>>
- $He comes over eagerly, with hunger <<if canSee($activeSlave)>>in $his eyes<<else>>on $his face<</if>>. $He gets to <<if hasAnyLegs($activeSlave)>>$his knee<<if hasBothLegs($activeSlave)>>s<</if>><<else>>the ground<</if>>, hurriedly takes you into $his <<if $seeRace == 1>>$activeSlave.race <</if>>mouth, and gives the blowjob $his all. As a cumslut $he's almost desperate to get your cum into $his mouth and rubs $himself in anticipation.<<if $PC.vagina >= 1>> You have more than one variety of deliciousness for $him, and $he's careful not to neglect your wet cunt.<</if>> When you finish, $he sits back with an ecstatic look on $his face and lets your cum rest in $his mouth as $he climaxes.
-=======
$He comes over eagerly, with hunger <<if canSee($activeSlave)>>in $his eyes<<else>>on $his face<</if>>. $He gets to $his knees, hurriedly takes you into $his <<if $seeRace == 1>>$activeSlave.race <</if>>mouth, and gives the blowjob $his all. As a cumslut $he's almost desperate to get your cum into $his mouth and <<if ($activeSlave.chastityPenis == 1)>>(since $his cock is off limits) frantically rubs $his nipples and asspussy<<elseif canAchieveErection($activeSlave)>>jacks $himself off<<else>>rubs $his sadly limp member<</if>> in anticipation.<<if $PC.vagina != -1>> You have more than one variety of deliciousness for $him, and $he's careful not to neglect your wet cunt.<</if>> When you finish, $he sits back with an ecstatic look on $his face and lets your cum rest in $his mouth as $he climaxes into $his $activeSlave.skin hand. $He pours $his own cum from $his hand into $his mouth so it can mingle with yours.
<<elseif ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1) && ($PC.dick != 0)>>
$He comes over eagerly, with hunger <<if canSee($activeSlave)>>in $his eyes<<else>>on $his face<</if>>. $He gets to <<if hasAnyLegs($activeSlave)>>$his knee<<if hasBothLegs($activeSlave)>>s<</if>><<else>>the ground<</if>>, hurriedly takes you into $his <<if $seeRace == 1>>$activeSlave.race <</if>>mouth, and gives the blowjob $his all. As a cumslut $he's almost desperate to get your cum into $his mouth and rubs $himself in anticipation.<<if $PC.vagina != -1>> You have more than one variety of deliciousness for $him, and $he's careful not to neglect your wet cunt.<</if>> When you finish, $he sits back with an ecstatic look on $his face and lets your cum rest in $his mouth as $he climaxes.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<elseif $activeSlave.devotion < -20>>
$He tries to back away, so you
<<if ($PC.dick != 0)>>
<<if $activeSlave.collar == "dildo gag">>
grab $him; $his <<if $seeRace == 1>>$activeSlave.race <</if>>mouth is already held invitingly open by $his gag, and $he's prevented from biting. You push $him down to <<if hasAnyLegs($activeSlave)>>$his knee<<if hasBothLegs($activeSlave)>>s<</if>><<else>>the ground<</if>> with $his head against the couch next to your desk so you can give $him a good hard throat fuck. When you cum down $his $activeSlave.skin throat $he retches through $his tears.
-<<<<<<< HEAD
- <<if $PC.vagina >= 1>>$He has a mere moment to get $his breath back before you press your pussy against $his unwilling mouth.<</if>>
- <<elseif $activeSlave.collar == "massive dildo gag">>
- grab $him; $his <<if $seeRace == 1>>$activeSlave.race <</if>>mouth is left agape, unable to close after being forced so widely open for so long, so $he is unlikely to bite. You push $him down to <<if hasAnyLegs($activeSlave)>>$his knee<<if hasBothLegs($activeSlave)>>s<</if>><<else>>the ground<</if>> with $his head against the couch next to your desk so you can give $him a good hard throat fuck. When you cum down $his $activeSlave.skin throat $he retches through $his tears.
- <<if $PC.vagina >= 1>>$He has a mere moment to get $his breath back before you press your pussy against $his unwilling mouth.<</if>>
- <<else>>
- grab $him and force a ring gag into $his <<if $seeRace == 1>>$activeSlave.race <</if>>mouth. Once you have the straps secured behind $his head, $he's prevented from biting. You push $him down to <<if hasAnyLegs($activeSlave)>>$his knee<<if hasBothLegs($activeSlave)>>s<</if>><<else>>the ground<</if>> with $his head against the couch next to your desk so you can give $him a good hard throat fuck. When you cum down $his $activeSlave.skin throat $he retches through $his tears.
- <<if $PC.vagina >= 1>>$He has a mere moment to get $his breath back before you press your pussy against $his unwilling mouth.<</if>>
-=======
<<if $PC.vagina != -1>>$He has a mere moment to get $his breath back before you press your pussy against $his unwilling mouth.<</if>>
<<elseif $activeSlave.collar == "massive dildo gag">>
grab $him; $his <<if $seeRace == 1>>$activeSlave.race <</if>>mouth is left agape, unable to close after being forced so widely open for so long, so $he is unlikely to bite. You push $him down to <<if hasAnyLegs($activeSlave)>>$his knee<<if hasBothLegs($activeSlave)>>s<</if>><<else>>the ground<</if>> with $his head against the couch next to your desk so you can give $him a good hard throat fuck. When you cum down $his $activeSlave.skin throat $he retches through $his tears.
@@ -160,7 +129,6 @@ You tell $activeSlave.slaveName to
<<else>>
grab $him and force a ring gag into $his <<if $seeRace == 1>>$activeSlave.race <</if>>mouth. Once you have the straps secured behind $his head, $he's prevented from biting. You push $him down to <<if hasAnyLegs($activeSlave)>>$his knee<<if hasBothLegs($activeSlave)>>s<</if>><<else>>the ground<</if>> with $his head against the couch next to your desk so you can give $him a good hard throat fuck. When you cum down $his $activeSlave.skin throat $he retches through $his tears.
<<if $PC.vagina != -1>>$He has a mere moment to get $his breath back before you press your pussy against $his unwilling mouth.<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</if>>
<<else>>
seize $him and throw $him onto the couch face-up, and then kneel on $him with your legs on either side of $his crying body, so your pussylips are hard against $his <<if $seeRace == 1>>$activeSlave.race <</if>>mouth. $He desperately eats you out, trying to get you off as fast as possible so $he can get a bit more air, but you grind down without mercy, taking your pleasure.
@@ -168,22 +136,14 @@ You tell $activeSlave.slaveName to
<<elseif $activeSlave.devotion <= 20>>
$He comes over reluctantly and begins to
<<if ($PC.dick != 0)>>
-<<<<<<< HEAD
- give you a blowjob. Deciding that $he isn't showing the necessary enthusiasm, you hold $his head and fuck $his <<if $seeRace == 1>>$activeSlave.race <</if>>face instead<<if $PC.vagina >= 1>>, occasionally jerking your dick free to shove your pussy against $his face instead<</if>>. $He does $his best to follow your motions but still splutters and gags. You pull free to cum across $his $activeSlave.skin face and hair.
-=======
give you a blowjob. Deciding that $he isn't showing the necessary enthusiasm, you hold $his head and fuck $his <<if $seeRace == 1>>$activeSlave.race <</if>>face instead<<if $PC.vagina != -1>>, occasionally jerking your dick free to shove your pussy against $his face instead<</if>>. $He does $his best to follow your motions but still splutters and gags. You pull free to cum across $his $activeSlave.skin face and hair.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<else>>
eat you out. Deciding that $he isn't showing the necessary enthusiasm, you hold $his head and grind your pussy against $his <<if $seeRace == 1>>$activeSlave.race <</if>>face instead. $He does $his best to follow your motions but still splutters and gasps for air. You climax quickly and haul $him <<if hasBothLegs($activeSlave)>>to $his feet<<else>>upright<</if>>, kissing the bewildered $girl full on the mouth. You can taste yourself on $his lips.
<</if>>
<<else>>
$He licks $his lips <<if canSee($activeSlave)>>and looks you in the eyes <</if>>as $he gets to <<if hasBothLegs($activeSlave)>>$his knees<<else>>the floor<</if>>. $He
<<if ($PC.dick != 0)>>
-<<<<<<< HEAD
- gives you a long, deep blowjob. $He massages your balls<<if $PC.vagina >= 1>> and pussy<</if>> with one hand and $his breasts with the other, giving you a show. $He sucks your head until you climax, letting your cock pop free of $his mouth to shoot pearly cum all across $his $activeSlave.skin face.
-=======
gives you a long, deep blowjob. $He massages your balls<<if $PC.vagina != -1>> and pussy<</if>> with one hand and $his breasts with the other, giving you a show. $He sucks your head until you climax, letting your cock pop free of $his mouth to shoot pearly cum all across $his $activeSlave.skin face.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<else>>
eats you out like $he's starving, moaning into your pussy to show off $his arousal and add to your pleasure. $He massages your perineum with one hand and $his breasts with the other, giving you a show. $He slowly concentrates more and more attention on your clit until you climax convulsively. You pull $him <<if hasBothLegs($activeSlave)>>to $his feet<<else>>upright<</if>>, kissing the compliant $girl full on the mouth. You can taste yourself on $his lips.
<</if>>
@@ -193,19 +153,11 @@ You tell $activeSlave.slaveName to
<<if ($activeSlave.skill.oral >= 100)>>
$He's so orally skilled that $he had the confidence to lightly graze you with $his <<if ($activeSlave.teeth == "pointy")>>sharp teeth<<else>>braces<</if>> on occasion, a delightfully scary sensation.
<<elseif ($activeSlave.skill.oral > 30)>>
-<<<<<<< HEAD
- $He's sufficiently orally skilled that $he managed to accomplish all that without $his <<if ($activeSlave.teeth == "pointy")>>sharp teeth<<else>>braces<</if>> contacting your <<if ($PC.dick >= 1)>>dick<<else>>pussy<</if>> once.
- <<elseif ($activeSlave.skill.oral > 10)>>
- With $his basic oral skills, $he accidentally grazed you with $his <<if ($activeSlave.teeth == "pointy")>>sharp teeth<<else>>braces<</if>> a few times, leaving your <<if ($PC.dick >= 1)>>dick<<else>>pussy<</if>> slightly the worse for wear.
- <<else>>
- Since $he is orally unskilled, you were sporting with your <<if ($PC.dick >= 1)>>dick<<else>>pussy<</if>> by using $his mouth. $He did $his best to keep $his <<if ($activeSlave.teeth == "pointy")>>sharp teeth<<else>>braces<</if>> off you, but you're bleeding a bit down there.
-=======
$He's sufficiently orally skilled that $he managed to accomplish all that without $his <<if ($activeSlave.teeth == "pointy")>>sharp teeth<<else>>braces<</if>> contacting your <<if ($PC.dick != 0)>>dick<<else>>pussy<</if>> once.
<<elseif ($activeSlave.skill.oral > 10)>>
With $his basic oral skills, $he accidentally grazed you with $his <<if ($activeSlave.teeth == "pointy")>>sharp teeth<<else>>braces<</if>> a few times, leaving your <<if ($PC.dick != 0)>>dick<<else>>pussy<</if>> slightly the worse for wear.
<<else>>
Since $he is orally unskilled, you were sporting with your <<if ($PC.dick != 0)>>dick<<else>>pussy<</if>> by using $his mouth. $He did $his best to keep $his <<if ($activeSlave.teeth == "pointy")>>sharp teeth<<else>>braces<</if>> off you, but you're bleeding a bit down there.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</if>>
<</if>>
@@ -215,11 +167,7 @@ You tell $activeSlave.slaveName to
<<set $activeSlave.sexualFlaw = "hates oral">>
<</if>>
<<elseif (random(1,100) > (110 - $activeSlave.devotion))>>
-<<<<<<< HEAD
- <<if ($PC.dick >= 1) && ($activeSlave.fetish == "none") && ($activeSlave.sexualFlaw != "hates oral")>>
-=======
<<if ($PC.dick != 0) && ($activeSlave.fetish == "none") && ($activeSlave.sexualFlaw != "hates oral")>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
Consummating an enjoyable sexual encounter by drinking your cum has @@.lightcoral;encouraged $him to focus on oral sex.@@
<<set $activeSlave.fetish = "cumslut", $activeSlave.fetishKnown = 1>>
<</if>>
diff --git a/src/npc/descriptions/fPoolSex.tw b/src/npc/descriptions/fPoolSex.tw
index cb28d188459..43fb7121a3e 100644
--- a/src/npc/descriptions/fPoolSex.tw
+++ b/src/npc/descriptions/fPoolSex.tw
@@ -28,11 +28,7 @@ You order $him to meet you in the spa for some quality time in the penthouse's r
<<else>>
wobbles back and forth, ineffectually trying to fight back as you cover $him in thick wads of gel, over and over. After several minutes of this, you decide that your
<</if>>
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
solid, quivering erection is in need of $his tender care. <<if canSee($activeSlave)>>Seeing<<else>>Sensing<</if>> the change in your demeanor, $he rolls back to recline at the pool's edge and, once you've joined $him,
<<if hasAnyArms($activeSlave)>>
reaches down to masturbate your ooze lubricated dick.
diff --git a/src/npc/descriptions/fVagina.tw b/src/npc/descriptions/fVagina.tw
index 7c55acd42aa..89008105c83 100644
--- a/src/npc/descriptions/fVagina.tw
+++ b/src/npc/descriptions/fVagina.tw
@@ -316,11 +316,7 @@ You call $him over so you can
<<elseif ($activeSlave.dick != 0)>>
As a submissive $he spares no attention for $his own orgasm, so $his flaccid cock swings untended.
<</if>>
-<<<<<<< HEAD
- <<if $PC.vagina >= 1>>
-=======
<<if $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
When you finally climax, you pull out and press your wet cunt against $his mouth, letting $his lavish attention on you that brings you to another quick orgasm.
<<set $activeSlave.counter.oral += 1>>
<<set $oralTotal += 1>>
@@ -341,11 +337,7 @@ You call $him over so you can
<<elseif ($activeSlave.dick != 0)>>
$His flaccid dick is ground into the back of the couch as you rape $him.
<</if>>
-<<<<<<< HEAD
- <<if $PC.vagina >= 1>>
-=======
<<if $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
After your first orgasm, you pull out and grind your pussy against $his face for another, enjoying the stimulation of $his muffled crying.
<<set $activeSlave.counter.oral += 1>>
<<set $oralTotal += 1>>
@@ -421,11 +413,6 @@ You call $him over so you can
$his breasts press against your own average breasts;
<<elseif $PC.boobs >= 300>>
$his breasts press against your own small breasts;
-<<<<<<< HEAD
- <<elseif $PC.boobs >= 1>>
- $his breasts press against your own generous breasts;
-=======
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<elseif $PC.title == 0>>
$his breasts press against your flat breasts;
<<else>>
diff --git a/src/npc/fAbuse.tw b/src/npc/fAbuse.tw
index 13ca198c2eb..b0566abc7ea 100644
--- a/src/npc/fAbuse.tw
+++ b/src/npc/fAbuse.tw
@@ -509,11 +509,7 @@ from your victim.
<<elseif (_seed == 7) && ($activeSlave.sexualFlaw !== "judgemental")>>
@@.red;sexually judgemental,@@ out of an unconscious desire to disqualify people from being good enough to have sex with $him.
<<set $activeSlave.sexualFlaw = "judgemental">>
-<<<<<<< HEAD
- <<elseif ($PC.dick >= 1)>>
-=======
<<elseif ($PC.dick != -1)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
@@.red;hating men,@@ since you forced your cock on $him.
<<set $activeSlave.behavioralFlaw = "hates men">>
<<else>>
diff --git a/src/npc/fBeg.tw b/src/npc/fBeg.tw
index b90b03cfe14..f7fcb216a61 100644
--- a/src/npc/fBeg.tw
+++ b/src/npc/fBeg.tw
@@ -249,11 +249,7 @@ Now kneeling at your feet naked before you, your slave waits for $his <<= Writte
<<case "masochist">>
$He positions $himself uncomfortably, bringing visual pleasure to you and pain to $himself. $He accentuates $his most sensitive parts, inviting you to slap or spank them.
<<case "cumslut">>
-<<<<<<< HEAD
- $he goes to $his knees, all the while staring at your <<if $PC.dick != 0>>manly bulge<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina != 0>>feminine mound<</if>>.
-=======
$he goes to $his knee<<if hasBothLegs($activeSlave)>>s<</if>>, all the while staring at your <<if $PC.dick != 0>>manly bulge<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>feminine mound<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<case "humiliation">>
$He eagerly takes to this humiliating position, hoping to demonstrate $his willingness to be degraded by $his <<= WrittenMaster()>>.
<<case "buttslut">>
@@ -388,11 +384,7 @@ You give $him permission to speak, and tell $him that $he may beg $his <<= Writt
"<<Master>>," $he breathes heavily, "Plea<<s>>e let me
<<if $PC.dick != 0>>
<<s>>uck your magnifi<<c>>ent
-<<<<<<< HEAD
- <<if $PC.vagina >= 1>>
-=======
<<if $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
cock and eat you out,
<<else>>
cock,
diff --git a/src/npc/fDance.tw b/src/npc/fDance.tw
index 485a9e61bd3..8d747a34c55 100644
--- a/src/npc/fDance.tw
+++ b/src/npc/fDance.tw
@@ -116,11 +116,7 @@ $His face is
making you
<<if $PC.dick != 0>>
rock hard
-<<<<<<< HEAD
- <<if $PC.vagina >= 1>>
-=======
<<if $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
and dripping wet
<</if>>
<<else>>
diff --git a/src/npc/fFeelings.tw b/src/npc/fFeelings.tw
index ab89182198a..ea6f9441dcc 100644
--- a/src/npc/fFeelings.tw
+++ b/src/npc/fFeelings.tw
@@ -159,11 +159,7 @@ My favorite part of my body i<<s>>
<<elseif ($activeSlave.sexualFlaw == "cum addict") && ($activeSlave.fetishStrength > 95)>>
<<if $activeSlave.lips > 40>>
my <<if $activeSlave.lips > 70>>huge <</if>>lip<<s>>, I like how everyone e<<x>>pect<<s>> to fa<<c>>efuck me, and how my lip<<s>> wrap around their dick<<s>> to keep all that <<if canTaste($activeSlave)>>yummy<<else>>warm<</if>> 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.
-<<<<<<< HEAD
- <<elseif $PC.dick >= 1>>
-=======
<<elseif $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
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?
<<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 <<if canTaste($activeSlave)>>yummy<<else>>warm<</if>> cum. Maybe you could let me eat cum out of your pu<<ss>>y <<s>>oon?
@@ -230,11 +226,7 @@ My favorite part of my body i<<s>>
<<if $activeSlave.geneticQuirks.superfetation == 2 && $activeSlave.womb.length > 0 && $activeSlave.pregKnown == 1>>
<<if ($activeSlave.intelligence + $activeSlave.intelligenceImplant > 15)>>
<<if ($activeSlave.belly < ($activeSlave.pregAdaptation * 1750))>>
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
You know, <<Master>>, I think I could fit another baby or two in here if you wanted to take advantage of my condition...
<<else>>
You know, I think I could fit a few more babie<<s>> in here if you wanted me to...
@@ -243,13 +235,8 @@ My favorite part of my body i<<s>>
Oh <<Master>>, I feel it'<<s>> that awful time when I have to let an egg go to wa<<s>>te for the <<s>>ake of the re<<s>>t of u<<s>>. I wi<<sh>> it didn't have to be thi<<s>> way and I could ju<<s>>t keep <<s>>welling larger and larger with children.
<</if>>
<<else>>
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
- You know, <<Master>>, I think I can feel that tingle deep in<<s>>ide me... You know, the one that get'<<s>> me even more pregnant... Don't you think I need another baby in<<s>>ide me?
-=======
<<if $PC.dick != 0>>
You know, <<Master>>, I think I can feel that tingle deep in<<s>>ide me... You know, the one that get<<s>> me even more pregnant... Don't you think I need another baby in<<s>>ide me?
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<else>>
I think it'<<s>> time, actually... Oh ye<<s>>, it'<<s>> <<s>>urely time to u<<s>>e my gift and make even more babie<<s>> in me.
<</if>>
@@ -321,11 +308,7 @@ My favorite part of my body i<<s>>
<<elseif ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishStrength > 60)>>
<<if $activeSlave.lips > 40>>
my <<if $activeSlave.lips > 70>>huge <</if>>lip<<s>>, I like how everyone e<<x>>pect<<s>> to fa<<c>>efuck me.
-<<<<<<< HEAD
- <<elseif $PC.dick >= 1>>
-=======
<<elseif $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
my mouth, I love how it feel<<s>> to <<s>>uck dicks and drink all the cum.
<<else>>
my mouth, I love how it feel<<s>> to eat pu<<ss>>y.
diff --git a/src/npc/fKiss.tw b/src/npc/fKiss.tw
index 09ce93e525f..e29db3360e0 100644
--- a/src/npc/fKiss.tw
+++ b/src/npc/fKiss.tw
@@ -51,11 +51,7 @@ You tell $activeSlave.slaveName to
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
$He complies in a wifely fashion, moving $his body as $he approaches to best catch your desire. Once $he's close, you take a moment to gaze deeply
<<if canSee($activeSlave)>>
-<<<<<<< HEAD
- into $his <<= App.Desc.eyeColor($activeSlave)>> eyes. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile, running $his eyes over your <<if $PC.boobs >= 1>>bosom<<else>>chest<</if>>.
-=======
into $his <<= App.Desc.eyesColor($activeSlave)>>. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile, running $his eyes over your <<if $PC.boobs >= 300>>bosom<<else>>chest<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<else>>
upon $his face. $He senses the intense look from the _womanP $he's married to and finds it affirming, and looks down with a smile.
<</if>>
@@ -76,11 +72,7 @@ You tell $activeSlave.slaveName to
<<else>>
$He complies obediently. Once $he's close, you take a moment to gaze deeply
<<if canSee($activeSlave)>>
-<<<<<<< HEAD
- into $his <<= App.Desc.eyeColor($activeSlave)>> eyes. $He finds the intense look from the _womanP $he's married to reassuring, and looks down with a slight smile, running $his eyes over your <<if $PC.boobs >= 1>>bosom<<else>>chest<</if>>.
-=======
into $his <<= App.Desc.eyesColor($activeSlave)>>. $He finds the intense look from the _womanP $he's married to reassuring, and looks down with a slight smile, running $his eyes over your <<if $PC.boobs >= 300>>bosom<<else>>chest<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<else>>
upon $his face. $He senses the intense look from the _womanP $he's married to and finds it reassuring, and looks down with a slight smile.
<</if>>
diff --git a/src/npc/fRelation.tw b/src/npc/fRelation.tw
index 10f0a6ff04f..ddaa7ad2108 100644
--- a/src/npc/fRelation.tw
+++ b/src/npc/fRelation.tw
@@ -83,11 +83,7 @@ You call both $activeSlave.slaveName and $slaves[$partner].slaveName to your off
<<set $activeSlave.counter.oral += 2, $slaves[$partner].counter.oral += 2, $oralTotal += 2>>
<<= VCheck.Partner()>>
<<elseif canDoVaginal($activeSlave) && canDoVaginal($slaves[$partner]) && canWalk($activeSlave) && canWalk($slaves[$partner]) && ($activeSlave.devotion > 50) && ($slaves[$partner].devotion > 50) && (_activeSlaveRel == "twin")>>
-<<<<<<< HEAD
- $activeSlave.slaveName and $slaves[$partner].slaveName are such devoted sex slaves that they've long since lost any hesitations about their partnership, and generally approach sex as though their bodies were interchangeable. (This means that they almost never masturbate, for one thing, preferring to have sex with each other, instead.) Giggling and kissing each other, they eagerly kneel before your chair and give you simultaneous oral sex, making an effort to play with their symmetry. They kiss around your <<if ($PC.dick == 0)>>pussy<<else>>cock, making a complete seal around you with their lips<</if>>, one on each side. Then they jump up on your desk and press their <<if ($activeSlave.dick > 0) && ($slaves[$partner].dick > 0)>>cocks<<elseif ($activeSlave.dick > 0) || ($slaves[$partner].dick > 0)>>cock and pussy<<else>>pussies<</if>> against one another<<if ($PC.dick == 0)>> while you don a strap-on<</if>>, spreading their legs to offer you everything. You switch back and forth, with the twin you're not in rubbing and grinding against their <<print relativeTerm($activeSlave, $slaves[$partner])>>, until both of $slaves[$partner].slaveName and $activeSlave.slaveName are lying on the desk<<if ($PC.dick >= 1)>> with cum dripping out of them<</if>>, making out tiredly.
-=======
$activeSlave.slaveName and $slaves[$partner].slaveName are such devoted sex slaves that they've long since lost any hesitations about their partnership, and generally approach sex as though their bodies were interchangeable. (This means that they almost never masturbate, for one thing, preferring to have sex with each other, instead.) Giggling and kissing each other, they eagerly kneel before your chair and give you simultaneous oral sex, making an effort to play with their symmetry. They kiss around your <<if ($PC.dick == 0)>>pussy<<else>>cock, making a complete seal around you with their lips<</if>>, one on each side. Then they jump up on your desk and press their <<if ($activeSlave.dick > 0) && ($slaves[$partner].dick > 0)>>cocks<<elseif ($activeSlave.dick > 0) || ($slaves[$partner].dick > 0)>>cock and pussy<<else>>pussies<</if>> against one another<<if ($PC.dick == 0)>> while you don a strap-on<</if>>, spreading their legs to offer you everything. You switch back and forth, with the twin you're not in rubbing and grinding against their <<print relativeTerm($activeSlave, $slaves[$partner])>>, until both of $slaves[$partner].slaveName and $activeSlave.slaveName are lying on the desk<<if ($PC.dick != 0)>> with cum dripping out of them<</if>>, making out tiredly.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $slaves[$partner].counter.oral++, $activeSlave.counter.oral++, $oralTotal++>>
<<= VCheck.Both()>>
<<= VCheck.Partner()>>
diff --git a/src/npc/fSlaveImpregConsummate.tw b/src/npc/fSlaveImpregConsummate.tw
index d1d16a8e0b4..0e69e7bff75 100644
--- a/src/npc/fSlaveImpregConsummate.tw
+++ b/src/npc/fSlaveImpregConsummate.tw
@@ -181,11 +181,7 @@ Next, you see to $activeSlave.slaveName.
<<elseif $activeSlave.mpreg == 1>>
The parents-to-be need little encouragement. They embrace happily and turn eagerly to the business of anal sex in <<if $activeSlave.belly+$impregnatrix.belly >= 5000>>an awkward<<else>>the<</if>> cowgirl position. They take their time, humping slowly and gazing into each others' eyes. After a little while, though, $activeSlave.slaveName looks over to where you're sitting, the invitation clear in $his eyes. As soon as you stand to come over, $activeSlave.slaveName turns around on $impregnatrix.slaveName's cock and opens wide for you. You and $impregnatrix.slaveName enjoy the <<if _superfetation == 1>>gravid $girl<<else>>mother-to-be<</if>> gently until $he climaxes, $his eager oral reaching a fever pitch, bringing you to your own climax.
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if canDoVaginal($impregnatrix)>>
Pulling out, you flip them again so that $impregnatrix.slaveName is on top and switch to _his2 pussy instead, stimulating _his2 <<if $impregnatrix.prostate != 0>>prostate<<else>>internals<</if>> with a good fucking until _he2 blows _his2 load into $activeSlave.slaveName's fertile <<if $activeSlave.mpreg == 1>>ass<<else>>cunt<</if>>. The two of them collapse into an exhausted, @@.hotpink;happy@@ pile of slave flesh with three loads inside them.
<<if ($impregnatrix.vagina == 0)>>
diff --git a/src/player/actions/fCaress.tw b/src/player/actions/fCaress.tw
index c8822811f01..d9bc953fb27 100644
--- a/src/player/actions/fCaress.tw
+++ b/src/player/actions/fCaress.tw
@@ -83,11 +83,6 @@ Then, you gently tilt $his <<if $activeSlave.face > 95>>overwhelmingly stunning<
<<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "dom") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
As you start to touch $his <<if $activeSlave.face > 95>>gorgeous<<elseif $activeSlave.face > 10>>lovely<<elseif $activeSlave.face >= -10>>pretty<<elseif $activeSlave.face >= -40>>homely<<else>>ugly<</if>> face, $he smiles at you and takes your hand in $hers, following its movements. $He tries hard to stop $himself from losing $himself in your masterful hands. $He takes $his tendency towards sexual dominance right up to the edge of insubordination, when $he starts to caress your face in turn. When you finally stop, $his eyes are closed and $he's smiling. <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate excitement with $his <<= App.Desc.eyesColor($activeSlave)>>, since $he does not speak $language well enough to express $himself.<<elseif (!hasAnyArms($activeSlave)) && (!canTalk($activeSlave))>>$He does $his best to communicate excitement with $his <<= App.Desc.eyesColor($activeSlave)>>.<<elseif !canTalk($activeSlave)>>$He signs that $he liked that.<<else>>"That wa<<s>> fun, <<Master>>," $he <<say>>s cheerfully.<</if>> $He looks at you, $his eyes almost begging you to give $him more than your mere caress.
<<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
-<<<<<<< HEAD
- $He stiffens at your touch but slowly relaxes to your fingers on $his face. As you move your fingers along $his lips, $he reacts almost as though $he's receiving oral. $He starts to gently suck your fingers, moaning into your hand and pressing $himself lewdly against your <<if $PC.boobs >= 1>>prominent breasts<<else>>manly chest<</if>>.<<if ($activeSlave.teeth == "pointy")>> $He's very careful to avoid spearing your tongue with $his sharp teeth.<</if>> $He achieves a weak orgasm before you stop caressing $him. <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate undiminished lust with $his <<= App.Desc.eyeColor($activeSlave)>> eyes, since $he does not speak $language well enough to express $himself.<<elseif (!hasAnyArms($activeSlave)) && (!canTalk($activeSlave))>>$He does $his best to communicate undiminished lust with $his <<= App.Desc.eyeColor($activeSlave)>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he liked that.<<else>>"That wa<<s>> fun, <<Master>>," $he <<say>>s lustfully.<</if>> $He looks at you as if $he wants more than your hands touching $him.
-<<elseif ($activeSlave.devotion > 50)>>
- $He accepts your touch with devotion, leaning $his head back at your gentle caress along $his face. $He leans $his body forward, pressing $himself against you, and you feel the intense heat from $his body against your <<if $PC.boobs >= 1>>soft breasts<<else>>manly chest<</if>>. $He gradually closes $his eyes and when you finally stop, <<if (hasAnyArms($activeSlave))>>$he runs $his hand delightfully across $his face where you last touched $him,<<else>>there is<</if>> a euphoric look on $his $activeSlave.skin face. <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate devotion with $his <<= App.Desc.eyeColor($activeSlave)>> eyes, since $he's not confident in $his ability to express it in $language.<<elseif (!hasAnyArms($activeSlave)) && (!canTalk($activeSlave))>>$He does $his best to communicate devotion with $his <<= App.Desc.eyeColor($activeSlave)>> eyes.<<elseif !canTalk($activeSlave)>>$He signs that $he loves you.<<else>>"I love you, <<Master>>," $he <<say>>s jubilantly.<</if>> $He looks at you longingly, almost as if $he's bursting to say that $he wants more than your mere caress.
-=======
$He stiffens at your touch but slowly relaxes to your fingers on $his face. As you move your fingers along $his lips, $he reacts almost as though $he's receiving oral. $He starts to gently suck your fingers, moaning into your hand and pressing $himself lewdly against your
<<if $PC.boobs >= 1400>>
giant tits.
@@ -129,7 +124,6 @@ Then, you gently tilt $his <<if $activeSlave.face > 95>>overwhelmingly stunning<
flat chest.
<</if>>
$He gradually closes $his eyes and when you finally stop, <<if (hasAnyArms($activeSlave))>>$he runs $his hand delightfully across $his face where you last touched $him,<<else>>there is<</if>> a euphoric look on $his $activeSlave.skin face. <<if ($activeSlave.accent >= 3)>>$He does $his best to communicate devotion with $his <<= App.Desc.eyesColor($activeSlave)>>, since $he's not confident in $his ability to express it in $language.<<elseif (!hasAnyArms($activeSlave)) && (!canTalk($activeSlave))>>$He does $his best to communicate devotion with $his <<= App.Desc.eyesColor($activeSlave)>>.<<elseif !canTalk($activeSlave)>>$He signs that $he loves you.<<else>>"I love you, <<Master>>," $he <<say>>s jubilantly.<</if>> $He looks at you longingly, almost as if $he's bursting to say that $he wants more than your mere caress.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<elseif ($activeSlave.devotion > 20)>>
$He accepts your touch willingly. As you are so close to $him, you sense considerable turmoil in the <<if ($activeSlave.physicalAge > 30)>>$woman<<else>>$girl<</if>>; $he's doing $his duty as a slave by complying with your wishes, and is probably struggling with the mixture of resistance, obedience and perhaps even devotion forced to the forefront of $his mind by your touch across $his face. When you finally move your hand away, $his <<= App.Desc.eyesColor($activeSlave)>> gaze into yours searchingly, looking for answers that are not there. <<if ((!hasAnyArms($activeSlave)) && (!canTalk($activeSlave)))>>$His eyes beg for an answer: is that it?<<elseif !canTalk($activeSlave)>>$He signs hesitantly, asking if that's it.<<else>>$He asks hesitantly, "I-i<<s>> that it, <<Master>>?"<</if>>
<<elseif ($activeSlave.devotion >= -20) && ($activeSlave.trust < -20)>>
diff --git a/src/player/actions/fEmbrace.tw b/src/player/actions/fEmbrace.tw
index 0cb8ae0f038..063e040e2fd 100644
--- a/src/player/actions/fEmbrace.tw
+++ b/src/player/actions/fEmbrace.tw
@@ -25,21 +25,13 @@ 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 <<= App.Desc.eyesColor($activeSlave)>>. $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 <<= App.Desc.eyeColor($activeSlave)>> 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>>.
-=======
$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 <<= App.Desc.eyesColor($activeSlave)>>. $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 >= 300>>bosom<<else>>chest<</if>><</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<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 <<= App.Desc.eyesColor($activeSlave)>>. $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>>
$He complies out of fear. Once $he's close, you take your unwilling $wife's head in your hands and gaze deeply into $his teary <<= App.Desc.eyesColor($activeSlave)>>. $He finds the intense look from the _womanP $he's forcibly married to terrifying, and <<if canSee($activeSlave)>> breaks eye contact<<else>> turns $his face away<</if>>.
<<else>>
-<<<<<<< HEAD
- $He complies obediently. Once $he's close, you take your willing $wife's head in your hands and gaze deeply into $his <<= App.Desc.eyeColor($activeSlave)>> eyes. $He finds the intense look from the _womanP $he's married to reassuring, and looks down with a slight smile<<if canSee($activeSlave)>>, running $his eyes over your <<if $PC.boobs >= 1>>bosom<<else>>chest<</if>><</if>>.
-=======
$He complies obediently. Once $he's close, you take your willing $wife's head in your hands and gaze deeply into $his <<= App.Desc.eyesColor($activeSlave)>>. $He finds the intense look from the _womanP $he's married to reassuring, and looks down with a slight smile<<if canSee($activeSlave)>>, running $his eyes over your <<if $PC.boobs >= 300>>bosom<<else>>chest<</if>><</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</if>>
<<elseif ($activeSlave.devotion > 75)>>
$He elatedly complies, joyful at being near to you. Once $he's close, you take $his completely relaxed head in your hands and gaze deeply into $his <<= App.Desc.eyesColor($activeSlave)>>. $He finds the intense look from $his beloved <<= WrittenMaster()>> disconcerting, and $his eyes flick downward after a moment. $He blushes furiously.
@@ -71,15 +63,9 @@ You walk around $him and put your hands around $his abdomen,<<if (hasAnyLegs($ac
<<else>>
You feel $his erect nipples against your
<</if>>
-<<<<<<< HEAD
- hands as you move your arms down around $his breasts. <<if ($activeSlave.devotion > 20)>>You take your time to stay in this position, feeling $his heart beat against you. $He starts to breathe faster before you keep one arm wrapped around $him as you move to $his front<<else>>As you move to $his front, with one arm still around $him, $he again tries to break away but you keep $him held tightly and you whisper the alternatives to $him, reminding $him<</if>>. You wrap your arms around $his back as you press $his breasts against your <<if $PC.boobs >= 1>>bosom<<else>>chest<</if>>.
-<<else>>
- $His massive tits are too large for you to wrap your arms around so you start to wrap your arms around $his waist. You feel $his heart beat against your chest, $he starts to breathe faster as you press $his back against your <<if $PC.boobs >= 1>>bosom<<else>>chest<</if>>.
-=======
hands as you move your arms down around $his breasts. <<if ($activeSlave.devotion > 20)>>You take your time to stay in this position, feeling $his heart beat against you. $He starts to breathe faster before you keep one arm wrapped around $him as you move to $his front<<else>>As you move to $his front, with one arm still around $him, $he again tries to break away but you keep $him held tightly and you whisper the alternatives to $him, reminding $him<</if>>. You wrap your arms around $his back as you press $his breasts against your <<if $PC.boobs >= 300>>bosom<<else>>chest<</if>>.
<<else>>
$His massive tits are too large for you to wrap your arms around so you start to wrap your arms around $his waist. You feel $his heart beat against your chest, $he starts to breathe faster as you press $his back against your <<if $PC.boobs >= 300>>bosom<<else>>chest<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</if>>
<<if ($activeSlave.fetish == "mindbroken")>>
diff --git a/src/player/electiveSurgery.tw b/src/player/electiveSurgery.tw
index d4340f3c722..bac2c2df073 100644
--- a/src/player/electiveSurgery.tw
+++ b/src/player/electiveSurgery.tw
@@ -309,22 +309,6 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
<br>[[Get a pair of butt implants|PC Surgery Degradation][$PC.butt += 1, $PC.buttImplant += 1, cashX(forceNeg(10000), "PCmedical"), $surgeryType = "buttEnlargementImplant"]] | [[Add additional fatty tissue|PC Surgery Degradation][$PC.butt += 1, cashX(forceNeg(15000), "PCmedical"), $surgeryType = "buttEnlargement"]]
<</if>>
-<<<<<<< HEAD:src/pregmod/electiveSurgery.tw
-<<if $PC.dick >= 1>>
- <br><br>"We could add gel around your testes to make your balls look bigger. Would also dampen any impacts to them as well, if that is anything to consider," _heU says, running a finger down the length of your shaft. "@@.yellowgreen;<<print cashFormat(7500)>>@@ for draining and @@.yellowgreen;<<print cashFormat(15000)>>@@ for filling, it's not the most simple procedure, you know? Anyway, they'll be very obvious, if that turns you on."
- <<if $AGrowth == 2>>
- _HeU takes another look at you before offering another option. "Of course, if you want bigger balls in a <i>functional</i> sense, we can do that too. The doctor's research in advanced targeted growth hormones has shown promising results in slaves, and he's been able to use them successfully on a few citizen patients so far. A direct injection of hormone gel, and your testes and prostate will grow on their own. Unlike the cosmetic gel, there's no reversing this treatment. It's expensive too, for the high quality drugs you want; @@.yellowgreen;<<print cashFormat(15000)>>@@ for one round of therapy. It'll cost @@.yellowgreen;<<print cashFormat(20000)>>@@ if you want hormone treatment and a gel adjustment at the same time.<br>
- <<else>>
- _HeU takes another look at you before continuing. "Of course, you seem like the type that might want bigger balls in a <i>functional</i> sense. The doctor's been working on a treatment using advanced targeted growth hormones, but it isn't quite ready yet. Might be something to keep in mind before you decide on a gel injection."<br>
- <</if>>
- <<if $PC.balls > 2 && $PC.ballsImplant > 3>>
- You have a @@.orange;monstrous, massive pair of balls@@ roughly the size of small watermelons; it's impossible to sit normally, so you've had to buy special chairs, you've given up on wearing pants, and they're so obvious that people probably assume they're fake, but every slave you fuck gets a distended belly from all the cum you pump into them, and you love it.
- <br>//You have trouble moving around and need special furniture thanks to your over-sized nuts, even bringing your legs together is a pain; you can hardly even walk anymore. It might be worth getting rid of the cosmetic gel.// | [[Have gel extracted|PC Surgery Degradation][$PC.ballsImplant = 3, $PC.balls = 3, cashX(forceNeg(7500), "PCmedical"), $surgeryType = "ballShrinkageHorm"]]
- <<elseif $PC.balls == 2 && $PC.ballsImplant == 3>>
- You have an @@.orange;enormous, heavy pair of balls@@ roughly the size of cantaloupes; it's difficult to sit normally, your clothes barely fit, and they're so obvious that people probably assume they're fake, but every slave you fuck gets a swollen belly from all the cum you pump into them, and you love it.
- <br>//You're beginning to have trouble moving around and using furniture thanks to your over-sized nuts, even bringing your legs together is a pain; any bigger and they might seriously impede your ability to run your arcology, or walk, for that matter.// | [[Get another round of growth hormones|PC Surgery Degradation][$PC.balls = 3, $PC.ballsImplant = 4, cashX(forceNeg(15000), "PCmedical"), $surgeryType = "ballEnlargementHorm"]] | [[Have gel extracted|PC Surgery Degradation][$PC.ballsImplant = 3, $PC.balls = 3, cashX(forceNeg(7500), "PCmedical"), $surgeryType = "ballShrinkageHorm"]]
- <<elseif $PC.balls == 1 && $PC.ballsImplant == 2>>
-=======
<<if $PC.balls != 0 && $PC.scrotum != 0>>
<br><br>"We could add gel around your testes to make your balls look bigger. Would also dampen any impacts to them as well, if that is anything to consider," _heU says, running a finger down the length of your shaft. "@@.yellowgreen;<<print cashFormat(7500)>>@@ for draining and @@.yellowgreen;<<print cashFormat(12000)>>@@ for filling, it's not the most simple procedure, you know? Anyway, they'll be very obvious, if that turns you on." _HeU takes another look at you before offering another option. "Of course, if you want bigger balls in a <i>functional</i> sense, we can do that too. The doctor's research in advanced targeted growth hormones has shown promising results in test subjects, and he's been able to use them successfully on a few citizen patients so far. A direct injection of hormones, and your testes will grow on their own. Unlike the cosmetic gel, there's no easily reversing this treatment, unless you are willing to subject yourself to slave drugs. It's expensive too, for the high quality drugs you want; @@.yellowgreen;<<print cashFormat(25000)>>@@ for one round of therapy. I should also warn you that repeated doses tend to have an increased effect."
<<if $PC.balls >= 30>>
@@ -341,7 +325,6 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
[[Get another round of growth hormones anyway|PC Surgery Degradation][$PC.balls = 30, cashX(forceNeg(15000), "PCmedical"), $surgeryType = "ballEnlargementHorm"]]
<</if>>
<<elseif $PC.balls >= 9>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1:src/player/electiveSurgery.tw
You have a @@.orange;huge pair of balls@@ roughly the size of softballs; they make quite a bulge in your clothes and dangle heavily any other time.
<br>
<<if $PC.ballsImplant>>
@@ -382,11 +365,7 @@ You have @@.orange;$PC.skin skin.@@<<if $PC.skin != $PC.origSkin>> Your original
<<if $PC.preg > 0>>
_HeU pokes your belly. "You're pregnant. What did I tell you?"
<<else>>
-<<<<<<< HEAD:src/pregmod/electiveSurgery.tw
- <<if $PC.dick >= 1 && $PC.vagina >= 1>>
-=======
<<if $PC.dick != 0 && $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1:src/player/electiveSurgery.tw
You have working @@.orange;male and female reproductive organs@@ and a @@.orange;<<if $PC.title > 0>>masculine<<else>>feminine<</if>> appearance.@@ "We'll store some of your sperm for you, should you decide to lose your maleness, and have it shipped to your arcology. Who you decide to use it on, well... That's up to you!"
<br>
[[Remove your male half|PC Surgery Degradation][$PC.ballsImplant = 0, $PC.balls = 0, $PC.scrotum = 0, $PC.dick = 0, $PC.prostate = 0, $PC.storedCum += 10, cashX(forceNeg(25000), "PCmedical"), $surgeryType = "herm2female"]] |
diff --git a/src/player/pcSurgeryDegradation.tw b/src/player/pcSurgeryDegradation.tw
index 189089e23c0..4e96ba2e78b 100644
--- a/src/player/pcSurgeryDegradation.tw
+++ b/src/player/pcSurgeryDegradation.tw
@@ -10,11 +10,7 @@
<<switch $surgeryType>>
<<case "skinTone">>
-<<<<<<< HEAD:src/pregmod/pcSurgeryDegradation.tw
- After a few hours, you awaken in the recovery wing to find every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of your body burning; though from what you did manage to see, you are, in fact, $PC.skin now. <<if !["pure white", "ivory", "white", "extremely pale", "very pale", "pale", "extremely fair", "very fair", "fair", "light", "light olive", "tan", "olive", "bronze", "dark olive", "dark", "light beige", "beige", "dark beige", "light brown", "brown", "dark brown", "black", "ebony", "pure black"].includes($PC.skin)>>The surgeon's assistant immediately covers _hisU mouth to hide _hisU giggle a the sight of you<<else>>The surgeon's assistant carefully seats _himselfU besides you with a large drum of cream<</if>>. "This stuff is specially formulated to soothe burns like this and should have you feeling much better after a few applications.<<if $PC.dick >= 1>> Now please, try not to get hard while I apply this. It will hurt like hell.<</if>>" _HeU spends the next half hour gingerly applying the cream across every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of your body. _HisU touch is so soft, it is hard to not get aroused, and as your body tenses, a wave of pain washes over you. "Calm down, and take a few applications first. Though I forgot to tell you, your erogenous zones were especially affected and will need plenty of extra attention." _HeU winks at you. You doubt the validity of that claim but understand exactly what _heU means by it. The next few days will be very enjoyable, but for now, you opt to stay perfectly still and will the cream to work faster.
-=======
After a few hours, you awaken in the recovery wing to find every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of your body burning; though from what you did manage to see, you are, in fact, $PC.skin now. <<if !["pure white", "ivory", "white", "extremely pale", "very pale", "pale", "extremely fair", "very fair", "fair", "light", "light olive", "tan", "olive", "bronze", "dark olive", "dark", "light beige", "beige", "dark beige", "light brown", "brown", "dark brown", "black", "ebony", "pure black"].includes($PC.skin)>>The surgeon's assistant immediately covers _hisU mouth to hide _hisU giggle a the sight of you<<else>>The surgeon's assistant carefully seats _himselfU besides you with a large drum of cream<</if>>. "This stuff is specially formulated to soothe burns like this and should have you feeling much better after a few applications.<<if $PC.dick != 0>> Now please, try not to get hard while I apply this. It will hurt like hell.<</if>>" _HeU spends the next half hour gingerly applying the cream across every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of your body. _HisU touch is so soft, it is hard to not get aroused, and as your body tenses, a wave of pain washes over you. "Calm down, and take a few applications first. Though I forgot to tell you, your erogenous zones were especially affected and will need plenty of extra attention." _HeU winks at you. You doubt the validity of that claim but understand exactly what _heU means by it. The next few days will be very enjoyable, but for now, you opt to stay perfectly still and will the cream to work faster.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1:src/player/pcSurgeryDegradation.tw
<<case "restoreFace">>
After a few hours, you awaken in the recovery wing with a face both sore and somewhat numb. <<if $PC.belly >= 10000 || $PC.boobs >= 1400>>Struggling to sit<<else>>Sitting<</if>> up, you catch sight of yourself in the mirror-covered wall across from your bed. Your face is back to the way it was before you had it altered (not counting any additional years added to it) and looking just as good as you remember. You attempt to smile at yourself, only to find your face doesn't want to comply; guess the drugs haven't completely worn off yet. You lie back down to sleep off the rest of the anesthesia before returning to your arcology.
@@ -216,13 +212,8 @@
find your pussy is much tighter than it was. No hymen though, so you can't pass as a virgin.
<</if>>
"So, do you like it? Does it feel any tighter?", asks the surgeon's assistant, seating _himselfU beside you and tracing your labia with a finger. "Feel anything? Or do we need to take this a little further?" _HeU begins fingering your new pussy, feeling around for any oddities and teasing you at the same time. "I know you're still a little sore, but bear with it. Plus, I know it must feel good.
-<<<<<<< HEAD:src/pregmod/pcSurgeryDegradation.tw
- <<if $PC.dick >= 1>>
- See? He agrees with me," _heU says, poking at the tip of your erection with _hisU free hand. "Shall we see if it's working right?" _HeU circles around till _heU is between your legs and <<if $PC.belly >= 10000>>disappears behind the curvature of your pregnancy<<else>>disappears between your thighs<</if>>. You feel <<if $PC.ballsImplant > 1>>_himU lift your engorged sack and leave it resting atop _hisU head<<else>>_hisU head brush against your sack<</if>> as _heU brings _hisU mouth to your cunt and begins to enthusiastically eat you out. _HeU is quite good at _hisU job and quickly brings you to climax; your neglected dick spraying cum across your belly. _HeU rises from your crotch to lick up your wayward cum. "I always did like the taste of you. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Satisfied, you settle back down to sleep off the rest of the anesthesia before returning to your arcology.
-=======
<<if $PC.dick != 0>>
See? He agrees with me," _heU says, poking at the tip of your erection with _hisU free hand. "Shall we see if it's working right?" _HeU circles around till _heU is between your legs and <<if $PC.belly >= 10000>>disappears behind the curvature of your pregnancy<<else>>disappears between your thighs<</if>>. You feel <<if $PC.balls >= 9>>_himU lift your engorged sack and leave it resting atop _hisU head<<else>>_hisU head brush against your sack<</if>> as _heU brings _hisU mouth to your cunt and begins to enthusiastically eat you out. _HeU is quite good at _hisU job and quickly brings you to climax; your neglected dick spraying cum across your belly. _HeU rises from your crotch to lick up your wayward cum. "I always did like the taste of you. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Satisfied, you settle back down to sleep off the rest of the anesthesia before returning to your arcology.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1:src/player/pcSurgeryDegradation.tw
<<else>>
See? Your cute little clit agrees with me," _heU says, poking at the tip of your peeking clit with _hisU free hand. "Shall we see if it's working right?" _HeU circles around till _heU is between your legs and <<if $PC.belly >= 10000>>disappears behind the curvature of your pregnancy<<else>>disappears between your thighs<</if>>. You feel face brush your inner legs as _heU brings _hisU mouth to your cunt and begins to enthusiastically eat you out. _HeU is quite good at _hisU job and quickly brings you to climax; your new pussy squirting girlcum across _hisU face. _HeU rises from your crotch and licks _hisU lips. "I always did like the taste of you. Feel free to rest as long as you need before departing. If you need, or want, me, I'll be around." Satisfied, you settle back down to sleep off the rest of the anesthesia before returning to your arcology.
<</if>>
diff --git a/src/pregmod/FSuckle.tw b/src/pregmod/FSuckle.tw
index f6cd0b22eb8..118af25516d 100644
--- a/src/pregmod/FSuckle.tw
+++ b/src/pregmod/FSuckle.tw
@@ -328,11 +328,7 @@ You <<if _mood == 2>>demand<<else>>beckon<</if>> $activeSlave.slaveName to
<<elseif $activeSlave.nipples == "inverted" || $activeSlave.nipples == "partially inverted">>
$his erect nipple in your mouth, while your sex focuses on the soft hand diligently working it. You feverishly suckle on $his nipple as you thrash your tongue, your efforts rewarded with more milk.
<<elseif $activeSlave.nipples == "fuckable">>
-<<<<<<< HEAD
- your sex feeling nothing but the wet <<if $PC.dick >= 1>>insides of $his breast<<else>>lips of $his breastpussy<</if>>. You feverishly thrash your tongue around inside of the bumpy enclosure, with each strong movement sending shivers through $him, forcing gasps, moans and milk out of $him.
-=======
your sex feeling nothing but the wet <<if $PC.dick != 0>>insides of $his breast<<else>>lips of $his breastpussy<</if>>. You feverishly thrash your tongue around inside of the bumpy enclosure, with each strong movement sending shivers through $him, forcing gasps, moans and milk out of $him.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<else>>
$his milky nipple in your mouth, while your sex focuses on the soft hand diligently working it. You feverishly suckle on $his nipple as you thrash your tongue, your efforts rewarded with more milk.
<</if>>
@@ -381,25 +377,12 @@ relishing the delicious treat one could have only received from a mother's bosom
<<if $activeSlave.boobs >= 20000>>
<<if $activeSlave.nipples == "fuckable">>
$He
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
holds $his breast and jiggles it in an attempt to compliment your thrusts, adding even more sensation alongside your own efforts. With the milk adding lubrication to the sensual hole of $his nipple and the enclosed nature of $his sopping wet breastpussy itself adding suction, it's like you were enveloped inside of a highly advanced cock milking machine, each bump sending thrums of pleasure as your dick brushed against them.
<<else>>
held $his breast and jiggled it in an attempt to compliment your thrusts, adding more sensation to your own efforts. The milk adding wetness to the sensual hole of $his nipple and the nature of $his sopping wet breastpussy itself adding suction felt like you were being enveloped by a world class pussy pump, each movement adding more suction and wetness than the last.
<</if>>
<<else>>
-<<<<<<< HEAD
- While you were busy suckling, $he was anything but idle, using $his hand as best as $he could to bring you the most pleasure $he is capable of. Though no lube was applied, $his ministrations were more than enough to take you to the knife's edge of orgasm more than once. In your <<if $PC.dick >= 1>>already dazed state<<else>>lust addled haze<</if>>, $his fingers seem to send lightning along your nerves<<if $PC.dick >= 1>>; the tips brushing across your shaft to tickle its head make you thrust instinctively. $His tugs, gentle yet firm<<else>>. $His fingertips brush across your labia to tickle your clit, making you buck instinctively. $His strokes, gentle yet decisive<</if>>, have an almost motherly feel to them. Such ministrations cannot help but prepare you to <<if $PC.dick >= 1>>shoot your load<<else>>come<</if>> as hard as you can.
- <</if>>
-<<elseif $activeSlave.boobs >= 2000>>
- While you were busy suckling, $he was anything but idle, using $his hand as best as $he could to bring you the most pleasure $he is is capable of. Though no lube was applied, $his ministrations were more than enough to take you to the knife's edge of orgasm more than once. $His hand continues to apply itself to your <<if $PC.dick >= 1>>shaft, its fingertips brushing across your shaft to tickle its head and make you thrust instinctively. $His tugs<<else>>sex, $his fingertips seeming to send lightning along your nerves. As $he tickles your clit, you buck instinctively. $His strokes<</if>>, gentle yet firm, have an almost motherly feel to them. Such ministrations cannot help but prepare you to <<if $PC.dick >= 1>>shoot your load<<else>>come<</if>> as hard as you can.
-<</if>>
-
-The two of you put so much into seeking pleasure in the act that you both cum at once, $his great gasp coinciding with your <<if $PC.dick >= 1>><<if $PC.balls > 1>>flood<<else>>jet<</if>> of jizz flying<<else>>own jet of pussy juice squirting<</if>>
-=======
While you were busy suckling, $he was anything but idle, using $his hand as best as $he could to bring you the most pleasure $he is capable of. Though no lube was applied, $his ministrations were more than enough to take you to the knife's edge of orgasm more than once. In your <<if $PC.dick != 0>>already dazed state<<else>>lust addled haze<</if>>, $his fingers seem to send lightning along your nerves<<if $PC.dick != 0>>; the tips brushing across your shaft to tickle its head make you thrust instinctively. $His tugs, gentle yet firm<<else>>. $His fingertips brush across your labia to tickle your clit, making you buck instinctively. $His strokes, gentle yet decisive<</if>>, have an almost motherly feel to them. Such ministrations cannot help but prepare you to <<if $PC.dick != 0>>shoot your load<<else>>come<</if>> as hard as you can.
<</if>>
<<elseif $activeSlave.boobs >= 2000>>
@@ -407,7 +390,6 @@ The two of you put so much into seeking pleasure in the act that you both cum at
<</if>>
The two of you put so much into seeking pleasure in the act that you both cum at once, $his great gasp coinciding with your <<if $PC.dick != 0>><<if $PC.balls >= 10>>flood<<else>>jet<</if>> of jizz flying<<else>>own jet of pussy juice squirting<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.boobs >= 20000 && $activeSlave.nipples == "fuckable">>
into
<<else>>
diff --git a/src/pregmod/artificialInsemination.tw b/src/pregmod/artificialInsemination.tw
index 27b92541d59..fc541bbf742 100644
--- a/src/pregmod/artificialInsemination.tw
+++ b/src/pregmod/artificialInsemination.tw
@@ -42,11 +42,7 @@ __Select an eligible slave to serve as the semen donatrix:__
<</if>>
<</if>>
-<<<<<<< HEAD
-<<if $PC.dick >= 1>>
-=======
<<if $PC.balls != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<br>
[[Use your own|Surgery Degradation][$impregnatrix = $PC, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $surgeryType = "insemination"]]
<<elseif $PC.storedCum > 0>>
diff --git a/src/pregmod/cloningWorkaround.tw b/src/pregmod/cloningWorkaround.tw
index a247e343d72..b02f3672e78 100644
--- a/src/pregmod/cloningWorkaround.tw
+++ b/src/pregmod/cloningWorkaround.tw
@@ -43,17 +43,12 @@
<div>//You have no slaves capable of acting as a surrogate.//</div>
<</if>>
-<<<<<<< HEAD
-<<if $PC.vagina >= 1 && $PC.preg >= 0 && $PC.preg < 4 && $PC.pregType < 8 && $PC.physicalAge < 70>>
- <br>
-=======
<<if $PC.vagina != -1 && $PC.preg >= 0 && $PC.preg < 4 && $PC.pregType < 8 && $PC.physicalAge < 70>>
<div>
<<if $receptrix != "Undecided" && $receptrix.ID == $PC.ID>>
- //Yourself//
+ //Yourself//
<<else>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
- [[Use your own womb|Cloning Workaround][$receptrix = $PC]]
+ [[Use your own womb|Cloning Workaround][$receptrix = $PC]]
<</if>>
</div>
<</if>>
diff --git a/src/pregmod/fDick.tw b/src/pregmod/fDick.tw
index f8f8802463d..f2cd4f0e1e2 100644
--- a/src/pregmod/fDick.tw
+++ b/src/pregmod/fDick.tw
@@ -92,32 +92,6 @@
making it abundantly clear that you want $his cum.
<<if ($activeSlave.fetish == "mindbroken")>>
-<<<<<<< HEAD
- Like a doll, $he dumbly remains still, completely indifferent that $he's deep in $his <<= WrittenMaster()>>'s <<if $PC.vagina >= 1>>pussy<<else>>butt<</if>>.
- You start moving up and on $his shaft, continuing until you climax and lift yourself off of $him. A strand of cum slips from your <<if $PC.vagina >= 1>>slit<<else>>anus<</if>>; it seems $activeSlave.slaveName came too.
- Since $he is mindbroken, $his responses to you are purely physiological and your actions have no affect on $him mentally. You leave your toy for one of your other slaves to clean and maintain.
- <<elseif $activeSlave.devotion > 50>>
- <<if $activeSlave.trust < -20>>
- Having followed your instructions as quickly as $he could in fear of your wrath, $he tries $his best to please you while you bounce<<if $PC.belly >= 5000>> your gravid bulk<</if>> on $his obedient cock. $He timidly warns you that $he is about to cum; in response you speed up your pace and clamp down hard on $his throbbing shaft. $He squeaks lewdly, overwhelmed by your orgasmic <<if $PC.vagina >= 1>>cunt<<else>>rectal<</if>> spasms, and unloads inside of you before apologizing submissively.
- <<elseif $activeSlave.trust <= 20>>
- Having followed your instructions quickly and obediently, $he tries $his best to please you while you bounce<<if $PC.belly >= 5000>> your gravid bulk<</if>> on $his eager cock. $He grabs your hips and warns you $he is about to cum; in response you speed up your pace, encouraging $him to impale you on $his throbbing shaft. $He squeals lewdly, overwhelmed by your orgasmic <<if $PC.vagina >= 1>>cunt<<else>>rectal<</if>> spasms, and unloads spurt after spurt into you before helping you up.
- <<else>>
- Having followed your instructions with gusto, $he energetically pounds you while you bounce<<if $PC.belly >= 5000>> your gravid bulk<</if>> on $his eager cock. $He grabs your hips and desperately warns you $he can't hold out any longer; in response you speed up your pace, tipping $him over the edge and forcing $him to impale you on $his twitching shaft. $He moans loudly, overwhelmed by your orgasmic <<if $PC.vagina >= 1>>cunt<<else>>rectal<</if>> spasms, and unloads spurt after spurt into you before pulling you into a post coitus embrace.
- <</if>>
- <<elseif $activeSlave.devotion >= -20>>
- <<if $activeSlave.trust < -20>>
- Having hesitatingly followed your instructions, $he lies as still as $he can beneath you while you bounce<<if $PC.belly >= 5000>> your gravid bulk<</if>> on $his terrified cock. While $he is too afraid to enjoy pleasuring you, $he obediently thrusts into you. $He timidly warns you that $he is about to cum; in response you speed up your pace and clamp down hard on $his throbbing shaft. $He cries out in surprise, overwhelmed by your orgasmic <<if $PC.vagina >= 1>>cunt<<else>>rectal<</if>> spasms, and blows $his load in you like a good little slave.
- <<elseif $activeSlave.trust <= 20>>
- Having obediently followed your instructions, $he lies as still as $he can beneath you while you bounce<<if $PC.belly >= 5000>> your gravid bulk<</if>> on $his willing cock. While $he is too uncertain of $his position in the hierarchy to really enjoy $himself, $he hesitatingly thrusts into you. When $he feels $he is nearing $his limit, $he gives you proper warning that $he is about to cum; in response you speed up your pace and clamp down hard on $his throbbing shaft. $He cries out in surprise, overwhelmed by your orgasmic <<if $PC.vagina >= 1>>cunt<<else>>rectal<</if>> spasms and boldness, and blows $his load in you during the confusion.
- <<else>>
- Having obediently followed your instructions, $he energetically pounds you while you bounce<<if $PC.belly >= 5000>> your gravid bulk<</if>> on $his eager cock. $He grabs your hips and pounds you a little too eagerly, not even slowing down as you begin to feel $him tense with orgasm. Without so much as a warning to you, $he trembles with orgasm, pumping $his load deep into your <<if $PC.vagina >= 1>>cunt<<else>>rectum<</if>> and setting off your own. You glare daggers at $him as $he profusely apologizes for $his lack of restraint.
- <</if>>
- <<else>>
- <<if $activeSlave.trust < -20>>
- Having followed your instructions as quickly as $he could, $he lies as still as $he can beneath you while you bounce<<if $PC.belly >= 5000>> your gravid bulk<</if>> on $his reluctant cock. While $he is too afraid to be an active participant in pleasuring you, you make do with what $he's giving. $He timidly warns you that $he is about to cum; in response you speed up your pace and clamp down hard on $his throbbing shaft. $He cries out lewdly, overwhelmed by your orgasmic <<if $PC.vagina >= 1>>cunt<<else>>rectal<</if>> spasms, and unloads inside of you despite $his fear.
- <<elseif $activeSlave.trust <= 20>>
- Having followed your instructions as quickly as $he could, $he lies as still as $he can beneath you while you bounce<<if $PC.belly >= 5000>> your gravid bulk<</if>> on $his reluctant cock. While $he is too hateful to be an active participant in pleasuring you, you make do with what $he's got. $He cries out lewdly, overwhelmed by your orgasmic <<if $PC.vagina >= 1>>cunt<<else>>rectal<</if>> spasms, and unloads deep inside you without warning. $He @@.orangered;smirks a little@@ as you glare daggers at $him.
-=======
Like a doll, $he dumbly remains still, completely indifferent that $he's deep in $his <<= WrittenMaster()>>'s <<if $PC.vagina != -1>>pussy<<else>>butt<</if>>.
You start moving up and on $his shaft, continuing until you climax and lift yourself off of $him. A strand of cum slips from your <<if $PC.vagina != -1>>slit<<else>>anus<</if>>; it seems $activeSlave.slaveName came too.
Since $he is mindbroken, $his responses to you are purely physiological and your actions have no affect on $him mentally. You leave your toy for one of your other slaves to clean and maintain.
@@ -142,7 +116,6 @@
Having followed your instructions as quickly as $he could, $he lies as still as $he can beneath you while you bounce<<if $PC.belly >= 5000>> your gravid bulk<</if>> on $his reluctant cock. While $he is too afraid to be an active participant in pleasuring you, you make do with what $he's giving. $He timidly warns you that $he is about to cum; in response you speed up your pace and clamp down hard on $his throbbing shaft. $He cries out lewdly, overwhelmed by your orgasmic <<if $PC.vagina != -1>>cunt<<else>>rectal<</if>> spasms, and unloads inside of you despite $his fear.
<<elseif $activeSlave.trust <= 20>>
Having followed your instructions as quickly as $he could, $he lies as still as $he can beneath you while you bounce<<if $PC.belly >= 5000>> your gravid bulk<</if>> on $his reluctant cock. While $he is too hateful to be an active participant in pleasuring you, you make do with what $he's got. $He cries out lewdly, overwhelmed by your orgasmic <<if $PC.vagina != -1>>cunt<<else>>rectal<</if>> spasms, and unloads deep inside you without warning. $He @@.orangered;smirks a little@@ as you glare daggers at $him.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.trust++>>
<<elseif overpowerCheck($activeSlave, $PC) < random(1,100)>>
Without warning, $he flips you onto your side and, still hilted,
diff --git a/src/pregmod/fMarry.tw b/src/pregmod/fMarry.tw
index 0b60a6e982b..5fccd56eeda 100644
--- a/src/pregmod/fMarry.tw
+++ b/src/pregmod/fMarry.tw
@@ -797,11 +797,7 @@ You tell $activeSlave.slaveName that you're going to marry $him. (A proposal, of
//and cannot host an orgiastic ceremony//
<</if>>
<</if>>
-<<<<<<< HEAD
- <<if isFertile($activeSlave) && ($PC.dick >= 1)>>
-=======
<<if isFertile($activeSlave) && ($PC.dick != 0)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $weddingPlanned == 3>>
<br>
<<link "Impregnation ceremony">>
diff --git a/src/pregmod/fPat.tw b/src/pregmod/fPat.tw
index c943002bc71..59fc505ecda 100644
--- a/src/pregmod/fPat.tw
+++ b/src/pregmod/fPat.tw
@@ -42,11 +42,7 @@ You tell $activeSlave.slaveName to
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
$He complies in a wifely fashion, moving $his body as $he approaches to best enflame your desire, eager to be close to the _womanP who married $him. Once $he's close, you hold $his face in your palms and gaze
<<if canSee($activeSlave)>>
-<<<<<<< HEAD
- deeply into $his <<= App.Desc.eyeColor($activeSlave)>> eyes. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile, running $his eyes over your <<if $PC.boobs >= 1>>bosom<<else>>chest<</if>>.
-=======
deeply into $his <<= App.Desc.eyesColor($activeSlave)>>. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile, running $his eyes over your <<if $PC.boobs >= 300>>bosom<<else>>chest<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<else>>
upon $his face. $He finds the intense look from the _womanP $he's married to affirming, and looks down with a smile.
<</if>>
@@ -67,11 +63,7 @@ You tell $activeSlave.slaveName to
<<else>>
$He complies obediently. Once $he's close, you hold $his face in your palms and take a moment to gaze deeply
<<if canSee($activeSlave)>>
-<<<<<<< HEAD
- into $his <<= App.Desc.eyeColor($activeSlave)>> eyes. $He finds the intense look from the _womanP $he's married to reassuring, and looks down with a slight smile, running $his eyes over your <<if $PC.boobs >= 1>>bosom<<else>>chest<</if>>.
-=======
into $his <<= App.Desc.eyesColor($activeSlave)>>. $He finds the intense look from the _womanP $he's married to reassuring, and looks down with a slight smile, running $his eyes over your <<if $PC.boobs >= 300>>bosom<<else>>chest<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<else>>
upon $his face. The intense look from the _womanP $he's married to is reassuring to $him, and $he looks down with a slight smile.
<</if>>
@@ -238,9 +230,6 @@ You move your hand down to caress $his forehead, and then slide your hand along
<</if>>
$He looks at you, $his <<if canSee($activeSlave)>>lovely <<= App.Desc.eyesColor($activeSlave)>><<else>>face<</if>> practically begging you to let $him take this farther.
<<elseif ($activeSlave.devotion > 50) && ($activeSlave.fetish == "submissive") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
-<<<<<<< HEAD
- As you stroke $his head, $he reacts almost as though you're stroking $his nether regions, and begins to moan and press $himself lewdly against your <<if $PC.boobs >= 1>>prominent breasts<<else>>manly chest<</if>>. $He achieves a weak orgasm before you finally stop caressing $his head; $he is your pet, after all.
-=======
As you stroke $his head, $he reacts almost as though you're stroking $his nether regions, and begins to moan and press $himself lewdly against your
<<if $PC.boobs >= 1400>>
giant tits.
@@ -262,7 +251,6 @@ You move your hand down to caress $his forehead, and then slide your hand along
non-existent breasts.
<</if>>
$He achieves a weak orgasm before you finally stop caressing $his head; $he is your pet, after all.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if ($activeSlave.accent >= 3)>>
$He does $his best to communicate undiminished lust with $his <<if canSee($activeSlave)>><<= App.Desc.eyesColor($activeSlave)>><<else>>facial expressions<</if>>, since $he does not speak $language well enough to express $himself.
<<elseif (!hasAnyArms($activeSlave)) && (!canTalk($activeSlave))>>
diff --git a/src/pregmod/fSelf.tw b/src/pregmod/fSelf.tw
index 8dd6191f048..1cf6d7b0c8f 100644
--- a/src/pregmod/fSelf.tw
+++ b/src/pregmod/fSelf.tw
@@ -16,11 +16,7 @@
<<if $PC.skill.cumTap == 0>>
-<<<<<<< HEAD
- Taking the hose and attaching the delectable cockhead to it, you drag it over to your bed and make yourself comfortable. Teasing your pussylips with the perfect sized cock quickly gets you moist<<if $PC.dick >= 1>> and hard<</if>>, itching for the fake dick inside you. You know yourself well, and it fits perfectly; as you thrust it into your cunt you can't help but buck with pleasure. Just as you reach your climax, you accidentally kick the tap on. Needless to say, you are quite surprised when your "lover" orgasms and begins releasing inside you, forcing you to lose your grip on the nozzle, allowing it to free itself from you along with a torrent of cum. Panting and rubbing your tender belly, you quickly pull your clothes back on and head to clean yourself out. You can't help but notice your waist feels rather tight; it shot so much into you — that cum wasn't virile, right?
-=======
Taking the hose and attaching the delectable cockhead to it, you drag it over to your bed and make yourself comfortable. Teasing your pussylips with the perfect sized cock quickly gets you moist<<if $PC.dick != 0>> and hard<</if>>, itching for the fake dick inside you. You know yourself well, and it fits perfectly; as you thrust it into your cunt you can't help but buck with pleasure. Just as you reach your climax, you accidentally kick the tap on. Needless to say, you are quite surprised when your "lover" orgasms and begins releasing inside you, forcing you to lose your grip on the nozzle, allowing it to free itself from you along with a torrent of cum. Panting and rubbing your tender belly, you quickly pull your clothes back on and head to clean yourself out. You can't help but notice your waist feels rather tight; it shot so much into you — that cum wasn't virile, right?
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<elseif $PC.skill.cumTap < 5>>
diff --git a/src/pregmod/fSlaveFeed.tw b/src/pregmod/fSlaveFeed.tw
index f74c6f9891f..6cf00adc4ff 100644
--- a/src/pregmod/fSlaveFeed.tw
+++ b/src/pregmod/fSlaveFeed.tw
@@ -238,15 +238,9 @@ Next, you see to $activeSlave.slaveName.
<<if canImpreg($milkTap, $PC)>>
<<= knockMeUp($milkTap, 40, 1, -1)>>
<</if>>
-<<<<<<< HEAD
- <<elseif $PC.dick >= 1 && $milkTap.butt > 4>>
- Moving behind the restrained cow while teasing your erect cock, you push _him2 forward to allow you to press your dick between _his2 huge butt cheeks. Getting comfortable, you reach around to _his2 immense mammaries and begin kneading them in time to your thrusts. After some time, and several orgasms across the back of the sobbing cow, is $activeSlave.slaveName bloated with enough milk.
- <<elseif $PC.dick >= 1 && !hasAnyLegs($milkTap)>>
-=======
<<elseif $PC.dick != 0 && $milkTap.butt > 4>>
Moving behind the restrained cow while teasing your erect cock, you push _him2 forward to allow you to press your dick between _his2 huge butt cheeks. Getting comfortable, you reach around to _his2 immense mammaries and begin kneading them in time to your thrusts. After some time, and several orgasms across the back of the sobbing cow, is $activeSlave.slaveName bloated with enough milk.
<<elseif $PC.dick != 0 && !hasAnyLegs($milkTap)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
Moving behind the restrained cow while teasing your erect cock, you find a severe lack of places to stick your dick. Sighing, you hoist _his2 belted ass into the air so you may thrust between _his2 <<if $milkTap.weight > 95>>soft <</if>>thighs. Getting comfortable, you reach around to _his2 immense mammaries and begin kneading them in time to your thrusts. After some time, and several loads blown<<if $milkTap.belly >= 1500>> onto the rounded belly of the sobbing cow<</if>>, is $activeSlave.slaveName bloated with enough milk.
<<else>>
With a lack of holes to penetrate, you simply wrap your arms around $milkTap.slaveName and begin fondling and milking _his2 luscious breasts. After some time, $activeSlave.slaveName is finally bloated to your desired size.
@@ -330,15 +324,9 @@ Next, you see to $activeSlave.slaveName.
<<elseif canDoAnal($activeSlave)>>
You order $activeSlave.slaveName to lift $his ass so you can penetrate $his <<if $activeSlave.anus == 0>>virgin <</if>>ass <<if $PC.dick == 0>>with a strap-on <</if>> while $he drinks from $milkTap.slaveName's breasts. With every thrust into the squirming slave, you push $him into the docile $milkTap.slaveName forcing even more milk down $his throat.
<<set $activeSlave.counter.anal++, $analTotal++>>
-<<<<<<< HEAD
- <<elseif $PC.dick >= 1 && $activeSlave.butt > 4>>
- You order $activeSlave.slaveName to lift $his ass so you can rub your dick between $his huge butt cheeks while $he drinks from $milkTap.slaveName's breasts. With every thrust against the squirming slave, you push $him into the docile $milkTap.slaveName forcing even more milk down $his throat.
- <<elseif $PC.dick >= 1 && hasBothLegs($activeSlave)>>
-=======
<<elseif $PC.dick != 0 && $activeSlave.butt > 4>>
You order $activeSlave.slaveName to lift $his ass so you can rub your dick between $his huge butt cheeks while $he drinks from $milkTap.slaveName's breasts. With every thrust against the squirming slave, you push $him into the docile $milkTap.slaveName forcing even more milk down $his throat.
<<elseif $PC.dick != 0 && hasBothLegs($activeSlave)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
You order $activeSlave.slaveName to lift $his ass so you can fuck $his <<if $activeSlave.weight > 95>>soft <</if>>thighs, for a lack of anything better, while $he drinks from $milkTap.slaveName's breasts. With every thrust against the squirming slave, you push $him into the docile $milkTap.slaveName forcing even more milk down $his throat.
<<else>>
You order $activeSlave.slaveName to position $himself so you can rub your <<if $PC.dick == 0>>clit<<else>>dick<</if>> against $him while $he drinks from $milkTap.slaveName's breasts, since $he lacks any better way to please you while you lavish praise on your obedient cow. With every thrust against the squirming slave, you push $him into the docile $milkTap.slaveName forcing even more milk down $his throat.
@@ -644,16 +632,6 @@ Next, you see to $activeSlave.slaveName.
<<elseif canDoAnal($activeSlave)>>
Moving behind the struggling cocksleeve while<<if $PC.dick == 0>> donning a strap-on<<else>> teasing your erect cock<</if>>, you pull $him into a comfortable position to penetrate $his <<if $activeSlave.anus == 0>>virgin <</if>>rear. Once you are firmly mounted, you reach around, bringing one hand to $his empty stomach and the other to $his exposed throat. As you thrust into $him, you force $him to choke down $milkTap.slaveName's dick, applying pressure to $his throat any time $he attempts to pull away.
<<set $activeSlave.counter.anal++, $analTotal++>>
-<<<<<<< HEAD
- <<elseif $PC.dick >= 1 && $activeSlave.butt > 4>>
- Moving behind the struggling cocksleeve while teasing your erect cock, you pull $him into a comfortable position to rub your dick between $his huge butt cheeks. Once you are firmly slotted, you reach around, bringing one hand to $his empty stomach and the other to $his exposed throat. As you thrust against $him, you force $him to choke down $milkTap.slaveName's dick, applying pressure to $his throat any time $he attempts to pull away.
- <<elseif $PC.dick >= 1 && hasBothLegs($activeSlave)>>
- Moving behind the struggling cocksleeve while teasing your erect cock, you pull $him into a comfortable position to fuck $his <<if $activeSlave.weight > 95>>soft <</if>>thighs, for a lack of anything better. Once you are firmly seated, you reach around, bringing one hand to $his empty stomach and the other to $his exposed throat. As you thrust against $him, you force $him to choke down $milkTap.slaveName's dick, applying pressure to $his throat any time $he attempts to pull away.
- <<else>>
- Moving behind the struggling cocksleeve while teasing your erect cock, you find a distinct lack of ways to use $him to get off. <<if $PC.dick >= 1>>You settle for rubbing your erection against $his back<<else>>You settle for a vibrating dildo stuck deep into your pussy<</if>>, you'll need both hands to fondle your toy. Once you are positioned, you reach around, bringing one hand to $his empty stomach and the other to $his exposed throat. As you masturbate, you force $him to choke down $milkTap.slaveName's dick, applying pressure to $his throat any time $he attempts to pull away.
- <</if>>
- <<if $activeSlave.inflation == 3>>You cum multiple times as you feel $his belly slowly round with cum, transform into a jiggling mass, and finally grow taut under your molesting fingers and the seemingly endless supply of ejaculate from $milkTap.slaveName<<elseif $activeSlave.inflation == 2>>You cum several times as you feel $his belly slowly round with cum, finally transforming into a jiggling mass, under your molesting fingers and the seemingly endless supply of ejaculate from $milkTap.slaveName<<else>>You cum as you feel $his belly slowly round with cum under your molesting fingers and the seemingly endless supply of ejaculate from $milkTap.slaveName<</if>>. Standing and releasing $him from $milkTap.slaveName, gives you a lovely sight of $activeSlave.slaveName's <<if $activeSlave.inflation == 3>>taut, round belly<<elseif $activeSlave.inflation == 2>>rounded, jiggling belly<<else>>distended, sloshing belly<</if>> quivering as $he comes down from $his own forced climax<<if $PC.dick >= 1 && (canDoAnal($activeSlave) || canDoVaginal($activeSlave))>>, cum leaking from both ends<</if>>.
-=======
<<elseif $PC.dick != 0 && $activeSlave.butt > 4>>
Moving behind the struggling cocksleeve while teasing your erect cock, you pull $him into a comfortable position to rub your dick between $his huge butt cheeks. Once you are firmly slotted, you reach around, bringing one hand to $his empty stomach and the other to $his exposed throat. As you thrust against $him, you force $him to choke down $milkTap.slaveName's dick, applying pressure to $his throat any time $he attempts to pull away.
<<elseif $PC.dick != 0 && hasBothLegs($activeSlave)>>
@@ -662,7 +640,6 @@ Next, you see to $activeSlave.slaveName.
Moving behind the struggling cocksleeve while teasing your erect cock, you find a distinct lack of ways to use $him to get off. <<if $PC.dick != 0>>You settle for rubbing your erection against $his back<<else>>You settle for a vibrating dildo stuck deep into your pussy<</if>>, you'll need both hands to fondle your toy. Once you are positioned, you reach around, bringing one hand to $his empty stomach and the other to $his exposed throat. As you masturbate, you force $him to choke down $milkTap.slaveName's dick, applying pressure to $his throat any time $he attempts to pull away.
<</if>>
<<if $activeSlave.inflation == 3>>You cum multiple times as you feel $his belly slowly round with cum, transform into a jiggling mass, and finally grow taut under your molesting fingers and the seemingly endless supply of ejaculate from $milkTap.slaveName<<elseif $activeSlave.inflation == 2>>You cum several times as you feel $his belly slowly round with cum, finally transforming into a jiggling mass, under your molesting fingers and the seemingly endless supply of ejaculate from $milkTap.slaveName<<else>>You cum as you feel $his belly slowly round with cum under your molesting fingers and the seemingly endless supply of ejaculate from $milkTap.slaveName<</if>>. Standing and releasing $him from $milkTap.slaveName, gives you a lovely sight of $activeSlave.slaveName's <<if $activeSlave.inflation == 3>>taut, round belly<<elseif $activeSlave.inflation == 2>>rounded, jiggling belly<<else>>distended, sloshing belly<</if>> quivering as $he comes down from $his own forced climax<<if $PC.dick != 0 && (canDoAnal($activeSlave) || canDoVaginal($activeSlave))>>, cum leaking from both ends<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
Both slaves @@.mediumorchid;resent@@ what you made them do and @@.gold;fear you@@ as a result.
<<set $activeSlave.devotion -= 5, $activeSlave.trust -= 5>>
<<set $milkTap.devotion -= 5, $milkTap.trust -= 5>>
diff --git a/src/pregmod/forceFeeding.tw b/src/pregmod/forceFeeding.tw
index b7520748f76..d5190f27f3a 100644
--- a/src/pregmod/forceFeeding.tw
+++ b/src/pregmod/forceFeeding.tw
@@ -459,33 +459,21 @@ and a little jiggle from $his gut.
<<else>>
stretched.
<</if>>
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
$He gives some nice resistance as you squeeze into $him.
<<else>>
You squeeze in without problem.
<</if>>
<<elseif _looseness > 1>>
it'll feel positively tight.
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
$His <<if _sexType == "vaginal">>pussy<<else>>anus<</if>> feels great, you practically had to squeeze in.
<<else>>
You squeeze in with a little effort.
<</if>>
<<else>>
you'll barely be able to fit it in.
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
$His <<if _sexType == "vaginal">>vagina<<else>>rear<</if>> is so tight you can barely get it in, but with a little work, you manage to squeeze into its tight confines. $He's tighter than any <<if _sexType == "anal">>anal<</if>> virgin you've ever fucked.
<<else>>
You have to
diff --git a/src/pregmod/managePersonalAffairs.tw b/src/pregmod/managePersonalAffairs.tw
index d29c8b666f0..63fde111f74 100644
--- a/src/pregmod/managePersonalAffairs.tw
+++ b/src/pregmod/managePersonalAffairs.tw
@@ -388,11 +388,7 @@ On formal occasions, you are announced as $PCTitle. By slaves, however, you pref
<</if>>
<</if>>
-<<<<<<< HEAD
-<<if $PC.vagina >= 1>>
-=======
<<if $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<br><br>
__Contraceptives and Fertility__
<br>
@@ -514,11 +510,7 @@ In total, you have given birth to:
<<if ($PC.preg > 0 && $pregnancyMonitoringUpgrade == 1)>>
<br>[[Inspect pregnancy|Analyze PC Pregnancy]]
<</if>>
-<<<<<<< HEAD
-<<if $PC.preg >= 0 && $PC.vagina >= 1>>
-=======
<<if $PC.preg >= 0 && $PC.ovaries == 1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<br>[[Harvest and implant an egg|Surrogacy Workaround][$donatrix = $PC, $impregnatrix = "Undecided", $receptrix = "Undecided", $nextLink = "Manage Personal Affairs"]]
<</if>>
diff --git a/src/pregmod/newChildIntro.tw b/src/pregmod/newChildIntro.tw
index 9ac8de60ca3..ee64f35880e 100644
--- a/src/pregmod/newChildIntro.tw
+++ b/src/pregmod/newChildIntro.tw
@@ -519,31 +519,19 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
<<if $incubatorReproductionSetting > 0>>
<<if (($activeSlave.attrXX > 50) || ($activeSlave.behavioralQuirk == "adores women")) && ($activeSlave.behavioralFlaw != "hates women") && ($activeSlave.trust >= -20)>>
-<<<<<<< HEAD
- <<if ($PC.boobs >= 1)>>
-=======
<<if ($PC.boobs >= 900)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
$He seems to think you're pretty, and is more willing to @@.hotpink;try for your approval@@ than $he would otherwise be. $He openly ogles your rack at every opportunity.
<<set $activeSlave.devotion += 4>>
<</if>>
<</if>>
<<if ($activeSlave.behavioralFlaw == "hates women") && ($activeSlave.devotion <= 50)>>
-<<<<<<< HEAD
- <<if ($PC.dick == 0) && ($PC.boobs >= 1)>>
-=======
<<if ($PC.dick == 0) && ($PC.boobs >= 500)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
$He obviously does not find you immediately attractive, and is @@.mediumorchid;less eager to conciliate you@@ than $he would otherwise be.
<<set $activeSlave.devotion -= 5>>
<</if>>
<</if>>
<<if (($activeSlave.attrXY > 50) || ($activeSlave.behavioralQuirk == "adores men")) && ($activeSlave.behavioralFlaw != "hates men") && ($activeSlave.trust >= -20)>>
-<<<<<<< HEAD
- <<if ($PC.dick >= 1) && ($PC.boobs == 0)>>
-=======
<<if ($PC.dick != 0) && ($PC.boobs < 300)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
$He seems to think you're handsome, and is more willing to @@.hotpink;try for your approval@@ than $he would otherwise be. $He ogles your crotch at every opportunity.
<<set $activeSlave.devotion += 4>>
<</if>>
@@ -701,11 +689,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
<</link>>
<<if $seePreg != 0>>
-<<<<<<< HEAD
- <<if isFertile($activeSlave) && $PC.dick >= 1>>
-=======
<<if isFertile($activeSlave) && $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<br><<link "Impregnate $him">>
<<replace "#result">>
<<if $activeSlave.readyOva > 0>>
@@ -755,11 +739,7 @@ You slowly strip down, gauging $his reactions to your show, until you are fully
<br><<link "Inseminate $him">>
<<replace "#result">>
-<<<<<<< HEAD
- You lay the curious $desc across your desk and gently <<if $PC.dick >= 1>>slide your hard cock<<else>>push a special strap-on<</if>> <<if $activeSlave.vagina >= 0>>inside $his womanhood<<else>>up $his butt<</if>>. You take $him with care, enjoying $his body and doing your best to give $him pleasure without hurting $his virgin hole. <<if $PC.dick >= 1>>You empty your balls inside $him, thrusting in as far as you can go<<else>>The strap-on contains a reservoir of faux ejaculate, and you give it to $him<</if>> as you climax. When $he feels the hot liquid jet into $him, $he moans lewdly and relaxes, giving in to the tank's teachings. $He might not be an impregnation fetishist, but $he is @@.hotpink;willing to submit@@ to have $his body used as your receptacle and may even grow to enjoy it.
-=======
You lay the curious $desc across your desk and gently <<if $PC.dick != 0>>slide your hard cock<<else>>push a special strap-on<</if>> <<if $activeSlave.vagina >= 0>>inside $his womanhood<<else>>up $his butt<</if>>. You take $him with care, enjoying $his body and doing your best to give $him pleasure without hurting $his virgin hole. <<if $PC.dick != 0>>You empty your balls inside $him, thrusting in as far as you can go<<else>>The strap-on contains a reservoir of faux ejaculate, and you give it to $him<</if>> as you climax. When $he feels the hot liquid jet into $him, $he moans lewdly and relaxes, giving in to the tank's teachings. $He might not be an impregnation fetishist, but $he is @@.hotpink;willing to submit@@ to have $his body used as your receptacle and may even grow to enjoy it.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.devotion += 4>>
<<if random(1,100) > 60 && $activeSlave.fetish == "none">>
<<set $activeSlave.fetish = "pregnancy">>
diff --git a/src/pregmod/ovaTransplantWorkaround.tw b/src/pregmod/ovaTransplantWorkaround.tw
index fd4f6518da6..ec57a965168 100644
--- a/src/pregmod/ovaTransplantWorkaround.tw
+++ b/src/pregmod/ovaTransplantWorkaround.tw
@@ -23,11 +23,7 @@ __Select a slave to serve as the host__
<br>//You have no slaves capable of acting as a surrogate.//
<</if>>
-<<<<<<< HEAD
-<<if $PC.vagina >= 1 && $donatrix.ID != -1 && $PC.preg >= 0 && $PC.preg < 4 && $PC.pregType < 8 && $PC.physicalAge < 70>>
-=======
<<if $PC.vagina != -1 && $donatrix.ID != -1 && $PC.preg >= 0 && $PC.preg < 4 && $PC.pregType < 8 && $PC.physicalAge < 70>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<br>
[[Use your own womb|Surrogacy][$receptrix = $PC, cashX(forceNeg($surgeryCost*2), "slaveSurgery"), $surgeryType = "transplant"]]
<</if>>
diff --git a/src/pregmod/pInsemination.tw b/src/pregmod/pInsemination.tw
index 07ec37999e9..7b0c2bbadce 100644
--- a/src/pregmod/pInsemination.tw
+++ b/src/pregmod/pInsemination.tw
@@ -68,12 +68,7 @@
<<case "futa">>
<<if $futaCount == 0>>
-<<<<<<< HEAD
- You arrive at the apartment of the rather assertive girl with both sets of functional genitals. She quickly pulls you into her bedroom, skillfully unwrapping her gift along the way, and tips you into her bed.<<if $PC.dick >= 1>> Straddling you with a lewd smile, she plucks the condom off your stiff prick. She helps you into a position where she can both fuck you, and be fucked by you, at once. Your body aches by the end of things, but your lover happily massages every sore spot you point out to her. She blows you a kiss as you head out the door.<<else>> Straddling you with a lewd smile, she penetrates deep into your pussy. Sex with her was quite fun (she managed to touch every place on your body that turns you on) though a little messy, noting the cum dripping from you as you make your exit.<</if>>
- <<set $futaCount++>>
-=======
You arrive at the apartment of the rather assertive girl with both sets of functional genitals. She quickly pulls you into her bedroom, skillfully unwrapping her gift along the way, and tips you into her bed.<<if $PC.dick != 0>> Straddling you with a lewd smile, she plucks the condom off your stiff prick. She helps you into a position where she can both fuck you, and be fucked by you, at once. Your body aches by the end of things, but your lover happily massages every sore spot you point out to her. She blows you a kiss as you head out the door.<<else>> Straddling you with a lewd smile, she penetrates deep into your pussy. Sex with her was quite fun (she managed to touch every place on your body that turns you on) though a little messy, noting the cum dripping from you as you make your exit.<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<elseif $futaCount == 1>>
You arrive once more at the apartment of the assertive girl with both sets of functional genitals. You immediately notice something off about her stance as she greets you and pulls you inside. As she guides you to her bed, you take note of the unusual bulge under her shapely asscheeks. Once she has you undressed and on her bed, she pauses and begins a seductive strip tease. She bends completely over as she reaches her bottoms, giving you a clear look at that bulge as she slips them off. Testicles; her balls are triple the size that your remember! She spins around, nearly slapping you with her raging erection, "You like 'em? I haven't gotten a chance to use them yet, so let's have some fun!" she says seductively. She wastes no time in setting you up doggystyle and plunging deep into your moist pussy. You gasp as her hefty balls slap against your thighs. She leans in close as she rails you, a hand sneaking around to your flat belly. You feel her cum, hard, into you, followed by an unusual sensation. She is literally filling you with cum! You gasp at the mounting pressure in your belly, now fully aware of what she was groping for. Turning to her, you find her a little disappointed; "I thought you'd get bigger..." She cups her balls and mumbles something to herself. "Well, at least my load seems to be staying in you this time, mostly," she says, motioning to the cum steadily dripping from your vagina. Taking such an impressive load was quite enjoyable, you think to yourself as you make your exit.
<<else>>
diff --git a/src/pregmod/personalNotes.tw b/src/pregmod/personalNotes.tw
index f947edb8a7d..07f94e3b6d4 100644
--- a/src/pregmod/personalNotes.tw
+++ b/src/pregmod/personalNotes.tw
@@ -7,44 +7,6 @@
<<PlayerBelly>>
<<PlayerCrotch>>
<<PlayerButt>>
-<<<<<<< HEAD
-<<if $PC.boobs >= 1 && $PC.boobsImplant == 0>>
- <<if $PC.preg == 31>>
- <<if $PC.boobsBonus == 2>>
- <<if random(1,100) > 90>>
- Your already huge breasts have @@.lime;grown even more enormous@@ with your new pregnancy. Quick measurements show you've gone up yet another a cup size over the course of your pregnancy.
- <<set $PC.boobsBonus++>>
- <</if>>
- <<elseif $PC.boobsBonus == 1>>
- <<if random(1,100) > 75>>
- Your already large breasts have @@.lime;grown even larger@@ with your new pregnancy. Quick measurements show you've gone up another cup size or so over the course of your pregnancy.
- <<set $PC.boobsBonus++>>
- <</if>>
- <<elseif $PC.boobsBonus == 0>>
- <<if random(1,100) > 75>>
- Your breasts have @@.lime;grown larger@@ to feed your coming child<<if $PC.pregType > 1>>ren<</if>>. Quick measurements show you've gone up a cup size over the course of your pregnancy.
- <<set $PC.boobsBonus++>>
- <</if>>
- <<elseif $PC.boobsBonus == -1>>
- <<if random(1,100) > 80>>
- Your breasts have @@.lime;grown a bit larger@@ to feed your coming child<<if $PC.pregType > 1>>ren<</if>>. Quick measurements show you've gone up nearly two cup sizes over the course of your pregnancy.
- <<set $PC.boobsBonus++>>
- <</if>>
- <<elseif $PC.boobsBonus == -2>>
- <<if random(1,100) > 80>>
- Your once small breasts have @@.lime;become very swollen@@ lately with your new pregnancy. Quick measurements show you've gone up a cup size over the course of your pregnancy.
- <<set $PC.boobsBonus++>>
- <</if>>
- <<elseif $PC.boobsBonus == -3>>
- <<if random(1,100) > 75>>
- Your once tiny breasts have @@.lime;become swollen@@ lately with your new pregnancy. Quick measurements show you've actually gone up a cup size over the course of your pregnancy.
- <<set $PC.boobsBonus++>>
- <</if>>
- <</if>>
- <</if>>
-<</if>>
-=======
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $PC.lactation > 0>>
<<if $PC.rules.lactation != "none" && $PC.rules.lactation != "induce">>
<<set $PC.lactationDuration = 2>>
diff --git a/src/pregmod/reMaleCitizenHookup.tw b/src/pregmod/reMaleCitizenHookup.tw
index c4c1435befd..6082f0d85ab 100644
--- a/src/pregmod/reMaleCitizenHookup.tw
+++ b/src/pregmod/reMaleCitizenHookup.tw
@@ -265,11 +265,7 @@ He's clearly attracted to you; even the most consummate actor would have difficu
that his whole body looks fresh, untouched, and quite young, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
<</if>>
<<case "Maturity Preferentialist">>
-<<<<<<< HEAD
- a mature body featuring an erection with years of experience. Before you can tip him onto your bed; he deftly slips you out of your evening dress, scoops you up and places you, back first, at the edge of your bed. He dominantly spears your pussy and begins thrusting, hitting all the right places. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly fucking you. You shift in discomfort at being dominated, and in response he <<if $PC.belly >= 5000>>begins massaging your rounded middle<<else>>groping your <<if $PC.boobsBonus > 0>>huge breasts<<elseif $PC.boobsBonus < 0>>cute breasts<<elseif $PC.boobs >= 1>>ample breasts<<else>>butt<</if>><</if>>, calming you and allowing you to give in to the pleasure. With a hard, firm thrust, he cums deep into your pussy. You follow shortly after, feeling the heat of his seed in your depths as you clamp down around his dick. Thankfully, despite his age, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
-=======
a mature body featuring an erection with years of experience. Before you can tip him onto your bed; he deftly slips you out of your evening dress, scoops you up and places you, back first, at the edge of your bed. He dominantly spears your pussy and begins thrusting, hitting all the right places. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly fucking you. You shift in discomfort at being dominated, and in response he <<if $PC.belly >= 5000>>begins massaging your rounded middle<<else>>groping your <<if $PC.boobs >= 1000>>huge breasts<<elseif $PC.boobs >= 650>>ample breasts<<elseif $PC.boobs >= 300>>cute breasts<<else>>butt<</if>><</if>>, calming you and allowing you to give in to the pleasure. With a hard, firm thrust, he cums deep into your pussy. You follow shortly after, feeling the heat of his seed in your depths as you clamp down around his dick. Thankfully, despite his age, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<case "Slimness Enthusiast">>
lean muscles, a smooth waist, trim hips and a cute little ass, and gently push him back onto your bed. You tease him as you remove your evening dress, crawl over him and impale yourself on his eager shaft before beginning to ride him. Even a female arcology owner like yourself appreciates a good hard fuck, since regular submission to a pounding from sex slaves would be a scandal. There's little opprobrium waiting for you if it's known he had you, though, and he is eagerly thrusting into your pussy. You shift into a slightly more comfortable position<<if $PC.belly >= 5000>> (one that forces him to bear the weight of your heavy middle) <</if>>and ride him to orgasm. You follow shortly after, feeling the heat of his seed in the depths of your pussy as it clamps down around his dick. Thankfully, he isn't spent yet and begins anew, quickly carrying your climax to a second orgasm and drawing an adorable moan out of you.
<<case "Asset Expansionist">>
diff --git a/src/pregmod/rePregInventor.tw b/src/pregmod/rePregInventor.tw
index aea22f77cb9..14d46943d33 100644
--- a/src/pregmod/rePregInventor.tw
+++ b/src/pregmod/rePregInventor.tw
@@ -141,21 +141,13 @@
<<EventNameDelink $activeSlave>>
<<replace "#result">>
Being so close to the near-bursting womb of your slave for so long has got your loins stirring, and you hop up onto your desk, bringing your
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
dick
<<else>>
vagina
<</if>>
level with the broodmother's mouth. You tell $him that you could be convinced to let $him explore $his interests. $He squeals in delight and
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
wraps $his
<<if ($activeSlave.lips > 95)>>
plush mouth pussy
@@ -325,11 +317,7 @@
<<set $activeSlave.counter.vaginal++, $vaginalTotal++>>
<br><br>
With gentle coaching from your slave, you rotate the two of you in the air so that $he can ride you reverse cowgirl style. <<= VCheck.Vaginal(2)>> You then switch $him around, allowing $his belly to eclipse your vision entirely as $he rides you in the traditional cowgirl position. The contents of $his womb have exploded its weight to the point that this position would have previously been hazardous to both your health and $hers, if not completely impossible, and the illusion of having sex while perpetually on the knife's edge of being flattened by literal tons of baby packed slave flesh sends you over the edge. You
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
ejaculate into $him, your cum dripping out of $his vagina, splattering on the ground below.
<<else>>
orgasm as you transition into scissoring with your tightly packed broodmare, keeping the fantasy of being crushed by $his body foremost in your mind.
@@ -455,11 +443,7 @@
<</if>>
<br><br>
It is only then that you realize that
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
your dick is as hard as a length of steel.
<<else>>
your kitty is positively drowning in fem-cum.
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index 056c17e6fd7..6c657bd2357 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -1092,11 +1092,7 @@
"I told you it wouldn't work, <<Master>>. Plu<<s>> you know you can touch the<<s>>e anytime!" $Concubine.slaveName shakes $his chest at you.
<</if>>
<<elseif $showEleven > 1>>
-<<<<<<< HEAD
- You could always order a crate to play around with. Who knows, maybe it'll actually work?<<if $PC.dick >= 1>> At the very least it should make for some decent lubricant for a titfuck.<</if>>
-=======
You could always order a crate to play around with. Who knows, maybe it'll actually work?<<if $PC.dick != 0>> At the very least it should make for some decent lubricant for a titfuck.<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<br>
<span id="called">
<<link "Place an order">>
@@ -1108,11 +1104,7 @@
<</link>> // This will cost <<print cashFormat(Math.trunc(50 * $upgradeMultiplierTrade))>> //
</span>
<<else>>
-<<<<<<< HEAD
- You could always order a crate to play around with. Who knows, maybe it'll actually work?<<if $PC.dick >= 1>> At the very least it should make for some decent lubricant for a titfuck.<</if>>
-=======
You could always order a crate to play around with. Who knows, maybe it'll actually work?<<if $PC.dick != 0>> At the very least it should make for some decent lubricant for a titfuck.<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $Concubine != 0>>
<<run Enunciate($Concubine)>>
<<setLocalPronouns $Concubine>>
diff --git a/src/pregmod/sePlayerBirth.tw b/src/pregmod/sePlayerBirth.tw
index 02a619ee83b..93589f69f18 100644
--- a/src/pregmod/sePlayerBirth.tw
+++ b/src/pregmod/sePlayerBirth.tw
@@ -141,11 +141,7 @@ While sitting at your desk planning your day, @@.lime;your water breaks,@@ thoro
<</if>>
<</if>>
<br><br>
-<<<<<<< HEAD
-You arrange yourself to give birth, relaxing until your body urges you to begin bearing down and pushing your child into the world.<<if _concubinePresent == 1>>$Concubine.slaveName settles in beside you, one hand soothing your contraction wracked middle and the other <<if $PC.dick >= 1>>stroking your hardening dick<<else>>teasing your stiffening clit<</if>>.<</if>>
-=======
You arrange yourself to give birth, relaxing until your body urges you to begin bearing down and pushing your child into the world.<<if _concubinePresent == 1>>$Concubine.slaveName settles in beside you, one hand soothing your contraction wracked middle and the other <<if $PC.dick != 0>>stroking your hardening dick<<else>>teasing your stiffening clit<</if>>.<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if _badBirth > random(1,100)>> /* shits going wrong */
<<if $Nurse != 0>>
<<setLocalPronouns $Nurse>>
diff --git a/src/pregmod/surrogacyWorkaround.tw b/src/pregmod/surrogacyWorkaround.tw
index 1bde9c65878..bd91bb8e4d8 100644
--- a/src/pregmod/surrogacyWorkaround.tw
+++ b/src/pregmod/surrogacyWorkaround.tw
@@ -57,11 +57,7 @@ __Semen donatrix: _impreg __
<</if>>
<</if>>
-<<<<<<< HEAD
-<<if $PC.dick >= 1>>
-=======
<<if $PC.balls != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<br>
[[Use your own|Surrogacy Workaround][$impregnatrix = $PC]]
<</if>>
@@ -85,11 +81,7 @@ __Chosen surrogate: _receive __
<br>//You have no slaves capable of acting as a surrogate.//
<</if>>
-<<<<<<< HEAD
-<<if $PC.vagina >= 1 && $PC.preg >= 0 && $PC.preg < 4 && $PC.pregType < 8 && $PC.physicalAge < 70>>
-=======
<<if $PC.vagina != -1 && $PC.preg >= 0 && $PC.preg < 4 && $PC.pregType < 8 && $PC.physicalAge < 70>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<br>
[[Use your own womb|Surrogacy Workaround][$receptrix = $PC]]
<</if>>
diff --git a/src/pregmod/widgets/playerDescriptionWidgets.tw b/src/pregmod/widgets/playerDescriptionWidgets.tw
index 3ac60778acb..a4cf53dc8f4 100644
--- a/src/pregmod/widgets/playerDescriptionWidgets.tw
+++ b/src/pregmod/widgets/playerDescriptionWidgets.tw
@@ -676,11 +676,7 @@
<<if _passage == "Manage Personal Affairs">>
you have
-<<<<<<< HEAD
- <<if $PC.dick >= 1 && $PC.vagina >= 1>>
-=======
<<if $PC.dick != 0 && $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
an @@.orange;above average penis@@
<<if $PC.balls >= 14>>
that is constantly streaming precum,
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index e39c0dd9d8a..c1c3b22db9f 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -371,11 +371,7 @@ This descriptions can be expanded with more outcomes later. But it's not practic
<<if $slaves[$i].curBabies[_seb].fatherID == 0>>
<<set _fathers.push("an unknown father")>>
<<elseif $slaves[$i].curBabies[_seb].fatherID == -1>>
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set _fathers.push("your magnificent dick")>>
<<else>>
<<set _fathers.push("your powerful sperm")>>
diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw
index 075a84de992..49b75ddf31a 100644
--- a/src/uncategorized/PETS.tw
+++ b/src/uncategorized/PETS.tw
@@ -220,11 +220,7 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
<<EventNameDelink $activeSlave>>
<<replace "#result">>
You announce your presence to $activeSlave.slaveName by groping $his <<if $subSlave.butt > 7>>absurd butt<<elseif $subSlave.butt > 3>>generous buttocks<<else>>cute behind<</if>>. $He jumps, startled, and emits a short scream of surprise that trails off into a moan of sexual anticipation as you continue to knead and massage $his $activeSlave.skin bottom. $He starts thrusting again, but carefully, so gently that $he doesn't need to stop for you to insert
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
your hard cock into $his
<<if canDoVaginal($activeSlave)>>
hot cunt.
@@ -235,11 +231,7 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
<<set $activeSlave.counter.anal += 1>>
<<set $analTotal += 1>>
<</if>>
-<<<<<<< HEAD
- <<if $PC.vagina >= 1>>Then you grab one of $his hands and pull it down under $him. $He gets the idea, and fingers your pussy while you fuck $him.<</if>>
-=======
<<if $PC.vagina != -1>>Then you grab one of $his hands and pull it down under $him. $He gets the idea, and fingers your pussy while you fuck $him.<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<else>>
a couple of fingers into $his
<<if canDoVaginal($activeSlave)>>
@@ -258,11 +250,7 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
This is far too much for $activeSlave.slaveName, and $he shakes with orgasm. $He isn't getting off that easily; you fuck $him slowly, letting $him ride aftershocks until $he bottoms out and $his arousal starts to build again. $He never stopped gently thrusting into the insensible $subSlave.slaveName, who is so thoroughly affected by the drugs that only _his2 unconscious bodily reactions offer any indication that _he2's getting fucked too.
<br><br>
When you finally finish with $activeSlave.slaveName and step away, allowing $him to step back in turn, $he looks at you with @@.mediumaquamarine;flirty confidence@@ and husks, "<<Master>>, that wa<<s>> really pervertedly good. Even by the <<s>>tandard<<s>> around here." You make no verbal reply, but give $him an open-handed swat across $his $activeSlave.skin buttocks as $he turns to clean up $his patient's asshole. $He squeaks with surprise a second time, so startled that
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
$his well-fucked
<<if canDoVaginal($activeSlave)>>
cunt
diff --git a/src/uncategorized/RECI.tw b/src/uncategorized/RECI.tw
index 9997f09e865..7d2552decff 100644
--- a/src/uncategorized/RECI.tw
+++ b/src/uncategorized/RECI.tw
@@ -393,11 +393,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
<</if>>
$Concubine.slaveName guides _his2 <<if !canPenetrate($Concubine)>>strap-on<<else>>cock<</if>> inside the <<if ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishKnown == 1)>>enthusiastic<<else>>compliant<</if>> $activeSlave.slaveName, who begins to ride it, enjoying both the <<if $activeSlave.prostate > 0>>prostate<<else>>anal<</if>> stimulation and the feeling of $his <<if $activeSlave.dick > 0>><<if ($activeSlave.hormoneBalance >= 100) || ($activeSlave.chastityPenis == 1)>>midsection trapped between $him and <<elseif ($activeSlave.hormoneBalance >= 100) || ($activeSlave.balls == 0) || ($activeSlave.ballType == "sterile")>>soft dick trapped between $him and <<else>>erection trapped between $him and <</if>><<else>>pussy pressed against<</if>> $Concubine.slaveName. $Concubine.slaveName smacks the humping <<if $activeSlave.physicalAge > 30>>$woman<<else>>$girl<</if>>'s butt to get $him to stop, and slides an index finger up $his ass alongside the <<if !canPenetrate($Concubine)>>phallus<<else>>cock<</if>>. $activeSlave.slaveName shudders, and then begins to whine as $Concubine.slaveName pulls $his sphincter wider.
<br><br>
-<<<<<<< HEAD
- "Plea<<s>>e," the slave begs incoherently as you press your <<if $PC.dick >= 1>>dick<<else>>strap-on<</if>> against $Concubine.slaveName's finger. It's not clear whether $he's begging you to DP $his anus, or begging you not to, but whichever it is, $Concubine.slaveName withdraws _his2 finger and you shove yourself inside. $activeSlave.slaveName jerks with discomfort and gives a gasping "Oh f-fuck-k" that <<if $activeSlave.anus > 2>>$he repeats over and over<<else>>is followed by some minor struggling<</if>> as you begin to fuck $him. From _his2 angle, $Concubine.slaveName can't pound $activeSlave.slaveName quite as hard as you can, but _he2 does _his2 best. When you've both had your fun, extracted yourselves, and let the exhausted, gaped bitch collapse onto the floor, $Concubine.slaveName gives you a naughty wink.
-=======
"Plea<<s>>e," the slave begs incoherently as you press your <<if $PC.dick != 0>>dick<<else>>strap-on<</if>> against $Concubine.slaveName's finger. It's not clear whether $he's begging you to DP $his anus, or begging you not to, but whichever it is, $Concubine.slaveName withdraws _his2 finger and you shove yourself inside. $activeSlave.slaveName jerks with discomfort and gives a gasping "Oh f-fuck-k" that <<if $activeSlave.anus > 2>>$he repeats over and over<<else>>is followed by some minor struggling<</if>> as you begin to fuck $him. From _his2 angle, $Concubine.slaveName can't pound $activeSlave.slaveName quite as hard as you can, but _he2 does _his2 best. When you've both had your fun, extracted yourselves, and let the exhausted, gaped bitch collapse onto the floor, $Concubine.slaveName gives you a naughty wink.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<run Enunciate($Concubine)>>
"@@.hotpink;That wa<<s>> fun,@@ <<Master>>!" _he2 <<say>>s. "<<Sh>>all we flip $him over and go again?"
<<run Enunciate($activeSlave)>>
@@ -415,15 +411,9 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
<<EventNameDelink $activeSlave>>
<<replace "#result">>
<<setSpokenPlayerPronouns $activeSlave>>
-<<<<<<< HEAD
- You head into the bathroom, shedding clothing as you go. $He stares at you as you advance, $his eyes fixing on your <<if $PC.boobs>>tits as you reveal them<<else>>ripped abs as they become visible<</if>>, and $his lips part slightly. $His gaze only shifts when you disrobe completely, revealing your <<if $PC.dick >= 1>>hardening dick<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>flushed womanhood<</if>>; $he licks $his lips unconsciously. You grab a towel off the counter, spread it on a bathroom bench, and recline on it with your back against the wall. You pat your <<if $PC.title == 1>>hard<<else>>pretty<</if>> thighs, and $he hurries over, <<if ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishKnown == 1)>>eagerly<<else>>carefully<</if>> swinging $his leg over the bench and seating $himself in your lap. <<if $PC.dick >= 1>>Your cock slides easily up $his whorish butt. One of your arms<<else>>You decided not to bother with a strap-on, so you slide a couple of fingers inside $him, and $he reciprocates by working a hand under $himself to attend to your pussy. Your free arm<</if>> wraps around<<if $activeSlave.boobs > 4000>> $him and under $his heavy tits, resting in a cocoon of soft breastflesh<<elseif $activeSlave.boobs > 800>> $his heavy breasts, hefting their weight and eliciting a sigh from the slave<<else>> $him to support $his chest<</if>>. Being held this way, $he can't really <<if $PC.dick >= 1>>bounce on your dick, so $he just wiggles $his butt into you to seat it a bit deeper<<else>>grind against your fingers<</if>> and sighs contentedly. You instruct $him to elaborate on what $he said earlier.
- <br><br>
- "Ye<<s>> <<Master>>," $he <<say>>s automatically, and then pauses. "Hmm. I try not to think about back, you know, before." $He squeezes $his buttocks against your <<if $PC.dick >= 1>>crotch<<else>>hand<</if>>. "But I gue<<ss>> back then I didn't really think about my butthole, much? Like, I went to the bathroom, and wa<<sh>>ed it in the <<sh>>ower, and that wa<<s>> it. But with the liquid <<s>>lave food, I don't — <<s>>orry, <<Master>>, I'm being <<s>>illy. You know all about that." You tell $him to explain it anyway. $He looks puzzled for a moment, but @@.mediumaquamarine;remembers $he can trust you,@@ and twists around to plant an awkward kiss on your chin before continuing. "Well," $he <<say>>s, with mock seriousness. "Here in the arcology, we <<s>>lave<<s>> eat a very <<s>>pe<<c>>ial liquid diet that keep<<s>> u<<s>> healthy and fit and ready to fuck. And, it'<<s>> ab<<s>>orbed completely, <<s>>o our butt<<s>> are alway<<s>> ni<<c>>e and clean. That way, <<Master>> can -" $he clenches $his sphincter <<if $PC.dick >= 1>>around the base of your cock — "fuck<<else>>against your invading fingers — "play with<</if>> our a<<ss>>e<<s>>" — clench — "whenever" — clench — "<<heP>>" — clench — "want<<s>>!" $He squeals as you use your encircling arm to hoist $his torso up a bit higher, and mercilessly <<if $PC.dick >= 1>>fuck<<else>>fingerfuck<</if>> $his ass. Many of your other slaves came and went during this, and none of them saw anything unusual about you molesting $activeSlave.slaveName's bottom in a corner of the restroom.
-=======
You head into the bathroom, shedding clothing as you go. $He stares at you as you advance, $his eyes fixing on your <<if $PC.boobs >= 300 >>tits as you reveal them<<else>>ripped abs as they become visible<</if>>, and $his lips part slightly. $His gaze only shifts when you disrobe completely, revealing your <<if $PC.dick != 0>>hardening dick<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>flushed womanhood<</if>>; $he licks $his lips unconsciously. You grab a towel off the counter, spread it on a bathroom bench, and recline on it with your back against the wall. You pat your <<if $PC.title == 1>>hard<<else>>pretty<</if>> thighs, and $he hurries over, <<if ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishKnown == 1)>>eagerly<<else>>carefully<</if>> swinging $his leg over the bench and seating $himself in your lap. <<if $PC.dick != 0>>Your cock slides easily up $his whorish butt. One of your arms<<else>>You decided not to bother with a strap-on, so you slide a couple of fingers inside $him, and $he reciprocates by working a hand under $himself to attend to your pussy. Your free arm<</if>> wraps around<<if $activeSlave.boobs > 4000>> $him and under $his heavy tits, resting in a cocoon of soft breastflesh<<elseif $activeSlave.boobs > 800>> $his heavy breasts, hefting their weight and eliciting a sigh from the slave<<else>> $him to support $his chest<</if>>. Being held this way, $he can't really <<if $PC.dick != 0>>bounce on your dick, so $he just wiggles $his butt into you to seat it a bit deeper<<else>>grind against your fingers<</if>> and sighs contentedly. You instruct $him to elaborate on what $he said earlier.
<br><br>
"Ye<<s>> <<Master>>," $he <<say>>s automatically, and then pauses. "Hmm. I try not to think about back, you know, before." $He squeezes $his buttocks against your <<if $PC.dick != 0>>crotch<<else>>hand<</if>>. "But I gue<<ss>> back then I didn't really think about my butthole, much? Like, I went to the bathroom, and wa<<sh>>ed it in the <<sh>>ower, and that wa<<s>> it. But with the liquid <<s>>lave food, I don't — <<s>>orry, <<Master>>, I'm being <<s>>illy. You know all about that." You tell $him to explain it anyway. $He looks puzzled for a moment, but @@.mediumaquamarine;remembers $he can trust you,@@ and twists around to plant an awkward kiss on your chin before continuing. "Well," $he <<say>>s, with mock seriousness. "Here in the arcology, we <<s>>lave<<s>> eat a very <<s>>pe<<c>>ial liquid diet that keep<<s>> u<<s>> healthy and fit and ready to fuck. And, it'<<s>> ab<<s>>orbed completely, <<s>>o our butt<<s>> are alway<<s>> ni<<c>>e and clean. That way, <<Master>> can -" $he clenches $his sphincter <<if $PC.dick != 0>>around the base of your cock — "fuck<<else>>against your invading fingers — "play with<</if>> our a<<ss>>e<<s>>" — clench — "whenever" — clench — "<<heP>>" — clench — "want<<s>>!" $He squeals as you use your encircling arm to hoist $his torso up a bit higher, and mercilessly <<if $PC.dick != 0>>fuck<<else>>fingerfuck<</if>> $his ass. Many of your other slaves came and went during this, and none of them saw anything unusual about you molesting $activeSlave.slaveName's bottom in a corner of the restroom.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.trust += 4>>
<</replace>>
<</link>>
@@ -431,15 +421,9 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
<br><<link "Change it some more">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- You tell $him that since $he appreciates how $his ass has changed, $he won't be surprised if you treat it like the fuckhole it is. Something in your tone makes $him cautious, but $he's a good $girl and says "Ye<<s>>, <<Master>>," automatically. You pass $assistantName wardrobe orders for the poor <<if $activeSlave.physicalAge > 30>>$woman<<else>>$girl<</if>>, and instructions to have $him report to your office once $he's dressed. A few minutes later, $activeSlave.slaveName walks up to your desk, stark naked except for a buttplug that comfortably fills $his rectum and a sturdy leather collar attached to a leash. You snap your fingers, pointing at the ground, and $he scrambles to $his hands and knees and removes $his plug. After $he's taken a harsh buttfuck, you <<if $PC.dick >= 1>>push the plug back in without letting any of your cum escape<<else>>plug $him up again<</if>> and attach the leash to your belt. You ignore your anal toy completely, letting $him kneel next to you as you work — $he doesn't seem to want to sit, for some reason. For the rest of the day, $his anus takes the full force of your libido. You fuck nothing else, confining your efforts to $his backdoor, keeping $him plugged when you aren't penetrating $him. When you're bored, you hand $him a dildo and tell $him to take care of it $himself.
- <br><br>
- $He's quite exhausted by the end of the day, walking dumbly along behind you, leashed to your belt and wondering tiredly when $his next reaming is coming. $He doesn't notice that you're bringing $him back to stand in front of the mirror until $he's there. You push $his compliant body into an approximation of $his position from the morning and tell $him to remove $his plug and look at $his asshole. "Ye<<s>> <<Master>>," $he <<says>>, and obeys.<<if $PC.dick >= 1>> This releases quite a rush of ejaculate.<</if>> $His anus is @@.lime;very loose,@@ a lewd, gaping fuckhole hungry for toys, fingers, and dick. You tell $him that, and ask whether $he agrees. @@.hotpink;"Ye<<s>> <<Master>>," $he <<say>>s.@@
-=======
You tell $him that since $he appreciates how $his ass has changed, $he won't be surprised if you treat it like the fuckhole it is. Something in your tone makes $him cautious, but $he's a good $girl and says "Ye<<s>>, <<Master>>," automatically. You pass $assistantName wardrobe orders for the poor <<if $activeSlave.physicalAge > 30>>$woman<<else>>$girl<</if>>, and instructions to have $him report to your office once $he's dressed. A few minutes later, $activeSlave.slaveName walks up to your desk, stark naked except for a buttplug that comfortably fills $his rectum and a sturdy leather collar attached to a leash. You snap your fingers, pointing at the ground, and $he scrambles <<if hasAllLimbs($activeSlave)>>to $his hands and knees<<else>>downwards<</if>> and removes $his plug. After $he's taken a harsh buttfuck, you <<if $PC.dick != 0>>push the plug back in without letting any of your cum escape<<else>>plug $him up again<</if>> and attach the leash to your belt. You ignore your anal toy completely, letting $him kneel next to you as you work — $he doesn't seem to want to sit, for some reason. For the rest of the day, $his anus takes the full force of your libido. You fuck nothing else, confining your efforts to $his backdoor, keeping $him plugged when you aren't penetrating $him. When you're bored, you hand $him a dildo and tell $him to take care of it $himself.
<br><br>
$He's quite exhausted by the end of the day, walking dumbly along behind you, leashed to your belt and wondering tiredly when $his next reaming is coming. $He doesn't notice that you're bringing $him back to stand in front of the mirror until $he's there. You push $his compliant body into an approximation of $his position from the morning and tell $him to remove $his plug and look at $his asshole. "Ye<<s>> <<Master>>," $he <<says>>, and obeys.<<if $PC.dick != 0>> This releases quite a rush of ejaculate.<</if>> $His anus is @@.lime;very loose,@@ a lewd, gaping fuckhole hungry for toys, fingers, and dick. You tell $him that, and ask whether $he agrees. @@.hotpink;"Ye<<s>> <<Master>>," $he <<say>>s.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.devotion += 4>>
<<set $activeSlave.anus = 3>>
<</replace>>
diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw
index 6c9a585231a..7f4ea68037a 100644
--- a/src/uncategorized/REFI.tw
+++ b/src/uncategorized/REFI.tw
@@ -815,11 +815,7 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
/* TODO: not sure what to do here */
<<if canDoAnal($activeSlave)>>
<<if $activeSlave.anus == 0>>
-<<<<<<< HEAD
- $He hasn't recovered before $he feels the still more urgent pain of <<if $PC.dick >= 1>>your dick brutally @@.lime;taking $his anal virginity@@<<else>>an enormous dildo @@.lime;stealing $his anal virginity@@<</if>>, followed by rough anal,
-=======
$He hasn't recovered before $he feels the still more urgent pain of <<if $PC.dick != 0>>your dick brutally @@.lime;taking $his anal virginity@@<<else>>an enormous dildo @@.lime;stealing $his anal virginity@@<</if>>, followed by rough anal,
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.anus = 1>>
<<else>>
$He hasn't recovered before $he feels the still more urgent pain of rough anal,
@@ -827,17 +823,10 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
<<= VCheck.Anal()>>
<<elseif canDoVaginal($activeSlave)>>
<<if $activeSlave.vagina == 0>>
-<<<<<<< HEAD
- $He hasn't recovered before $he feels the still more urgent pain of <<if $PC.dick >= 1>>your dick brutally @@.lime;stripping $him of $his virginity@@<<else>>an enormous dildo @@.lime;stealing $his virginity@@<</if>>, followed by rough sex,
- <<set $activeSlave.vagina = 1>>
- <<else>>
- $He hasn't recovered before $he feels the still more urgent pain of <<if $PC.dick >= 1>>your dick<<else>>an enormous dildo<</if>> slamming against $his cervix,
-=======
$He hasn't recovered before $he feels the still more urgent pain of <<if $PC.dick != 0>>your dick brutally @@.lime;stripping $him of $his virginity@@<<else>>an enormous dildo @@.lime;stealing $his virginity@@<</if>>, followed by rough sex,
<<set $activeSlave.vagina = 1>>
<<else>>
$He hasn't recovered before $he feels the still more urgent pain of <<if $PC.dick != 0>>your dick<<else>>an enormous dildo<</if>> slamming against $his cervix,
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</if>>
<<= VCheck.Vaginal()>>
<<else>>
@@ -848,11 +837,7 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
<<case "ball gag" "bit gag">>
you unhook $his gag before
<</switch>>
-<<<<<<< HEAD
- the still more urgent pain of <<if $PC.dick >= 1>>your dick getting shoved as deep down $his throat as you can<<else>>an enormous dildo forcing $his jaw wide and working its way down $his throat<</if>>,
-=======
the still more urgent pain of <<if $PC.dick != 0>>your dick getting shoved as deep down $his throat as you can<<else>>an enormous dildo forcing $his jaw wide and working its way down $his throat<</if>>,
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.counter.oral++, $oralTotal++>>
<</if>>
which is then overlaid by rough spanking, nipple pinching, and
@@ -967,11 +952,7 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
As $he writhes in agony, you tell $him to get used to it. $He's a pain slut now, second thoughts or not.
<<if canDoAnal($activeSlave)>>
<<if $activeSlave.anus == 0>>
-<<<<<<< HEAD
- $He hasn't recovered before $he feels the still more urgent pain of <<if $PC.dick >= 1>>your dick brutally @@.lime;taking $his anal virginity@@<<else>>an enormous dildo @@.lime;stealing $his anal virginity@@<</if>>, followed by rough anal,
-=======
$He hasn't recovered before $he feels the still more urgent pain of <<if $PC.dick != 0>>your dick brutally @@.lime;taking $his anal virginity@@<<else>>an enormous dildo @@.lime;stealing $his anal virginity@@<</if>>, followed by rough anal,
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.anus = 1>>
<<else>>
$He hasn't recovered before $he feels the still more urgent pain of rough anal,
@@ -1090,11 +1071,7 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
<<else>>
"Plea<<s>>e knock me up, <<Master>>!"
<</if>>
-<<<<<<< HEAD
- You shove $him over the desk, rub <<if $PC.dick >= 1>>your hard dick<<else>>a squirt dildo<</if>>
-=======
You shove $him over the desk, rub <<if $PC.dick != 0>>your hard dick<<else>>a squirt dildo<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.mpreg == 1>>
<<if canDoAnal($activeSlave)>>
around $his asspussy,
@@ -1111,22 +1088,14 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
and ask if $he wants you to impregnate $him. $He's almost beside $himself, shuddering at the titillation, but before $he can answer,
<<if $activeSlave.mpreg == 1>>
<<if canDoAnal($activeSlave) && $activeSlave.anus > 0>>
-<<<<<<< HEAD
- you slide <<if $PC.dick == 0>>a strap-on<<else>>your cock<</if>> into $his rear and give $him a pounding that leaves $him begging for what's to come. <<if $PC.dick >= 1>>When you start to feel you climax approaching<<else>>Once you've thoroughly enjoyed yourself<</if>>, you tell $him that pregnancy is a very special reward for very good slaves, and you might give it to $him one day — but that $he doesn't deserve it yet. With that, you slide out of $his ass and paint $his back with <<if $PC.dick >= 1>>your cum<<else>>a few squirts from the dildo<</if>>.
-=======
you slide <<if $PC.dick == 0>>a strap-on<<else>>your cock<</if>> into $his rear and give $him a pounding that leaves $him begging for what's to come. <<if $PC.dick != 0>>When you start to feel you climax approaching<<else>>Once you've thoroughly enjoyed yourself<</if>>, you tell $him that pregnancy is a very special reward for very good slaves, and you might give it to $him one day — but that $he doesn't deserve it yet. With that, you slide out of $his ass and paint $his back with <<if $PC.dick != 0>>your cum<<else>>a few squirts from the dildo<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<= VCheck.Anal()>>
<<else>>
you tell $him that pregnancy is a very special reward for very good slaves, and you might give it to $him one day — but that $he doesn't deserve it yet. With that, you run your hands across the quivering slave's belly; pantomiming it swelling with child and sending $him over the edge.
<</if>>
<<else>>
<<if canDoVaginal($activeSlave) && $activeSlave.vagina > 0>>
-<<<<<<< HEAD
- you slide <<if $PC.dick == 0>>a strap-on<<else>>your cock<</if>> into $his vagina and give $him a pounding that leaves $him begging for what's to come. <<if $PC.dick >= 1>>When you start to feel you climax approaching<<else>>Once you've thoroughly enjoyed yourself<</if>>, you tell $him that pregnancy is a very special reward for very good slaves, and you might give it to $him one day — but that $he doesn't deserve it yet. With that, you slide out of $his pussy and paint the quivering slave's belly with <<if $PC.dick >= 1>>your cum<<else>>a few squirts from the dildo<</if>>.
-=======
you slide <<if $PC.dick == 0>>a strap-on<<else>>your cock<</if>> into $his vagina and give $him a pounding that leaves $him begging for what's to come. <<if $PC.dick != 0>>When you start to feel you climax approaching<<else>>Once you've thoroughly enjoyed yourself<</if>>, you tell $him that pregnancy is a very special reward for very good slaves, and you might give it to $him one day — but that $he doesn't deserve it yet. With that, you slide out of $his pussy and paint the quivering slave's belly with <<if $PC.dick != 0>>your cum<<else>>a few squirts from the dildo<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<= VCheck.Vaginal()>>
<<else>>
you tell $him that pregnancy is a very special reward for very good slaves, and you might give it to $him one day — but that $he doesn't deserve it yet. With that, you run your hands across the quivering slave's belly; pantomiming it swelling with child and sending $him over the edge.
@@ -1188,22 +1157,14 @@ There was a glint of envy <<if canSee($activeSlave)>>in $his eyes when $he saw<<
<</if>>
<<if $activeSlave.mpreg == 1>>
<<if canDoAnal($activeSlave) && $activeSlave.anus > 0>>
-<<<<<<< HEAD
- slide your <<if $PC.dick == 0>>strap-on<<else>>cock<</if>> into $his rear. You lean in to run your hands across the quivering slave's belly as you focus on breeding the already fecund bitch. <<if $PC.dick >= 1>>When you start to feel you climax approaching<<else>>Once you've thoroughly enjoyed yourself<</if>>, you tell $him that pregnancy is a very special reward for very good slaves, and if $he keeps being a good $girl you'll be sure to keep $him swollen with child. With that, you hilt yourself and <<if $PC.dick >= 1>>flood $his rectum with your cum<<else>>repeatedly pump bursts of cum out of your toy into $his bowels<</if>>.
-=======
slide your <<if $PC.dick == 0>>strap-on<<else>>cock<</if>> into $his rear. You lean in to run your hands across the quivering slave's belly as you focus on breeding the already fecund bitch. <<if $PC.dick != 0>>When you start to feel you climax approaching<<else>>Once you've thoroughly enjoyed yourself<</if>>, you tell $him that pregnancy is a very special reward for very good slaves, and if $he keeps being a good $girl you'll be sure to keep $him swollen with child. With that, you hilt yourself and <<if $PC.dick != 0>>flood $his rectum with your cum<<else>>repeatedly pump bursts of cum out of your toy into $his bowels<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<= VCheck.Anal()>>
<<else>>
you tell $him that pregnancy is a very special reward for very good slaves, and if $he keeps being a good $girl you'll be sure to keep $him swollen with child. With that, you run your hands across the quivering slave's _belly belly, pantomiming it swelling to an obscene size with children and sending $him over the edge.
<</if>>
<<else>>
<<if canDoVaginal($activeSlave) && $activeSlave.vagina > 0>>
-<<<<<<< HEAD
- slide your <<if $PC.dick == 0>>strap-on<<else>>cock<</if>> into $his pussy. You lean in to run your hands across the quivering slave's belly as you focus on breeding the already fecund bitch. <<if $PC.dick >= 1>>When you start to feel you climax approaching<<else>>Once you've thoroughly enjoyed yourself<</if>>, you tell $him that pregnancy is a very special reward for very good slaves, and if $he keeps being a good $girl you'll be sure to keep $him swollen with child. With that, you hilt yourself and <<if $PC.dick >= 1>>flood $his cunt with your cum<<else>>repeatedly pump bursts of cum into $him until it flows out around your toy<</if>>.
-=======
slide your <<if $PC.dick == 0>>strap-on<<else>>cock<</if>> into $his pussy. You lean in to run your hands across the quivering slave's belly as you focus on breeding the already fecund bitch. <<if $PC.dick != 0>>When you start to feel you climax approaching<<else>>Once you've thoroughly enjoyed yourself<</if>>, you tell $him that pregnancy is a very special reward for very good slaves, and if $he keeps being a good $girl you'll be sure to keep $him swollen with child. With that, you hilt yourself and <<if $PC.dick != 0>>flood $his cunt with your cum<<else>>repeatedly pump bursts of cum into $him until it flows out around your toy<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<= VCheck.Vaginal()>>
<<else>>
you tell $him that pregnancy is a very special reward for very good slaves, and if $he keeps being a good $girl you'll be sure to keep $him swollen with child. With that, you run your hands across the quivering slave's _belly belly, pantomiming it swelling to an obscene size with children and sending $him over the edge.
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 5c893053b92..bdb18de01be 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -2381,15 +2381,6 @@ You complete the final rep of your first workout of the day, rack the bar, and j
heavily pregnant middle and the last remnants of your abs with almost painful intensity. You can't really blame $him; you're the perfect image of a mother-to-be and your heavy belly is coated in a thin sheen of sweat.
<<elseif $PC.belly >= 5000>>
greatly swollen middle and its stretched abdominal muscles with almost painful intensity. You can't really blame $him; despite how big you've gotten, you still have some abs left.
-<<<<<<< HEAD
-<<elseif $PC.boobsBonus > 2>>
- sports bra clad boobs with almost painful intensity. You can't really blame $him; the bra's three sizes too small, forcing your enormous <<if $PC.boobsImplant == 1>>fake breasts to balloon around the strained material<<else>>breasts to lewdly bulge around the strained material<</if>>, soaked in your sweat<<if $PC.lactation > 0>>and breast milk<</if>>, and your nipples are clearly defined through the stretched thin fabric.
-<<elseif $PC.boobsBonus == 2>>
- sports bra clad boobs with almost painful intensity. You can't really blame $him; the bra's two sizes too small, allowing your huge <<if $PC.boobsImplant == 1>>fake <</if>>breasts to lewdly bulge out of them, soaked in your sweat<<if $PC.lactation > 0>>and breast milk<</if>>, and your nipples are clearly visible as bumps in the strained material.
-<<elseif $PC.boobsBonus == 1>>
- sports bra clad boobs with almost painful intensity. You can't really blame $him; the bra's one size too small, allowing your big <<if $PC.boobsImplant == 1>>fake <</if>>breasts to bulge out of them, soaked in your sweat<<if $PC.lactation > 0>>and breast milk<</if>>, and your nipples are clearly visible as bumps in the taut material.
-<<elseif $PC.boobs >= 1>>
-=======
<<elseif $PC.boobs >= 1400>>
sports bra clad boobs with almost painful intensity. You can't really blame $him; the bra's three sizes too small, forcing your enormous <<if $PC.boobsImplant > 0>>fake breasts to balloon around the strained material<<else>>breasts to lewdly bulge around the strained material<</if>>, soaked in your sweat<<if $PC.lactation > 0>>and breast milk<</if>>, and your nipples are clearly defined through the stretched thin fabric.
<<elseif $PC.boobs >= 1200>>
@@ -2397,7 +2388,6 @@ You complete the final rep of your first workout of the day, rack the bar, and j
<<elseif $PC.boobs >= 1000>>
sports bra clad boobs with almost painful intensity. You can't really blame $him; the bra's one size too small, allowing your big <<if $PC.boobsImplant > 0>>fake <</if>>breasts to bulge out of them, soaked in your sweat<<if $PC.lactation > 0>>and breast milk<</if>>, and your nipples are clearly visible as bumps in the taut material.
<<elseif $PC.boobs >= 300>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
sports bra clad boobs with almost painful intensity. You can't really blame $him; the bra's soaked in your sweat<<if $PC.lactation > 0>>and breast milk<</if>> and your nipples are clearly visible as bumps in the tight material.
<<elseif $PC.belly >= 1500>>
swollen middle and its abdominal muscles with almost painful intensity. You can't really blame $him; despite your growing child<<if $PC.pregType > 1>>ren<</if>>, they're still pretty cut.
@@ -3225,11 +3215,7 @@ $He turns to you as you enter, and <<if canSee($activeSlave)>>seeing<<else>>real
a pair of enormous <<if $PC.boobsImplant > 0>>air bags<<else>>pillowlike breasts<</if>> and a hugely pregnant belly,
<<elseif $PC.belly >= 10000>>
a hugely pregnant middle,
-<<<<<<< HEAD
-<<elseif $PC.boobs >= 1>>
-=======
<<elseif $PC.boobs >= 300>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
a pair of <<if $PC.boobsImplant == 0>>soft<<else>>firm<</if>> breasts,
<<elseif $PC.title == 0>>
a flat chest,
@@ -4709,11 +4695,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<set $activeSlave.trust += 5>>
<</replace>>
<</link>>
-<<<<<<< HEAD
-<<if ($PC.dick >= 1) && ($activeSlave.eggType == "human")>>
-=======
<<if ($PC.dick != 0) && ($activeSlave.eggType == "human")>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<br><<link "Demonstrate what this means">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
@@ -5344,11 +5326,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<if $activeSlave.vagina == -2>>
<br><<link "Surgically alter $his gender">>
<<replace "#result2">>
-<<<<<<< HEAD
- You ask $him if $he enjoyed the last time $he used $his dick and if it was worth crossing you, because it will not happen again. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a shemale@@ and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving $him against the wall and forcing your <<if $PC.dick >= 1>>dick<<else>>strap-on<</if>> into $his virgin pussy. You use $him until you are satisfied and toss $him to the floor to think about $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@
-=======
You ask $him if $he enjoyed the last time $he used $his dick and if it was worth crossing you, because it will not happen again. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a shemale@@ and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving $him against the wall and forcing your <<if $PC.dick != 0>>dick<<else>>strap-on<</if>> into $his virgin pussy. You use $him until you are satisfied and toss $him to the floor to think about $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.trust -= 30, $activeSlave.devotion -= 25, $activeSlave.health -= 20, $activeSlave.dick = 0, $activeSlave.balls = 0, $activeSlave.scrotum = 0, $activeSlave.prostate = 0, $activeSlave.dickAccessory = "none", $activeSlave.vagina = 1, $activeSlave.chastityPenis = 0>>
<<= VCheck.Vaginal()>>
<<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 15; } })>>
@@ -5367,11 +5345,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<</if>>
<br><<link "Deny $him from ever having satisfying sex again">>
<<replace "#result2">>
-<<<<<<< HEAD
- You ask $him if $he enjoyed $his last orgasm, because $he won't be getting any more. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a surgical null,@@ though $he retains $his balls, and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving $him against the wall and forcing your <<if $PC.dick >= 1>>dick<<else>>strap-on<</if>> into $his anus. As $his arousal grows, $he realizes you not only took $his dick, but $his prostate as well. $He quickly finds $himself desperate for release but lacking any way to do so. You watch $him squirm in sexual frustration. This will be $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@
-=======
You ask $him if $he enjoyed $his last orgasm, because $he won't be getting any more. Restrained as $he is, the most $he can do is cry and beg. Once $he comes to after the surgery, $he faces $his new body; @@.mediumorchid;$he's now a surgical null,@@ though $he retains $his balls, and $he's @@.gold;the only one to blame@@ for $his @@.red;suffering.@@ You waste no time in shoving $him against the wall and forcing your <<if $PC.dick != 0>>dick<<else>>strap-on<</if>> into $his anus. As $his arousal grows, $he realizes you not only took $his dick, but $his prostate as well. $He quickly finds $himself desperate for release but lacking any way to do so. You watch $him squirm in sexual frustration. This will be $his new life. Every other rebellious slave is @@.gold;horrified by the example.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.trust -= 50, $activeSlave.devotion -= 30, $activeSlave.health -= 20, $activeSlave.dick = 0, $activeSlave.prostate = 0, $activeSlave.dickAccessory = "none", $activeSlave.chastityPenis = 0, $activeSlave.vagina = 0, $activeSlave.ovaries = 0, $activeSlave.clit = 0, $activeSlave.labia = 0, $activeSlave.vaginalAccessory = "none", $activeSlave.vaginalAttachment = "none", $activeSlave.chastityVagina = 0>>
<<= VCheck.Anal()>>
<<set $slaves.forEach(function(s) { if (s.devotion < -50) { s.trust -= 15; } })>>
@@ -6227,11 +6201,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<if $activeSlave.anus > 0>>
<br><<link "Fuck $him">>
<<replace "#result2">>
-<<<<<<< HEAD
- You gently push $his shoulders forward. $He moans as the forward lean stretches $his hip flexors, and then breathes deeply with relief as you pull $his legs back and out of their crossed position. The rush of a completed stretch crashes into $him, and $he relaxes completely. This change of position leaves $him with $his <<if $activeSlave.butt > 6>>massive ass<<elseif $activeSlave.butt > 3>>big butt<<else>>rear<</if>> pointed right at you, and $he knows what's coming next. $His <<if $activeSlave.anus > 2>>loose butthole relaxes completely into a gape that positively begs to be penetrated<<elseif $activeSlave.anus > 1>>relaxed anus opens into a slight gape that positively begs to be penetrated<<else>>tight anus relaxes slightly, $his rosebud begging to be fucked<</if>>. You rise partway to kneel behind $him, <<if $PC.dick == 0>>sliding fingers inside the slave's ass and humping your pussy against the heel of that hand<<else>>using a hand to guide your member inside the slave's ass<<if $PC.vagina >= 1>>, not without teasing your own pussylips a bit<</if>><</if>>. $He gasps when your other hand grabs one of $his shoulders and continues the massage. You quickly find that working out a knot in $his muscles produces reflexive reactions across $his whole body, notably including $his anal sphincter. After you've driven $him into a state of @@.hotpink;mindless satiation@@ and climaxed yourself, you let $him slump to the floor and curl up around $his sweaty body.
-=======
You gently push $his shoulders forward. $He moans as the forward lean stretches $his hip flexors, and then breathes deeply with relief as you pull $his legs back and out of their crossed position. The rush of a completed stretch crashes into $him, and $he relaxes completely. This change of position leaves $him with $his <<if $activeSlave.butt > 6>>massive ass<<elseif $activeSlave.butt > 3>>big butt<<else>>rear<</if>> pointed right at you, and $he knows what's coming next. $His <<if $activeSlave.anus > 2>>loose butthole relaxes completely into a gape that positively begs to be penetrated<<elseif $activeSlave.anus > 1>>relaxed anus opens into a slight gape that positively begs to be penetrated<<else>>tight anus relaxes slightly, $his rosebud begging to be fucked<</if>>. You rise partway to kneel behind $him, <<if $PC.dick == 0>>sliding fingers inside the slave's ass and humping your pussy against the heel of that hand<<else>>using a hand to guide your member inside the slave's ass<<if $PC.vagina != -1>>, not without teasing your own pussylips a bit<</if>><</if>>. $He gasps when your other hand grabs one of $his shoulders and continues the massage. You quickly find that working out a knot in $his muscles produces reflexive reactions across $his whole body, notably including $his anal sphincter. After you've driven $him into a state of @@.hotpink;mindless satiation@@ and climaxed yourself, you let $him slump to the floor and curl up around $his sweaty body.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.devotion += 2>>
<<= VCheck.Anal()>>
<</replace>>
@@ -6349,11 +6319,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
and <<say>>ing "Oh" over and over again.
<</if>>
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>$He clenches against your dick,<<if $PC.vagina >= 1>> so hard that you can feel the rush of blood into your cunt,<</if>><<else>>$He works your pussy harder,<</if>> getting you off in turn, and then rolls over to plant a whole-hearted kiss on your lips.
-=======
<<if $PC.dick != 0>>$He clenches against your dick,<<if $PC.vagina != -1>> so hard that you can feel the rush of blood into your cunt,<</if>><<else>>$He works your pussy harder,<</if>> getting you off in turn, and then rolls over to plant a whole-hearted kiss on your lips.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.devotion += 4>>
<<if _didAnal == 1>>
<<= VCheck.Anal()>>
@@ -6365,11 +6331,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<br><<link "Spend the day in bed">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- What's the point of becoming a wealthy tycoon in an anarcho-libertarian paradise if you have to obey the rules all the time? You tell $assistantName to cancel the appointment. Then, you wake your bedmate, and <<if $PC.dick >= 1>>get a blowjob<<if $PC.vagina >= 1>> and some attention for your pussy<</if>><<else>>have $him eat you out<</if>> under the sheet while you enjoy the lurid sunrise through the glass wall of your bedroom. When the sun is up and you've <<if $PC.dick >= 1>>shot your load down $his throat<<else>>climaxed twice<</if>>, you pull the bemused $girl up alongside you again, bring the sheets up over you both, switch on a wallscreen, and ask $him if there's anything $he'd like to <<if canSee($activeSlave)>>watch<<elseif canHear($activeSlave)>>listen to<<else>>put on<</if>>. $He smiles incredulously, but after you encourage $him $he @@.mediumaquamarine;finds $his confidence@@ and admits that there's a Free Cities serial drama about slave life that $he enjoys. You put it on and watch three episodes with $him. It's terribly insipid, but there's a lot of explicit sex to liven things up, and all the actresses are nice enough to look at. $activeSlave.slaveName cuddles comfortably with you the entire time, <<if canSee($activeSlave)>>watching raptly<<elseif canHear($activeSlave)>>listening intently<<else>>staying as silent as possible<</if>> and doing $his best to explain the wretchedly trite plot you've missed.
-=======
What's the point of becoming a wealthy tycoon in an anarcho-libertarian paradise if you have to obey the rules all the time? You tell $assistantName to cancel the appointment. Then, you wake your bedmate, and <<if $PC.dick != 0>>get a blowjob<<if $PC.vagina != -1>> and some attention for your pussy<</if>><<else>>have $him eat you out<</if>> under the sheet while you enjoy the lurid sunrise through the glass wall of your bedroom. When the sun is up and you've <<if $PC.dick != 0>>shot your load down $his throat<<else>>climaxed twice<</if>>, you pull the bemused $girl up alongside you again, bring the sheets up over you both, switch on a wallscreen, and ask $him if there's anything $he'd like to <<if canSee($activeSlave)>>watch<<elseif canHear($activeSlave)>>listen to<<else>>put on<</if>>. $He smiles incredulously, but after you encourage $him $he @@.mediumaquamarine;finds $his confidence@@ and admits that there's a Free Cities serial drama about slave life that $he enjoys. You put it on and watch three episodes with $him. It's terribly insipid, but there's a lot of explicit sex to liven things up, and all the actresses are nice enough to look at. $activeSlave.slaveName cuddles comfortably with you the entire time, <<if canSee($activeSlave)>>watching raptly<<elseif canHear($activeSlave)>>listening intently<<else>>staying as silent as possible<</if>> and doing $his best to explain the wretchedly trite plot you've missed.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.counter.oral++, $oralTotal++>>
You have a meal delivered,
<<if $activeSlave.vagina > 0 && canDoVaginal($activeSlave)>>
@@ -6397,11 +6359,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<link "Ask $him if $he needs help with $his tan">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- You ask $him if $he needs help with $his tan. $He looks momentarily confused, but then $he catches <<if canSee($activeSlave)>>the gleam in your eye <<if $PC.dick >= 1>>and notices your stiffening member<<else>>and the flush on your cheeks<</if>><<else>>on to the swing of things<</if>>. "Ooh," $he <<say>>s cheekily,
-=======
You ask $him if $he needs help with $his tan. $He looks momentarily confused, but then $he catches <<if canSee($activeSlave)>>the gleam in your eye <<if $PC.dick != 0>>and notices your stiffening member<<else>>and the flush on your cheeks<</if>><<else>>on to the swing of things<</if>>. "Ooh," $he <<say>>s cheekily,
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if ($activeSlave.fetish == "submissive") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
"my back i<<s>> getting <<s>>unburnt! Plea<<s>>e, <<Master>>, help me!" $He rolls over and lies still, sighing with submissive relaxation as you <<if $activeSlave.belly >= 5000>>climb atop <<else>>settle against<</if>>$his warm back and take $him.
<<if canDoVaginal($activeSlave)>>
@@ -6410,11 +6368,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<set _didAnal = 1>>
<</if>>
<<elseif ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
-<<<<<<< HEAD
- "my fa<<c>>e is getting <<s>>unburnt! Plea<<s>>e, <<Master>>, help me! I need <<s>>omewhere to hide it!" $He scrambles hungrily for your crotch, nuzzling you, licking you, and <<if $PC.dick >= 1>>sucking your dick<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>eating you out<</if>>.
-=======
"my fa<<c>>e is getting <<s>>unburnt! Plea<<s>>e, <<Master>>, help me! I need <<s>>omewhere to hide it!" $He scrambles hungrily for your crotch, nuzzling you, licking you, and <<if $PC.dick != 0>>sucking your dick<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>eating you out<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.counter.oral++, $oralTotal++>>
<<elseif ($activeSlave.fetish == "humiliation") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
"I'm getting <<s>>unburnt! I had better go in<<s>>ide. But <<Master>> everyone in there will <<s>>ee me naked!" $He looks at you in mock horror, and giggles with building lust as you pull $his sun-warmed body inside the arcology and into an open space for a good thorough public fucking.
@@ -6424,21 +6378,12 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<set _didAnal = 1>>
<</if>>
<<elseif ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
-<<<<<<< HEAD
- "my butt i<<s>> getting <<s>>unburnt! Plea<<s>>e, <<Master>>, help me!" $He spins to point $his rear end at the sun, hikes it up to present $his asshole to the light, and begins to wink it lewdly, begging you to save $his anus from a sunburn. $He giggles happily as $he feels <<if $PC.dick >= 1>>your cockhead<<else>>a strap-on<</if>> penetrate $his asshole, and starts to shove $himself back against you as hard as you're shoving it into $him.
- <<set _didAnal = 1>>
- <<elseif ($activeSlave.fetish == "boobs") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
- "my boob<<s>> are getting <<s>>unburnt! Plea<<s>>e, <<Master>>, help me!" $He wiggles $his torso around to make $himself bounce enticingly, and then giggles happily as you
- <<if $PC.dick >= 1>>
- get on top of $him and slide yourself <<if $activeSlave.nipples != "fuckable">>between $his lotion-slick tits<<if $PC.vagina >= 1>>, occasionally riding up to slide $his hard nipples between your pussylips<</if>><<else>>all the way into a fuckable tit and attending to the other with your fingers<</if>>.
-=======
"my butt i<<s>> getting <<s>>unburnt! Plea<<s>>e, <<Master>>, help me!" $He spins to point $his rear end at the sun, hikes it up to present $his asshole to the light, and begins to wink it lewdly, begging you to save $his anus from a sunburn. $He giggles happily as $he feels <<if $PC.dick != 0>>your cockhead<<else>>a strap-on<</if>> penetrate $his asshole, and starts to shove $himself back against you as hard as you're shoving it into $him.
<<set _didAnal = 1>>
<<elseif ($activeSlave.fetish == "boobs") && ($activeSlave.fetishKnown == 1) && ($activeSlave.fetishStrength > 60)>>
"my boob<<s>> are getting <<s>>unburnt! Plea<<s>>e, <<Master>>, help me!" $He wiggles $his torso around to make $himself bounce enticingly, and then giggles happily as you
<<if $PC.dick != 0>>
get on top of $him and slide yourself <<if $activeSlave.nipples != "fuckable">>between $his lotion-slick tits<<if $PC.vagina != -1>>, occasionally riding up to slide $his hard nipples between your pussylips<</if>><<else>>all the way into a fuckable tit and attending to the other with your fingers<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<else>>
begin to <<if $activeSlave.nipples != "fuckable">>play with<<else>>finger<</if>> $his nipples.
<</if>>
@@ -6764,11 +6709,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<run repX(250, "event", $activeSlave)>>
<<set _didAnal = 1>>
<<elseif ($activeSlave.fetish == "boobs")>>
-<<<<<<< HEAD
- You push $him down to $his knees and <<if $PC.dick >= 1>>press your cock between $his tits<<else>>ride $his breasts<</if>>. $He pays no attention to the @@.green;mildly appreciative@@ stares from passersby, enjoying the feeling of your <<if $PC.dick >= 1>>dick pounding $his <<if $activeSlave.nipples != "fuckable">>cleavage<<else>>breast<</if>><<else>>cunt rubbing against one of $his <<if $activeSlave.nipples != "fuckable">>hard<<else>>engorged<</if>> nipples<</if>>.
-=======
You push $him down to $his knees and <<if $PC.dick != 0>>press your cock between $his tits<<else>>ride $his breasts<</if>>. $He pays no attention to the @@.green;mildly appreciative@@ stares from passersby, enjoying the feeling of your <<if $PC.dick != 0>>dick pounding $his <<if $activeSlave.nipples != "fuckable">>cleavage<<else>>breast<</if>><<else>>cunt rubbing against one of $his <<if $activeSlave.nipples != "fuckable">>hard<<else>>engorged<</if>> nipples<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<run repX(250, "event", $activeSlave)>>
<<set $activeSlave.counter.mammary++, $mammaryTotal++>>
<<elseif ($activeSlave.fetish == "pregnancy")>>
@@ -7317,11 +7258,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
$his lower back.
<</if>>
-<<<<<<< HEAD
- $He automatically begins to rub $himself up and down to stimulate you; once $he feels you reach <<if $PC.dick == 0>>full arousal<<else>>rock hardness<<if $PC.vagina >= 1>> and total wetness<</if>><</if>> $he
-=======
$He automatically begins to rub $himself up and down to stimulate you; once $he feels you reach <<if $PC.dick == 0>>full arousal<<else>>rock hardness<<if $PC.vagina != -1>> and total wetness<</if>><</if>> $he
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.height >= 170>>
leans into the rail, bending over it just slightly to offer $his pussy at just the right height
<<else>>
@@ -7441,11 +7378,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
direct $him to lay on $his side on your desk<<if $activeSlave.belly >= 300000>> with $his _belly belly hanging over the edge<</if>>,
<</if>>
-<<<<<<< HEAD
- but is surprised and reassured when $he's penetrated not by a <<if $PC.dick == 0>>strap-on<<else>>turgid<<if $PC.vagina >= 1>> futa<</if>> cock<</if>> but by a single gentle finger coated with something healing and cool. The mixed analgesic and anti-inflammatory takes the sharpness off the sore feeling, and will help get $his butt back into fucking shape. @@.mediumaquamarine;$He has become more accepting of anal slavery,@@ and @@.green;$his asshole feels better.@@
-=======
but is surprised and reassured when $he's penetrated not by a <<if $PC.dick == 0>>strap-on<<else>>turgid<<if $PC.vagina != -1>> futa<</if>> cock<</if>> but by a single gentle finger coated with something healing and cool. The mixed analgesic and anti-inflammatory takes the sharpness off the sore feeling, and will help get $his butt back into fucking shape. @@.mediumaquamarine;$He has become more accepting of anal slavery,@@ and @@.green;$his asshole feels better.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if ($activeSlave.anus > 2)>>Your expert care has @@.orange;allowed $his loose asspussy to recover a little of its natural shape and size.@@<<set $activeSlave.anus -= 1>><</if>>
<<set $activeSlave.trust += 4, $activeSlave.minorInjury = 0>>
<</replace>>
@@ -7529,11 +7462,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
muscular chest pressing
<</if>>
-<<<<<<< HEAD
- against $his back, and shudders when your <<if $PC.dick == 0>>strap-on<<else>>stiff prick<</if>> comes to rest between $his legs<<if $PC.vagina >= 1>><<if $PC.dick >= 1>>, the moist heat of your pussy very obvious at the base of your cock<</if>><</if>>. You bring $him to a fine point of arousal, enjoying $his body, pulling $his $activeSlave.skin chin around to kiss $his
-=======
against $his back, and shudders when your <<if $PC.dick == 0>>strap-on<<else>>stiff prick<</if>> comes to rest between $his legs<<if $PC.vagina != -1>><<if $PC.dick != 0>>, the moist heat of your pussy very obvious at the base of your cock<</if>><</if>>. You bring $him to a fine point of arousal, enjoying $his body, pulling $his $activeSlave.skin chin around to kiss $his
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.lips > 60>>
bimbo
<<elseif $activeSlave.lips > 40>>
@@ -7844,17 +7773,10 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<</if>>
<<else>>
You squirm as you feel $him slip $his big dick into your tight rear, the sensation making you quiver with pleasure and a little pain. $He gives you a chance to get used to $his size before continuing.
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>Your erection firmly <<if $PC.belly >= 10000>>pushes into the underside of your belly<<else>>sticks out from under you<</if>>, overstimulated from $his cock teasing your prostate.<</if>>
- <</if>>
- <<elseif $activeSlave.dick == 5>>
- <<if $PC.vagina >= 1>>
-=======
<<if $PC.dick != 0>>Your erection firmly <<if $PC.belly >= 10000>>pushes into the underside of your belly<<else>>sticks out from under you<</if>>, overstimulated from $his cock teasing your prostate.<</if>>
<</if>>
<<elseif $activeSlave.dick == 5>>
<<if $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $PC.newVag == 1>>
You shudder with delight as $his impressive dick stretches you perfectly.
<<elseif $PC.career == "escort">>
@@ -8807,11 +8729,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<setLocalPronouns $HeadGirl 2>>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- When $HeadGirl.slaveName comes into your office in response to your summons, _he2 finds $activeSlave.slaveName sitting in your lap with your <<if $PC.dick == 0>>strap-on<<else>>dick<</if>> up $his gaping butt<<if $PC.vagina >= 1>><<if $PC.dick >= 1>>, your bare pussy very visible at the base of your working cock<</if>><</if>>. $HeadGirl.slaveName's expression softens when _he2 realizes _he2's here for pleasure, not business. $activeSlave.slaveName gasps a little when $he <<if canHear($activeSlave)>>hears you tell $HeadGirl.slaveName to join you up $his asshole,<<else>>feels you pull apart $his asscheeks to make some room for $HeadGirl.slaveName,<</if>> but $he doesn't protest.
-=======
When $HeadGirl.slaveName comes into your office in response to your summons, _he2 finds $activeSlave.slaveName sitting in your lap with your <<if $PC.dick == 0>>strap-on<<else>>dick<</if>> up $his gaping butt<<if $PC.vagina != -1>><<if $PC.dick != 0>>, your bare pussy very visible at the base of your working cock<</if>><</if>>. $HeadGirl.slaveName's expression softens when _he2 realizes _he2's here for pleasure, not business. $activeSlave.slaveName gasps a little when $he <<if canHear($activeSlave)>>hears you tell $HeadGirl.slaveName to join you up $his asshole,<<else>>feels you pull apart $his asscheeks to make some room for $HeadGirl.slaveName,<</if>> but $he doesn't protest.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if ($activeSlave.chastityPenis == 1)>>
Since your poor Head Girl can't use _his2 caged cock, _he2 takes a dildo and shoves it up $activeSlave.slaveName's already-filled butt without further ado.
<<elseif canAchieveErection() && $HeadGirl.dick > 7>>
@@ -9561,20 +9479,12 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
against your legs, and nuzzles $his warm nose and wet tongue against
<<if $PC.balls >= 9>>
your oversized nuts.
-<<<<<<< HEAD
- <<elseif $PC.vagina >= 1>>
-=======
<<elseif $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
your moist folds.
<<else>>
your ballsack.
<</if>>
-<<<<<<< HEAD
- You run a languid hand through $his hair, but soon relax into a pleasant, tired fugue, letting yourself enjoy $his ministrations. You almost drift off under the slow oral loving, but a sudden coolness against you brings you partially awake again: $he's taken $his mouth off you, leaving the night air against your saliva-wetted <<if $PC.vagina >= 1>>pussylips<<else>>cock<</if>>. $He quickly realizes the error, and applies $himself diligently to you, never letting the warm feeling die down again. You orgasm twice, which $he absorbs without stopping, looking up at you with an expression that's unidentifiable in the gloom. But when you finally reach down and give $his <<if ($activeSlave.belly >= 10000)>>_belly <<if $activeSlave.bellyPreg >= 3000>>pregnant <</if>>belly a light pat<<else>>shoulder a little tug<</if>> to let $him know that's enough, $he @@.mediumaquamarine;cuddles up close to you@@ without hesitation.
-=======
You run a languid hand through $his hair, but soon relax into a pleasant, tired fugue, letting yourself enjoy $his ministrations. You almost drift off under the slow oral loving, but a sudden coolness against you brings you partially awake again: $he's taken $his mouth off you, leaving the night air against your saliva-wetted <<if $PC.vagina != -1>>pussylips<<else>>cock<</if>>. $He quickly realizes the error, and applies $himself diligently to you, never letting the warm feeling die down again. You orgasm twice, which $he absorbs without stopping, looking up at you with an expression that's unidentifiable in the gloom. But when you finally reach down and give $his <<if ($activeSlave.belly >= 10000)>>_belly <<if $activeSlave.bellyPreg >= 3000>>pregnant <</if>>belly a light pat<<else>>shoulder a little tug<</if>> to let $him know that's enough, $he @@.mediumaquamarine;cuddles up close to you@@ without hesitation.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.trust += 4, $activeSlave.counter.oral++, $oralTotal++>>
<</replace>>
<</link>>
@@ -9747,19 +9657,11 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<</replace>>
<</link>><<if ($activeSlave.anus == 0 && canDoAnal($activeSlave)) || ($activeSlave.vagina == 0 && canDoVaginal($activeSlave))>> //This option will take $his virginity//<</if>>
<</if>>
-<<<<<<< HEAD
-<<if ($PC.dick >= 1)>>
- <br><<link "The only dick $he should suck is $his <<= WrittenMaster()>>'s">>
- <<EventNameDelink $activeSlave>>
- <<replace "#result">>
- $He's so occupied that $he doesn't <<if canHear($activeSlave)>>hear<<else>>notice<</if>> you until you seize $his hair and pull $his head back. $His massive dickhead pops free of $his mouth and $he squeaks in surprise. The noise is cut off by a gag as you ram yourself down $his throat. $He plays with your <<if $PC.vagina >= 1>>cunt<<else>>balls<</if>> as you facefuck $him and jacks off with $his other hand. $He was so close when you intruded that $he cums long before you do. There's a lot of cum in the shower when you're through. <<if $activeSlave.balls == 3>>$His huge balls made an especially major contribution. <</if>>@@.hotpink;$He has become more submissive to you.@@
-=======
<<if ($PC.dick != 0)>>
<br><<link "The only dick $he should suck is $his <<= WrittenMaster()>>'s">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
$He's so occupied that $he doesn't <<if canHear($activeSlave)>>hear<<else>>notice<</if>> you until you seize $his hair and pull $his head back. $His massive dickhead pops free of $his mouth and $he squeaks in surprise. The noise is cut off by a gag as you ram yourself down $his throat. $He plays with your <<if $PC.vagina != -1>>cunt<<else>>balls<</if>> as you facefuck $him and jacks off with $his other hand. $He was so close when you intruded that $he cums long before you do. There's a lot of cum in the shower when you're through. <<if $activeSlave.balls == 3>>$His huge balls made an especially major contribution. <</if>>@@.hotpink;$He has become more submissive to you.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.devotion += 4, $activeSlave.counter.oral++, $oralTotal++>>
<</replace>>
<</link>>
@@ -9964,15 +9866,9 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
You finger fuck $him for a while, the sting of the soap on $his sensitive insides making $him gasp.
<</if>>
As $he moans down on the shower floor, you lie down behind $him, spooning $his helpless body<<if $activeSlave.belly >= 5000>>, your hands encircling $his _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>middle<</if>><</if>>.
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
- Your cock slides into $him with ease
- <<elseif $PC.boobs >= 1>>
-=======
<<if $PC.dick != 0>>
Your cock slides into $him with ease
<<elseif $PC.boobs >= 300>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
$His soft back is delicious against your hard nipples
<<else>>
The contours of $his soft rear feel lovely against your feminine petals
@@ -9992,11 +9888,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
$his loosened vagina
<<set _didVaginal = 1>>
<</if>>
-<<<<<<< HEAD
- <<if $PC.vagina >= 1>> and make $him eat your pussy for a quick aftershock,<</if>>
-=======
<<if $PC.vagina != -1>> and make $him eat your pussy for a quick aftershock,<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</if>>
and only then do you help $him back to $his feet. $He drips soap, water, and <<if $PC.dick == 0>>your juices<<else>>ejaculate<</if>>. @@.hotpink;$He has become more submissive.@@
<<if _didVaginal == 1 && _didAnal == 1>>
@@ -10008,11 +9900,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<</if>>
<<set $activeSlave.devotion += 4>>
<</replace>>
-<<<<<<< HEAD
- <</link>><<if $PC.dick >= 1 && (($activeSlave.anus == 0 && canDoAnal($activeSlave)) || ($activeSlave.vagina == 0 && canDoVaginal($activeSlave)))>> //This option will take $his virginity//<</if>>
-=======
<</link>><<if $PC.dick != 0 && (($activeSlave.anus == 0 && canDoAnal($activeSlave)) || ($activeSlave.vagina == 0 && canDoVaginal($activeSlave)))>> //This option will take $his virginity//<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</if>>
<br><<link "Let $him struggle">>
<<EventNameDelink $activeSlave>>
@@ -10742,11 +10630,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<set $activeSlave.fetishKnown = 1, $activeSlave.fetishStrength = 65, $activeSlave.fetish = "submissive">>
<</if>>
<<set $activeSlave.trust -= 5, $activeSlave.anus = 1, $activeSlave.counter.anal++, $analTotal++>>
-<<<<<<< HEAD
- <<if $PC.dick >= 1 && $activeSlave.eggType == "human" && isFertile($activeSlave) && $activeSlave.preg == 0>>
-=======
<<if $PC.dick != 0 && $activeSlave.eggType == "human" && isFertile($activeSlave) && $activeSlave.preg == 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<= knockMeUp($activeSlave, 25, 1, -1)>>
<</if>>
<</replace>>
@@ -10797,11 +10681,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
gentle anal sex
<</if>>
-<<<<<<< HEAD
- for the rest of the night<<if $PC.vagina >= 1>><<if $PC.dick >= 1>>; whenever you go soft for a moment, all $he has to do is eat you out, and you're rock hard again<</if>><</if>>. As you move from position to position<<if $activeSlave.belly >= 5000>>, and exploring several unusual ones thanks to $his _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>><</if>>, $he twists to face you whenever $he can. When $he manages it, $he kisses you when $he can reach your lips, and $he <<if canSee($activeSlave)>>stares deeply into your eyes<<else>>meets your face with $his own<</if>> when $he cannot. $His trust in you @@.mediumaquamarine;has increased.@@
-=======
for the rest of the night<<if $PC.vagina != -1>><<if $PC.dick != 0>>; whenever you go soft for a moment, all $he has to do is eat you out, and you're rock hard again<</if>><</if>>. As you move from position to position<<if $activeSlave.belly >= 5000>>, and exploring several unusual ones thanks to $his _belly <<if $activeSlave.bellyPreg >= 3000>>pregnancy<<else>>belly<</if>><</if>>, $he twists to face you whenever $he can. When $he manages it, $he kisses you when $he can reach your lips, and $he <<if canSee($activeSlave)>>stares deeply into your eyes<<else>>meets your face with $his own<</if>> when $he cannot. $His trust in you @@.mediumaquamarine;has increased.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.trust += 4>>
<<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>>
<<= VCheck.Both()>>
@@ -11434,25 +11314,15 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<br><<link "Use $his cage to torture $him">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- You make no reply at all, but walk around to stand behind the slave. $He knows $he's fucked, and starts to shake with fear. You put a foot on $his ass and shove $him down<<if $activeSlave.belly >= 5000>> so $his rear is pointed into the air again<<else>> to lie flat on the floor<</if>>, and then straddle $him, shoving <<if $PC.dick >= 1>>your<<if $PC.vagina >= 1>> futa<</if>> cock up $his butt<<else>>one more finger than $he can comfortably take up $his butt<</if>>. $He tries to beg some more, but you give $him a warning slap, and $he shuts up. Despite your roughness, $he's so horny that $he starts to get hard. You can't see or feel this directly, of course, but it's easy to tell from $his desperate sobbing and involuntary writhing, and the lovely spasming of $his anal sphincter. $His tears dry up as $he builds towards a climax; orgasm might be an uncomfortable experience for $him, but it will buy $him a few minutes free of discomfort.
- <br><br>
- But $he's to be disappointed. You <<if $PC.dick >= 1>>worm a hand down between $his ass and your stomach, and shove a finger up inside $him, alongside your dick<<if $PC.vagina >= 1>>, dexterously using the thumb of that hand to stroke your own pussy<</if>><<else>>use the hand that isn't fucking $him to pull one of $his arms around behind $him into a painful joint lock<</if>>. The pain ruins $his building orgasm, and $he cries with frustration and @@.gold;despair@@ as $he realizes that $he won't be getting off today. You force $him to experience this horrible near-release twice more, bringing $him to a terribly uncomfortable state of arousal and then using sudden pain to destroy any chance $he has of getting relief. All the wriggling and jerking around is good for you, though.
-=======
You make no reply at all, but walk around to stand behind the slave. $He knows $he's fucked, and starts to shake with fear. You put a foot on $his ass and shove $him down<<if $activeSlave.belly >= 5000>> so $his rear is pointed into the air again<<else>> to lie flat on the floor<</if>>, and then straddle $him, shoving <<if $PC.dick != 0>>your<<if $PC.vagina != -1>> futa<</if>> cock up $his butt<<else>>one more finger than $he can comfortably take up $his butt<</if>>. $He tries to beg some more, but you give $him a warning slap, and $he shuts up. Despite your roughness, $he's so horny that $he starts to get hard. You can't see or feel this directly, of course, but it's easy to tell from $his desperate sobbing and involuntary writhing, and the lovely spasming of $his anal sphincter. $His tears dry up as $he builds towards a climax; orgasm might be an uncomfortable experience for $him, but it will buy $him a few minutes free of discomfort.
<br><br>
But $he's to be disappointed. You <<if $PC.dick != 0>>worm a hand down between $his ass and your stomach, and shove a finger up inside $him, alongside your dick<<if $PC.vagina != -1>>, dexterously using the thumb of that hand to stroke your own pussy<</if>><<else>>use the hand that isn't fucking $him to pull one of $his arms around behind $him into a painful joint lock<</if>>. The pain ruins $his building orgasm, and $he cries with frustration and @@.gold;despair@@ as $he realizes that $he won't be getting off today. You force $him to experience this horrible near-release twice more, bringing $him to a terribly uncomfortable state of arousal and then using sudden pain to destroy any chance $he has of getting relief. All the wriggling and jerking around is good for you, though.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.trust -= 4>>
<<= VCheck.Anal()>>
<</replace>>
<</link>><<if ($activeSlave.anus == 0)>> //This option will take $his anal virginity//<</if>>
<</if>>
-<<<<<<< HEAD
-<<if ((($activeSlave.fetish == "pregnancy" && $PC.belly >= 5000) || ($activeSlave.fetish == "cumslut" && $PC.balls > 2) || ($activeSlave.fetish == "boobs" && $PC.boobsBonus >= 3)) && $activeSlave.fetishKnown == 1) || ((($activeSlave.attrXX > 70 && $activeSlave.attrXY < 50 && $PC.title == 0 && $PC.vagina >= 1 && $PC.dick == 0) || ($activeSlave.attrXY > 70 && $activeSlave.attrXX < 50 && $PC.title == 1 && $PC.vagina == 0 && $PC.dick >= 1)) && $activeSlave.attrKnown == 1)>>
-=======
<<if ((($activeSlave.fetish == "pregnancy" && $PC.belly >= 5000) || ($activeSlave.fetish == "cumslut" && $PC.balls >= 14) || ($activeSlave.fetish == "boobs" && $PC.boobs >= 1400)) && $activeSlave.fetishKnown == 1) || ((($activeSlave.attrXX > 70 && $activeSlave.attrXY < 50 && $PC.title == 0 && $PC.vagina != -1 && $PC.dick == 0) || ($activeSlave.attrXY > 70 && $activeSlave.attrXX < 50 && $PC.title == 1 && $PC.vagina == 0 && $PC.dick != 0)) && $activeSlave.attrKnown == 1)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<br><<link "Use your body to make $his cage feel even tighter">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
@@ -11499,11 +11369,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
$He questions what you mean until you grab $his head and push $his face against your enormous<<if $PC.boobsImplant != 0>> fake<</if>> breasts. $He tries to recoil, bringing $his hand<<if hasBothArms($activeSlave)>>s<</if>> to your breasts. You continue burying $his face in your rack as $he begins to grope you. $He groans at the sensation, $his dick rapidly hardening at the feel of your lovely tits. You make sure to play off $his boob fetish in every way possible until the aroused slave is in tears from the pressure on $his cock.
<</if>>
-<<<<<<< HEAD
- <<elseif ($activeSlave.attrXX > 70 && $activeSlave.attrXY < 50 && $PC.title == 0 && $PC.vagina >= 1 && $PC.dick == 0)>>
-=======
<<elseif ($activeSlave.attrXX > 70 && $activeSlave.attrXY < 50 && $PC.title == 0 && $PC.vagina != -1 && $PC.dick == 0)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if canSee($activeSlave)>>
$He questions what you mean until you begin your strip tease. $He groans at the sight, $his dick rapidly hardening at the view of your tits and pussy. You know just how arousing $he finds the female form, and you play off that until the aroused slave is in tears from the pressure on $his cock.
<<else>>
@@ -11616,11 +11482,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
After some continued whining through $his tears, $he gives up and just @@.gold;lets you@@ rape $his sore vagina.
<<= VCheck.Vaginal()>>
<</if>>
-<<<<<<< HEAD
- When you finally <<if ($PC.dick >= 1)>>fill $his <<if canDoAnal($activeSlave)>>butt<<else>>pussy<</if>> with your ejaculate and pull out,<<if $PC.vagina >= 1>> the motion releasing a waft of the combined cum and pussyjuice smell of a satisfied futa,<</if>><<else>>shudder with orgasm and withdraw your strap-on,<</if>> $he slumps and turns to go, looking a bit sad for some reason.
-=======
When you finally <<if ($PC.dick != 0)>>fill $his <<if canDoAnal($activeSlave)>>butt<<else>>pussy<</if>> with your ejaculate and pull out,<<if $PC.vagina != -1>> the motion releasing a waft of the combined cum and pussyjuice smell of a satisfied futa,<</if>><<else>>shudder with orgasm and withdraw your strap-on,<</if>> $he slumps and turns to go, looking a bit sad for some reason.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.trust += 4>>
<</replace>>
<</link>>
@@ -11633,11 +11495,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
$He manages to beg, "Plea<<s>>e no, <<Master>> —"
<</if>>
-<<<<<<< HEAD
- before you give $him a hard warning slap on the ass to shut $him up. $He's quiet, but starts to sob a little when $he feels <<if $PC.dick == 0>>the head of a strap-on<<else>>an invading<<if $PC.vagina >= 1>> futa<</if>> cockhead<</if>> against $his
-=======
before you give $him a hard warning slap on the ass to shut $him up. $He's quiet, but starts to sob a little when $he feels <<if $PC.dick == 0>>the head of a strap-on<<else>>an invading<<if $PC.vagina != -1>> futa<</if>> cockhead<</if>> against $his
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if canDoAnal($activeSlave)>>
anus.
<<if ($activeSlave.anus > 2)>>
@@ -11845,15 +11703,6 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
mouth is right at the edge of the desk. You give it a good fuck and then
<<set $activeSlave.counter.oral += 3, $oralTotal += 3>>
<</if>>
-<<<<<<< HEAD
- order $him brusquely to clean up and come right back. You use $him as a nice little desktop <<if $PC.dick >= 1>>cockholster<<else>>sex toy<</if>> for the rest of the day.
- <<case "cumslut">>
- get under your desk and <<if $PC.dick >= 1>>suck a dick<<if $PC.vagina >= 1>> and eat a pussy<</if>><<else>>eat pussy<</if>> while you work.
- <<if $activeSlave.belly >= 120000>>
- As $his _belly belly bumps into you, you sigh and swivel your chair to the side; there is no way $he'll fit under there in $his bloated state.
- <</if>>
- $He's so horny that $he's barely got <<if $PC.dick >= 1>>your cock into $his mouth<<else>>$his lips and tongue on your cunt<</if>> before $he climaxes spontaneously, shivering and moaning nicely. You keep $him down there for a while, doing light work and orgasming occasionally as $he gently <<if $PC.dick >= 1>>blows you<<if $PC.vagina >= 1>> and eats you out<</if>><<else>>lavishes attention on your wet vagina<</if>>.
-=======
order $him brusquely to clean up and come right back. You use $him as a nice little desktop <<if $PC.dick != 0>>cockholster<<else>>sex toy<</if>> for the rest of the day.
<<case "cumslut">>
get under your desk and <<if $PC.dick != 0>>suck a dick<<if $PC.vagina != -1>> and eat a pussy<</if>><<else>>eat pussy<</if>> while you work.
@@ -11861,7 +11710,6 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
As $his _belly belly bumps into you, you sigh and swivel your chair to the side; there is no way $he'll fit under there in $his bloated state.
<</if>>
$He's so horny that $he's barely got <<if $PC.dick != 0>>your cock into $his mouth<<else>>$his lips and tongue on your cunt<</if>> before $he climaxes spontaneously, shivering and moaning nicely. You keep $him down there for a while, doing light work and orgasming occasionally as $he gently <<if $PC.dick != 0>>blows you<<if $PC.vagina != -1>> and eats you out<</if>><<else>>lavishes attention on your wet vagina<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.counter.oral += 3, $oralTotal += 3>>
<<case "humiliation">>
run an unimportant message to a citizen across $arcologies[0].name. Naked. $He blushes with mixed embarrassment and anticipation. $He's so pent up that before taking ten steps out of your penthouse entryway and towards $his objective, the open stares $his naked, horny body is getting push $him over the edge.
@@ -11892,11 +11740,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<case "buttslut">>
sit on your lap.
<<if canDoAnal($activeSlave)>>
-<<<<<<< HEAD
- $He climaxes the instant your <<if $PC.dick >= 1>>dickhead<<else>>strap-on<</if>> touches $his <<if $activeSlave.anus > 2>>anal gape<<else>>pucker<</if>>, but $he knows this is just the start, and $he laughs with pleasure as $his <<if $activeSlave.anus > 2>>lewd sphincter loosely squeezes<<else>>sphincter tightens against<</if>> the base of <<if $PC.dick >= 1>>your cock<<else>>the strap-on<</if>>. You
-=======
$He climaxes the instant your <<if $PC.dick != 0>>dickhead<<else>>strap-on<</if>> touches $his <<if $activeSlave.anus > 2>>anal gape<<else>>pucker<</if>>, but $he knows this is just the start, and $he laughs with pleasure as $his <<if $activeSlave.anus > 2>>lewd sphincter loosely squeezes<<else>>sphincter tightens against<</if>> the base of <<if $PC.dick != 0>>your cock<<else>>the strap-on<</if>>. You
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.belly >= 5000>>
spread your legs more and shove the<<if $activeSlave.bellyPreg >= 3000>>pregnant, <</if>>giggling buttslut down so $his _belly belly and chest are between your legs, lower your chair a little, and slide yourself back towards your desk to work.
<<else>>
@@ -11904,15 +11748,6 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<</if>>
$He wraps $his legs around the back of the chair and hugs your knees with $his arms, securing $himself
<<if $activeSlave.belly >= 100000>>
-<<<<<<< HEAD
- to you as an anal cocksleeve for as long as you feel like keeping <<if $PC.dick >= 1>>your penis lodged up a compliant butthole<<else>>the happy buttslut nice and full<</if>>.
- <<else>>
- under the desk as an anal cocksleeve for as long as you feel like keeping <<if $PC.dick >= 1>>your penis lodged up a compliant butthole<<else>>the happy buttslut trapped under there<</if>>.
- <</if>>
- <<= VCheck.Anal()>>
- <<else>>
- $He climaxes the instant your <<if $PC.dick >= 1>>dickhead<<else>>strap-on<</if>> squeezes between $his
-=======
to you as an anal cocksleeve for as long as you feel like keeping <<if $PC.dick != 0>>your penis lodged up a compliant butthole<<else>>the happy buttslut nice and full<</if>>.
<<else>>
under the desk as an anal cocksleeve for as long as you feel like keeping <<if $PC.dick != 0>>your penis lodged up a compliant butthole<<else>>the happy buttslut trapped under there<</if>>.
@@ -11920,7 +11755,6 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<= VCheck.Anal()>>
<<else>>
$He climaxes the instant your <<if $PC.dick != 0>>dickhead<<else>>strap-on<</if>> squeezes between $his
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.butt < 2>>
flat, tight cheeks,
<<elseif $activeSlave.butt <= 2>>
@@ -11942,11 +11776,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<elseif $activeSlave.butt <= 20>>
couch-like, super jiggly ass cheeks,
<</if>>
-<<<<<<< HEAD
- but $he knows this is just the start, and $he laughs with pleasure as hug $his rear around <<if $PC.dick >= 1>>your cock<<else>>the strap-on<</if>>. You
-=======
but $he knows this is just the start, and $he laughs with pleasure as hug $his rear around <<if $PC.dick != 0>>your cock<<else>>the strap-on<</if>>. You
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.belly >= 5000>>
spread your legs more and shove the<<if $activeSlave.bellyPreg >= 3000>>pregnant, <</if>>giggling buttslut down so $his _belly belly and chest are between your legs, lower your chair a little, and slide yourself back towards your desk to work.
<<else>>
@@ -11954,11 +11784,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<</if>>
$He wraps $his legs around the back of the chair and hugs your knees with $his arms, securing $himself
<<if $activeSlave.belly >= 100000>>
-<<<<<<< HEAD
- to you as an a cockbun for as long as you feel like keeping <<if $PC.dick >= 1>>your penis wrapped in a happy buttslut<<else>>the happy buttslut entertained<</if>>.
-=======
to you as an a cockbun for as long as you feel like keeping <<if $PC.dick != 0>>your penis wrapped in a happy buttslut<<else>>the happy buttslut entertained<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<else>>
under the desk as a cockbun for as long as you feel like keeping the happy buttslut trapped under there.
<</if>>
@@ -12034,11 +11860,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
$He gasps and shudders against you.
<<set $activeSlave.counter.mammary++, $mammaryTotal++>>
<<elseif $activeSlave.pregKnown == 1>>
-<<<<<<< HEAD
- join you on the couch. <<if $PC.dick >= 1>>You orgasm inside $him promptly, and then tell $him you'll be leaving your seed inside $him to do its work while you have $him again.<<else>>You use a strap-on with a fluid reservoir, and you trigger it promptly, releasing a gush of warm fluid into $him. You tell $him you'll be leaving it inside $him to do its work while you have $him again.<</if>> $He gasps at the appeal of the idea and grinds $himself against you hungrily.
-=======
join you on the couch. <<if $PC.dick != 0>>You orgasm inside $him promptly, and then tell $him you'll be leaving your seed inside $him to do its work while you have $him again.<<else>>You use a strap-on with a fluid reservoir, and you trigger it promptly, releasing a gush of warm fluid into $him. You tell $him you'll be leaving it inside $him to do its work while you have $him again.<</if>> $He gasps at the appeal of the idea and grinds $himself against you hungrily.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if !canDoVaginal($activeSlave)>>
<<if $activeSlave.mpreg == 1>>
$He's already pregnant, but that doesn't disrupt $his fantasy of being even more pregnant.
@@ -12051,11 +11873,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<= VCheck.Vaginal()>>
<</if>>
<<else>>
-<<<<<<< HEAD
- join you on the couch. <<if $PC.dick >= 1>>You orgasm inside $him promptly, and then tell $him you'll be leaving your seed inside $him to do its work while you have $him again.<<else>>You use a strap-on with a fluid reservoir, and you trigger it promptly, releasing a gush of warm fluid into $him. You tell $him you'll be leaving it inside $him to do its work while you have $him again.<</if>> $He gasps at the appeal of the idea and grinds $himself against you hungrily.
-=======
join you on the couch. <<if $PC.dick != 0>>You orgasm inside $him promptly, and then tell $him you'll be leaving your seed inside $him to do its work while you have $him again.<<else>>You use a strap-on with a fluid reservoir, and you trigger it promptly, releasing a gush of warm fluid into $him. You tell $him you'll be leaving it inside $him to do its work while you have $him again.<</if>> $He gasps at the appeal of the idea and grinds $himself against you hungrily.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if !canDoVaginal($activeSlave)>>
<<if $activeSlave.mpreg == 1>>
$He's eager to get pregnant and intends to put $his asspussy to use.
@@ -12100,11 +11918,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<br> <<link "while $he sucks">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- You tell $him that $he deserves a way to get off for coming to tell you rather than breaking the rules. From now on, $he can come to you and ask to <<if $PC.dick == 0>>perform cunnilingus on you<<else>>blow you<<if $PC.vagina >= 1>> and eat you out<</if>><</if>>, and masturbate while $he does. $He nods through $his tears and hurriedly gets to $his knees, gagging in $his clumsy eagerness, crying a little with relief as $he masturbates furiously<<if $PC.vagina >= 1>><<if $PC.dick >= 1>> and does $his best to simultaneously please both a cock and a cunt with only one mouth<</if>><</if>>. $He doesn't even pause after $his first orgasm; $his acceptance of sexual slavery @@.hotpink;has increased.@@
-=======
You tell $him that $he deserves a way to get off for coming to tell you rather than breaking the rules. From now on, $he can come to you and ask to <<if $PC.dick == 0>>perform cunnilingus on you<<else>>blow you<<if $PC.vagina != -1>> and eat you out<</if>><</if>>, and masturbate while $he does. $He nods through $his tears and hurriedly gets to $his knees, gagging in $his clumsy eagerness, crying a little with relief as $he masturbates furiously<<if $PC.vagina != -1>><<if $PC.dick != 0>> and does $his best to simultaneously please both a cock and a cunt with only one mouth<</if>><</if>>. $He doesn't even pause after $his first orgasm; $his acceptance of sexual slavery @@.hotpink;has increased.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.counter.oral += 5, $oralTotal += 5, $activeSlave.devotion += 4>>
<<if ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishKnown == 1)>>
<<set $activeSlave.fetishStrength += 4>>
@@ -12120,11 +11934,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<br> <<link "during nipple play">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- You tell $him that $he deserves a way to get off for coming to tell you rather than breaking the rules. From now on, $he can come to you and offer you $his breasts; $he will be allowed to masturbate while you do. $He nods through $his tears and hurriedly presents $his chest, crying a little with relief as $he feels <<if $activeSlave.nipples != "fuckable">>you nip a nipple with your teeth<<elseif $PC.dick >= 1>>your dick slip into a nipple<<else>>your tongue penetrate into $his nipple<</if>>. $He masturbates furiously, not even pausing after $his first orgasm; $his acceptance of sexual slavery @@.hotpink;has increased.@@
-=======
You tell $him that $he deserves a way to get off for coming to tell you rather than breaking the rules. From now on, $he can come to you and offer you $his breasts; $he will be allowed to masturbate while you do. $He nods through $his tears and hurriedly presents $his chest, crying a little with relief as $he feels <<if $activeSlave.nipples != "fuckable">>you nip a nipple with your teeth<<elseif $PC.dick != 0>>your dick slip into a nipple<<else>>your tongue penetrate into $his nipple<</if>>. $He masturbates furiously, not even pausing after $his first orgasm; $his acceptance of sexual slavery @@.hotpink;has increased.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.counter.mammary += 5, $mammaryTotal += 5, $activeSlave.devotion += 4>>
<<if ($activeSlave.fetish == "boobs") && ($activeSlave.fetishKnown == 1)>>
<<set $activeSlave.fetishStrength += 4>>
@@ -12637,11 +12447,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
pussy
<</if>>
-<<<<<<< HEAD
- hard and fast, doggy style. $He's clearly got a lot of experience, so $he takes the pounding well. Before long $he's happily moaning and begging, pushing $himself back into you<<if $PC.vagina >= 1>> and using a hand thrust back between $his own legs to stimulate your pussy<</if>>. You thrust deep inside $him. $He thanks you and wishes you a happy millenary. @@.mediumaquamarine;$He has become much more trusting@@ of $his place with you.
-=======
hard and fast, doggy style. $He's clearly got a lot of experience, so $he takes the pounding well. Before long $he's happily moaning and begging, pushing $himself back into you<<if $PC.vagina != -1>> and using a hand thrust back between $his own legs to stimulate your pussy<</if>>. You thrust deep inside $him. $He thanks you and wishes you a happy millenary. @@.mediumaquamarine;$He has become much more trusting@@ of $his place with you.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.trust += 10>>
<<if canDoVaginal($activeSlave)>>
<<= VCheck.Vaginal()>>
@@ -13129,29 +12935,17 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<= VCheck.Vaginal()>>
<</if>>
<<else>>
-<<<<<<< HEAD
- "Plea<<s>>e, would you hold me down and <<if $PC.dick >= 1>>fuck my throat<<else>>grind again<<s>>t my fa<<c>>e<</if>>, <<Master>>?" $He drapes $himself submissively
-=======
"Plea<<s>>e, would you hold me down and <<if $PC.dick != 0>>fuck my throat<<else>>grind again<<s>>t my fa<<c>>e<</if>>, <<Master>>?" $He drapes $himself submissively
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.belly >= 300000>>
over $his _belly middle
<<else>>
over the couch
<</if>>
-<<<<<<< HEAD
- and opens wide, lest you misunderstand. You could hold $him down and <<if $PC.dick >= 1>>facefuck $him<<else>>make $him eat you out<</if>>, and you do.
- <<set $activeSlave.counter.oral++, $oralTotal++>>
- <</if>>
- <<case "cumslut">>
- "Plea<<s>>e, may I <<if $PC.dick >= 1>>give you a blowjob<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>eat you out<</if>>, <<Master>>?" $He
-=======
and opens wide, lest you misunderstand. You could hold $him down and <<if $PC.dick != 0>>facefuck $him<<else>>make $him eat you out<</if>>, and you do.
<<set $activeSlave.counter.oral++, $oralTotal++>>
<</if>>
<<case "cumslut">>
"Plea<<s>>e, may I <<if $PC.dick != 0>>give you a blowjob<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>eat you out<</if>>, <<Master>>?" $He
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.belly >= 300000>>
leans onto $his _belly middle
<<elseif $activeSlave.belly >= 10000>>
@@ -13159,11 +12953,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
gets down on $his knees
<</if>>
-<<<<<<< HEAD
- and licks $his lips, lest you misunderstand. You could let $him <<if $PC.dick >= 1>>give you a blowjob<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>eat you out<</if>>, and you do.
-=======
and licks $his lips, lest you misunderstand. You could let $him <<if $PC.dick != 0>>give you a blowjob<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>eat you out<</if>>, and you do.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.counter.oral++, $oralTotal++>>
<<case "humiliation">>
<<if (canDoAnal($activeSlave) || canDoVaginal($activeSlave))>>
@@ -13174,11 +12964,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<= VCheck.Vaginal()>>
<</if>>
<<else>>
-<<<<<<< HEAD
- "Plea<<s>>e, may I <<if $PC.dick >= 1>>give you a blowjob<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>eat you out<</if>> in public, <<Master>>?" $He edges towards the door, lest you misunderstand. You could <<if $PC.dick >= 1>>give you a blowjob<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>eat you out<</if>> in public, and you do.
-=======
"Plea<<s>>e, may I <<if $PC.dick != 0>>give you a blowjob<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>eat you out<</if>> in public, <<Master>>?" $He edges towards the door, lest you misunderstand. You could <<if $PC.dick != 0>>give you a blowjob<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>eat you out<</if>> in public, and you do.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.counter.oral++, $oralTotal++>>
<</if>>
<<case "buttslut">>
@@ -13257,11 +13043,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<case "sadist">>
<<if ($activeSlave.toyHole == "dick" || $sexualOpeness == 1) && canPenetrate($activeSlave)>>
"Plea<<s>>e, can I pretend to rape you, <<Master>>?" $His eyes are wild. You could let $him rape you, and you do, pretending to go about your day until $he shoves you onto the couch and roughly fucks your
-<<<<<<< HEAD
- <<if $PC.vagina >= 1>>
-=======
<<if $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
pussy.
<<if canImpreg($PC, $activeSlave)>>
<<= knockMeUp($PC, 20, 0, $activeSlave.ID)>>
@@ -13701,11 +13483,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
It doesn't take long before you fill $his ass with cum.
<</if>>
<<elseif $activeSlave.belly >= 100000>>
-<<<<<<< HEAD
- Once you're hilted, you hoist $him up by the underarms, shifting your stance to handle $his _belly stomach's weight, and hold $him in midair, impaled on your dick. You can't pound $him all that hard in this challenging position, but the effort of holding $him this way forces you to work out hard, producing an excellent sensation.<<if $PC.vagina >= 1>> The position angles your dick upward, producing a lovely massaging sensation in your pussy as you slide in and out of $him.<</if>>
-=======
Once you're hilted, you hoist $him up by the underarms, shifting your stance to handle $his _belly stomach's weight, and hold $him in midair, impaled on your dick. You can't pound $him all that hard in this challenging position, but the effort of holding $him this way forces you to work out hard, producing an excellent sensation.<<if $PC.vagina != -1>> The position angles your dick upward, producing a lovely massaging sensation in your pussy as you slide in and out of $him.<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>>
After a while, you lift $him up as high as you can, freeing your member, and then lower $him back down again, forcing yourself up $his butt instead despite the slave's anxious begging.
<<= VCheck.Both()>>
@@ -13719,11 +13497,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<</if>>
You're going to be feeling this tomorrow.
<<else>>
-<<<<<<< HEAD
- Once you're hilted, you bring $his hands up on either side of $his head to grasp your shoulders behind $him, and then scoop $his legs up and hoist $him to rest against your chest, held in midair and impaled on your dick. You can't pound $him all that hard in this challenging position, but the effort of holding $himself this way forces $him to tighten $his muscles down hard, producing an excellent sensation.<<if $PC.vagina >= 1>> The position angles your dick upward, producing a lovely massaging sensation in your pussy as you slide in and out of $him.<</if>>
-=======
Once you're hilted, you bring $his hands up on either side of $his head to grasp your shoulders behind $him, and then scoop $his legs up and hoist $him to rest against your chest, held in midair and impaled on your dick. You can't pound $him all that hard in this challenging position, but the effort of holding $himself this way forces $him to tighten $his muscles down hard, producing an excellent sensation.<<if $PC.vagina != -1>> The position angles your dick upward, producing a lovely massaging sensation in your pussy as you slide in and out of $him.<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>>
After a while, you lift $him up as high as you can, freeing your member, and then lower $him back down again, forcing yourself up $his butt instead despite the slave's anxious begging.
<<= VCheck.Both()>>
@@ -13841,11 +13615,6 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
average breasts
<<elseif $PC.boobs >= 300>>
small breasts
-<<<<<<< HEAD
- <<elseif $PC.boobs >= 1>>
- generous breasts.
-=======
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</if>>
<br><br>
$He hesitates, clearly surprised that you're allowing $him to fondle you, but building arousal is making $him forget $his awkwardness and $he begins to play with your boobs in earnest. You direct $his fingers to your nipples, and $he obeys the nonverbal cue, devoting more attention to the <<if $PC.lactation > 0>>milky<<else>>hard<</if>>, sensitive nubs. Satisfied that $he's got the idea, you run your hands lightly down $his
@@ -14202,11 +13971,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<EventNameDelink $activeSlave>>
<<replace "#result">>
$activeSlave.slaveName finds $himself standing in front of you, feeling you roughly using two fingers to finger $his <<if $activeSlave.mpreg == 1>>asspussy<<else>>pussy<</if>>. $He gasps out:
-<<<<<<< HEAD
- "Oh <<Master>>, owner, protector, and father of my children, forgive my <<s>>in<<s>>, ju<<s>>t a<<s>> you forgave my <<s>>i<<s>>ter<<s>> in <<s>>lavery before me. Count not my tran<<s>>gre<<ss>>ion<<s>> again<<s>>t your rule<<s>>, but, rather, the tear<<s>> of my womb. Remember not my iniquitie<<s>> but my willingne<<ss>> to be bred by you. I long to <<s>>erve your <<if $PC.vagina >= 1>>futa <</if>>dick, and beg that you will u<<s>>e me and ble<<ss>> my body with your off<<s>>pring. I promi<<s>>e to <<s>>ubmit to you a<<s>> your breeding <<s>>lut all the day<<s>> of my <<s>>ervitude, and to grow heavy with child, again and again."
-=======
"Oh <<Master>>, owner, protector, and father of my children, forgive my <<s>>in<<s>>, ju<<s>>t a<<s>> you forgave my <<s>>i<<s>>ter<<s>> in <<s>>lavery before me. Count not my tran<<s>>gre<<ss>>ion<<s>> again<<s>>t your rule<<s>>, but, rather, the tear<<s>> of my womb. Remember not my iniquitie<<s>> but my willingne<<ss>> to be bred by you. I long to <<s>>erve your <<if $PC.vagina != -1>>futa <</if>>dick, and beg that you will u<<s>>e me and ble<<ss>> my body with your off<<s>>pring. I promi<<s>>e to <<s>>ubmit to you a<<s>> your breeding <<s>>lut all the day<<s>> of my <<s>>ervitude, and to grow heavy with child, again and again."
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
$He moans with relief when $he feels you withdraw your penetrating digits partway through $his recitation, but by the time $he's finished, you've shoved your dick up $his waiting <<if $activeSlave.mpreg == 1>>asshole<<else>>pussy<</if>> and are close so blessing $him with a load of cum. $He @@.hotpink;does $his best@@ to relax and resumes, "Oh <<Master>>..."
<<if $activeSlave.mpreg == 1>><<= VCheck.Anal()>><<else>><<= VCheck.Vaginal()>><</if>>
<<= knockMeUp($activeSlave, 100, 2, -1, 1)>>
@@ -15037,11 +14802,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
struggles and begs for mercy as _hisU holes are brutally stretched.
<</if>>
-<<<<<<< HEAD
- The poor slave rides out the sexual storm as you and $activeSlave.slaveName fuck _himU<<if $PC.vagina >= 1>>, your pussy sliding against the base of $activeSlave.slaveName's thrusting shaft<</if>>. $activeSlave.slaveName flirts outrageously with you over the other slave's shoulder whenever $he can. @@.mediumaquamarine;$He has become more trusting of you.@@
-=======
The poor slave rides out the sexual storm as you and $activeSlave.slaveName fuck _himU<<if $PC.vagina != -1>>, your pussy sliding against the base of $activeSlave.slaveName's thrusting shaft<</if>>. $activeSlave.slaveName flirts outrageously with you over the other slave's shoulder whenever $he can. @@.mediumaquamarine;$He has become more trusting of you.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.trust += 4, $activeSlave.counter.penetrative++, $penetrativeTotal++>>
<</replace>>
<</link>>
@@ -15065,11 +14826,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<replace "#result">>
$activeSlave.slaveName's hermaphroditic genitalia is a little crammed together; it's busy down there. $He obediently stops fucking so you can maneuver into $him.
<<= VCheck.Vaginal()>>
-<<<<<<< HEAD
- Having a <<if $PC.dick == 0>>strap-on<<else>>dick<</if>> in $his pussy reduces $his erection a little, so the slave beneath $him helps $his penetration as much as _heU can. It's not the most convenient of fucks, but that's to be expected when a <<= properMaster()>> and two slaves successfully have two separate instances of vaginal intercourse running at once.<<if $PC.vagina >= 1>><<if $PC.dick >= 1>> You add a third by grabbing a free hand and guiding it to your own pussy; its owner gets the idea and strokes it as best they can.<</if>><</if>> $activeSlave.slaveName's orgasm is general and intense. @@.hotpink;$His devotion to you has increased.@@
-=======
Having a <<if $PC.dick == 0>>strap-on<<else>>dick<</if>> in $his pussy reduces $his erection a little, so the slave beneath $him helps $his penetration as much as _heU can. It's not the most convenient of fucks, but that's to be expected when a <<= properMaster()>> and two slaves successfully have two separate instances of vaginal intercourse running at once.<<if $PC.vagina != -1>><<if $PC.dick != 0>> You add a third by grabbing a free hand and guiding it to your own pussy; its owner gets the idea and strokes it as best they can.<</if>><</if>> $activeSlave.slaveName's orgasm is general and intense. @@.hotpink;$His devotion to you has increased.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.devotion += 4, $activeSlave.counter.penetrative++, $penetrativeTotal++>>
<</replace>>
<</link>><<if ($activeSlave.vagina == 0)>> //This option will take $his virginity//<</if>>
@@ -15125,13 +14882,8 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
leap up
<</if>>
onto the desktop and kneel upright, legs splayed. (Naturally, the desk is reinforced and sealed for exactly this reason.) You point meaningfully at your
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
- stiff prick <<if $PC.vagina >= 1>>and flushed pussy<</if>>, and the obedient slave <<if $activeSlave.belly >= 5000>>hefts $himself<<else>>clambers<</if>> up to suck you off<<if $PC.vagina >= 1>> and eat you out<</if>>. When you're close, you surprise $him by pulling your cock out of $his mouth and blowing your load onto the glass.
-=======
<<if $PC.dick != 0>>
stiff prick <<if $PC.vagina != -1>>and flushed pussy<</if>>, and the obedient slave <<if $activeSlave.belly >= 5000>>hefts $himself<<else>>clambers<</if>> up to suck you off<<if $PC.vagina != -1>> and eat you out<</if>>. When you're close, you surprise $him by pulling your cock out of $his mouth and blowing your load onto the glass.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<else>>
hot cunt, and the obedient slave <<if $activeSlave.belly >= 5000>>hefts $himself<<else>>clambers<</if>> up to eat you out. You surprise $him by taking your time, drawing out the oral session with the ulterior motive of getting as much saliva and pussyjuice onto the glass as possible.
<</if>>
@@ -15170,11 +14922,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<case "schoolgirl">>
pretty young pussy.
<</switch>>
-<<<<<<< HEAD
- "Clean me off, $activeSlave.slaveName," _heA demands, winking broadly at you. The slave, knowing that commands from _himA are commands from you, repositions $himself to lick up the <<if $PC.dick >= 1>>ejaculate<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>girlcum<</if>>.
-=======
"Clean me off, $activeSlave.slaveName," _heA demands, winking broadly at you. The slave, knowing that commands from _himA are commands from you, repositions $himself to lick up the <<if $PC.dick != 0>>ejaculate<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>girlcum<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<br><br>
This brings the slave into a crouch with $his ass pointed at you,
<<if canDoVaginal($activeSlave)>>
@@ -15185,11 +14933,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
$his tight little pussy completely vulnerable.
<</if>>
-<<<<<<< HEAD
- As <<if $PC.dick >= 1>><<if $PC.vagina >= 1>>use manual stimulation of your pussy to get your dick<<else>>stroke yourself<</if>> rapidly back to full mast<<else>>don a strap-on<</if>>, $assistantName opines helpfully, "Hey $activeSlave.slaveName! You're about to get fucked!" The slave reacts by obediently reaching back to spread $his buttocks and relaxing, but $assistantName ruins $his attempt at graceful submission." <<if $PC.title == 1>>Siiir,<<else>>Ma'aaam,<</if>> $he's bluuuushing," $he says tauntingly, and the slave stiffens with renewed embarrassment, not to mention stimulation, as you penetrate $him.
-=======
As <<if $PC.dick != 0>><<if $PC.vagina != -1>>use manual stimulation of your pussy to get your dick<<else>>stroke yourself<</if>> rapidly back to full mast<<else>>don a strap-on<</if>>, $assistantName opines helpfully, "Hey $activeSlave.slaveName! You're about to get fucked!" The slave reacts by obediently reaching back to spread $his buttocks and relaxing, but $assistantName ruins $his attempt at graceful submission." <<if $PC.title == 1>>Siiir,<<else>>Ma'aaam,<</if>> $he's bluuuushing," $he says tauntingly, and the slave stiffens with renewed embarrassment, not to mention stimulation, as you penetrate $him.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<= VCheck.Vaginal()>>
<<else>>
<<if $activeSlave.anus > 2>>
@@ -15199,11 +14943,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
$his tight little rosebud completely vulnerable.
<</if>>
-<<<<<<< HEAD
- As <<if $PC.dick >= 1>><<if $PC.vagina >= 1>>use manual stimulation of your pussy to get your dick<<else>>stroke yourself<</if>> rapidly back to full mast<<else>>don a strap-on<</if>>, $assistantName opines helpfully, "Hey $activeSlave.slaveName! You're about to get buttfucked!" The slave reacts by obediently reaching back to spread $his buttocks, and relaxes $his anus, but $assistantName ruins $his attempt at graceful anal submission." <<if $PC.title == 1>>Siiir,<<else>>Ma'aaam,<</if>> $he's bluuuushing," $he says tauntingly, and the slave stiffens with renewed embarrassment, not to mention discomfort, as you penetrate $him.
-=======
As <<if $PC.dick != 0>><<if $PC.vagina != -1>>use manual stimulation of your pussy to get your dick<<else>>stroke yourself<</if>> rapidly back to full mast<<else>>don a strap-on<</if>>, $assistantName opines helpfully, "Hey $activeSlave.slaveName! You're about to get buttfucked!" The slave reacts by obediently reaching back to spread $his buttocks, and relaxes $his anus, but $assistantName ruins $his attempt at graceful anal submission." <<if $PC.title == 1>>Siiir,<<else>>Ma'aaam,<</if>> $he's bluuuushing," $he says tauntingly, and the slave stiffens with renewed embarrassment, not to mention discomfort, as you penetrate $him.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<= VCheck.Anal()>>
<</if>>
$He keeps licking away, cleaning up the mess you made as $assistantName does everything $he can to make it seem like the slave is pleasuring $him. Partway through, $assistantName sticks out a hand for a high-five from you, producing a gurgle of indignation @@.mediumaquamarine;or perhaps even laughter@@ as $his owner and $his owner's personal assistant program high-five over $his back.
@@ -15368,11 +15108,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
kneels,
<</if>>
-<<<<<<< HEAD
- $his rear pointing at you, but hesitates for an instant, unsure of what to do next. You help $him understand by shoving $him down so $his collarbone is resting on the back of the couch and $his ass is at just the right height.<<if $PC.vagina >= 1>> You ensure that you're fully hard and get $him in the right frame of mind by grinding the pussy beneath your dick against $him.<</if>> You fuck
-=======
$his rear pointing at you, but hesitates for an instant, unsure of what to do next. You help $him understand by shoving $him down so $his collarbone is resting on the back of the couch and $his ass is at just the right height.<<if $PC.vagina != -1>> You ensure that you're fully hard and get $him in the right frame of mind by grinding the pussy beneath your dick against $him.<</if>> You fuck
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if canDoVaginal($activeSlave) && canDoAnal($activeSlave)>>
$his pussy and then $his ass in quick succession, plundering $his holes without much regard for $his pleasure.
<<= VCheck.Both()>>
@@ -15574,11 +15310,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
When you're done, you discard $him like the human sex toy $he is, and go back to your work. $He stumbles off, looking @@.gold;fearful@@ but @@.hotpink;submissive,@@ knowing that $he now has a better idea of what you want, even if what you want isn't very nice.
<<set $activeSlave.trust -= 4, $activeSlave.devotion += 4>>
<</replace>>
-<<<<<<< HEAD
- <</link>><<if (($activeSlave.anus == 0) || ($activeSlave.vagina == 0)) && ($PC.dick >= 1)>> //This option will take $his virginity//<</if>>
-=======
<</link>><<if (($activeSlave.anus == 0) || ($activeSlave.vagina == 0)) && ($PC.dick != 0)>> //This option will take $his virginity//<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<br><<link "It's not that simple">>
<<replace "#result2">>
You tell $him kindly that it isn't that simple, but that if $he obeys orders and does $his best, you will like $him just fine, and $he will do well as your slave. Relief floods through $him.
@@ -15587,11 +15319,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
"Thank you, <<Master>> and I'm <<s>>orry for being <<s>>illy," $he apologizes.
<</if>>
-<<<<<<< HEAD
- You dismiss $him, and $he goes, a strangely @@.hotpink;respectful@@ look on $his face. $He's no more confident of $his ability to find safety and stability here with you than $he was before, but $he seems to like that it apparently isn't as simple as <<if $PC.dick >= 1>>taking your cock up $his butt<<if $PC.vagina >= 1>> or <</if>><</if>><<if $PC.vagina >= 1>>eating you out<</if>>.
-=======
You dismiss $him, and $he goes, a strangely @@.hotpink;respectful@@ look on $his face. $He's no more confident of $his ability to find safety and stability here with you than $he was before, but $he seems to like that it apparently isn't as simple as <<if $PC.dick != 0>>taking your cock up $his butt<<if $PC.vagina != -1>> or <</if>><</if>><<if $PC.vagina != -1>>eating you out<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.devotion += 4>>
<</replace>>
<</link>>
@@ -17438,11 +17166,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
asshole.
<</if>>
-<<<<<<< HEAD
- $He <<if $activeSlave.voice == 0>>tries to groan<<else>>groans<</if>> with anticipation of the coming relief as you slide <<if $PC.dick >= 1>>your cock<<else>>a strap-on<</if>> past $his
-=======
$He <<if $activeSlave.voice == 0>>tries to groan<<else>>groans<</if>> with anticipation of the coming relief as you slide <<if $PC.dick != 0>>your cock<<else>>a strap-on<</if>> past $his
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if canDoVaginal($activeSlave)>>
pussylips and inside $his womanhood.
<<= VCheck.Vaginal()>>
@@ -17451,15 +17175,9 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<= VCheck.Anal()>>
<</if>>
<br><br>
-<<<<<<< HEAD
- It doesn't take long. $His <<if $activeSlave.scrotum == 0>>invisible but overfull balls<<else>>balls tighten and<</if>> shoot cum into $his soft python of a dick, but not a drop appears at its tip. Gasping at the mixed relief and discomfort, $he lets $his butt go and wriggles around to grab $his dick around its base with both hands. $He squeezes it from base to tip to bring out its contents. $He's so huge that $he's able to reach down with $his lips and get $his cockhead into $his mouth, the meat filling it entirely. $He sucks industriously, swallowing $his own load. $He was just trying to relieve the pressure, but the added stimulation brings $him to climax again. Silenced by $his own dickhead, $he shudders deliciously and starts over, wringing more cum into $his own mouth. You change angles, bringing the hard head of <<if $PC.dick >= 1>>your own penis<<else>>your phallus<</if>> against $his prostate and forcing an agonizing third climax.
- <br><br>
- $He's so discombobulated by this that $he goes limp, offering no resistance as you extract yourself, <<if $PC.dick >= 1>>straddle $his torso, and press your dick inside $his mouth to climax there, adding your own ejaculate<<else>>slip out of the harness with the ease of long practice, and straddle $his face so that your climax adds a good quantity of your pussyjuice<</if>> to everything $he's already gotten down<<if $PC.vagina >= 1>><<if $PC.dick >= 1>> and leaving quite a lot of your pussyjuice on $his chin<</if>><</if>>. When you finally release $him, $he slithers down to the floor, utterly spent.
-=======
It doesn't take long. $His <<if $activeSlave.scrotum == 0>>invisible but overfull balls<<else>>balls tighten and<</if>> shoot cum into $his soft python of a dick, but not a drop appears at its tip. Gasping at the mixed relief and discomfort, $he lets $his butt go and wriggles around to grab $his dick around its base with both hands. $He squeezes it from base to tip to bring out its contents. $He's so huge that $he's able to reach down with $his lips and get $his cockhead into $his mouth, the meat filling it entirely. $He sucks industriously, swallowing $his own load. $He was just trying to relieve the pressure, but the added stimulation brings $him to climax again. Silenced by $his own dickhead, $he shudders deliciously and starts over, wringing more cum into $his own mouth. You change angles, bringing the hard head of <<if $PC.dick != 0>>your own penis<<else>>your phallus<</if>> against $his prostate and forcing an agonizing third climax.
<br><br>
$He's so discombobulated by this that $he goes limp, offering no resistance as you extract yourself, <<if $PC.dick != 0>>straddle $his torso, and press your dick inside $his mouth to climax there, adding your own ejaculate<<else>>slip out of the harness with the ease of long practice, and straddle $his face so that your climax adds a good quantity of your pussyjuice<</if>> to everything $he's already gotten down<<if $PC.vagina != -1>><<if $PC.dick != 0>> and leaving quite a lot of your pussyjuice on $his chin<</if>><</if>>. When you finally release $him, $he slithers down to the floor, utterly spent.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if !canTalk($activeSlave)>>
$He raises a shaky hand to @@.mediumaquamarine;gesture thanks.@@
<<elseif SlaveStatsChecker.checkForLisp($activeSlave)>>
@@ -17485,11 +17203,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
run your hands across $his bottom,
<</if>>
-<<<<<<< HEAD
- and then shove <<if $PC.dick >= 1>>your cock<<else>>a strap-on<</if>>
-=======
and then shove <<if $PC.dick != 0>>your cock<<else>>a strap-on<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if canDoVaginal($activeSlave)>>
inside $his cunt.
<<= VCheck.Vaginal()>>
@@ -17508,19 +17222,11 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
$him.
<</if>>
<br><br>
-<<<<<<< HEAD
- $He's so pent up that $he reaches $his first climax quickly, filling $his capped dick with cum. $He <<if $activeSlave.voice == 0>>tries to moan<<else>>moans<</if>> at the combination of relief and pressure inside $his dick, and then slumps a little when $he feels the <<if $PC.dick >= 1>>penis<<else>>hard phallus<</if>> inside $him fuck $him even harder, forcing $him towards a second orgasm. And after that one, a third. And a fourth.
- <br><br>
- When you finally climax yourself, you stand, leaving $him writhing at your feet with $his huge soft cock positively pressurized. Considering the situation, you kneel down at $his side, deciding what to do. Stroking $him in a mockery of reassurance, you grab $his agonized member, producing a <<if $activeSlave.voice == 0>>gaping, silent scream<<else>>little shriek<</if>>.
- <<if $activeSlave.toyHole == "dick" && ($PC.preg == 0 || $PC.vagina == 0)>>
- You maneuver the massive thing into your own <<if $PC.preg == 0 && $PC.vagina >= 1>>pussy<<else>>asshole<</if>>, slide a finger in alongside the monstrous thing as $he <<if $activeSlave.voice == 0>>moans with expectation<<else>>begs abjectly to unleash $his<</if>>, and pop the elastic off. You get to watch $his face as $he floods your <<if $PC.preg == 0 && $PC.vagina >= 1>>womanhood<<else>>bowels<</if>> with cum, your stomach taking on a distinctive swell as $his pent-up load empties into you.
-=======
$He's so pent up that $he reaches $his first climax quickly, filling $his capped dick with cum. $He <<if $activeSlave.voice == 0>>tries to moan<<else>>moans<</if>> at the combination of relief and pressure inside $his dick, and then slumps a little when $he feels the <<if $PC.dick != 0>>penis<<else>>hard phallus<</if>> inside $him fuck $him even harder, forcing $him towards a second orgasm. And after that one, a third. And a fourth.
<br><br>
When you finally climax yourself, you stand, leaving $him writhing at your feet with $his huge soft cock positively pressurized. Considering the situation, you kneel down at $his side, deciding what to do. Stroking $him in a mockery of reassurance, you grab $his agonized member, producing a <<if $activeSlave.voice == 0>>gaping, silent scream<<else>>little shriek<</if>>.
<<if $activeSlave.toyHole == "dick" && ($PC.preg == 0 || $PC.vagina == 0)>>
You maneuver the massive thing into your own <<if $PC.preg == 0 && $PC.vagina != -1>>pussy<<else>>asshole<</if>>, slide a finger in alongside the monstrous thing as $he <<if $activeSlave.voice == 0>>moans with expectation<<else>>begs abjectly to unleash $his<</if>>, and pop the elastic off. You get to watch $his face as $he floods your <<if $PC.preg == 0 && $PC.vagina != -1>>womanhood<<else>>bowels<</if>> with cum, your stomach taking on a distinctive swell as $his pent-up load empties into you.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.counter.penetrative++, $penetrativeTotal++>>
<<if canImpreg($PC, $activeSlave)>>
<<= knockMeUp($PC, 50, 0, $activeSlave.ID)>>
@@ -17908,19 +17614,11 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<br><<link "Enjoy $his helplessness">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- You give $him no orders at all, since $his helplessness makes $him <<if $activeSlave.devotion > 20>>cooperation<<else>>consent<</if>> completely unnecessary for what you're planning. $He makes to turn as you come around behind $him, but $he can manage only a partial crane of $his shoulders and neck to <<if canSee($activeSlave)>>see<<else>>figure out<</if>> what you're doing. Seizing $his ankles, you haul $his legs out from under $his boobs and body, and then push $him forward, balancing $his body atop $his tits as though they were an exercise ball. <<if $activeSlave.devotion > 20>>$He giggles at this<<else>>$He struggles a little at the sudden discomfort<</if>>, and tries to steady $himself with $his hands, so you pull them around behind $him and pin $his arms to $his $activeSlave.skin back with one of your hands. You <<if $PC.dick >= 1>>shove your dick up<<else>>pull on a strap-on with your other hand and insert it into<</if>> $his defenseless
- <<if canDoVaginal($activeSlave)>>pussy<<else>>asshole<</if>>. Then you fuck $him.
- <<= VCheck.Simple()>>
- <br><br>
- You're physically fit to begin with, and between that and all the practice you get, you pride yourself on your <<if $PC.dick >= 1>><<if $PC.vagina >= 1>>master level futa skills<<else>>cocksmanship<</if>><<else>>power with a strap-on<</if>>. You can fuck hard, and $activeSlave.slaveName gets fucked hard. Having all of $his weight on $his tits, and being sawed back and forth on top of those tits, is not comfortable.
-=======
You give $him no orders at all, since $his helplessness makes $him <<if $activeSlave.devotion > 20>>cooperation<<else>>consent<</if>> completely unnecessary for what you're planning. $He makes to turn as you come around behind $him, but $he can manage only a partial crane of $his shoulders and neck to <<if canSee($activeSlave)>>see<<else>>figure out<</if>> what you're doing. Seizing $his ankles, you haul $his legs out from under $his boobs and body, and then push $him forward, balancing $his body atop $his tits as though they were an exercise ball. <<if $activeSlave.devotion > 20>>$He giggles at this<<else>>$He struggles a little at the sudden discomfort<</if>>, and tries to steady $himself with $his hands, so you pull them around behind $him and pin $his arms to $his $activeSlave.skin back with one of your hands. You <<if $PC.dick != 0>>shove your dick up<<else>>pull on a strap-on with your other hand and insert it into<</if>> $his defenseless
<<if canDoVaginal($activeSlave)>>pussy<<else>>asshole<</if>>. Then you fuck $him.
<<= VCheck.Simple()>>
<br><br>
You're physically fit to begin with, and between that and all the practice you get, you pride yourself on your <<if $PC.dick != 0>><<if $PC.vagina != -1>>master level futa skills<<else>>cocksmanship<</if>><<else>>power with a strap-on<</if>>. You can fuck hard, and $activeSlave.slaveName gets fucked hard. Having all of $his weight on $his tits, and being sawed back and forth on top of those tits, is not comfortable.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if canDoVaginal($activeSlave)>>
<<if $activeSlave.vagina < 3>>
Worse, only the most veteran cunt could accept this kind of treatment without some pain, and $hers is far tighter than you're treating it.
@@ -17932,11 +17630,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<</if>>
<<if $activeSlave.voice == 0>>Since $he cannot groan, $he begins to gasp raggedly<<else>>$He begins to grunt and groan<</if>> with each forward thrust as you penetrate $him, pressing $him forward across $his cushion of boobs. $He tries to take some of the weight off with $his feet, but after some vain scrabbling $he's obliged to @@.hotpink;give up and take it.@@
<br><br>
-<<<<<<< HEAD
- When you're finished, you withdraw and drop $him, letting $him slump against $his sore breasts. $He's too tired and overstimulated to do anything but stay limp, and $his relaxed <<if canDoVaginal($activeSlave)>>pussy<<else>>butthole<</if>> <<if $PC.dick >= 1>>releases drips of your cum to go sliding down $his thighs<<else>>glistens attractively with lube<</if>>. You direct
-=======
When you're finished, you withdraw and drop $him, letting $him slump against $his sore breasts. $He's too tired and overstimulated to do anything but stay limp, and $his relaxed <<if canDoVaginal($activeSlave)>>pussy<<else>>butthole<</if>> <<if $PC.dick != 0>>releases drips of your cum to go sliding down $his thighs<<else>>glistens attractively with lube<</if>>. You direct
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $boobAccessibility == 1 || $pregAccessibility == 1>>
the accessibility assistance functions of your office to
<<else>>
@@ -18083,11 +17777,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<br><<link "Double penetrate $his mouth for insolence">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- You step forward and caress the slave's throat, telling $him to suck like a good little $desc. You make no threat, but give $him the order in a <<if canHear($activeSlave)>>voice of brass<<else>>commanding manner<</if>>. $He knows what you can do to $him, and scrabbles forward to obey, @@.gold;terribly frightened.@@ $His fear is justified. You announce that $he's avoided serious punishment, but $he still needs correction for $him hesitation and insolence. $He can't beg or even moan, since $he's being facefucked by the feeder dildo by now, but $his <<= App.Desc.eyeColor($activeSlave)>> eyes widen in terror. $He <<if canSee($activeSlave)>>can't watch you, since $he can't turn $his head,<<else>>can't see what you are doing,<</if>> so $he has almost no time to prepare when you haul $him head most of the way off the feeder and shove <<if $PC.dick >= 1>>your own phallus<<else>>a strap-on<</if>> into $his mouth, too. $He gags instantly, almost vomiting, but forces $himself to relax as you begin to thrust into $his throat, alternately with the feeder. The liquid food provides plenty of lubrication, and a lot of liquid for $him to gag on, and before long $he's a degraded, humiliating mess. $He often clamps $his eyes shut as $he desperately concentrates on breathing, squeezing the tears out to run down $his $activeSlave.skin cheeks.
-=======
You step forward and caress the slave's throat, telling $him to suck like a good little $desc. You make no threat, but give $him the order in a <<if canHear($activeSlave)>>voice of brass<<else>>commanding manner<</if>>. $He knows what you can do to $him, and scrabbles forward to obey, @@.gold;terribly frightened.@@ $His fear is justified. You announce that $he's avoided serious punishment, but $he still needs correction for $him hesitation and insolence. $He can't beg or even moan, since $he's being facefucked by the feeder dildo by now, but $his <<= App.Desc.eyesColor($activeSlave)>> widen in terror. $He <<if canSee($activeSlave)>>can't watch you, since $he can't turn $his head,<<else>>can't see what you are doing,<</if>> so $he has almost no time to prepare when you haul $him head most of the way off the feeder and shove <<if $PC.dick != 0>>your own phallus<<else>>a strap-on<</if>> into $his mouth, too. $He gags instantly, almost vomiting, but forces $himself to relax as you begin to thrust into $his throat, alternately with the feeder. The liquid food provides plenty of lubrication, and a lot of liquid for $him to gag on, and before long $he's a degraded, humiliating mess. $He often clamps $his eyes shut as $he desperately concentrates on breathing, squeezing the tears out to run down $his $activeSlave.skin cheeks.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if ($suppository != 0) && ($activeSlave.drugs != "none")>>You leave the poor slave to take $his drugs up the ass, since the kitchen administers those by phallus, too. Fortunately for $him, $he doesn't object to that.<</if>>
<<set $activeSlave.trust -= 4, $activeSlave.counter.oral++, $oralTotal++>>
<</replace>>
@@ -18417,11 +18107,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<</if>>
as $he moves.
<</if>>
-<<<<<<< HEAD
- $He gives you an excellent nude lap dance, expressing the art at the level only the finest old world strippers can manage. The interaction is all about you, your eyes on $his body, your desire for $his touch, and finally your <<if $PC.dick >= 1>>cum flowing into $his mouth as $he sucks your dick<<if $PC.vagina >= 1>> and the wetness against $his fingers as they tease your pussy<</if>><<else>>pussyjuice coating $his lips as $he eats you out<</if>>. $He @@.mediumaquamarine;knows $his place@@ very well.
-=======
$He gives you an excellent nude lap dance, expressing the art at the level only the finest old world strippers can manage. The interaction is all about you, your eyes on $his body, your desire for $his touch, and finally your <<if $PC.dick != 0>>cum flowing into $his mouth as $he sucks your dick<<if $PC.vagina != -1>> and the wetness against $his fingers as they tease your pussy<</if>><<else>>pussyjuice coating $his lips as $he eats you out<</if>>. $He @@.mediumaquamarine;knows $his place@@ very well.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.trust += 4, $activeSlave.counter.oral++, $oralTotal++>>
<</replace>>
<</link>>
@@ -18435,11 +18121,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
You make your moves the masculine companion to $hers, moving like a paragon of frank male
<<if $PC.belly >= 1500>>
sexuality, despite the fecund curve to your stomach.
-<<<<<<< HEAD
- <<elseif $PC.boobs >= 1>>
-=======
<<elseif $PC.boobs >= 300>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
sexuality, despite the pair of breasts bouncing on your chest.
<<else>>
sexuality.
@@ -18591,18 +18273,6 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<br><<link "Agree and make sure $he doesn't regret it">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- You agree and send $him straight to the surgery. $He looks a little hesitant, as though the prospect is intimidating now that it's actually about to happen, but $he complies obediently. You direct $assistantName to bring $him back to your office as soon as $he's fully recovered. The curatives applied right after surgery hasten $his recovery, and $he's back the next day, standing a little gingerly, $his limp dick looking a bit sore. $He greets you properly, and comes over willingly when you recline in your chair and <<if canSee($activeSlave)>>crook a finger at<<else>>beckon<</if>> $him. <<if canSee($activeSlave)>>As $he approaches, $he notices that <<if $PC.dick >= 1>>you've got your<<if $PC.vagina >= 1>> futa<</if>> dick out<<else>>you're wearing a strap-on<</if>>, and looks a little apprehensive<<else>>$He approaches gingerly, still slightly sore<</if>>, but $he sits down obediently, <<if $PC.dick >= 1>>your erection<<else>>the phallus<</if>> coming to rest between $his legs and lower buttocks, resting against $his perineum and the smooth, recently healed patch of skin at the base of $his dick where $his ballsack used to be. $He gasps at the sensation of <<if $PC.dick >= 1>>your hot cock<<if $PC.vagina >= 1>> and the wet pussy beneath it<</if>><<else>>the hard thing<</if>> pressed against $his most intimate area, but $he doesn't flinch away.
- <br><br>
- You take your time with $him, leaning back in your chair so that $he's lying
- <<if $PC.boobsBonus > 2>>
- against your enormous <<if $PC.boobsImplant == 1>>fake breasts<<else>>cow tits<</if>>.
- <<elseif $PC.boobsBonus == 2>>
- against your huge<<if $PC.boobsImplant == 1>> firm<<else>> soft<</if>> breasts.
- <<elseif $PC.boobsBonus == 1>>
- against your big<<if $PC.boobsImplant == 1>> firm<</if>> breasts.
- <<elseif $PC.boobs >= 1>>
-=======
You agree and send $him straight to the surgery. $He looks a little hesitant, as though the prospect is intimidating now that it's actually about to happen, but $he complies obediently. You direct $assistantName to bring $him back to your office as soon as $he's fully recovered. The curatives applied right after surgery hasten $his recovery, and $he's back the next day, standing a little gingerly, $his limp dick looking a bit sore. $He greets you properly, and comes over willingly when you recline in your chair and <<if canSee($activeSlave)>>crook a finger at<<else>>beckon<</if>> $him. <<if canSee($activeSlave)>>As $he approaches, $he notices that <<if $PC.dick != 0>>you've got your<<if $PC.vagina != -1>> futa<</if>> dick out<<else>>you're wearing a strap-on<</if>>, and looks a little apprehensive<<else>>$He approaches gingerly, still slightly sore<</if>>, but $he sits down obediently, <<if $PC.dick != 0>>your erection<<else>>the phallus<</if>> coming to rest between $his legs and lower buttocks, resting against $his perineum and the smooth, recently healed patch of skin at the base of $his dick where $his ballsack used to be. $He gasps at the sensation of <<if $PC.dick != 0>>your hot cock<<if $PC.vagina != -1>> and the wet pussy beneath it<</if>><<else>>the hard thing<</if>> pressed against $his most intimate area, but $he doesn't flinch away.
<br><br>
You take your time with $him, leaning back in your chair so that $he's lying
@@ -18613,7 +18283,6 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<elseif $PC.boobs >= 1000>>
against your big<<if $PC.boobsImplant != 0>> firm<</if>> breasts.
<<elseif $PC.boobs >= 300>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
against your tits
<<elseif $PC.title == 0>>
against your flat chest
@@ -18628,11 +18297,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
nipples
<</if>>
-<<<<<<< HEAD
- for a while, slowly starting to grind <<if $PC.dick >= 1>>your dick<<if $PC.vagina >= 1>> and the pussy attached to it<</if>><<else>>the strap-on<</if>> back and forth between $his legs. $He starts to ride you, and starts to beg you to fuck $him. You take $him under the arms and pull $him up, letting <<if $PC.dick >= 1>>your erection<<else>>the dildo<</if>> spring free; $he takes the cue and lines its head up with $his
-=======
for a while, slowly starting to grind <<if $PC.dick != 0>>your dick<<if $PC.vagina != -1>> and the pussy attached to it<</if>><<else>>the strap-on<</if>> back and forth between $his legs. $He starts to ride you, and starts to beg you to fuck $him. You take $him under the arms and pull $him up, letting <<if $PC.dick != 0>>your erection<<else>>the dildo<</if>> spring free; $he takes the cue and lines its head up with $his
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.anus > 2>>
asspussy.
<<elseif $activeSlave.anus > 1>>
@@ -19062,11 +18727,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<</if>>
@@.lime;ass is now broken in.@@
<</if>>
-<<<<<<< HEAD
- $He sobs quietly with each thrust of your hips, and when you finally <<if $PC.dick >= 1>>make yet another cum deposit into $his <<if $activeSlave.weight < -80>>emaciated <<else>>bony <</if>>body and<</if>> pull out, you instruct
-=======
$He sobs quietly with each thrust of your hips, and when you finally <<if $PC.dick != 0>>make yet another cum deposit into $his <<if $activeSlave.weight < -80>>emaciated <<else>>bony <</if>>body and<</if>> pull out, you instruct
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.dietCum == 1>>
$assistantName to dramatically increase the amount of cum in $his diet from now on. You won't have a slave telling you what $he eats. $activeSlave.slaveName <<if canHear($activeSlave)>>hears your instructions <<else>>correctly guesses the meaning behind your body language <</if>>and whimpers before rubbing $his sore bottom and
<<else>>
@@ -19207,11 +18868,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
shivers and releases some watery fluid.
<</if>>
-<<<<<<< HEAD
- $He had almost forgotten that $he was being fucked like a girl, and stiffens uncomfortably when $he feels you <<if $PC.dick >= 1>>fill $his rectum with your hot seed<<else>>grip $his hips harder and shake with your own climax<</if>>. As $he gets up from the couch, $he seems @@.hotpink;subdued and submissive.@@ After all, if $he's submitting to you, that absolves $him of responsibility for what $he's becoming.
-=======
$He had almost forgotten that $he was being fucked like a girl, and stiffens uncomfortably when $he feels you <<if $PC.dick != 0>>fill $his rectum with your hot seed<<else>>grip $his hips harder and shake with your own climax<</if>>. As $he gets up from the couch, $he seems @@.hotpink;subdued and submissive.@@ After all, if $he's submitting to you, that absolves $him of responsibility for what $he's becoming.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.devotion += 5>>
<</replace>>
<</link>>
@@ -19219,11 +18876,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<replace "#result2">>
You grab $his hips, getting a good grip, and spear the poor $desc without any hint of mercy. $He <<if $activeSlave.voice > 0>>screams in pain and fear<<else>>sucks in a great sobbing gasp<</if>>, and tries to wriggle away despite $his intention of submitting to your use, but you hold $him in place and rape $his ass.
<<= VCheck.Anal()>>
-<<<<<<< HEAD
- $He tries to maintain $his position, crying openly, but eventually slides off $his perch on the couch, pulling $his hole off your <<if $PC.dick >= 1>>dick<<else>>strap-on<</if>>. You grab $him by <<if $activeSlave.hLength > 20>>hair<<else>>neck<</if>> and smash $his face into the angle of the couch, leaving $his poor butt completely vulnerable. $He can't see you line up to ream $him again, but $he knows it's coming and cries, quivering. After a while, you haul $him up to $his feet and keep fucking $him, the uncomfortable angle of standing anal forcing new <<if $activeSlave.voice > 0>>squeals<<else>>rasps<</if>> out of $him. You pour degradation into $his ear as you take your pleasure from $his unhappy body, telling $him that $he's your fuckmeat. $He believes you, and when you finally orgasm and let $him slide off your hateful <<if $PC.dick >= 1>>penis<<else>>strap-on<</if>>, $he's @@.gold;already terrified@@ of the next time you feel like fucking $him.
-=======
$He tries to maintain $his position, crying openly, but eventually slides off $his perch on the couch, pulling $his hole off your <<if $PC.dick != 0>>dick<<else>>strap-on<</if>>. You grab $him by <<if $activeSlave.hLength > 20>>hair<<else>>neck<</if>> and smash $his face into the angle of the couch, leaving $his poor butt completely vulnerable. $He can't see you line up to ream $him again, but $he knows it's coming and cries, quivering. After a while, you haul $him up to $his feet and keep fucking $him, the uncomfortable angle of standing anal forcing new <<if $activeSlave.voice > 0>>squeals<<else>>rasps<</if>> out of $him. You pour degradation into $his ear as you take your pleasure from $his unhappy body, telling $him that $he's your fuckmeat. $He believes you, and when you finally orgasm and let $him slide off your hateful <<if $PC.dick != 0>>penis<<else>>strap-on<</if>>, $he's @@.gold;already terrified@@ of the next time you feel like fucking $him.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.trust -= 5>>
<</replace>>
<</link>>
@@ -19326,11 +18979,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
cup $his cute little
<</if>>
-<<<<<<< HEAD
- buttocks. $He <<if $activeSlave.voice > 0>>coos<<else>>hums mutely<</if>> at the feeling of your <<if $PC.title == 1>>strong<<else>>feminine<</if>> hands on $his bottom, and presses $himself against you as you rotate the two of you until you can set $his butt on the edge of your desk and <<if $PC.dick >= 1>>slide your big dick into $his well-lubricated cunt<<else>>assertively press your own pussy against $his wet cunt<</if>>.
-=======
buttocks. $He <<if $activeSlave.voice > 0>>coos<<else>>hums mutely<</if>> at the feeling of your <<if $PC.title == 1>>strong<<else>>feminine<</if>> hands on $his bottom, and presses $himself against you as you rotate the two of you until you can set $his butt on the edge of your desk and <<if $PC.dick != 0>>slide your big dick into $his well-lubricated cunt<<else>>assertively press your own pussy against $his wet cunt<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<br><br>
$He makes as if to lie back and take it, but you keep an arm around $his back and hug $his
<<if $activeSlave.boobs > 2000 || $activeSlave.belly >= 5000>>
@@ -19356,31 +19005,19 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
trib $him with assurance, grinding your hips against $hers and making $him feel your heat.
<<set $activeSlave.counter.vaginal++, $vaginalTotal++>>
<</if>>
-<<<<<<< HEAD
- $He clings to you, accepting the closeness to $his <<= WrittenMaster($activeSlave)>> and enjoying the loving attention, even as the extreme wetness of $his cunt and your <<if $PC.dick >= 1>>powerful thrusting<<else>>hungry grinding<</if>> begin to produce lewd noises from between you. $His generous natural lubrication lessens the friction and sensation a little, and you go for a long time before you both climax. You lead $him into your office shower, since you're both coated in $his pussyjuice<<if $PC.dick >= 1>> and $he's carrying a big load of your cum<<else>>, and your own<</if>>. Under the hot water, you don't even have to pull $him close; @@.hotpink;$he presses $himself into your arms on $his own.@@
-=======
$He clings to you, accepting the closeness to $his <<= WrittenMaster($activeSlave)>> and enjoying the loving attention, even as the extreme wetness of $his cunt and your <<if $PC.dick != 0>>powerful thrusting<<else>>hungry grinding<</if>> begin to produce lewd noises from between you. $His generous natural lubrication lessens the friction and sensation a little, and you go for a long time before you both climax. You lead $him into your office shower, since you're both coated in $his pussyjuice<<if $PC.dick != 0>> and $he's carrying a big load of your cum<<else>>, and your own<</if>>. Under the hot water, you don't even have to pull $him close; @@.hotpink;$he presses $himself into your arms on $his own.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.sexualQuirk == "romantic">>
For an incorrigible romantic like $him, this encounter was perfect, and $he @@.hotpink;loves you all the more for it.@@
<<set $activeSlave.devotion += 3>>
<</if>>
<<set $activeSlave.devotion += 5>>
<</replace>>
-<<<<<<< HEAD
-<</link>><<if $activeSlave.vagina == 0 && $PC.dick >= 1>> //This option will take $his virginity//<</if>>
-=======
<</link>><<if $activeSlave.vagina == 0 && $PC.dick != 0>> //This option will take $his virginity//<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<br><<link "Pound $his wet pussy">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
$He's so generously lubricated that $he's ready to take a good hard fuck, so you decide to give $him one. You point at the ground, and you don't even have to tell $him to get down on all fours and get ready to take it. <<if canSee($activeSlave)>>Your gesture<<else>>The atmosphere of the room<</if>> says it for you, and $he obediently gets down and gets in position to be bred like a bitch. $He angles $his hips just right to offer $his cunt to you<<if $activeSlave.belly >= 300000>>, an endeavor given the size of $his middle<<elseif $activeSlave.belly >= 5000>>, while giving $his rounded middle room to hang<</if>>, and even reaches down to spread $his<<if $activeSlave.labia > 1>> dangling<</if>> labia to invite you into $his pink channel.
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.vagina > 1>>
$He can take your big dick without a twinge,
<<else>>
@@ -19400,11 +19037,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<</if>>
cunt's capacity, don it, and
<</if>>
-<<<<<<< HEAD
- mount $him with such force that your first stroke brings $his butt against your hips with an audible smack. There's also a deliciously lewd noise as <<if $PC.dick >= 1>>your invading penis<<else>>the invading phallus<</if>> forces a little gush of pussyjuice out of $him. $He <<if $activeSlave.voice > 0>>shrieks, but it's a shriek<<else>>gasps, but it's a gasp<</if>> of pleasure, and your rutting is so well-lubricated that $he has no trouble getting off on it. Wanting $his climax, you reach around $him and grab hold of $his pussy, feeling the slippery fluid between your fingers and the lewd thrusting motion as <<if $PC.dick >= 1>>your cock<<else>>the phallus<</if>> pistons in and out of $him. That bit of stimulation is enough to tip $him over, and you feel a gush of femcum against your hand as <<if $PC.dick >= 1>>your dickhead<<else>>the head of the strap-on<</if>> forces an orgasm out of $his g-spot. $He's so discombobulated that $he collapses into the puddle of pussyjuice $he left on the floor when you stand up and head off for a shower, but $he @@.hotpink;crawls after you@@ as best $he can on rubbery legs.
-=======
mount $him with such force that your first stroke brings $his butt against your hips with an audible smack. There's also a deliciously lewd noise as <<if $PC.dick != 0>>your invading penis<<else>>the invading phallus<</if>> forces a little gush of pussyjuice out of $him. $He <<if $activeSlave.voice > 0>>shrieks, but it's a shriek<<else>>gasps, but it's a gasp<</if>> of pleasure, and your rutting is so well-lubricated that $he has no trouble getting off on it. Wanting $his climax, you reach around $him and grab hold of $his pussy, feeling the slippery fluid between your fingers and the lewd thrusting motion as <<if $PC.dick != 0>>your cock<<else>>the phallus<</if>> pistons in and out of $him. That bit of stimulation is enough to tip $him over, and you feel a gush of femcum against your hand as <<if $PC.dick != 0>>your dickhead<<else>>the head of the strap-on<</if>> forces an orgasm out of $his g-spot. $He's so discombobulated that $he collapses into the puddle of pussyjuice $he left on the floor when you stand up and head off for a shower, but $he @@.hotpink;crawls after you@@ as best $he can on rubbery legs.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.fetish == "submissive">>
<<if $activeSlave.fetishKnown == 1>>
The $desc sub loves getting fucked like that, and
@@ -19737,32 +19370,19 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
face the ground
<</if>>
-<<<<<<< HEAD
- and offer you $his ass. You're going to need some lubricant for this, but the $desc's saliva should be plenty. As you <<if $PC.dick >= 1>>aim your dick<<else>>swiftly pull on a strap-on and aim it<</if>> at $his face, $he realizes that $his spit is going to be the only relief $his fucked-out butt is going to have for whatever you're planning. $He blows you with desperate eagerness, doing $his absolute best to coat your<<if $PC.dick != 1>> weapon's<</if>> shaft with as much saliva as $he can. You pull it free of $his mouth with a wet pop, and $he immediately faces the floor, cocking $his hips and spreading $his huge asspussy for you.
- <br><br>
- After watching the way it contracts slightly as $he breathes hard for a while, letting $him feel the apprehension, you shove <<if $PC.dick >= 1>>yourself<<else>>the phallus<</if>> inside $him. $He takes it without any reaction at all, and $his gaped hole cups it only loosely. Grabbing $him by the shoulders, you haul $his torso up so it's against your
- <<if $PC.belly >= 5000>>
- pregnancy<<if $PC.belly >= 10000>>, capped by its popped navel<</if>>,
- <<elseif $PC.boobs >= 1>>
-=======
and offer you $his ass. You're going to need some lubricant for this, but the $desc's saliva should be plenty. As you <<if $PC.dick != 0>>aim your dick<<else>>swiftly pull on a strap-on and aim it<</if>> at $his face, $he realizes that $his spit is going to be the only relief $his fucked-out butt is going to have for whatever you're planning. $He blows you with desperate eagerness, doing $his absolute best to coat your<<if $PC.dick != 1>> weapon's<</if>> shaft with as much saliva as $he can. You pull it free of $his mouth with a wet pop, and $he immediately faces the floor, cocking $his hips and spreading $his huge asspussy for you.
<br><br>
After watching the way it contracts slightly as $he breathes hard for a while, letting $him feel the apprehension, you shove <<if $PC.dick != 0>>yourself<<else>>the phallus<</if>> inside $him. $He takes it without any reaction at all, and $his gaped hole cups it only loosely. Grabbing $him by the shoulders, you haul $his torso up so it's against your
<<if $PC.belly >= 5000>>
pregnancy<<if $PC.belly >= 10000>>, capped by its popped navel<</if>>,
<<elseif $PC.boobs >= 300>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
breasts, capped by their rock-hard nipples,
<<elseif $PC.title == 0>>
flat chest, capped by its rock-hard nipples,
<<else>>
muscular chest,
<</if>>
-<<<<<<< HEAD
- and push three of your fingers into $his mouth. $He gags, surprised, but you shove them in farther, collecting as much spit as you can reach. Then you let $him fall back down again. $He knows what you're going to do, and moans as you slide your fingers in alongside your <<if $PC.dick >= 1>>cock<<else>>strap-on<</if>>, taking huge shuddering gasps as $he feels $his sphincter accommodate the abuse. Slowly, you slide your thumb in as well, pushing it around <<if $PC.dick >= 1>>your stiff prick<<else>>the unyielding phallus<</if>> until you're holding it as if masturbating. And then you masturbate. Inside $his ass. $He begins to scream, but manages to prevent $himself from resisting. $He does $his desperate best to take your crushing abuse of $his worn-out hole, and collapses when you finally orgasm and let $him go. $He does $his best to offer some sort of @@.hotpink;submissive thanks,@@ but is barely coherent, and crawls off to shower again, $his lewd sphincter pulsing as $he goes.
-=======
and push three of your fingers into $his mouth. $He gags, surprised, but you shove them in farther, collecting as much spit as you can reach. Then you let $him fall back down again. $He knows what you're going to do, and moans as you slide your fingers in alongside your <<if $PC.dick != 0>>cock<<else>>strap-on<</if>>, taking huge shuddering gasps as $he feels $his sphincter accommodate the abuse. Slowly, you slide your thumb in as well, pushing it around <<if $PC.dick != 0>>your stiff prick<<else>>the unyielding phallus<</if>> until you're holding it as if masturbating. And then you masturbate. Inside $his ass. $He begins to scream, but manages to prevent $himself from resisting. $He does $his desperate best to take your crushing abuse of $his worn-out hole, and collapses when you finally orgasm and let $him go. $He does $his best to offer some sort of @@.hotpink;submissive thanks,@@ but is barely coherent, and crawls off to shower again, $his lewd sphincter pulsing as $he goes.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.devotion += 5>>
<<= VCheck.Anal()>>
<<EventFetish $activeSlave "buttslut">>
@@ -19774,13 +19394,8 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<setLocalPronouns $HeadGirl 2>>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- You page $HeadGirl.slaveName for some assistance filling up a loose hole, and _he2 comes quickly, <<if canPenetrate($HeadGirl)>>precum already visible at the tip of _his2 erection<<else>>bringing a strap-on<</if>>. When _he2 arrives, it's to the sight of $activeSlave.slaveName sitting on your lap<<if !canDoAnal($activeSlave)>>, anal chastity discarded<</if>>, with your <<if $PC.dick >= 1>>cock<<else>>strap-on<</if>> up $his ridiculous anal gape, waiting for a second phallus while your hands tease $his $activeSlave.nipples nipples. Seeing that backup has arrived, you lean back and shift your grip to the back of the receptacle's lower thighs, pulling $him up and shifting $his hips to offer your Head Girl another berth in $activeSlave.slaveName's ass. This pulls $his loose sphincter up, producing a little gape above the top of your invading shaft, and $HeadGirl.slaveName loses no time in fucking it. _He2 gives $activeSlave.slaveName a kiss, but soon breaks the lip lock, since _he2's more interested in making eyes at you over your mutual anal conquest's shuddering shoulder. As
- <<if $PC.dick >= 1>>
-=======
You page $HeadGirl.slaveName for some assistance filling up a loose hole, and _he2 comes quickly, <<if canPenetrate($HeadGirl)>>precum already visible at the tip of _his2 erection<<else>>bringing a strap-on<</if>>. When _he2 arrives, it's to the sight of $activeSlave.slaveName sitting on your lap<<if !canDoAnal($activeSlave)>>, anal chastity discarded<</if>>, with your <<if $PC.dick != 0>>cock<<else>>strap-on<</if>> up $his ridiculous anal gape, waiting for a second phallus while your hands tease $his $activeSlave.nipples nipples. Seeing that backup has arrived, you lean back and shift your grip to the back of the receptacle's lower thighs, pulling $him up and shifting $his hips to offer your Head Girl another berth in $activeSlave.slaveName's ass. This pulls $his loose sphincter up, producing a little gape above the top of your invading shaft, and $HeadGirl.slaveName loses no time in fucking it. _He2 gives $activeSlave.slaveName a kiss, but soon breaks the lip lock, since _he2's more interested in making eyes at you over your mutual anal conquest's shuddering shoulder. As
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if canPenetrate($HeadGirl)>>
your dicks slide against each other,
<<else>>
@@ -19891,11 +19506,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
traces $his chastity
<</if>>
-<<<<<<< HEAD
- and you press your groin towards $him. Getting the idea, $he begins to <<if $PC.dick >= 1>>jack you off<<else>>finger your clit<</if>> energetically, taking the pace from your lusty demeanor and $his own feeling of energy and well-being. The two of you orgasm almost together. <<if $PC.dick >= 1>>You angle your hips to shoot your seed onto the floor<<else>>You climax so violently that some of your femcum makes it onto the floor<</if>>.
-=======
and you press your groin towards $him. Getting the idea, $he begins to <<if $PC.dick != 0>>jack you off<<else>>finger your clit<</if>> energetically, taking the pace from your lusty demeanor and $his own feeling of energy and well-being. The two of you orgasm almost together. <<if $PC.dick != 0>>You angle your hips to shoot your seed onto the floor<<else>>You climax so violently that some of your femcum makes it onto the floor<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if ($activeSlave.chastityPenis == 1)>>
$His ejaculate steadily drips from $his chastity cage,
<<elseif canAchieveErection($activeSlave)>>
@@ -20003,13 +19614,8 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<</if>>
and pull $him back into your arms. The other slave watches silently, awaiting some cue as to whether _heU's to join in or return to breakfast; you give _himU a flick of your chin, and _heU turns away, leaving you with $activeSlave.slaveName, embracing among the eating slaves.
<br><br>
-<<<<<<< HEAD
- You whisper into $his ear that you think $he's attractive, <<if $PC.dick >= 1>>and point out that $he can feel the proof between $his buttocks. You're hard, and your stiff prick is poking $him in the rear. $He gasps and shifts a little, and you nestle your dick even closer into the warm place between $his legs and ass.<<else>>and tell $him that you can prove it. You grab one of $his hands and pull it around behind $him, between you, making $him feel your pussy. $He gasps at how wet it is.<</if>> "An old <<s>>lave like me, <<Master>>?" $he echoes in a small voice. An old slave like $him, you confirm, and tell $him that right now,
- <<if $PC.dick >= 1 && (canDoVaginal($activeSlave) || canDoAnal($activeSlave))>>
-=======
You whisper into $his ear that you think $he's attractive, <<if $PC.dick != 0>>and point out that $he can feel the proof between $his buttocks. You're hard, and your stiff prick is poking $him in the rear. $He gasps and shifts a little, and you nestle your dick even closer into the warm place between $his legs and ass.<<else>>and tell $him that you can prove it. You grab one of $his hands and pull it around behind $him, between you, making $him feel your pussy. $He gasps at how wet it is.<</if>> "An old <<s>>lave like me, <<Master>>?" $he echoes in a small voice. An old slave like $him, you confirm, and tell $him that right now,
<<if $PC.dick != 0 && (canDoVaginal($activeSlave) || canDoAnal($activeSlave))>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if canDoVaginal($activeSlave)>>
you've decided to fuck $his pussy. $He starts at the sudden vulgarity, even with your cock resting against the soft skin between the bottom of $his vulva and $his anus, and shudders with sudden pleasure as you use a hand to guide yourself inside $his welcoming channel.
<<= VCheck.Vaginal()>>
@@ -20020,11 +19626,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
You take $him standing,
<<else>>
some oral sex from a slave like $him sounds just right. You push $him to $his knees and
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
push your dick into $his mouth,
<<else>>
hold $his mouth to your cunt,
@@ -20032,17 +19634,10 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
taking your pleasure from $him
<<set $activeSlave.counter.oral++, $oralTotal++>>
<</if>>
-<<<<<<< HEAD
- right there among your breakfasting slaves, who try to ignore you or watch with appreciation, according to their own natures. When you're finished, you <<if $PC.dick >= 1>>spin $him around and kiss $him,<<else>>pull $him up to $his feet and kiss $him, tasting yourself on $his lips and<</if>> making sure $he knows @@.hotpink;you appreciate $his mature body@@ just as much as <<if $activeSlave.assignment == "whore" || $activeSlave.assignment == "work in the brothel">>$his customers do<<else>>your citizens do<</if>>.
- <<set $activeSlave.devotion += 5>>
- <</replace>>
-<</link>><<if canDoVaginal($activeSlave) && ($activeSlave.vagina == 0) && $PC.dick >= 1>>//This option will take $his virginity//<<elseif !canDoVaginal($activeSlave) && ($activeSlave.anus == 0) && $PC.dick >= 1>> //This option will take $his anal virginity//<</if>>
-=======
right there among your breakfasting slaves, who try to ignore you or watch with appreciation, according to their own natures. When you're finished, you <<if $PC.dick != 0>>spin $him around and kiss $him,<<else>>pull $him up to $his feet and kiss $him, tasting yourself on $his lips and<</if>> making sure $he knows @@.hotpink;you appreciate $his mature body@@ just as much as <<if $activeSlave.assignment == "whore" || $activeSlave.assignment == "work in the brothel">>$his customers do<<else>>your citizens do<</if>>.
<<set $activeSlave.devotion += 5>>
<</replace>>
<</link>><<if canDoVaginal($activeSlave) && ($activeSlave.vagina == 0) && $PC.dick != 0>>//This option will take $his virginity//<<elseif !canDoVaginal($activeSlave) && ($activeSlave.anus == 0) && $PC.dick != 0>> //This option will take $his anal virginity//<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<case "im scared">>
@@ -20235,22 +19830,14 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<else>>
wiggling $his rear side to side alluringly
<</if>>
-<<<<<<< HEAD
- and putting a finger to $his slightly parted lips as $he stares down at your <<if $PC.dick >= 1>>stiff prick<<else>>strap-on<</if>>.
-=======
and putting a finger to $his slightly parted lips as $he stares down at your <<if $PC.dick != 0>>stiff prick<<else>>strap-on<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<br><br>
<<set _fucked = 0>>
<<if $activeSlave.fetishKnown == 1 && $activeSlave.fetish != "none">>
Finally making $his decision, $he
<<switch $eventSlave.fetish>>
<<case "submissive">>
-<<<<<<< HEAD
- turns around and carefully perches $himself on <<if $PC.dick >= 1>>your cock<<else>>the phallus<</if>>,
-=======
turns around and carefully perches $himself on <<if $PC.dick != 0>>your cock<<else>>the phallus<</if>>,
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if canDoVaginal($activeSlave) && ($activeSlave.vagina > 0)>>
letting $his weight slide it inside $his wet pussy.
<<= VCheck.Vaginal()>>
@@ -20263,19 +19850,11 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
$He's not used to being on top, but $he uses $himself to service you as submissively as $he can. $He pays $his own pleasure no attention at all,
<<set _fucked = 1>>
<<case "cumslut">>
-<<<<<<< HEAD
- squats down, coming face to face with <<if $PC.dick >= 1>>your cock<<else>>the phallus<</if>>. <<if canTalk($activeSlave)>>"<<Master>>, I changed my mind about <<s>>itting," $he <<say>>s<<else>>$He gestures that $he changed $his mind about sitting<</if>>, and licks $his lips sluttily. Then $he gives <<if $PC.dick >= 1>>you<<else>>the phallus<</if>> a lusty blowjob, humming and licking happily. <<if $PC.dick >= 1>>$He swallows your load hungrily,<<else>>$He helps you out of the harness with your permission and eats you out too,<</if>>
- <<set $activeSlave.counter.oral++, $oralTotal++>>
- <<set _fucked = 1>>
- <<case "humiliation">>
- turns around and sits on <<if $PC.dick >= 1>>your cock<<else>>the phallus<</if>>, leaning back against you and making sure all the other slaves who pass by can see
-=======
squats down, coming face to face with <<if $PC.dick != 0>>your cock<<else>>the phallus<</if>>. <<if canTalk($activeSlave)>>"<<Master>>, I changed my mind about <<s>>itting," $he <<say>>s<<else>>$He gestures that $he changed $his mind about sitting<</if>>, and licks $his lips sluttily. Then $he gives <<if $PC.dick != 0>>you<<else>>the phallus<</if>> a lusty blowjob, humming and licking happily. <<if $PC.dick != 0>>$He swallows your load hungrily,<<else>>$He helps you out of the harness with your permission and eats you out too,<</if>>
<<set $activeSlave.counter.oral++, $oralTotal++>>
<<set _fucked = 1>>
<<case "humiliation">>
turns around and sits on <<if $PC.dick != 0>>your cock<<else>>the phallus<</if>>, leaning back against you and making sure all the other slaves who pass by can see
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if canDoVaginal($activeSlave) && ($activeSlave.vagina > 0)>>
where it penetrates $his cunt.
<<= VCheck.Vaginal()>>
@@ -20289,16 +19868,6 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<set _fucked = 1>>
<<case "buttslut">>
<<if canDoAnal($activeSlave) && ($activeSlave.anus > 0)>>
-<<<<<<< HEAD
- turns around and shivers with pleasure as $he hilts $his anal sphincter around the base of <<if $PC.dick >= 1>>your cock<<else>>the phallus<</if>>. $He bounces on it happily, reaming $his own ass,
- <<= VCheck.Anal()>>
- <<else>>
- turns around and shivers with pleasure as $he feels <<if $PC.dick >= 1>>your cock<<else>>the phallus<</if>> slip between $his buttcheeks. $He rubs against it, happy to share $his butt with you,
- <</if>>
- <<set _fucked = 1>>
- <<case "boobs">>
- squats down, placing <<if $PC.dick >= 1>>your cock<<else>>the phallus<</if>> <<if $activeSlave.boobs > 4000>>in the virtual hole formed in the place between $his breasts, which are so massive they rest together<<elseif $activeSlave.boobs > 1000>>in the valley between $his tits<<elseif $activeSlave.boobs > 300>>between $his breasts<<else>>against one of $his nipples<</if>>. <<if canTalk($activeSlave)>>"<<Master>>, I changed my mind about <<s>>itting," $he <<say>>s<<else>>$He gestures that $he changed $his mind about sitting<</if>>, and starts giving you a boob job. $He enjoys the breast play,
-=======
turns around and shivers with pleasure as $he hilts $his anal sphincter around the base of <<if $PC.dick != 0>>your cock<<else>>the phallus<</if>>. $He bounces on it happily, reaming $his own ass,
<<= VCheck.Anal()>>
<<else>>
@@ -20307,34 +19876,21 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<set _fucked = 1>>
<<case "boobs">>
squats down, placing <<if $PC.dick != 0>>your cock<<else>>the phallus<</if>> <<if $activeSlave.boobs > 4000>>in the virtual hole formed in the place between $his breasts, which are so massive they rest together<<elseif $activeSlave.boobs > 1000>>in the valley between $his tits<<elseif $activeSlave.boobs > 300>>between $his breasts<<else>>against one of $his nipples<</if>>. <<if canTalk($activeSlave)>>"<<Master>>, I changed my mind about <<s>>itting," $he <<say>>s<<else>>$He gestures that $he changed $his mind about sitting<</if>>, and starts giving you a boob job. $He enjoys the breast play,
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.counter.mammary++, $mammaryTotal++>>
<<set _fucked = 1>>
<<case "pregnancy">>
<<if canDoVaginal($activeSlave) && ($activeSlave.vagina > 0)>>
-<<<<<<< HEAD
- turns around and lovingly lowers $his pussy onto you. <<if $PC.dick >= 1>><<if $activeSlave.pregKnown == 1>>$He's already pregnant, so this isn't a direct satisfaction of $his impregnation fetish, but being fucked while pregnant is almost as good as far as $he's concerned.<<elseif canGetPregnant($activeSlave)>>This might be the moment $he gets pregnant, and $he's quivering with anticipations.<<else>>$He knows $he isn't fertile, but $he's good at fantasizing.<</if>><<else>>Your strap-on might not be able to impregnate anyone, but $he's good at fantasizing.<</if>> $He rides you hungrily,
-=======
turns around and lovingly lowers $his pussy onto you. <<if $PC.dick != 0>><<if $activeSlave.pregKnown == 1>>$He's already pregnant, so this isn't a direct satisfaction of $his impregnation fetish, but being fucked while pregnant is almost as good as far as $he's concerned.<<elseif canGetPregnant($activeSlave)>>This might be the moment $he gets pregnant, and $he's quivering with anticipations.<<else>>$He knows $he isn't fertile, but $he's good at fantasizing.<</if>><<else>>Your strap-on might not be able to impregnate anyone, but $he's good at fantasizing.<</if>> $He rides you hungrily,
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<= VCheck.Vaginal()>>
<<if canImpreg($activeSlave, $PC)>>
<<= knockMeUp($activeSlave, 40, 0, -1)>>
<</if>>
<<else>>
-<<<<<<< HEAD
- turns around and carefully perches $himself on <<if $PC.dick >= 1>>your cock<<else>>the phallus<</if>>, putting it between $his thighs. $He rides you caringly,
- <</if>>
- <<set _fucked = 1>>
- <<case "dom">>
- turns around and sits right down on <<if $PC.dick >= 1>>your cock<<else>>the phallus<</if>>, eagerly
-=======
turns around and carefully perches $himself on <<if $PC.dick != 0>>your cock<<else>>the phallus<</if>>, putting it between $his thighs. $He rides you caringly,
<</if>>
<<set _fucked = 1>>
<<case "dom">>
turns around and sits right down on <<if $PC.dick != 0>>your cock<<else>>the phallus<</if>>, eagerly
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if canDoVaginal($activeSlave) && ($activeSlave.vagina > 0)>>
taking it into $his cunt.
<<= VCheck.Vaginal()>>
@@ -20347,11 +19903,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
$He loves being on top, even if $he's the one who's getting fucked. $He rides you happily,
<<set _fucked = 1>>
<<case "sadist">>
-<<<<<<< HEAD
- turns around and hesitantly sits on <<if $PC.dick >= 1>>your cock<<else>>the phallus<</if>>, letting
-=======
turns around and hesitantly sits on <<if $PC.dick != 0>>your cock<<else>>the phallus<</if>>, letting
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if canDoVaginal($activeSlave) && ($activeSlave.vagina > 0)>>
it slide into $his cunt.
<<= VCheck.Vaginal()>>
@@ -20364,11 +19916,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
$He prefers to be rough, but settles for just directing how $he gets used. $He rides you cautiously,
<<set _fucked = 1>>
<<case "masochist">>
-<<<<<<< HEAD
- turns around and carefully perches $himself on <<if $PC.dick >= 1>>your cock<<else>>the phallus<</if>>,
-=======
turns around and carefully perches $himself on <<if $PC.dick != 0>>your cock<<else>>the phallus<</if>>,
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if canDoVaginal($activeSlave) && ($activeSlave.vagina > 0)>>
letting $his weight slide it inside $his wet pussy at an uncomfortable angle.
<<= VCheck.Vaginal()>>
@@ -20383,15 +19931,9 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<</switch>>
<</if>>
<<if _fucked == 1>>
-<<<<<<< HEAD
- and after you've <<if $PC.dick >= 1>>cum<<else>>climaxed<</if>>, $he @@.mediumaquamarine;thanks you trustingly,@@ happy $he's still allowed a sexy choice with you now and then.
- <<else>>
- <<if $activeSlave.fetishKnown == 1>>$He can't really think of how to accommodate the situation to $his own preferred approach to sex,<<else>>$He isn't well versed in how $his own sexual needs might fit into the situation,<</if>> so $he just services you like a good $girl. $He turns around and sits on <<if $PC.dick >= 1>>your cock<<else>>the phallus<</if>>,
-=======
and after you've <<if $PC.dick != 0>>cum<<else>>climaxed<</if>>, $he @@.mediumaquamarine;thanks you trustingly,@@ happy $he's still allowed a sexy choice with you now and then.
<<else>>
<<if $activeSlave.fetishKnown == 1>>$He can't really think of how to accommodate the situation to $his own preferred approach to sex,<<else>>$He isn't well versed in how $his own sexual needs might fit into the situation,<</if>> so $he just services you like a good $girl. $He turns around and sits on <<if $PC.dick != 0>>your cock<<else>>the phallus<</if>>,
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if canDoVaginal($activeSlave) && ($activeSlave.vagina > 0)>>
squatting to bounce $his cunt up and down on it.
<<= VCheck.Vaginal()>>
@@ -20420,11 +19962,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
getting it situated between $his thighs, since that's the best option $he has available.
<</if>>
<<if $activeSlave.belly >= 5000>>Before starting to pleasure you, $he notices there is no way $he can move with $his rounded middle sticking out as far as it does. $He carefully turns around, feeling your glare on $his back at $his mistake.<</if>>
-<<<<<<< HEAD
- Still crouched over you, $he begins to move up and down, milking <<if $PC.dick >= 1>>your penis<<else>>the strap-on<</if>>. As $he works into it, $he lets $his butt touch you, just once, but you make a nonverbal sound of disapproval, letting $him know not to disturb your work like that. Realizing that $he needs to play the human sex toy, $he
-=======
Still crouched over you, $he begins to move up and down, milking <<if $PC.dick != 0>>your penis<<else>>the strap-on<</if>>. As $he works into it, $he lets $his butt touch you, just once, but you make a nonverbal sound of disapproval, letting $him know not to disturb your work like that. Realizing that $he needs to play the human sex toy, $he
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.butt > 12>>
grabs $his massive buttocks and finds that there is no way $he can keep the expanses of flesh from enveloping your lap.
<<elseif $activeSlave.butt > 5>>
@@ -20584,11 +20122,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<replace "#result">>
Deciding to help $him, you head over and grab a handful of each of $his asscheeks, hefting $him <<if $activeSlave.buttImplant/$activeSlave.butt >= .5>>unnaturally taut<<else>>soft<</if>> masses of feminine assflesh upward and out of the constricting clothing.
<<if (($activeSlave.fetishKnown == 1) && ($activeSlave.fetish == "buttslut")) || ($activeSlave.energy > 80)>>
-<<<<<<< HEAD
- $He's a little disappointed when $he realizes that you're just being helpful, instead of getting ready to stick <<if $PC.dick >= 1>>your dick<<else>>something<</if>> inside $him, but $he thanks you properly once $he's free. Clearly unwilling to leave it at just that, $he gives you quite a show as $he gets into the next size up, making sure to bounce $his ass for you and keeping $his <<if !canDoVaginal($activeSlave)>>ass<</if>>pussy visible for longer than is strictly necessary. @@.mediumaquamarine;$He trusts you'll fuck $him some other time,@@ and is even a little happy that you're willing to lend $him a helping hand outside of sex.
-=======
$He's a little disappointed when $he realizes that you're just being helpful, instead of getting ready to stick <<if $PC.dick != 0>>your dick<<else>>something<</if>> inside $him, but $he thanks you properly once $he's free. Clearly unwilling to leave it at just that, $he gives you quite a show as $he gets into the next size up, making sure to bounce $his ass for you and keeping $his <<if !canDoVaginal($activeSlave)>>ass<</if>>pussy visible for longer than is strictly necessary. @@.mediumaquamarine;$He trusts you'll fuck $him some other time,@@ and is even a little happy that you're willing to lend $him a helping hand outside of sex.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<elseif $activeSlave.trust > 20>>
$He feels the familiar grip of your <<if $PC.title == 1>>strong<<else>>feminine<</if>> hands without surprise or resentment, and relaxes trustingly as you manipulate $his bottom. Realizing that you're helping $him, $he quickly slides the offending item down $his thigh<<if hasBothLegs($activeSlave)>>s<</if>> and off $himself, and then thanks you properly. $He smiles at you as $he puts on the next size up, clearly pleased that you'd @@.mediumaquamarine;assist $him with a trivial thing@@ outside of $his direct duties as a sex slave.
<<else>>
@@ -20606,19 +20140,11 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
$He gasps wantonly as $he feels the familiar sensation of <<if $PC.dick != 0>>your dick<<else>>a strap-on<</if>> infiltrating between $his cheeks and towards $his <<if $activeSlave.anus >= 3>>loose<<elseif $activeSlave.anus >= 2>>relaxed<<else>>tight little<</if>> anus. $He releases $his grip on the constricting clothing that's binding $his thighs together and grinds $his ass back against you, making sure every <<if $showInches == 2>>inch<<else>>centimeter<</if>> of your <<if $PC.dick != 0>>hard member<<else>>phallus<</if>> that will fit gets inside $his asshole. Some time later, the hard pounding dislodges the clothing and it slides down $his leg<<if hasBothLegs($activeSlave)>>s<</if>> to gather around $his ankle<<if hasBothLegs($activeSlave)>>s<</if>>. @@.hotpink;$He doesn't notice.@@
<<= VCheck.Anal()>>
<<elseif $activeSlave.energy > 80>>
-<<<<<<< HEAD
- $He's so horny that $he doesn't need any foreplay. Nor does $he get any. You grab $his hips and smack your <<if $PC.dick >= 1>>dick<<else>>strap-on<</if>> against $his jiggling buttocks a couple of times, making $his bounce with eagerness and frustration at the anticipation of imminent sexual release. Exercising mercy, you pull $his ass back against you and maneuver <<if $PC.dick >= 1>>yourself<<else>>your instrument<</if>> inside $him, enjoying $his shiver at the @@.hotpink;satisfaction of $his hopes.@@ The constricting clothes pin $his legs together, and you hold $his arms against $his sides, keeping $his back pressed against your
- <<if $PC.belly > 1500>>
- pregnancy
- <<elseif $PC.boobs >= 1>>
- <<if $PC.boobsImplant == 1>>fake <</if>>breasts
-=======
$He's so horny that $he doesn't need any foreplay. Nor does $he get any. You grab $his hips and smack your <<if $PC.dick != 0>>dick<<else>>strap-on<</if>> against $his jiggling buttocks a couple of times, making $his bounce with eagerness and frustration at the anticipation of imminent sexual release. Exercising mercy, you pull $his ass back against you and maneuver <<if $PC.dick != 0>>yourself<<else>>your instrument<</if>> inside $him, enjoying $his shiver at the @@.hotpink;satisfaction of $his hopes.@@ The constricting clothes pin $his legs together, and you hold $his arms against $his sides, keeping $his back pressed against your
<<if $PC.belly > 1500>>
pregnancy
<<elseif $PC.boobs >= 300>>
<<if $PC.boobsImplant != 0>>fake <</if>>breasts
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<elseif $PC.title == 0>>
flat chest
<<else>>
@@ -20630,11 +20156,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
$He relaxes submissively when $he feels you take hold of $his huge ass and slide your <<if $PC.dick != 0>>dick<<else>>strap-on<</if>> between $his asscheeks and then inside $his <<if canDoVaginal($activeSlave)>>pussy<<else>>anus<</if>>. $His legs are already in effect bound by the constricting clothing that's still holding them together, and you enhance the effect by taking hold of $his wrists and hugging $him from behind as you fuck $him, holding $his <<if hasBothLegs($activeSlave)>>arms crossed<<else>>arm<</if>> across $his <<if $activeSlave.boobs > 2000>>massive breasts<<elseif $activeSlave.boobs > 300>>boobs<<else>>chest<</if>>. Helpless in your embrace, $he @@.hotpink;relaxes completely and lets it happen.@@
<<if canDoVaginal($activeSlave)>><<= VCheck.Vaginal()>><<else>><<= VCheck.Anal()>><</if>>
<<else>>
-<<<<<<< HEAD
- $He stiffens fearfully when $he feels you take hold of $his huge ass, but $he knows not to resist. $He stays still as you slide your <<if $PC.dick >= 1>>dick<<else>>strap-on<</if>> between $his asscheeks and then inside $his <<if canDoVaginal($activeSlave)>>pussy<<else>>anus<</if>>, trying to angle $his hips to make the standing penetration less uncomfortable. The clothing binds $his legs together, reducing $him to simply sticking $his butt out as best $he can to ease the stroking of your <<if $PC.dick >= 1>>cock<<else>>phallus<</if>>, invading $his helpless
-=======
$He stiffens fearfully when $he feels you take hold of $his huge ass, but $he knows not to resist. $He stays still as you slide your <<if $PC.dick != 0>>dick<<else>>strap-on<</if>> between $his asscheeks and then inside $his <<if canDoVaginal($activeSlave)>>pussy<<else>>anus<</if>>, trying to angle $his hips to make the standing penetration less uncomfortable. The clothing binds $his legs together, reducing $him to simply sticking $his butt out as best $he can to ease the stroking of your <<if $PC.dick != 0>>cock<<else>>phallus<</if>>, invading $his helpless
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if canDoVaginal($activeSlave)>>
cunt.
<<= VCheck.Vaginal()>>
@@ -20642,11 +20164,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
asshole.
<<= VCheck.Anal()>>
<</if>>
-<<<<<<< HEAD
- When you're done, you extract yourself and stalk off, leaving $him to struggle free<<if $PC.dick >= 1>> and try to keep the cum dripping out of $him off $his clothing<</if>>. $He stumbles back to fetch the right size, @@.hotpink;thoroughly fucked.@@
-=======
When you're done, you extract yourself and stalk off, leaving $him to struggle free<<if $PC.dick != 0>> and try to keep the cum dripping out of $him off $his clothing<</if>>. $He stumbles back to fetch the right size, @@.hotpink;thoroughly fucked.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</if>>
<</replace>>
<<set $activeSlave.devotion += 5>>
@@ -21190,11 +20708,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<link "Enjoy some oral with an evening of wallscreen television">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- There are some things that never change, even after ascension to the high position of an arcology owner. One of these fixtures of life is the ability to enjoy a relaxing evening of wallscreen television and <<if $PC.dick >= 1>>a blowjob<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>some cunnilingus<</if>>. With $activeSlave.slaveName sequestered between your legs, you tune into your favorite Free Cities serial drama and <<if !canSee($activeSlave)>>audibly <</if>>widen your legs slightly as you sink back into the chair with a sigh of contentment. $He
-=======
There are some things that never change, even after ascension to the high position of an arcology owner. One of these fixtures of life is the ability to enjoy a relaxing evening of wallscreen television and <<if $PC.dick != 0>>a blowjob<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>some cunnilingus<</if>>. With $activeSlave.slaveName sequestered between your legs, you tune into your favorite Free Cities serial drama and <<if !canSee($activeSlave)>>audibly <</if>>widen your legs slightly as you sink back into the chair with a sigh of contentment. $He
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.belly >= 300000>>
gently leans onto $his _belly belly<<if hasAnyArms($activeSlave)>> with $his arm<<if hasBothArms($activeSlave)>>s<</if>> steadying the mass<</if>>
<<elseif $activeSlave.belly >= 5000>>
@@ -21411,26 +20925,16 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
flat chest
<</if>>
and your
-<<<<<<< HEAD
- <<if $PC.boobs >= 1>>
-=======
<<if $PC.boobs >= 300>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
bosom.
<<elseif $PC.title == 0>>
chest.
<<else>>
hard pectorals.
<</if>>
-<<<<<<< HEAD
- $He sniffles, trying to restrain $his hopes. You push $him backwards toward the couch, giving $him a kiss to really bring $him to the height of anticipation before laying $him down and sliding your <<if $PC.dick >= 1>>cock<<else>>strap-on<</if>> <<if $activeSlave.anus > 1>>inside $his soft asshole<<else>>up $his tight little butt<</if>>.
- <<if $activeSlave.prostate != 0>>
- The instant <<if $PC.dick >= 1>>your hard dickhead<<else>>the hard tip of your phallus<</if>> presses against $his prostate, $he orgasms, squirting <<if $activeSlave.balls == 0>>translucent fluid<<else>>cum<</if>>. $He looks like $he wants to say something, or maybe even apologize, so you shush $him with a gentle hand and pull out, letting the fluid run down <<if $activeSlave.scrotum > 0>>$his soft scrotum<<else>>the pretty skin between $his cumhole and $his anus<</if>> until it glazes $his asspussy. You use <<if $PC.dick >= 1>>the tip of your cock<<else>>the head of the strap-on<</if>> to massage the fluid into the hole before penetrating it again with the extra lubrication.
-=======
$He sniffles, trying to restrain $his hopes. You push $him backwards toward the couch, giving $him a kiss to really bring $him to the height of anticipation before laying $him down and sliding your <<if $PC.dick != 0>>cock<<else>>strap-on<</if>> <<if $activeSlave.anus > 1>>inside $his soft asshole<<else>>up $his tight little butt<</if>>.
<<if $activeSlave.prostate != 0>>
The instant <<if $PC.dick != 0>>your hard dickhead<<else>>the hard tip of your phallus<</if>> presses against $his prostate, $he orgasms, squirting <<if $activeSlave.balls == 0>>translucent fluid<<else>>cum<</if>>. $He looks like $he wants to say something, or maybe even apologize, so you shush $him with a gentle hand and pull out, letting the fluid run down <<if $activeSlave.scrotum > 0>>$his soft scrotum<<else>>the pretty skin between $his cumhole and $his anus<</if>> until it glazes $his asspussy. You use <<if $PC.dick != 0>>the tip of your cock<<else>>the head of the strap-on<</if>> to massage the fluid into the hole before penetrating it again with the extra lubrication.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<else>>
Without a prostate or a strong anal fetish, $he'll have trouble climaxing to nothing but buttsex, so you make sure to tend to every erogenous zone $he has left. You guide one of $his hands down so $he can rub <<if $activeSlave.scrotum > 0>>$his scrotum<<else>>the skin between $his legs<</if>>, and make $his stimulate one of $his nipples with the other. You <<if $activeSlave.nipples != "fuckable">>pinch and rub<<else>>finger<</if>> $his other nipple, and push two fingers of your other hand into $his mouth, making $him suck them. So completely stimulated, $he finally manages to orgasm.
<</if>>
@@ -21444,19 +20948,11 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<replace "#result">>
$He's an anal sex toy, and you decide to use $him like one. You walk over, reach down, and jerk $him <<if hasBothLegs($activeSlave)>>to $his feet<<else>>off the ground<</if>>. You don't hurt $him, not yet, but the violence of the motion forces a sob out of $him. $He <<if canSee($activeSlave)>>sees the open lust in your eyes<<else>>feels the lust lingering about you<</if>> and is afraid. $He's not wrong to be so; you spin $him roughly around and use one arm to pin $his upper body mercilessly in place while you use your other hand to
<<if $activeSlave.anus > 2>>
-<<<<<<< HEAD
- manhandle your <<if $PC.dick >= 1>>cock<<else>>strap-on<</if>> up $his roomy ass. It's disappointingly easy, and $he takes it without a struggle, so you reach around $his front, down between $his legs, and jam a couple of fingers up there, too.
- <<elseif $activeSlave.anus > 1>>
- shove your <<if $PC.dick >= 1>>cock<<else>>strap-on<</if>> up $his anus. $He's taken hard anal before, but the angle isn't particularly comfortable, you didn't bother with lube, and you begin to rape $him vigorously without any warning.
- <<else>>
- force your <<if $PC.dick >= 1>>cock<<else>>strap-on<</if>> up $his spasming anus. $He'd struggle to take it in a position far more comfortable for anal than standing straight up, and you don't even bother to take it slow.
-=======
manhandle your <<if $PC.dick != 0>>cock<<else>>strap-on<</if>> up $his roomy ass. It's disappointingly easy, and $he takes it without a struggle, so you reach around $his front, down between $his legs, and jam a couple of fingers up there, too.
<<elseif $activeSlave.anus > 1>>
shove your <<if $PC.dick != 0>>cock<<else>>strap-on<</if>> up $his anus. $He's taken hard anal before, but the angle isn't particularly comfortable, you didn't bother with lube, and you begin to rape $him vigorously without any warning.
<<else>>
force your <<if $PC.dick != 0>>cock<<else>>strap-on<</if>> up $his spasming anus. $He'd struggle to take it in a position far more comfortable for anal than standing straight up, and you don't even bother to take it slow.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</if>>
"<<Master>>, that hurt<<s>>!" $he screams, crying even harder. "Ow, it h-hurt<<s>>! Plea<<s>>e take it out, ow, ow," $he shrieks, and then degenerates into nonverbal caterwauling.
<<if $activeSlave.prostate != 0>>
@@ -21775,11 +21271,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<link "Give $him something else to gag on">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- As pleasant an image as $activeSlave.slaveName's mouth filled by a $activeSlave.collar is, one of $his mouth's primary purposes is still to provide you with ample <<if $PC.dick >= 1>>blowjobs<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>cunnilingus<</if>>. With $activeSlave.slaveName already kneeling, it is merely a matter of undoing $his gag before you can put $his mouth to work.
-=======
As pleasant an image as $activeSlave.slaveName's mouth filled by a $activeSlave.collar is, one of $his mouth's primary purposes is still to provide you with ample <<if $PC.dick != 0>>blowjobs<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>cunnilingus<</if>>. With $activeSlave.slaveName already kneeling, it is merely a matter of undoing $his gag before you can put $his mouth to work.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.skill.oral >= 100>>
Though $he has spent much time gagged, $his mastery at giving oral is unaffected.
<<elseif $activeSlave.skill.oral > 60>>
@@ -21837,21 +21329,13 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<link "Fuck $his boobs">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- When $he <<if canSee($activeSlave)>>sees you <<if $PC.dick >= 1>>get your dick out<<else>>approaching $him with sapphic lust in your eyes<</if>><<elseif canHear($activeSlave)>>hears you <<if $PC.dick >= 1>>get your dick out<<else>>hungrily approach<</if>><<else>>feels your fingertips brush against $his nipples<</if>>, $he
-=======
When $he <<if canSee($activeSlave)>>sees you <<if $PC.dick != 0>>get your dick out<<else>>approaching $him with sapphic lust in your eyes<</if>><<elseif canHear($activeSlave)>>hears you <<if $PC.dick != 0>>get your dick out<<else>>hungrily approach<</if>><<else>>feels your fingertips brush against $his nipples<</if>>, $he
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.energy > 80>>grins with anticipation,
<<elseif $activeSlave.trust > 20>>smiles appealingly,
<<else>>does $his best to look submissive,
<</if>>
and offers you $his chest.
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.belly >= 300000>>You have to straddle $his _belly stomach to get close enough, but $his tantalizing breasts are worth the strain.<</if>>
You collect some lubrication for it by sticking your dick in $his mouth.
<<if $activeSlave.skill.oral >= 100>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 04810750b7b..dc9abb21680 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -1098,11 +1098,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
pretty rosebud
<</if>>
between them. $subSlave.slaveName has only a brief moment to wonder why _his2 butt is being spread this way before _he2 feels
-<<<<<<< HEAD
- <<if ($PC.dick >= 1)>>
-=======
<<if ($PC.dick != 0)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
your cockhead
<<elseif ($subSlave.anus > 2)>>
your hand, formed into a beak shape
@@ -1111,11 +1107,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
<<else>>
two fingers
<</if>>
-<<<<<<< HEAD
- press against and then inside _his2 butthole. _He2 tries to turn away from $activeSlave.slaveName and greet you properly, but $activeSlave.slaveName won't let _him2, so _he2 tries to mumble a greeting into $activeSlave.slaveName's mouth and then settles for a spastic wave of one hand. This is an alluringly awkward process made desperate by the distracting feeling of you fucking _his2 ass. You could have done something more inventive with the situation, but the feeling of <<if ($PC.dick >= 1)>>an anal sphincter around the base of your dick<<else>>finger fucking a compliant slave's submissive asspussy while you look after yourself with your other hand<</if>> never gets old. Why complicate things? An hour later you leave your fucktoys stumbling tiredly towards the shower, @@.hotpink;sexually satiated@@ and anally dominated.
-=======
press against and then inside _his2 butthole. _He2 tries to turn away from $activeSlave.slaveName and greet you properly, but $activeSlave.slaveName won't let _him2, so _he2 tries to mumble a greeting into $activeSlave.slaveName's mouth and then settles for a spastic wave of one hand. This is an alluringly awkward process made desperate by the distracting feeling of you fucking _his2 ass. You could have done something more inventive with the situation, but the feeling of <<if ($PC.dick != 0)>>an anal sphincter around the base of your dick<<else>>finger fucking a compliant slave's submissive asspussy while you look after yourself with your other hand<</if>> never gets old. Why complicate things? An hour later you leave your fucktoys stumbling tiredly towards the shower, @@.hotpink;sexually satiated@@ and anally dominated.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.trust += 2, $activeSlave.counter.anal += 2>>
<<set $subSlave.trust += 2, $subSlave.counter.anal += 2>>
<<set $analTotal += 4>>
@@ -1328,15 +1320,9 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
<<else>>
They don't have long to wait. There's no need to be excessively creative. You get behind them and start from the top, laying your cock against $activeSlave.slaveName's back, which produces an anticipatory shudder. Moving down, you
<<if !canDoAnal($activeSlave)>>
-<<<<<<< HEAD
- <<if $PC.vagina >= 1>>trail your hot cunt across the tops of $his buttocks and then <</if>>trace your dickhead around $activeSlave.slaveName's chastity belt before continuing. You move your cockhead, beaded with precum, down $his soft perineum
- <<elseif $activeSlave.anus == 0>>
- <<if $PC.vagina >= 1>>trail your hot cunt across the tops of $his buttocks and then <</if>>tease your dickhead against $activeSlave.slaveName's virgin butt for a moment before continuing. You move your cockhead, beaded with precum, down $his soft perineum
-=======
<<if $PC.vagina != -1>>trail your hot cunt across the tops of $his buttocks and then <</if>>trace your dickhead around $activeSlave.slaveName's chastity belt before continuing. You move your cockhead, beaded with precum, down $his soft perineum
<<elseif $activeSlave.anus == 0>>
<<if $PC.vagina != -1>>trail your hot cunt across the tops of $his buttocks and then <</if>>tease your dickhead against $activeSlave.slaveName's virgin butt for a moment before continuing. You move your cockhead, beaded with precum, down $his soft perineum
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<elseif $activeSlave.anus < 3>>
push your cock against $activeSlave.slaveName's tight asshole, causing $him to stiffen and struggle momentarily before it pops inside $him. After giving $his butt a thorough fuck, you move your wet cockhead down $his soft perineum
<<set $activeSlave.counter.anal++, $analTotal++>>
@@ -1578,15 +1564,9 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
<<link "$He's not wrong">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- You ask $activeSlave.slaveName what $he said in a neutral tone. $He gives you a quick glance, not sure whether to be aroused or afraid, but takes a breath to steady $himself and begins. For _his2 part, $subSlave.slaveName vainly tries to stop crying in front of you. When $activeSlave.slaveName reaches "<<HeP>>'<<s>> going to hold you down and <<sh>>ove <<hisP>> <<if $PC.dick >= 1>>huge cockhead<<else>>bigge<<s>>t <<s>>trap-on<</if>> right up again<<s>>t thi<<s>> tight little hole," you hold up a hand to get $him to pause. $He does, and you suddenly shove $subSlave.slaveName towards the couch. _He2 crashes face-down into the cushions, already sobbing in terror. You place a hand on _his2 $activeSlave.skin back to hold _him2 down and then use the other to apply some lube to your <<if $PC.dick >= 1>>penis<<else>>strap-on<</if>> before pressing it against the quivering slave's virgin anus. _He2 shakes with anguish, causing <<if $PC.dick >= 1>>your cock to rub deliciously<<else>>the strap-on to slide amusingly<</if>> up and down _his2 asscrack. You make a come-on gesture to $activeSlave.slaveName, and $he continues, "You're going to do your be<<s>>t to relax like a good little _girl2."
- $subSlave.slaveName desperately takes in a huge breath. $activeSlave.slaveName, who has gotten the idea (and to go by $his furious masturbation, clearly likes it), gasps out, "But it'<<s>> going to be <<s>>o big! It'<<s>> going to burn!" Here you begin to apply inexorable pressure. $subSlave.slaveName manages one more deep breath, but it becomes a squeal of anguish and _he2 tries frantically to burrow into the couch, away from the penetrating <<if $PC.dick >= 1>>cock<<else>>strap-on<</if>>. "You're going to panic, and <<s>>truggle, and <<heP>>'<<s>> going to hold you down and rape your butt while you <<s>>cream and cry..."
- $activeSlave.slaveName trails off as $he shakes with orgasm; $he doesn't say any more, but the @@.hotpink;wild satisfaction@@ <<if canSee($activeSlave)>>in $his <<= App.Desc.eyeColor($activeSlave)>> eyes<<else>>on $his face<</if>> says it for $him. $subSlave.slaveName, meanwhile, is a mess, but hurries @@.gold;fearfully@@ to obey your instructions to go clean _himself2, and hides _his2 @@.mediumorchid;hatred@@ as _he2 gingerly applies an enema to _his2 @@.lime;loosened butt.@@
-=======
You ask $activeSlave.slaveName what $he said in a neutral tone. $He gives you a quick glance, not sure whether to be aroused or afraid, but takes a breath to steady $himself and begins. For _his2 part, $subSlave.slaveName vainly tries to stop crying in front of you. When $activeSlave.slaveName reaches "<<HeP>>'<<s>> going to hold you down and <<sh>>ove <<hisP>> <<if $PC.dick != 0>>huge cockhead<<else>>bigge<<s>>t <<s>>trap-on<</if>> right up again<<s>>t thi<<s>> tight little hole," you hold up a hand to get $him to pause. $He does, and you suddenly shove $subSlave.slaveName towards the couch. _He2 crashes face-down into the cushions, already sobbing in terror. You place a hand on _his2 $activeSlave.skin back to hold _him2 down and then use the other to apply some lube to your <<if $PC.dick != 0>>penis<<else>>strap-on<</if>> before pressing it against the quivering slave's virgin anus. _He2 shakes with anguish, causing <<if $PC.dick != 0>>your cock to rub deliciously<<else>>the strap-on to slide amusingly<</if>> up and down _his2 asscrack. You make a come-on gesture to $activeSlave.slaveName, and $he continues, "You're going to do your be<<s>>t to rela<<x>> like a good little _girl2."
$subSlave.slaveName desperately takes in a huge breath. $activeSlave.slaveName, who has gotten the idea (and to go by $his furious masturbation, clearly likes it), gasps out, "But it'<<s>> going to be <<s>>o big! It'<<s>> going to burn!" Here you begin to apply inexorable pressure. $subSlave.slaveName manages one more deep breath, but it becomes a squeal of anguish and _he2 tries frantically to burrow into the couch, away from the penetrating <<if $PC.dick != 0>>cock<<else>>strap-on<</if>>. "You're going to panic, and <<s>>truggle, and <<heP>>'<<s>> going to hold you down and rape your butt while you <<s>>cream and cry..."
$activeSlave.slaveName trails off as $he shakes with orgasm; $he doesn't say any more, but the @@.hotpink;wild satisfaction@@ <<if canSee($activeSlave)>>in $his <<= App.Desc.eyesColor($activeSlave)>><<else>>on $his face<</if>> says it for $him. $subSlave.slaveName, meanwhile, is a mess, but hurries @@.gold;fearfully@@ to obey your instructions to go clean _himself2, and hides _his2 @@.mediumorchid;hatred@@ as _he2 gingerly applies an enema to _his2 @@.lime;loosened butt.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.devotion += 5>>
<<set $subSlave.trust -= 10, $subSlave.devotion -= 5, $subSlave.counter.anal++, $subSlave.anus = 1>>
<<set $analTotal++>>
@@ -1620,13 +1600,8 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
<<replace "#result">>
You approach and observe to $activeSlave.slaveName that it sounds like $he's speaking from experience. $He glances at you nervously, but agrees. You tell $him to go on, so $he turns to the mystified $subSlave.slaveName and mumbles, "It wa<<s>>n't ea<<s>>y for me the fir<<s>>t time either."
-<<<<<<< HEAD
- $He gasps as you slide around behind $him, your hands snaking around $his <<if $activeSlave.boobs > 2000>>massive tits<<elseif $activeSlave.boobs > 1000>>big boobs<<elseif $activeSlave.boobs > 400>>prominent breasts<<else>>chest<</if>> to pinch $his $activeSlave.nipples nipples. You whisper into $his ear, ordering $him to tell $his little story again, slowly. "<<HeP>>'<<s>> going to hold you down and <<sh>>ove <<hisP>> <<if $PC.dick >= 1>>huge cockhead<<else>>bigge<<s>>t <<s>>trap-on<</if>> right up again<<s>>t thi<<s>> tight little hole," $he tells $subSlave.slaveName. The poor _girl2 doesn't know what to do, so _he2 just stands <<if canHear($activeSlave)>>and listens<<else>>still<</if>>, <<if canSee($subSlave)>>watching<<else>>staring<</if>> dumbly as $activeSlave.slaveName talks. $He's a lot less intimidating this time around, gasping out the words as you maneuver your <<if $PC.dick >= 1>>cock<<else>>strap-on<</if>> against $his <<if $activeSlave.anus > 2>>loose butthole<<elseif $activeSlave.anus > 1>>experienced ass<<else>>tight butthole<</if>> for some standing anal. "You're going to do your be<<s>>t to relax like a good little _girl2," $he moans. <<if ($activeSlave.dick > 0) && !canAchieveErection($activeSlave)>>$His limp dick hangs lamely as you press against $his backdoor, but it's dripping precum.<<elseif $activeSlave.dick > 0>>$He has a throbbing erection.<<elseif $activeSlave.clit > 0>>As you shove $him into place, your hand brushes against $his enormously erect clit.<<else>>As you shove $him into place, your hand brushes against moisture coating $his inner thighs.<</if>> The bitch is getting off on this.
- "But it'<<s>> going to be <<s>>o big — it'<<s>> going to bu-hu-hur-hurn... oh..." You're up $his ass and pounding away, <<if $subSlave.belly >= 5000>>with one hand on $his hips and the other around $his gravid belly<<else>>holding $his hips with both hands and<</if>> bouncing $his butt against your crotch as your <<if $PC.dick >= 1>>cock<<else>>strap-on<</if>> slides in and out of $him. You administer a hard slap to $his ass and tell $him to keep going. $He shakes $his head and manages to get back on track, grunting out, "You're going to panic — and — and — oh — <<s>>-<<s>>truggle, and <<heP>>'<<s>> going t-to h-ho-oh-old you d-down, oh, ow, and r-ra-rape your b-butt while, oh p-plea<<s>>e <<Master>>, you <<s>>cream, ooh, and c-cry... o-oh... ah." $He feels your <<if $PC.dick >= 1>>hot seed jet into $his asshole<<else>>own orgasm<</if>> and your hands release their grip, and slides wetly off you, <<if ($activeSlave.dick > 0) && !canAchieveErection($activeSlave)>>$his own messy little orgasm running down $his legs to join the cum dripping out of $his ass<<elseif $activeSlave.dick > 0>>stepping around the mess $he shot onto the floor and trying to keep your load inside $his ass<<else>>$his feminine juices running down $his legs to join the cum dripping out of $his ass<</if>>. $He walks gingerly to the bathroom for a cleanup, looking a lot more @@.hotpink;submissive@@ than when you walked in. $subSlave.slaveName is still staring <<if canSee($subSlave)>>at<<else>>towards<</if>> you. There's a little @@.gold;fear@@ there, but some @@.hotpink;awe,@@ too.
-=======
$He gasps as you slide around behind $him, your hands snaking around $his <<if $activeSlave.boobs > 2000>>massive tits<<elseif $activeSlave.boobs > 1000>>big boobs<<elseif $activeSlave.boobs > 400>>prominent breasts<<else>>chest<</if>> to pinch $his $activeSlave.nipples nipples. You whisper into $his ear, ordering $him to tell $his little story again, slowly. "<<HeP>>'<<s>> going to hold you down and <<sh>>ove <<hisP>> <<if $PC.dick != 0>>huge cockhead<<else>>bigge<<s>>t <<s>>trap-on<</if>> right up again<<s>>t thi<<s>> tight little hole," $he tells $subSlave.slaveName. The poor _girl2 doesn't know what to do, so _he2 just stands <<if canHear($activeSlave)>>and listens<<else>>still<</if>>, <<if canSee($subSlave)>>watching<<else>>staring<</if>> dumbly as $activeSlave.slaveName talks. $He's a lot less intimidating this time around, gasping out the words as you maneuver your <<if $PC.dick != 0>>cock<<else>>strap-on<</if>> against $his <<if $activeSlave.anus > 2>>loose butthole<<elseif $activeSlave.anus > 1>>experienced ass<<else>>tight butthole<</if>> for some standing anal. "You're going to do your be<<s>>t to rela<<x>> like a good little _girl2," $he moans. <<if ($activeSlave.dick > 0) && !canAchieveErection($activeSlave)>>$His limp dick hangs lamely as you press against $his backdoor, but it's dripping precum.<<elseif $activeSlave.dick > 0>>$He has a throbbing erection.<<elseif $activeSlave.clit > 0>>As you shove $him into place, your hand brushes against $his enormously erect clit.<<else>>As you shove $him into place, your hand brushes against moisture coating $his inner thighs.<</if>> The bitch is getting off on this.
"But it'<<s>> going to be <<s>>o big — it'<<s>> going to bu-hu-hur-hurn... oh..." You're up $his ass and pounding away, <<if $subSlave.belly >= 5000>>with one hand on $his hips and the other around $his gravid belly<<else>>holding $his hips with both hands and<</if>> bouncing $his butt against your crotch as your <<if $PC.dick != 0>>cock<<else>>strap-on<</if>> slides in and out of $him. You administer a hard slap to $his ass and tell $him to keep going. $He shakes $his head and manages to get back on track, grunting out, "You're going to panic — and — and — oh — <<s>>-<<s>>truggle, and <<heP>>'<<s>> going t-to h-ho-oh-old you d-down, oh, ow, and r-ra-rape your b-butt while, oh p-plea<<s>>e <<Master>>, you <<s>>cream, ooh, and c-cry... o-oh... ah." $He feels your <<if $PC.dick != 0>>hot seed jet into $his asshole<<else>>own orgasm<</if>> and your hands release their grip, and slides wetly off you, <<if ($activeSlave.dick > 0) && !canAchieveErection($activeSlave)>>$his own messy little orgasm running down $his legs to join the cum dripping out of $his ass<<elseif $activeSlave.dick > 0>>stepping around the mess $he shot onto the floor and trying to keep your load inside $his ass<<else>>$his feminine juices running down $his legs to join the cum dripping out of $his ass<</if>>. $He walks gingerly to the bathroom for a cleanup, looking a lot more @@.hotpink;submissive@@ than when you walked in. $subSlave.slaveName is still staring <<if canSee($subSlave)>>at<<else>>towards<</if>> you. There's a little @@.gold;fear@@ there, but some @@.hotpink;awe,@@ too.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.devotion += 5, $activeSlave.counter.anal++>>
<<set $analTotal++>>
<<if canImpreg($activeSlave, $PC)>>
@@ -1695,11 +1670,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
<<else>>
$his pussylips are flushed and moist.
<</if>>
-<<<<<<< HEAD
- You tell $him to relax, and push a single lubed finger into $his anus. $He gasps, but does not resist, burrowing $his face down into the couch and doing $his best to calm $himself. After a few minutes, you withdraw your finger and press the slick tip of your <<if $PC.dick >= 1>>dick<<else>>strap-on<</if>> against $his virgin rosebud. $He starts in spite of $himself, but breathes out obediently, relaxing $his butthole enough to let you in. $He squeals at the sudden invasion, but you hold $him and let $him get used to you gradually. After a few minutes you encourage $him to
-=======
You tell $him to relax, and push a single lubed finger into $his anus. $He gasps, but does not resist, burrowing $his face down into the couch and doing $his best to calm $himself. After a few minutes, you withdraw your finger and press the slick tip of your <<if $PC.dick != 0>>dick<<else>>strap-on<</if>> against $his virgin rosebud. $He starts in spite of $himself, but breathes out obediently, relaxing $his butthole enough to let you in. $He squeals at the sudden invasion, but you hold $him and let $him get used to you gradually. After a few minutes you encourage $him to
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if ($activeSlave.chastityPenis == 1)>>
stimulate $his own nipples,
<<elseif ($activeSlave.dick > 0) && !canAchieveErection($activeSlave)>>
@@ -1713,11 +1684,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
<<else>>
play with $his pussy,
<</if>>
-<<<<<<< HEAD
- and $he almost sobs with relief. After $he's almost forgotten the phallus in $his ass, you begin to fuck $him gradually. $He climaxes before too long, $his tight sphincter <<if $PC.dick >= 1>>hugging your shaft wonderfully<<else>>visibly compressing the strap-on<</if>>. Confused, $he mumbles into the couch, "<<Master>>, I c-came. I came to your thing in my butt. A-am I — doe<<s>> that make me a <<s>>lut?" You assure $him that it does. Surprisingly, $he does not break down, but exhales slowly and squares $his shoulders, visibly resolving to @@.hotpink;be a slut@@ if $he has to. $He even takes a bit longer than strictly necessary giving $himself $his @@.lime;first@@ post-sex enema.
-=======
and $he almost sobs with relief. After $he's almost forgotten the phallus in $his ass, you begin to fuck $him gradually. $He climaxes before too long, $his tight sphincter <<if $PC.dick != 0>>hugging your shaft wonderfully<<else>>visibly compressing the strap-on<</if>>. Confused, $he mumbles into the couch, "<<Master>>, I c-came. I came to your thing in my butt. A-am I — doe<<s>> that make me a <<s>>lut?" You assure $him that it does. Surprisingly, $he does not break down, but exhales slowly and squares $his shoulders, visibly resolving to @@.hotpink;be a slut@@ if $he has to. $He even takes a bit longer than strictly necessary giving $himself $his @@.lime;first@@ post-sex enema.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.devotion += 5, $activeSlave.anus += 1, $activeSlave.counter.anal++>>
<<set $analTotal++>>
<<if canImpreg($activeSlave, $PC)>>
@@ -1728,11 +1695,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
<br><<link "<<= $Girl>>s' butts are for pounding">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- You tell $him that $his butt is your property, just like $subSlave.slaveName's. $He looks @@.gold;terrified.@@ You continue, telling $him to bring your property over to you. $He stumbles over, begging, "P-plea<<s>>e, fuck me <<Master>>, plea<<s>>e don't do <<s>>tuff to my butt. It'<<s>> going t-to h-hurt.<<if $activeSlave.preg > $activeSlave.pregData.normalBirth/2>> And I-I'm r-really pregnant.<<elseif $activeSlave.pregKnown == 1>> And I-I'm p-pregnant.<</if>>" You push $him down across your desk, giving $him a swat across the rump to warn $him to shut up. $He does, though $he makes a little squealing noise when you begin to grope $his ass, working your way in towards $his virgin backdoor. When $he feels <<if $PC.dick >= 1>>your lubed cockhead<<else>>a lubed strap-on<</if>> sliding between $his buttocks and then pressing against $his anus, $he bursts out, "Plea<<s>>e no, <<Master>>! Plea<<s>>e not my — AAAH! OW!" and bursts into tears. You give $him a few seconds to get used to your girth and then begin to fuck $his delicious little virgin behind. Despite the pain, the <<if $activeSlave.vagina != -1>>stimulation gets $him wet<<elseif $activeSlave.prostate != 0>>prostate stimulation gets $him hard<<else>>stimulation brings a little fluid out of $him<</if>>, and you tell $him that $he clearly wants it. $He doesn't know what to say in response, so $he just cries harder as <<if $activeSlave.dick == 0>>you reach around to cup $his soaking cunt possessively<<else>>$he starts to leak despite $his displeasure<</if>>. $His butthole is so wonderfully tight that you orgasm quickly, throwing $his unresisting butt over onto the couch for another round. $He's @@.green;no longer repressed,@@ but $he now @@.red;hates@@ having $his @@.lime;newly loosened butt@@ fucked.
-=======
You tell $him that $his butt is your property, just like $subSlave.slaveName's. $He looks @@.gold;terrified.@@ You continue, telling $him to bring your property over to you. $He stumbles over, begging, "P-plea<<s>>e, fuck me <<Master>>, plea<<s>>e don't do <<s>>tuff to my butt. It'<<s>> going t-to h-hurt.<<if $activeSlave.preg > $activeSlave.pregData.normalBirth/2>> And I-I'm r-really pregnant.<<elseif $activeSlave.pregKnown == 1>> And I-I'm p-pregnant.<</if>>" You push $him down across your desk, giving $him a swat across the rump to warn $him to shut up. $He does, though $he makes a little squealing noise when you begin to grope $his ass, working your way in towards $his virgin backdoor. When $he feels <<if $PC.dick != 0>>your lubed cockhead<<else>>a lubed strap-on<</if>> sliding between $his buttocks and then pressing against $his anus, $he bursts out, "Plea<<s>>e no, <<Master>>! Plea<<s>>e not my — AAAH! OW!" and bursts into tears. You give $him a few seconds to get used to your girth and then begin to fuck $his delicious little virgin behind. Despite the pain, the <<if $activeSlave.vagina != -1>>stimulation gets $him wet<<elseif $activeSlave.prostate != 0>>prostate stimulation gets $him hard<<else>>stimulation brings a little fluid out of $him<</if>>, and you tell $him that $he clearly wants it. $He doesn't know what to say in response, so $he just cries harder as <<if $activeSlave.dick == 0>>you reach around to cup $his soaking cunt possessively<<else>>$he starts to leak despite $his displeasure<</if>>. $His butthole is so wonderfully tight that you orgasm quickly, throwing $his unresisting butt over onto the couch for another round. $He's @@.green;no longer repressed,@@ but $he now @@.red;hates@@ having $his @@.lime;newly loosened butt@@ fucked.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.behavioralFlaw = 0, $activeSlave.sexualFlaw = "hates anal", $activeSlave.trust -= 5, $activeSlave.anus += 1, $activeSlave.counter.anal++>>
<<set $analTotal++>>
<<if canImpreg($activeSlave, $PC)>>
@@ -1810,11 +1773,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
holding the submissive $desc up against the shower wall and giving $him a second reaming.
<<= VCheck.Simple()>>
<<case "cumslut">>
-<<<<<<< HEAD
- giving the cumslut a soapy massage as $he <<if $PC.dick >= 1>>sucks your cock<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>eats you out<</if>>.
-=======
giving the cumslut a soapy massage as $he <<if $PC.dick != 0>>sucks your cock<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>eats you out<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.counter.oral += 1>>
<<set $oralTotal += 1>>
<<case "humiliation">>
@@ -1845,11 +1804,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
pushing the vanilla $girl's back against the wall and kissing $him lovingly.
<<= VCheck.Simple()>>
<</switch>>
-<<<<<<< HEAD
- As $activeSlave.slaveName orgasms in your arms, you feel $subSlave.slaveName hug your thighs lightly before starting to <<if $PC.dick >= 1>>blow you<<else>>lick your pussy<</if>> _himself2. Afterward, you bring the tired pair back to their bed and get them tucked in. They @@.mediumaquamarine;find the gesture comforting,@@ and are asleep in an instant.
-=======
As $activeSlave.slaveName orgasms in your arms, you feel $subSlave.slaveName hug your thighs lightly before starting to <<if $PC.dick != 0>>blow you<<else>>lick your pussy<</if>> _himself2. Afterward, you bring the tired pair back to their bed and get them tucked in. They @@.mediumaquamarine;find the gesture comforting,@@ and are asleep in an instant.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<= VCheck.Simple()>>
<<set $activeSlave.trust += 4>>
<<set $subSlave.counter.oral++, $subSlave.counter.penetrative++, $subSlave.trust += 4>>
diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw
index 94d108ead31..e751b197ed2 100644
--- a/src/uncategorized/arcmgmt.tw
+++ b/src/uncategorized/arcmgmt.tw
@@ -1874,11 +1874,7 @@ You own
<<set $TFS.subsidize = 0, $TFS.schoolProsperity = 10>>
<</if>>
<<if $TFS.subsidize == 1>>
-<<<<<<< HEAD
- You have a policy of subsidizing them<<if ($PC.dick >= 1) && ($PC.vagina >= 1) && ($PC.boobs >= 1)>>, which is more effective due to your close relationship with them and your physical resemblance to them<<set $TFS.schoolProsperity++>><</if>>.
-=======
You have a policy of subsidizing them<<if ($PC.dick != 0) && ($PC.vagina != -1) && ($PC.boobs >= 300)>>, which is more effective due to your close relationship with them and your physical resemblance to them<<set $TFS.schoolProsperity++>><</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $TFS.schoolProsperity++>>
<<elseif $TFS.subsidize == -1>>
You have a policy of covertly undermining them.
diff --git a/src/uncategorized/assistantEvents.tw b/src/uncategorized/assistantEvents.tw
index fe40866926f..ef361f7a59a 100644
--- a/src/uncategorized/assistantEvents.tw
+++ b/src/uncategorized/assistantEvents.tw
@@ -1170,11 +1170,7 @@ of your personal assistant pops up on the nearest screen. "<<= properTitle()>>!"
It's late one night, and for you, the day is not nearly over. Your penthouse never truly sleeps. You can hear public business going on some distance below you; you could certainly afford to totally soundproof your private quarters against all external noise, but the designer of the arcology clearly felt that its owner would benefit by this aural verification of its prosperity. Somewhere closer at hand, a slave is audibly nearing orgasm. And underneath all of this is the faint sound of the arcology itself, air circulation and hydroponics and power. Power.
<br><br>
-<<<<<<< HEAD
-You're not yet done with the day's business, and are leaning over your desk to compare a scatter of documents displayed on its surface. The penthouse lights are turned down to a low glow at the floorboards at night, offering enough illumination for anyone who needs to find their way around or find a sexual partner without disturbing anyone's sleep. You catch sight of your reflection in the wall opposite you: the diffuse light coming off the desktop gently illuminates your formal shirt, its top buttons undone, and highlights <<if $PC.boobs >= 1>>the dark cleft formed by your cleavage<<else>>how tightly your undershirt is held by the muscles of your chest<</if>>.
-=======
You're not yet done with the day's business, and are leaning over your desk to compare a scatter of documents displayed on its surface. The penthouse lights are turned down to a low glow at the floorboards at night, offering enough illumination for anyone who needs to find their way around or find a sexual partner without disturbing anyone's sleep. You catch sight of your reflection in the wall opposite you: the diffuse light coming off the desktop gently illuminates your formal shirt, its top buttons undone, and highlights <<if $PC.boobs >= 650>>the dark cleft formed by your cleavage<<elseif $PC.boobs >= 300>>the curves of your sensible breasts<<else>>how tightly your undershirt is held by the muscles of your chest<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<br><br>
Suddenly, there is a fresh source of light behind you. The reflection you're looking at reveals that it's $assistantName's avatar, appearing on a wallscreen behind you, and you turn to look at _himA directly. _HeA's simulating shyness, a very unusual emotion for _himA to imitate.
<<switch $assistantAppearance>>
diff --git a/src/uncategorized/genericPlotEvents.tw b/src/uncategorized/genericPlotEvents.tw
index ef17c84ad89..9f91854e621 100644
--- a/src/uncategorized/genericPlotEvents.tw
+++ b/src/uncategorized/genericPlotEvents.tw
@@ -1064,11 +1064,7 @@ A screen opposite your desk springs to life, <<if $assistant == 0>>showing your
<<else>>
<<link "Take an Arcology Tour">>
<<replace "#result">>
-<<<<<<< HEAD
- The cubicle _heU takes you back into is small, but clean and well-kept. _HeU gives you a kiss on the cheek. "That's not part of the Arcology Tour. Sorry. Here's the start of the real tour." <<if $PC.dick >= 1>>_HeU sucks you to full mast while shucking off _hisU skimpy clothing<<if $PC.vagina >= 1>>, giggling appreciatively at your pussy and lavishing attention on it with _hisU hands<</if>>. Then _heU turns around and slides you into _hisU <<if _heU == "he">>ass<<else>>pussy<</if>> with the ease of long practice. After a good long standing fuck, _heU begs you to "finish the tour" in _hisU ass and then "pay the tour guide" by coming in _hisU mouth.<<else>>_HeU giggles. "Tour's a little different for a lady like you, Ma'am. Here," _heU says, and starts to make out with you, pressing you back down onto a bench. _HeU lavishes expert oral attention on your pussy in a series of clever positions that offer every part of _hisU body to you in turn for you to grope, squeeze, and penetrate with your fingers.<</if>> Afterward, as _heU's hurrying back into _hisU clothes, _heU says, "We've got the money you paid to set those rooms up, @@.yellowgreen;here it is.@@ And we're doing pretty good, so we could use a little more working space. We'd like the vacant space next door. We'll furnish it, if you'll let us have it?" @@.green;$arcologies[0].name's prosperity has increased.@@
-=======
The cubicle _heU takes you back into is small, but clean and well-kept. _HeU gives you a kiss on the cheek. "That's not part of the Arcology Tour. Sorry. Here's the start of the real tour." <<if $PC.dick != 0>>_HeU sucks you to full mast while shucking off _hisU skimpy clothing<<if $PC.vagina != -1>>, giggling appreciatively at your pussy and lavishing attention on it with _hisU hands<</if>>. Then _heU turns around and slides you into _hisU <<if _heU == "he">>ass<<else>>pussy<</if>> with the ease of long practice. After a good long standing fuck, _heU begs you to "finish the tour" in _hisU ass and then "pay the tour guide" by coming in _hisU mouth.<<else>>_HeU giggles. "Tour's a little different for a lady like you, Ma'am. Here," _heU says, and starts to make out with you, pressing you back down onto a bench. _HeU lavishes expert oral attention on your pussy in a series of clever positions that offer every part of _hisU body to you in turn for you to grope, squeeze, and penetrate with your fingers.<</if>> Afterward, as _heU's hurrying back into _hisU clothes, _heU says, "We've got the money you paid to set those rooms up, @@.yellowgreen;here it is.@@ And we're doing pretty good, so we could use a little more working space. We'd like the vacant space next door. We'll furnish it, if you'll let us have it?" @@.green;$arcologies[0].name's prosperity has increased.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $arcologies[0].prosperity += 2>>
<<run cashX(500, "event")>>
<</replace>>
diff --git a/src/uncategorized/longSlaveDescription.tw b/src/uncategorized/longSlaveDescription.tw
index 7c191012842..4c504d7caae 100644
--- a/src/uncategorized/longSlaveDescription.tw
+++ b/src/uncategorized/longSlaveDescription.tw
@@ -1147,15 +1147,9 @@ is
<<if canSee($activeSlave)>>
<<if ($activeSlave.attrKnown == 1)>>
<<if ($activeSlave.assignment != "work in the dairy") || ($dairyRestraintsSetting > 1)>>
-<<<<<<< HEAD
- <<if ($activeSlave.attrXX > 85) && ($PC.boobs >= 1)>>
- $His attraction to women is obvious: $he can't seem to stop staring at your breasts.
- <<elseif ($activeSlave.attrXY > 85) && ($PC.dick >= 1)>>
-=======
<<if ($activeSlave.attrXX > 85) && ($PC.boobs >= 400)>>
$His attraction to women is obvious: $he can't seem to stop staring at your breasts.
<<elseif ($activeSlave.attrXY > 85) && ($PC.dick != 0)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
$His attraction to men is obvious: $he can't seem to stop glancing down at your package.
<<elseif ($activeSlave.attrXY > 85) && $PC.title == 1 && ($PC.boobs < 300)>>
$His attraction to men is obvious: $he can't seem to stop checking out your broad chest.
diff --git a/src/uncategorized/newSlaveIntro.tw b/src/uncategorized/newSlaveIntro.tw
index 09f8aaa9202..cfa34b0b458 100644
--- a/src/uncategorized/newSlaveIntro.tw
+++ b/src/uncategorized/newSlaveIntro.tw
@@ -204,20 +204,12 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<if ($activeSlave.vagina > -1) && ($activeSlave.dick == 0)>>
-<<<<<<< HEAD
- <<if ($PC.dick == 0) && ($PC.boobs >= 1)>>
-=======
<<if ($PC.dick == 0) && ($PC.boobs >= 300)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
$He looks to you and sees a fellow woman, and is @@.mediumaquamarine;a little less afraid@@ that you will rape and abuse $him.
<<set $activeSlave.trust += 4>>
<</if>>
<<elseif $activeSlave.career == "a Futanari Sister">>
-<<<<<<< HEAD
- <<if ($PC.dick >= 1) && ($PC.boobs >= 1) && ($PC.vagina >= 1)>>
-=======
<<if ($PC.dick != 0) && ($PC.boobs >= 300) && ($PC.vagina != -1)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $TFS.schoolPresent == 1>>
$He's heard of you, of course, as both a futanari yourself and a generous patron of the Sisters. $He feels @@.mediumaquamarine;very lucky@@ that $he's going to be your slave, not to mention @@.hotpink;almost desperate@@ to have sex with you.
<<set $activeSlave.devotion += 10>>
@@ -547,11 +539,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<elseif ($activeSlave.sexualQuirk == "perverted")>>
$He has heard that you like little <<= $girl>>s and @@.mediumaquamarine;hopes@@ that matching your taste means $he will be treated well.
<<set $activeSlave.trust += 2>>
-<<<<<<< HEAD
- <<elseif ($activeSlave.sexualQuirk == "size queen") && $PC.dick >= 1>>
-=======
<<elseif ($activeSlave.sexualQuirk == "size queen") && $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
$He has heard that you like little <<= $girl>>s and @@.hotpink;bites $his lip@@ at the thought of how big your dick will be inside $him.
<<set $activeSlave.devotion += 2>>
<<elseif ($activeSlave.sexualFlaw == "repressed") || ($activeSlave.sexualFlaw == "shamefast") || ($activeSlave.behavioralFlaw == "devout")>>
@@ -745,11 +733,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<br>
<<link "Abort $his child">>
<<replace "#introResult">>
-<<<<<<< HEAD
- You loudly place an innocuous-looking drug injector on your desk, and let $him think about it for a long moment. Then, you declare exactly what made that sound: abortifacients. After a moment of comprehension, $his mood instantly improves. $He pledges to @@.hotpink;submit to you,@@ <<if $PC.dick >= 1 && $PC.vagina >= 1>>suck your cock, take it in $his pussy, take it up $his ass, eat you out<<elseif $PC.dick >= 1>>suck your cock, take it in $his pussy, take it up $his ass<<else>>eat you out, worship you with $his pussy, serve you with $his ass<</if>>, anything, as long as you @@.mediumaquamarine;remove $his rape baby.@@ You observe that $he'll do all of those things, regardless of what you decide to do about $his pregnancy, but for now, you'll let $him terminate it; $he needs all the nutrients for $himself right now. $He thanks you through $his tears.
-=======
You loudly place an innocuous-looking drug injector on your desk, and let $him think about it for a long moment. Then, you declare exactly what made that sound: abortifacients. After a moment of comprehension, $his mood instantly improves. $He pledges to @@.hotpink;submit to you,@@ <<if $PC.dick != 0 && $PC.vagina != -1>>suck your cock, take it in $his pussy, take it up $his ass, eat you out<<elseif $PC.dick != 0>>suck your cock, take it in $his pussy, take it up $his ass<<else>>eat you out, worship you with $his pussy, serve you with $his ass<</if>>, anything, as long as you @@.mediumaquamarine;remove $his rape baby.@@ You observe that $he'll do all of those things, regardless of what you decide to do about $his pregnancy, but for now, you'll let $him terminate it; $he needs all the nutrients for $himself right now. $He thanks you through $his tears.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</replace>>
<<set $activeSlave.devotion += 4>>
<<set $activeSlave.trust += 3>>
@@ -1584,11 +1568,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<br>
<<link "Inseminate $him">>
<<replace "#introResult">>
-<<<<<<< HEAD
- You <<if ($activeSlave.devotion > 20) || ($activeSlave.trust < -20)>>lay the obedient $desc across your desk<<else>>force the resistant $desc to lie atop your desk<</if>> and gently <<if $PC.dick >= 1>>slide your hard cock<<else>>push a special strap-on<</if>> <<if $activeSlave.vagina >= 0>>inside $his womanhood<<else>>up $his butt<</if>>. You take $him with care, enjoying $his body <<if ($activeSlave.devotion > 20) || ($activeSlave.trust < -20)>>and doing your best to give $him pleasure, too<<else>>without hurting $him<</if>>. <<if $PC.dick >= 1>>You empty your balls inside $him, thrusting in as far as you can go<<else>>The strap-on contains a reservoir of faux ejaculate, and you give it to $him<</if>> as you climax. When $he feels the hot liquid jet into $him,
-=======
You <<if ($activeSlave.devotion > 20) || ($activeSlave.trust < -20)>>lay the obedient $desc across your desk<<else>>force the resistant $desc to lie atop your desk<</if>> and gently <<if $PC.dick != 0>>slide your hard cock<<else>>push a special strap-on<</if>> <<if $activeSlave.vagina >= 0>>inside $his womanhood<<else>>up $his butt<</if>>. You take $him with care, enjoying $his body <<if ($activeSlave.devotion > 20) || ($activeSlave.trust < -20)>>and doing your best to give $him pleasure, too<<else>>without hurting $him<</if>>. <<if $PC.dick != 0>>You empty your balls inside $him, thrusting in as far as you can go<<else>>The strap-on contains a reservoir of faux ejaculate, and you give it to $him<</if>> as you climax. When $he feels the hot liquid jet into $him,
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.devotion > 20>>
<<if $activeSlave.fetish == "pregnancy">>
<<if $activeSlave.fetishKnown == 0>>
@@ -1597,11 +1577,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<else>>
$he climaxes, $his impregnation fetish displayed cutely on $his face.
<</if>>
-<<<<<<< HEAD
- As you let $him go, $he feels <<if $PC.dick >= 1>>your<<else>>the fake<</if>> cum dripping out of $him, and $he @@.hotpink;feels like your property.@@
-=======
As you let $him go, $he feels <<if $PC.dick != 0>>your<<else>>the fake<</if>> cum dripping out of $him, and $he @@.hotpink;feels like your property.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.devotion += 5>>
<<else>>
$he gasps and does $his best to relax, accepting the flow. <<if $activeSlave.fetishKnown == 0>>It seems $he<<else>>$He<</if>> isn't an impregnation fetishist, but $he is @@.hotpink;willing to submit@@ to have $his body used as your receptacle.
@@ -1740,11 +1716,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<else>>
You cuff $his <<if hasAnyArms($activeSlave)>>wrist<<if hasBothArms($activeSlave)>>s<</if>><<if hasAnyLegs($activeSlave)>> and <</if>><</if>><<if hasAnyLegs($activeSlave)>>ankle<<if hasBothLegs($activeSlave)>>s<</if>><</if>> and secure $his struggling, screeching body to the couch next to your desk so that $he's straddling the back of the couch with $his butt sticking out.
<</if>>
-<<<<<<< HEAD
- $He wriggles and protests until $he feels the lubricated head of <<if $PC.dick >= 1>>your dick<<else>>a strap-on<</if>> pushing against $his virgin butthole, at which point $he desperately tries to break free. $He fails, but $he never stops writhing and begging you to take <<if $PC.dick >= 1>>your cock<<else>>the phallus<</if>> out of $his asshole. $He's certainly entered your service in a way that colors $his impression of you @@.mediumorchid;with hatred@@ and @@.gold;fear.@@ @@.lime;$His tight little ass has been broken in.@@
-=======
$He wriggles and protests until $he feels the lubricated head of <<if $PC.dick != 0>>your dick<<else>>a strap-on<</if>> pushing against $his virgin butthole, at which point $he desperately tries to break free. $He fails, but $he never stops writhing and begging you to take <<if $PC.dick != 0>>your cock<<else>>the phallus<</if>> out of $his asshole. $He's certainly entered your service in a way that colors $his impression of you @@.mediumorchid;with hatred@@ and @@.gold;fear.@@ @@.lime;$His tight little ass has been broken in.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</replace>>
<<set $activeSlave.devotion -= 5>>
<<set $activeSlave.trust -= 10>>
@@ -1861,11 +1833,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<br>
<<link "Make sure $he knows pregnant $women can still enjoy sex.">>
<<replace "#introResult">>
-<<<<<<< HEAD
- You introduce $him to obedience and proper manners regarding $his <<= WrittenMaster($activeSlave)>> before sending $him off for a physical. That night, $he's returned to your room, and finds you doing business on a tablet in bed. $He looks doubtful, but obeys when you direct $him to get into bed<<if $PC.dick == 0>>, even after $he realizes you're wearing a strap-on<</if>>. You turn out the light and spoon $him from behind, kissing $his neck and ears, cupping $his swollen breasts, and running your hands across $his pregnant belly with its taut $activeSlave.skin skin. $He's awkward at first but $his body responds to the tenderness. Before long $he's humping $his pussy back and forth against <<if $PC.dick >= 1>>your cock<<else>>the strap-on<</if>>. You begin to gently work <<if $PC.dick >= 1>>your dickhead<<else>>its tip<</if>> up $his used pussy. $He's unsure of $himself, but you keep $him nice and relaxed. After several minutes of gentle loving, $he's nothing but a satisfied puddle in your arms. $He believes that $he can @@.mediumaquamarine;trust@@ you won't harm $him or $his child.
-=======
You introduce $him to obedience and proper manners regarding $his <<= WrittenMaster($activeSlave)>> before sending $him off for a physical. That night, $he's returned to your room, and finds you doing business on a tablet in bed. $He looks doubtful, but obeys when you direct $him to get into bed<<if $PC.dick == 0>>, even after $he realizes you're wearing a strap-on<</if>>. You turn out the light and spoon $him from behind, kissing $his neck and ears, cupping $his swollen breasts, and running your hands across $his pregnant belly with its taut $activeSlave.skin skin. $He's awkward at first but $his body responds to the tenderness. Before long $he's humping $his pussy back and forth against <<if $PC.dick != 0>>your cock<<else>>the strap-on<</if>>. You begin to gently work <<if $PC.dick != 0>>your dickhead<<else>>its tip<</if>> up $his used pussy. $He's unsure of $himself, but you keep $him nice and relaxed. After several minutes of gentle loving, $he's nothing but a satisfied puddle in your arms. $He believes that $he can @@.mediumaquamarine;trust@@ you won't harm $him or $his child.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</replace>>
<<set $activeSlave.trust += 5>>
<<= VCheck.Vaginal()>>
@@ -1916,11 +1884,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<</replace>>
<</link>>
-<<<<<<< HEAD
-<<if $PC.vagina >= 1 && $activeSlave.dick > 0 && canAchieveErection($activeSlave)>>
-=======
<<if $PC.vagina != -1 && $activeSlave.dick > 0 && canAchieveErection($activeSlave)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<br>
<<link "Dominate $his penis and demonstrate $his place">>
<<replace "#introResult">>
@@ -1938,11 +1902,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<<elseif $activeSlave.dick == 6>>
You grin sadistically at $him as $his massive dick fills both of your hands.
<</if>>
-<<<<<<< HEAD
- As $he begins to moan with lust, you grip down tightly and force $him to the floor. You straddle $him and lower your dripping pussy onto $his face<<if $PC.dick >= 1>>, your erect cock coming to rest on $his forehead<</if>>. You continue stroking your toy's rod as $he eagerly begins eating you out. As $his cock begins to throb, anticipating $his upcoming orgasm, you quickly bind the base of $his penis, denying $his release. You grind your cunt into $his face, telling $him that YOU are the one who'll be orgasming here, not $him. Only once you have initiated the new slave by soaking $his face in your cum do you release $his dick and lean back to avoid the coming blast. A few strokes later and your hand is coated in $his cum. You turn around and order the exhausted $girl to clean $his cum off your hand<<if $PC.dick >= 1>> and to finish off $his twitching dick<</if>>; $he @@.hotpink;complies meekly,@@ knowing you are the @@.gold;dominant force@@ in $his life now.
-=======
As $he begins to moan with lust, you grip down tightly and force $him to the floor. You straddle $him and lower your dripping pussy onto $his face<<if $PC.dick != 0>>, your erect cock coming to rest on $his forehead<</if>>. You continue stroking your toy's rod as $he eagerly begins eating you out. As $his cock begins to throb, anticipating $his upcoming orgasm, you quickly bind the base of $his penis, denying $his release. You grind your cunt into $his face, telling $him that YOU are the one who'll be orgasming here, not $him. Only once you have initiated the new slave by soaking $his face in your cum do you release $his dick and lean back to avoid the coming blast. A few strokes later and your hand is coated in $his cum. You turn around and order the exhausted $girl to clean $his cum off your hand<<if $PC.dick != 0>> and to finish off $his twitching dick<</if>>; $he @@.hotpink;complies meekly,@@ knowing you are the @@.gold;dominant force@@ in $his life now.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</replace>>
<<set $activeSlave.devotion += 5>>
<<set $activeSlave.trust -= 3>>
@@ -2030,11 +1990,7 @@ The legalities completed, ''__@@.pink;<<= SlaveFullName($activeSlave)>>@@__'' <<
<</if>>
<</if>>
-<<<<<<< HEAD
-<<if $PC.boobs >= 1 && $activeSlave.boobs < (900+((500/3)*$PC.boobsBonus)) && $activeSlave.boobs >= 300>>
-=======
<<if $PC.boobs >= 800 && $activeSlave.boobs <= $PC.boobs-200 && $activeSlave.boobs >= 300>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<br>
<<link "Let your ample bust dominate $his pathetic one">>
<<replace "#introResult">>
diff --git a/src/uncategorized/pHostageAcquisition.tw b/src/uncategorized/pHostageAcquisition.tw
index b5c46ea6158..e0246c776e0 100644
--- a/src/uncategorized/pHostageAcquisition.tw
+++ b/src/uncategorized/pHostageAcquisition.tw
@@ -90,41 +90,25 @@ Your hired mercenaries are en route now with your precious cargo.
<<run WombFatherRace($activeSlave, _notSupreme)>>
<</if>>
<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
- Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> sobbing "Thank you... Thank you..." You gently wrap your arms around $him in a comforting embrace. $He's nearly the same as you remember $him, albeit acting slightly odd and covered in scars.
-=======
Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "Thank you... Thank you..." You gently wrap your arms around $him in a comforting embrace. $He's nearly the same as you remember $him, albeit acting slightly odd and covered in scars.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.weight = 0>>
<<set $activeSlave.muscles = 0>>
<<if $activeSlave.health > -20>><<set $activeSlave.health = -20>><</if>>
<<set $activeSlave.custom.tattoo = "$He has slight scarring from being beaten under your rival's rule.">>
<<elseif $rivalryDuration <= 10>>
-<<<<<<< HEAD
- Upon seeing you, $activeSlave.slaveName walks into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> sobbing "T-thank you... T-thank you..." You gently draw $his thin body into a comforting embrace. $He's nearly the same as you remember $him, albeit thinner, acting odd and covered in many scars.
-=======
Upon seeing you, $activeSlave.slaveName walks into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "T-thank you... T-thank you..." You gently draw $his thin body into a comforting embrace. $He's nearly the same as you remember $him, albeit thinner, acting odd and covered in many scars.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.weight = -20>>
<<set $activeSlave.muscles = -20>>
<<if $activeSlave.health > -40>><<set $activeSlave.health = -40>><</if>>
<<set $activeSlave.custom.tattoo = "$He has noticeable scarring from being beaten under your rival's rule.">>
<<elseif $rivalryDuration <= 15>>
-<<<<<<< HEAD
- Upon seeing you, $activeSlave.slaveName shuffles into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> sobbing "T-thank you..." You gently draw $his rail thin body into a comforting embrace, though you can't help but feel $his <<if $seePreg != 0>>swollen<<else>>caved-in<</if>> belly pressing into your own. $He's nearly the same as you remember $him, albeit thinner,<<if $seePreg != 0>> pregnant,<</if>> acting very odd, and heavily covered in scars.
-=======
Upon seeing you, $activeSlave.slaveName shuffles into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "T-thank you..." You gently draw $his rail thin body into a comforting embrace, though you can't help but feel $his <<if $seePreg != 0>>swollen<<else>>caved-in<</if>> belly pressing into your own. $He's nearly the same as you remember $him, albeit thinner,<<if $seePreg != 0>> pregnant,<</if>> acting very odd, and heavily covered in scars.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.weight = -50>>
<<set $activeSlave.muscles = -50>>
<<if $activeSlave.health > -60>><<set $activeSlave.health = -60>><</if>>
<<set $activeSlave.custom.tattoo = "$He has heavy scarring from being beaten under your rival's rule.">>
<<elseif $rivalryDuration <= 20>>
-<<<<<<< HEAD
- Upon seeing you, $activeSlave.slaveName attempts to stumble into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> but only makes it several pained steps before collapsing to the ground. You gently pick up $his frail, <<if $seePreg != 0>>bloated<<else>>sickly<</if>> body and hold it in a comforting embrace. a short "T-thank you..." escapes $his tired lips. $He's nearly the same as you remember $him, albeit emaciated,<<if $seePreg != 0>> pregnant,<</if>> acting very odd and completely covered in scars.
-=======
Upon seeing you, $activeSlave.slaveName attempts to stumble into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> but only makes it several pained steps before collapsing to the ground. You gently pick up $his frail, <<if $seePreg != 0>>bloated<<else>>sickly<</if>> body and hold it in a comforting embrace. a short "T-thank you..." escapes $his tired lips. $He's nearly the same as you remember $him, albeit emaciated,<<if $seePreg != 0>> pregnant,<</if>> acting very odd and completely covered in scars.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.weight = -100>>
<<set $activeSlave.muscles = -75>>
<<if $activeSlave.health > -80>><<set $activeSlave.health = -80>><</if>>
@@ -297,15 +281,9 @@ Your hired mercenaries are en route now with your precious cargo.
<<case "Degradationism">>
<<set $activeSlave.health = 60>>
<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
- Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> sobbing "They acted <<s>>o weird!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember, if not slightly more attached to you.
- <<elseif $rivalryDuration <= 10>>
- Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "Will you be a<<s>> kind to me a<<s>> they were?" $He's exactly as you remember, if not slightly more attached to you.
-=======
Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "They acted <<s>>o weird!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember, if not slightly more attached to you.
<<elseif $rivalryDuration <= 10>>
Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "Will you be a<<s>> kind to me a<<s>> they were?" $He's exactly as you remember, if not slightly more attached to you.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<elseif $rivalryDuration <= 15>>
Upon seeing you, $activeSlave.slaveName shifts $his weight back and forth, unsure of what to make of you. As you step forward, $he hesitatingly approaches. Once $he is close enough $he asks "Will you love me too?" While $he looks the same as you remember, $he certainly doesn't think the same anymore.
<<elseif $rivalryDuration <= 20>>
@@ -319,15 +297,9 @@ Your hired mercenaries are en route now with your precious cargo.
<<case "Body Purism">>
<<set $activeSlave.health = -30>>
<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
- Upon seeing you, $activeSlave.slaveName attempts to dive into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>>. The weight of $his huge <<print $activeSlave.boobs>>cc fake tits knocks the wind out of you. You embrace $him as best you can as $he sobs "Look what they did to my che<<s>>t! They ruined it!" $He looks similar to how you remember, minus $his huge chest of course.
- <<elseif $rivalryDuration <= 10>>
- Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $his massive <<print $activeSlave.boobs>>cc fake tits into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "Why do the<<s>>e tit balloon<<s>> feel so good?!" $He looks similar to how you remember, minus $his massive chest of course.
-=======
Upon seeing you, $activeSlave.slaveName attempts to dive into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>>. The weight of $his huge <<print $activeSlave.boobs>>cc fake tits knocks the wind out of you. You embrace $him as best you can as $he sobs "Look what they did to my che<<s>>t! They ruined it!" $He looks similar to how you remember, minus $his huge chest of course.
<<elseif $rivalryDuration <= 10>>
Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $his massive <<print $activeSlave.boobs>>cc fake tits into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "Why do the<<s>>e tit balloon<<s>> feel so good?!" $He looks similar to how you remember, minus $his massive chest of course.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<elseif $rivalryDuration <= 15>>
Upon seeing you, $activeSlave.slaveName shifts $his massive weight back and forth, unsure of what to make of you. As you step forward, $he attempts to move closer, only to fall to the ground under the weight of $his obscene <<print $activeSlave.boobs>>cc fake tits. You kneel beside $him, a hand on $his huge fake ass, as $he asks "Do you like them? I think they <<sh>>ould be bigger..." The $girl you used to know is barely recognizable under those implants and $he certainly doesn't think the same anymore.
<<elseif $rivalryDuration <= 20>>
@@ -410,15 +382,9 @@ Your hired mercenaries are en route now with your precious cargo.
<<set $activeSlave.health = -30>>
<<set $activeSlave.chem = 100>>
<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
- Upon seeing you, $activeSlave.slaveName attempts to dive into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>>. The weight of $his huge <<print $activeSlave.boobs>>cc tits knocks the wind out of you. You embrace $him as best you can, you hands sinking into $his soft butt, as $he sobs "Look what they did to my che<<s>>t and a<<ss>>! They ruined them!" $He looks similar to how you remember, minus $his huge assets of course.
- <<elseif $rivalryDuration <= 10>>
- Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $his massive <<print $activeSlave.boobs>>cc breasts into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "Why do the<<s>>e meat balloon<<s>> feel <<s>>o good?!" $He looks similar to how you remember, minus $his massive assets of course.
-=======
Upon seeing you, $activeSlave.slaveName attempts to dive into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>>. The weight of $his huge <<print $activeSlave.boobs>>cc tits knocks the wind out of you. You embrace $him as best you can, you hands sinking into $his soft butt, as $he sobs "Look what they did to my che<<s>>t and a<<ss>>! They ruined them!" $He looks similar to how you remember, minus $his huge assets of course.
<<elseif $rivalryDuration <= 10>>
Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $his massive <<print $activeSlave.boobs>>cc breasts into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "Why do the<<s>>e meat balloon<<s>> feel <<s>>o good?!" $He looks similar to how you remember, minus $his massive assets of course.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<elseif $rivalryDuration <= 15>>
$activeSlave.slaveName's impressive bulk is placed in your office. Upon seeing you, $activeSlave.slaveName shifts $his weight back and forth atop $his <<print $activeSlave.boobs>>cc breasts, causing $his chubby body and fat ass to jiggle, unsure of what to make of you. As you step forward, $he asks "Can you make my tit<<s>> bigger?" The $girl you used to know is barely recognizable under those massive tits and $he certainly doesn't think the same anymore.
<<elseif $rivalryDuration <= 20>>
@@ -454,15 +420,9 @@ Your hired mercenaries are en route now with your precious cargo.
<<case "Pastoralism">>
<<set $activeSlave.health = 60>>
<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
- Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> sobbing "I've never had to e<<x>>er<<c>>i<<s>>e <<s>>o much; I'm exhau<<s>>ted!" You gently wrap your arms around $his soft body in a comforting embrace. $He's exactly as you remember.
- <<elseif $rivalryDuration <= 10>>
- Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>>, feeling the muscles under $his chubby body, as $he breaks down in tears. "You aren't going to make me pump iron, are you?" While $he's thinner than you remember, and a little more muscular, $his personality is exactly the same.
-=======
Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "I've never had to e<<x>>er<<c>>i<<s>>e <<s>>o much; I'm exhau<<s>>ted!" You gently wrap your arms around $his soft body in a comforting embrace. $He's exactly as you remember.
<<elseif $rivalryDuration <= 10>>
Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>>, feeling the muscles under $his chubby body, as $he breaks down in tears. "You aren't going to make me pump iron, are you?" While $he's thinner than you remember, and a little more muscular, $his personality is exactly the same.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<elseif $rivalryDuration <= 15>>
Upon seeing you, $activeSlave.slaveName shifts $his weight back and forth, unsure of what to make of you. As you step forward, $he hesitatingly approaches. Once $he is close enough $he says "I don't want to ever be <<s>>o heavy again..." $He is noticeably thinner and much more muscular than you remember; $he certainly doesn't think the same anymore, either.
<<elseif $rivalryDuration <= 20>>
@@ -498,17 +458,10 @@ Your hired mercenaries are en route now with your precious cargo.
<</if>>
<<case "Physical Idealism">>
<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
- Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>>, $his added heft knocking the wind out of you. You gently wrap your arms around $him in a comforting embrace, your arms gently sinking into $his soft flesh, as $he sobs, "They made me fat! I'm <<s>>o glad tho<<s>>e guy<<s>> let me puke up all that food; I don't even want to think how big I'd be otherwi<<s>>e!" $He looks similar to how you remember, thanks to the pudge, though that can be easily rectified.
- <<set $activeSlave.health = 0>>
- <<elseif $rivalryDuration <= 10>>
- Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $his meaty body into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "Why did they make me into a <<s>>ow, I don't under<<s>>tand..." $He looks similar to how you remember, minus $his added weight of course.
-=======
Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>>, $his added heft knocking the wind out of you. You gently wrap your arms around $him in a comforting embrace, your arms gently sinking into $his soft flesh, as $he sobs, "They made me fat! I'm <<s>>o glad tho<<s>>e guy<<s>> let me puke up all that food; I don't even want to think how big I'd be otherwi<<s>>e!" $He looks similar to how you remember, thanks to the pudge, though that can be easily rectified.
<<set $activeSlave.health = 0>>
<<elseif $rivalryDuration <= 10>>
Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $his meaty body into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "Why did they make me into a <<s>>ow, I don't under<<s>>tand..." $He looks similar to how you remember, minus $his added weight of course.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.health = -10>>
<<elseif $rivalryDuration <= 15>>
Upon seeing you, $activeSlave.slaveName shifts $his weight back and forth causing $his plump body, big breasts and fat ass to jiggle, unsure of what to make of you. As you step forward, $he asks "Can I have <<s>>ome food?" The $girl you used to know is barely recognizable under all that fat and $he certainly doesn't think the same anymore.
@@ -570,15 +523,9 @@ Your hired mercenaries are en route now with your precious cargo.
<<case "Multiculturalism">>
<<set $activeSlave.health = 60>>
<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
- Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> sobbing "They <<s>>aid <<s>>uch cra<<z>>y thing<<s>>!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
- <<elseif $rivalryDuration <= 10>>
- Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "They made me pray for your arcology; why i<<s>> that?" $He's exactly as you remember.
-=======
Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "They <<s>>aid <<s>>uch cra<<z>>y thing<<s>>!" You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
<<elseif $rivalryDuration <= 10>>
Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "They made me pray for your arcology; why i<<s>> that?" $He's exactly as you remember.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<elseif $rivalryDuration <= 15>>
Upon seeing you, $activeSlave.slaveName shifts $his weight back and forth, unsure of what to make of you. As you step forward, $he hesitatingly approaches. Once $he is close enough $he prays "Plea<<s>>e pardon thi<<s>> arcology..." While $he looks the same as you remember, $he certainly doesn't think the same anymore.
<<elseif $rivalryDuration <= 20>>
@@ -618,15 +565,6 @@ Your hired mercenaries are en route now with your precious cargo.
<<case "Slave Professionalism">>
<<set $activeSlave.health = 60>>
<<if $rivalryDuration <= 5>>
-<<<<<<< HEAD
- Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> sobbing "They did thing<<s>> to me! My head hurt<<s>> <<s>>o much..." You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
- <<elseif $rivalryDuration <= 10>>
- Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 1>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "I can barely remember thing<<s>> anymore; who were you again? I hate to a<<s>>k, but... I need a good fuck right now..." While $he looks the same as you remember, $he certainly can't think the same anymore.
- <<elseif $rivalryDuration <= 15>>
- Upon seeing you, $activeSlave.slaveName shifts $his weight back and forth, unsure of what to make of you. As you step forward, $he bounces into your arms. "Wanna do it?" While $he looks the same as you remember, $he certainly doesn't think the same anymore.
- <<elseif $rivalryDuration <= 20>>
- Upon seeing you, $activeSlave.slaveName wastes no time in <<if $PC.dick >= 1>>unbuckling your pants<<else>>slipping under your skirt<</if>> and going to town. While $he looks the same as you remember<<if $seePreg != 0>>, albeit a little pregnant<</if>>, $he definitely doesn't think the same anymore.
-=======
Upon seeing you, $activeSlave.slaveName dives into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> sobbing "They did thing<<s>> to me! My head hurt<<s>> <<s>>o much..." You gently wrap your arms around $him in a comforting embrace. $He's exactly as you remember.
<<elseif $rivalryDuration <= 10>>
Upon seeing you, $activeSlave.slaveName gingerly approaches, uncertain if $he should. You pull $him into your <<if $PC.boobs >= 650>>ample bust<<else>>chest<</if>> as $he breaks down in tears. "I can barely remember thing<<s>> anymore; who were you again? I hate to a<<s>>k, but... I need a good fuck right now..." While $he looks the same as you remember, $he certainly can't think the same anymore.
@@ -634,7 +572,6 @@ Your hired mercenaries are en route now with your precious cargo.
Upon seeing you, $activeSlave.slaveName shifts $his weight back and forth, unsure of what to make of you. As you step forward, $he bounces into your arms. "Wanna do it?" While $he looks the same as you remember, $he certainly doesn't think the same anymore.
<<elseif $rivalryDuration <= 20>>
Upon seeing you, $activeSlave.slaveName wastes no time in <<if $PC.dick != 0>>unbuckling your pants<<else>>slipping under your skirt<</if>> and going to town. While $he looks the same as you remember<<if $seePreg != 0>>, albeit a little pregnant<</if>>, $he definitely doesn't think the same anymore.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<else>>
Your mercenaries radio you upon arrival. "This one's got one thing $his mind, you better ready yourself. We're coming in now."
Upon seeing you, $activeSlave.slaveName's eyes fill with excitement. As you step forward, $he struggles against $his bindings, desperately trying to get loose. The mercenary captain yanks $him back. "My apologies, the only thing left of $his mind is a libido it feels like. Please be careful when you unbind $him, $he's nothing more than a horny idiot now." he says as he and his group exit your penthouse, leaving you with the dripping $activeSlave.slaveName. $He looks the same as you remember<<if $seePreg != 0>>, albeit a little pregnant<</if>>, but $he acts nothing like the $girl you used to know. $He's probably too dumb to manage to cause any trouble, but is likely to be high maintenance given $his ineptitude and nymphomania.
diff --git a/src/uncategorized/peHeadgirlConcubine.tw b/src/uncategorized/peHeadgirlConcubine.tw
index e16f658e907..d43d1af41d5 100644
--- a/src/uncategorized/peHeadgirlConcubine.tw
+++ b/src/uncategorized/peHeadgirlConcubine.tw
@@ -240,21 +240,12 @@ and it's also obvious that they've been filling the few minutes they've been wai
<</if>>
<</if>>
<br><br>
-<<<<<<< HEAD
- $Concubine.slaveName laughs at $him and asks _his2 own question, a little aesthetic question about one of your other bedslaves, but something you like to exercise artistic control over. _His2 giggling is cut off as _he2 has to concentrate on getting _his2 words out as you use two fingers to massage and tease the sensitive skin between _his2 ass and <<if $Concubine.vagina > -1>>the start of _his2 cunt<<elseif $Concubine.scrotum > 0>>_his2 ballsack<<else>>the base of _his2 dick<</if>>. It's $HeadGirl.slaveName's turn to laugh, which $he does throatily, $his warm breath gusting deliciously across your <<if $PC.boobs >= 1 || $PC.title == 0>>hardening nipples<<else>>pecs<</if>>. "<<S>>ee, it'<<s>> not ea<<s>>y," $he breathes across you at your Concubine.
- <br><br>
- They soon get their revenge as you give them their orders, though, moving their expert hands between your legs to give you a handjob. They do it cooperatively as you continue to play with them, letting you enjoy the delightful sensation of
- <<if $PC.dick >= 1>>
- two hands working your shaft while
- <<if $PC.vagina >= 1>>
-=======
$Concubine.slaveName laughs at $him and asks _his2 own question, a little aesthetic question about one of your other bedslaves, but something you like to exercise artistic control over. _His2 giggling is cut off as _he2 has to concentrate on getting _his2 words out as you use two fingers to massage and tease the sensitive skin between _his2 ass and <<if $Concubine.vagina > -1>>the start of _his2 cunt<<elseif $Concubine.scrotum > 0>>_his2 ballsack<<else>>the base of _his2 dick<</if>>. It's $HeadGirl.slaveName's turn to laugh, which $he does throatily, $his warm breath gusting deliciously across your <<if $PC.boobs >= 300 || $PC.title == 0>>hardening nipples<<else>>pecs<</if>>. "<<S>>ee, it'<<s>> not ea<<s>>y," $he breathes across you at your Concubine.
<br><br>
They soon get their revenge as you give them their orders, though, moving their expert hands between your legs to give you a handjob. They do it cooperatively as you continue to play with them, letting you enjoy the delightful sensation of
<<if $PC.dick != 0>>
two hands working your shaft while
<<if $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
another massages your petals and a fourth delves two fingers inside you.
<<else>>
another tickles your frenulum and a fourth massages your balls.
@@ -262,11 +253,7 @@ and it's also obvious that they've been filling the few minutes they've been wai
<<else>>
a hand massaging your petals on either side while another delves two fingers inside you and a fourth pleasures your clit.
<</if>>
-<<<<<<< HEAD
- They crane their necks to rain kisses on your chin, neck, <<if $PC.boobs >= 1>>breasts, and nipples,<<elseif $PC.title == 0>>and nipples,<<else>>and chest,<</if>> and on each other's mouths. You <<if $PC.belly < 5000>>spring<<elseif $PC.belly < 10000>>pull yourself<<else>>slowly tip your gravid bulk<</if>> out of bed when you're satisfied, pulling your leadership with you towards the shower, and they @@.mediumaquamarine;trustingly bounce up to follow.@@
-=======
They crane their necks to rain kisses on your chin, neck, <<if $PC.boobs >= 300>>breasts, and nipples,<<elseif $PC.title == 0>>and nipples,<<else>>and chest,<</if>> and on each other's mouths. You <<if $PC.belly < 5000>>spring<<elseif $PC.belly < 10000>>pull yourself<<else>>slowly tip your gravid bulk<</if>> out of bed when you're satisfied, pulling your leadership with you towards the shower, and they @@.mediumaquamarine;trustingly bounce up to follow.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $slaves[_headGirl].trust += 4, $slaves[_concubine].trust += 4>>
<<set $slaves[_headGirl].counter.oral++, $slaves[_concubine].counter.oral++>>
<<set $oralTotal += 2>>
@@ -382,11 +369,7 @@ and it's also obvious that they've been filling the few minutes they've been wai
<</if>>
Then $he grabs $Concubine.slaveName behind a knee with $his other hand and rotates _his2 hips to position _him2 for additional anal penetration.
<</if>>
-<<<<<<< HEAD
- Your Concubine shivers and moans as _his2 sphincter accommodates <<if $PC.dick >= 1>>your cock<<else>>the strap-on<</if>>, too.
-=======
Your Concubine shivers and moans as _his2 sphincter accommodates <<if $PC.dick != 0>>your cock<<else>>the strap-on<</if>>, too.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</if>>
<br><br>
You start to fuck _him2, and then ask _him2 what _he2 needed from you. The poor _girl2 has to concentrate hard to remember why _he2's here through the waterfall of sensations, but _he2 manages it eventually, gasping out a little aesthetic question about one of your other bedslaves. You give _him2 _his2 answer and make _him2 repeat it back. When you're satisfied, you grab _his2 <<if !hasAnyLegs($Concubine)>>hips<<else>>ankle<<if hasBothLegs($Concubine)>>s<</if>><</if>> and pull them up, sliding _him2 off your <<if $PC.dick != 0>>pole<<else>>strap-on<</if>> and $HeadGirl.slaveName's <<if (canPenetrate($HeadGirl))>>dick<<else>>penetrating fingers<</if>> with a lovely lewd noise. After appreciating the sight of _his2 well-fucked <<if ((canDoAnal($Concubine) && $Concubine.anus > 0) && (canDoVaginal($Concubine) && $Concubine.vagina > 0))>>holes<<else>>hole<</if>>, you swing _his2 ass over and deposit it on the bed, producing a grunt as the drop forces the wind out of _him2. Grabbing your Head Girl in turn, you yank $him towards you, give the giggling slave a kiss, seize $his
@@ -432,21 +415,13 @@ and it's also obvious that they've been filling the few minutes they've been wai
<</if>>
while taking $his turn getting instructions. $He manages to ask your permission to make a couple of last-minute changes to slaves' assignments for the day. Having thus given your leadership guidance, you jump up for a shower, crooking a finger to indicate that they should follow. They @@.hotpink;trail obediently after you,@@ a bit sore, their holes dripping
<<if ($HeadGirl.vagina > -1) || ($HeadGirl.vagina > -1)>>
-<<<<<<< HEAD
- <<if ($PC.dick >= 1) || ($HeadGirl.balls > 0) || ($Concubine.balls > 0)>>
-=======
<<if ($PC.dick != 0) || ($HeadGirl.balls > 0) || ($Concubine.balls > 0)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
cum, pussyjuice, and lube.
<<else>>
pussyjuice and lube.
<</if>>
<<else>>
-<<<<<<< HEAD
- <<if ($PC.dick >= 1) || ($HeadGirl.balls > 0) || ($Concubine.balls > 0)>>
-=======
<<if ($PC.dick != 0) || ($HeadGirl.balls > 0) || ($Concubine.balls > 0)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
cum and lube.
<<else>>
lube.
diff --git a/src/uncategorized/personalAssistantAppearance.tw b/src/uncategorized/personalAssistantAppearance.tw
index 27aa9ca7c15..5641e0dafe6 100644
--- a/src/uncategorized/personalAssistantAppearance.tw
+++ b/src/uncategorized/personalAssistantAppearance.tw
@@ -1726,11 +1726,7 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
<<case "repopulation focus">>
_HeA's leaning back with both hands beneath _hisA swollen middle struggling to jack off. When _heA notices you watching, _heA sits up and sighs as _hisA belly pushes _hisA erection out of sight.
<<case "eugenics">>
-<<<<<<< HEAD
- _HeA's reclining while absentmindedly jacking off. When _heA notices you watching, <<if $PC.vagina >= 1>>sits back, making plenty of room for you to spear yourself on _hisA erection<<else>>_heA waves _hisA throbbing erection at you, imploring you to finish _himA off<</if>>.
-=======
_HeA's reclining while absentmindedly jacking off. When _heA notices you watching, <<if $PC.vagina != -1>>sits back, making plenty of room for you to spear yourself on _hisA erection<<else>>_heA waves _hisA throbbing erection at you, imploring you to finish _himA off<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<case "gender radicalist">>
<<if $arcologies[0].FSGenderRadicalistLawFuta == 1>>
_HeA's reclining while absentmindedly jacking off with one hand and playing with _hisA hidden pussy with the other. When _heA notices you watching, _heA spreads _hisA legs wide so you can watch _himA spasm in orgasm.
@@ -1815,11 +1811,7 @@ _HeA's a cute little <<if $arcologies[0].FSSupremacist != "unset" && $assistantF
<<case "repopulation focus">>
_HeA is wearing an overly taut dress that clings tightly to _hisA triplet rounded middle and milk-laden breasts. _HeA is positively glowing with motherhood.
<<case "eugenics">>
-<<<<<<< HEAD
- _HeA's become even more irresistible lately; <<if $PC.dick >= 1>>you can't help but fantasize about fucking _himA pregnant with your perfect child<<else>>you can't help but feel slightly envious of _hisA body<</if>>.
-=======
_HeA's become even more irresistible lately; <<if $PC.dick != 0>>you can't help but fantasize about fucking _himA pregnant with your perfect child<<else>>you can't help but feel slightly envious of _hisA body<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<case "gender radicalist">>
<<if $arcologies[0].FSGenderRadicalistLawFuta == 3>>
_HeA is wearing an amazingly ill-fitting pair of stretch pants barely pulled midway over _hisA ass. _HisA door-jamming hips, massive rear and extra thick thighs jiggle spectacularly under the strained material.
diff --git a/src/uncategorized/ptWorkaround.tw b/src/uncategorized/ptWorkaround.tw
index 85bff8f4ac2..cc67363e43c 100644
--- a/src/uncategorized/ptWorkaround.tw
+++ b/src/uncategorized/ptWorkaround.tw
@@ -270,11 +270,7 @@
does not pay enough attention to standards when having sex, leading to crude comments and unsexy noises. To remedy this, you have $him give you oral regularly: a sacrifice, but you make sacrifices for your slaves' improvement. Oral sex can be difficult to make elegant, but you work with $him to make it as pretty as possible, even when you require $him to apply $his mouth to some of the less common erogenous zones. You do your best to retain $his sexual openness while making $him more sexually presentable.
<<set $activeSlave.counter.oral += 10, $oralTotal += 10>>
<<case "judgemental">>
-<<<<<<< HEAD
- has a bad habit of being sexually judgemental, belittling anyone who doesn't live up to $his pretensions of standards. You do your best to train $him to perform regardless of $his partners' endowments, aiming for a delicate balance that will allow $him to get off with anyone while permitting $him to retain and even build on $his appetite for big dicks. You permit $him to achieve release only when $he's done well with <<if $PC.dick >= 1>>your thick cock<<else>>a fat dildo<</if>>
-=======
has a bad habit of being sexually judgemental, belittling anyone who doesn't live up to $his pretensions of standards. You do your best to train $him to perform regardless of $his partners' endowments, aiming for a delicate balance that will allow $him to get off with anyone while permitting $him to retain and even build on $his appetite for big dicks. You permit $him to achieve release only when $he's done well with <<if $PC.dick != 0>>your thick cock<<else>>a fat dildo<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.vagina > 0 && canDoVaginal($activeSlave)>>
lodged up $his cunt.
<<= VCheck.Vaginal(10)>>
@@ -369,11 +365,7 @@
$His stupidity makes $him absorb $his lessons slowly.
<</if>>
<<if $activeSlave.skill.oral <= 10>>
-<<<<<<< HEAD
- Since $he's orally unskilled, you start with $his mouth. $He <<if $PC.dick >= 1>>sucks your dick<<else>>eats you out<</if>>, of course, but $his training is more creative than just that. You give $him <<if canTaste($activeSlave)>>delicious<<else>>sugary<</if>> hard candies to suck and feed $him phallic fruits and vegetables that $he must deepthroat before $he can eat. As $his skill improves, $he wears a gag with an inward-facing dildo, which is swapped out for a bigger size every so often. You only let $him orgasm when $he's sucking, and before long $he's associating giving someone oral pleasure with experiencing pleasure $himself. @@.lime;$His oral skills have improved.@@
-=======
Since $he's orally unskilled, you start with $his mouth. $He <<if $PC.dick != 0>>sucks your dick<<else>>eats you out<</if>>, of course, but $his training is more creative than just that. You give $him <<if canTaste($activeSlave)>>delicious<<else>>sugary<</if>> hard candies to suck and feed $him phallic fruits and vegetables that $he must deepthroat before $he can eat. As $his skill improves, $he wears a gag with an inward-facing dildo, which is swapped out for a bigger size every so often. You only let $him orgasm when $he's sucking, and before long $he's associating giving someone oral pleasure with experiencing pleasure $himself. @@.lime;$His oral skills have improved.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<= SkillIncrease.Oral($activeSlave, _trainingEfficiency)>>
<<elseif ($activeSlave.skill.vaginal <= 10) && ($activeSlave.vagina > 0) && canDoVaginal($activeSlave)>>
Since $he's vaginally unskilled, and not a virgin, you start with $his pussy. @@.lime;$His vaginal skills have improved.@@
@@ -449,17 +441,10 @@
$activeSlave.slaveName needs to be taken down a peg. Fortunately, you know just the thing. You bring $him into a bathroom, place a chair in the tub, and tie $him securely to the chair. $He isn't too perturbed — $he probably expects a facefuck under running water or something like that — but $he begins to cry when $he <<if canHear($activeSlave)>>hears you switch on<<elseif canSee($activeSlave)>>sees you pull out<<else>>feels the cool touch of<</if>> an electric shaver. $He luxuriates in $his hair, flaunting it every chance $he gets; it's something of value in a bleak slave world and $he sobs as you shave it off $him. Afterward, $he sniffles and @@.gold;looks at you in fear@@ and @@.mediumorchid;unhappiness@@ when you rub $his newly bald scalp. Of course, there's always the body modification studio if you ever feel like $he's earned $his hair back.
<<set $activeSlave.hStyle = "shaved", $activeSlave.hLength = 0>>
<<elseif canDoAnal($activeSlave) && (random(1,100) < 10)>>
-<<<<<<< HEAD
- Sometimes, there's no need to be clever. The first indication $he gets that you've decided to train $him this week is when $he wakes suddenly in the middle of the night to the burning sensation of a <<if $PC.dick >= 1>>cock<<else>>strap-on<</if>> being shoved up $his ass. Not knowing what is happening, $he struggles, but since $he was already lying in $his bed you just lie on top of $him and press $his wriggling body into the sheets as you assrape $him. For the rest of the week, $he finds $himself grabbed and fucked. $He can't help but @@.gold;become used to the abuse@@ despite $his @@.mediumorchid;resentment.@@
- <<= VCheck.Anal(6)>>
- <<elseif canDoVaginal($activeSlave) && (random(1,100) < 10)>>
- Sometimes, there's no need to be clever. The first indication $he gets that you've decided to train $him this week is when $he wakes suddenly in the middle of the night to the filling sensation of a <<if $PC.dick >= 1>>cock<<else>>strap-on<</if>> being shoved up into $his pussy. Not knowing what is happening, $he struggles, but since $he was already lying in $his bed you just lie on top of $him and press $his wriggling body into the sheets as you assrape $him. For the rest of the week, $he finds $himself grabbed and fucked. $He can't help but @@.gold;become used to the abuse@@ despite $his @@.mediumorchid;resentment.@@
-=======
Sometimes, there's no need to be clever. The first indication $he gets that you've decided to train $him this week is when $he wakes suddenly in the middle of the night to the burning sensation of a <<if $PC.dick != 0>>cock<<else>>strap-on<</if>> being shoved up $his ass. Not knowing what is happening, $he struggles, but since $he was already lying in $his bed you just lie on top of $him and press $his wriggling body into the sheets as you assrape $him. For the rest of the week, $he finds $himself grabbed and fucked. $He can't help but @@.gold;become used to the abuse@@ despite $his @@.mediumorchid;resentment.@@
<<= VCheck.Anal(6)>>
<<elseif canDoVaginal($activeSlave) && (random(1,100) < 10)>>
Sometimes, there's no need to be clever. The first indication $he gets that you've decided to train $him this week is when $he wakes suddenly in the middle of the night to the filling sensation of a <<if $PC.dick != 0>>cock<<else>>strap-on<</if>> being shoved up into $his pussy. Not knowing what is happening, $he struggles, but since $he was already lying in $his bed you just lie on top of $him and press $his wriggling body into the sheets as you rape $him. For the rest of the week, $he finds $himself grabbed and fucked. $He can't help but @@.gold;become used to the abuse@@ despite $his @@.mediumorchid;resentment.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<= VCheck.Vaginal(6)>>
<<else>>
$activeSlave.slaveName violently resists you whenever $he can. This cannot be permitted, so after a particularly severe bout of physical resistance, you decide to employ an old method of breaking a mind without damaging a body. You secure $him to a board and gently wash $his face with a wet cloth. $He spits in defiance, only to be surprised when you lower the board so that $his feet are higher than $his head. You tie the cloth around $his face. A thin stream of water onto the cloth produces all the feeling and none of the reality of a slow death by drowning. Waterboarding isn't much use for extracting information, but it works well for @@.gold;slavebreaking.@@
@@ -529,11 +514,7 @@
<<set $activeSlave.fetish = "mindbroken", $activeSlave.sexualFlaw = "none", $activeSlave.behavioralFlaw = "none">>
<<elseif (_seed > 80) && ($activeSlave.behavioralFlaw != "hates men") && ($activeSlave.behavioralFlaw != "hates women")>>
This abuse has associated
-<<<<<<< HEAD
- <<if ($PC.dick >= 1)>>
-=======
<<if ($PC.dick != 0)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
cocks and masculinity with pain in $his mind; @@.red;$he now instinctively hates men.@@
<<set $activeSlave.behavioralFlaw = "hates men">>
<<else>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index decf0d0a3f9..137e707b331 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -752,29 +752,17 @@
<<set $recruit.push("immigrant")>>
<</if>>
-<<<<<<< HEAD
- <<if ($PC.dick >= 1) && ($PC.vagina == 0) && ($PC.boobs == 0) && ($PC.title == 1)>>
-=======
<<if ($PC.dick != 0) && ($PC.vagina == -1) && ($PC.boobs < 300) && ($PC.title == 1)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if ($rep/250) > random(1,100)>>
<<set $recruit.push("handsome PC")>>
<<set $recruit.push("handsome PC")>>
<</if>>
-<<<<<<< HEAD
- <<elseif ($PC.dick == 0) && ($PC.boobs >= 1) && ($PC.title == 0)>>
-=======
<<elseif ($PC.dick == 0) && ($PC.boobs >= 300) && ($PC.title == 0)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if ($rep/250) > random(1,100)>>
<<set $recruit.push("womanly PC")>>
<<set $recruit.push("womanly PC")>>
<</if>>
-<<<<<<< HEAD
- <<elseif ($PC.dick >= 1) && ($PC.boobs >= 1)>>
-=======
<<elseif ($PC.dick != 0) && ($PC.boobs >= 300)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if ($rep/250) > random(1,100)>>
<<set $recruit.push("shemale PC")>>
<<set $recruit.push("shemale PC")>>
@@ -1221,22 +1209,14 @@
<</if>>
<</if>>
<<if $TFS.schoolUpgrade == 0>>
-<<<<<<< HEAD
- <<if ($TFS.studentsBought > 1) || ($TFS.schoolPresent != 0) || (($TFS.studentsBought > 0) && ($PC.dick >= 1) && ($PC.vagina >= 1) && ($PC.boobs >= 1))>>
-=======
<<if ($TFS.studentsBought > 1) || ($TFS.schoolPresent != 0) || (($TFS.studentsBought > 0) && ($PC.dick != 0) && ($PC.vagina != -1) && ($PC.boobs >= 300))>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $events.push("RES Endowment")>>
<<set $RESEndowment.push("TFS")>>
<<if $TFS.studentsBought > 2>>
<<set $events.push("RES Endowment")>>
<<set $RESEndowment.push("TFS")>>
<</if>>
-<<<<<<< HEAD
- <<if ($PC.dick >= 1) && ($PC.vagina >= 1) && ($PC.boobs >= 1)>>
-=======
<<if ($PC.dick != 0) && ($PC.vagina != -1) && ($PC.boobs >= 300)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $events.push("RES Endowment")>>
<<set $RESEndowment.push("TFS")>>
<</if>>
@@ -1441,21 +1421,13 @@
<</if>>
<<if $RegularParties == 1>>
-<<<<<<< HEAD
- <<if ($PC.vagina >= 1 && $PC.title == 0) && (random(0,99) < $seeDicks)>>
-=======
<<if ($PC.vagina > 0 && $PC.title == 0) && (random(0,99) < $seeDicks)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $events.push("RE male citizen hookup")>>
<<else>>
<<set $events.push("RE citizen hookup")>>
<</if>>
<<if $rep-10000 > random(1,10000)>>
-<<<<<<< HEAD
- <<if ($PC.vagina >= 1 && $PC.boobs >= 1 && $PC.title == 0) && (random(0,99) < $seeDicks)>>
-=======
<<if ($PC.vagina > 0 && $PC.boobs >= 300 && $PC.title == 0) && (random(0,99) < $seeDicks)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $events.push("RE male arcology owner")>>
<<else>>
<<set $events.push("RE female arcology owner")>>
diff --git a/src/uncategorized/reAnalPunishment.tw b/src/uncategorized/reAnalPunishment.tw
index a1fc801f297..5a27c5cd992 100644
--- a/src/uncategorized/reAnalPunishment.tw
+++ b/src/uncategorized/reAnalPunishment.tw
@@ -54,11 +54,7 @@ $HeadGirl.slaveName is very much acting within _his2 duties, and $activeSlave.sl
<br><br>
After enjoying the spectacle for a while, you judge that the slave's sphincter is loose enough and tell $HeadGirl.slaveName to flip the bitch over. @@.hotpink;_He2 obeys, chuckling,@@ sitting _himself2 down and hauling the reluctant slave onto _his2 lap by seizing a nipple and pulling it into position so the agonized slave is forced to follow. <<if canPenetrate($HeadGirl) && ($HeadGirl.dick > 2)>>$HeadGirl.slaveName reinserts _his2 dick, <<else>>$HeadGirl.slaveName maneuvers the dildo down over _his2 own crotch, approximating the position of a natural cock and using its base to stimulate _himself2. _He2 reinserts it,<</if>> intentionally missing twice to keep the experience unpleasant despite _his2 victim's well-fucked backdoor.
<br><br>
-<<<<<<< HEAD
- $activeSlave.slaveName, now facing upward rather than having $his face ground into the floor, notices for the first time that <<if $PC.dick >= 1>>you've got your dick out and hard<<else>>you've donned one of your punishment-sized strap-ons<</if>>. $His <<= App.Desc.eyeColor($activeSlave)>> eyes @@.gold;fly open with horror@@ as you kneel down and smack its head against $his <<if $activeSlave.vagina > -1>>poor pussy<<else>>stretched taint<</if>>, but $he doesn't realize how comprehensively fucked $he is until you press it against the top of $his already-stretched anal sphincter. "Plea<<s>>e no, <<Master>>! It won't fit! Plea<<s>>e <<if $activeSlave.vagina > 0>>put it in my pu<<ss>>y<<else>>let me <<s>>uck it<</if>> in<<s>>tead," $he begs desperately. "I p-promi<<s>>e I'll be a g-good
-=======
$activeSlave.slaveName, now facing upward rather than having $his face ground into the floor, notices for the first time that <<if $PC.dick != 0>>you've got your dick out and hard<<else>>you've donned one of your punishment-sized strap-ons<</if>>. $His <<= App.Desc.eyesColor($activeSlave)>> @@.gold;fly open with horror@@ as you kneel down and smack its head against $his <<if $activeSlave.vagina > -1>>poor pussy<<else>>stretched taint<</if>>, but $he doesn't realize how comprehensively fucked $he is until you press it against the top of $his already-stretched anal sphincter. "Plea<<s>>e no, <<Master>>! It won't fit! Plea<<s>>e <<if $activeSlave.vagina > 0>>put it in my pu<<ss>>y<<else>>let me <<s>>uck it<</if>> in<<s>>tead," $he begs desperately. "I p-promi<<s>>e I'll be a g-good
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $girl == "girl">>
giiAAIIEEHH,"
<<elseif $girl == "boy">>
diff --git a/src/uncategorized/reFullBed.tw b/src/uncategorized/reFullBed.tw
index be106def54a..f7932be11ab 100644
--- a/src/uncategorized/reFullBed.tw
+++ b/src/uncategorized/reFullBed.tw
@@ -32,21 +32,13 @@ Today was an unusually relaxing day, and you aren't particularly tired.
<span id="result">
<<link "Take a slave in each hand">>
<<replace "#result">>
-<<<<<<< HEAD
- With each of your arms around a slave, you begin to run your hands across their bodies. They snuggle closer to you, their nipples growing hard and their hips grinding against you. As your grasp runs lower and lower, cupping and massaging their buttocks, they begin to kiss the chest against which their adoring faces are pressed, and reach down <<if $PC.dick == 0>>to your pussy<<else>><<if $PC.vagina >= 1>>towards your cock and cunt<<else>>for your member<</if>><</if>>. The more manually skilled begins to give you a gentle stroke, while the other softly massages your <<if ($PC.dick == 0)>>mons<<else>>testicles<</if>>. They stiffen in unison when you hook two fingers up each asshole, but immediately relax and begin to work you harder. They orgasm one after the other, their butts clenching against your intruding fingers, and then eagerly clean you with their mouths when you climax yourself. They have become @@.hotpink;still more devoted to you.@@
-=======
With each of your arms around a slave, you begin to run your hands across their bodies. They snuggle closer to you, their nipples growing hard and their hips grinding against you. As your grasp runs lower and lower, cupping and massaging their buttocks, they begin to kiss the chest against which their adoring faces are pressed, and reach down <<if $PC.dick == 0>>to your pussy<<else>><<if $PC.vagina != -1>>towards your cock and cunt<<else>>for your member<</if>><</if>>. The more manually skilled begins to give you a gentle stroke, while the other softly massages your <<if ($PC.dick == 0)>>mons<<else>>testicles<</if>>. They stiffen in unison when you hook two fingers up each asshole, but immediately relax and begin to work you harder. They orgasm one after the other, their butts clenching against your intruding fingers, and then eagerly clean you with their mouths when you climax yourself. They have become @@.hotpink;still more devoted to you.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $slaves[_bedSlaveOne].devotion += 4, $slaves[_bedSlaveTwo].devotion += 4>>
<<set $slaves[_bedSlaveOne].counter.anal++, $slaves[_bedSlaveTwo].counter.anal++>>
<<set $analTotal += 2>>
<</replace>>
<</link>>
-<<<<<<< HEAD
-<<if $slaves[_bedSlaveOne].bellyPreg >= 5000 && $slaves[_bedSlaveTwo].bellyPreg >= 5000 && $PC.dick >= 1>>
-=======
<<if $slaves[_bedSlaveOne].bellyPreg >= 5000 && $slaves[_bedSlaveTwo].bellyPreg >= 5000 && $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<br><<link "Fondle their pregnancies">>
<<replace "#result">>
With your arms each around a slave, you begin to run your hands across their bodies, focusing your attention on their full pregnancies. They snuggle closer to you, their nipples growing hard and their hips grinding against you. As they move, your rising cock catches between their gravid middles, giving you an idea. Shifting your arms under and around their backs, you pull them together over your erect member and begin using their taut stomachs to pleasure yourself. They quickly catch on and push closer to each other, trapping your dick between them. Once they begin rubbing, and you humping, the skin surrounding you is quickly coated in precum. They smile at you as they feel your penis tense, and with one final thrust you coat their bellies in a layer of cum. They love your discovery of a new way to enjoy their bodies and become @@.hotpink;even more devoted to you.@@
diff --git a/src/uncategorized/reRelativeRecruiter.tw b/src/uncategorized/reRelativeRecruiter.tw
index 05387e475d5..6d0a17b58a6 100644
--- a/src/uncategorized/reRelativeRecruiter.tw
+++ b/src/uncategorized/reRelativeRecruiter.tw
@@ -609,11 +609,7 @@ a<<s>> much a<<s>> I do.
<<elseif $eventSlave.energy > 95>>
I'm <<s>>ure <<he 2>>'d love to have three<<s>>ome<<s>>, <<Master>>!"
<<elseif $eventSlave.counter.birthsTotal > 3 && _relationType != "father" && _relationType != "son" && _relationType != "older brother" && _relationType != "younger brother">>
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
We could compete over who carried more of your children, <<Master>>!
<<else>>
We could compete over who carried more children for you, <<Master>>!
@@ -1177,11 +1173,7 @@ a<<s>> much a<<s>> I do.
<<elseif $eventSlave.energy > 95>>
I'm <<s>>ure <<he 2>>'d love to have three<<s>>ome<<s>>, <<Master>>!"
<<elseif $eventSlave.counter.births > 3>>
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
We could compete over who carried more of your children, <<Master>>!
<<else>>
We could compete over who carried more children for you, <<Master>>!
diff --git a/src/uncategorized/reShowerPunishment.tw b/src/uncategorized/reShowerPunishment.tw
index 6761f16956b..2078facc46e 100644
--- a/src/uncategorized/reShowerPunishment.tw
+++ b/src/uncategorized/reShowerPunishment.tw
@@ -80,11 +80,7 @@ $activeSlave.slaveName is being very thorough. When you first appeared, $he was
<<else>>
When the washing reaches your shoulders, it becomes clumsier, and $activeSlave.slaveName's wet body begins to bump gently against your torso. Opening your eyes, you see that your Head Girl is taking $him as $he finishes your bath. $activeSlave.slaveName is doing $his best to do a good job as $he's fucked, and $he manages it reasonably well. When $he's done, $HeadGirl.slaveName pushes $his head down towards your
<</if>>
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>groin so $he can suck you off<<if $PC.vagina >= 1>> and stroke your cunt<</if>><<else>>cunt so $he can eat you out<</if>>. $activeSlave.slaveName complies, and afterward, $he seems to feel that @@.mediumaquamarine;$he came off reasonably well;@@ it could have been worse.
-=======
<<if $PC.dick != 0>>groin so $he can suck you off<<if $PC.vagina != -1>> and stroke your cunt<</if>><<else>>cunt so $he can eat you out<</if>>. $activeSlave.slaveName complies, and afterward, $he seems to feel that @@.mediumaquamarine;$he came off reasonably well;@@ it could have been worse.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $activeSlave.counter.anal += 1>>
<<set $analTotal += 1>>
<<= knockMeUp($activeSlave, 10, 1, $HeadGirl.ID)>>
diff --git a/src/uncategorized/reStaffedMorning.tw b/src/uncategorized/reStaffedMorning.tw
index f7729045d93..81c942444e3 100644
--- a/src/uncategorized/reStaffedMorning.tw
+++ b/src/uncategorized/reStaffedMorning.tw
@@ -32,13 +32,8 @@
<<set _bedSlaves[0].clothes = _clothesTemp2>>
Sleep leaves you quickly one morning to the sensation of two of your fucktoys performing human alarm clock duty. You open your eyes and look down: it's _bedSlaves[0].slaveName and _bedSlaves[1].slaveName today.
-<<<<<<< HEAD
-<<if $PC.dick >= 1>>
- _bedSlaves[0].slaveName is <<if (_bedSlaves[0].fetish == "cumslut") && (_bedSlaves[0].fetishKnown == 1)>>rapturously<<else>>industriously<</if>> sucking your dick as it rapidly hardens in $his mouth<<if $PC.vagina >= 1>>, occasionally letting it pop free so $he can run $his tongue up and down your cunt<</if>>.
-=======
<<if $PC.dick != 0>>
_bedSlaves[0].slaveName is <<if (_bedSlaves[0].fetish == "cumslut") && (_bedSlaves[0].fetishKnown == 1)>>rapturously<<else>>industriously<</if>> sucking your dick as it rapidly hardens in $his mouth<<if $PC.vagina != -1>>, occasionally letting it pop free so $he can run $his tongue up and down your cunt<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
Meanwhile, _bedSlaves[1].slaveName is <<if (_bedSlaves[1].fetish == "cumslut") && (_bedSlaves[1].fetishKnown == 1)>>hungrily<<else>>gently<</if>> sucking your nuts.
The two slaves have crowded close together, and not just so they can both have access to your cock and balls. They're <<if (_bedSlaves[0].dick > 0) && (_bedSlaves[1].dick > 0)>>jerking each other off<<else>>manually stimulating each other<</if>> as they work.
<<else>>
@@ -52,17 +47,6 @@ The bathroom door is open and the shower is running. Though the steam is beginni
<span id="result">
<<link "Leave them satisfied">>
<<replace "#result">>
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
- You begin to thrust gently into _bedSlaves[0].slaveName's mouth. <<if $girl == _girl2>>The $girl<<else>>Your bedmate<</if>>s moan and giggle into you at the signal that you're not going to get up right this instant, and <<if (_bedSlaves[0].dick > 0) && (_bedSlaves[1].dick > 0)>>start jerking each other off harder, making lewd noises and humping each other's hands<<else>>really start giving each other proper handjobs, jerking around lewdly as their arousal builds<</if>>.<<if $PC.vagina >= 1>> They always spare at least one hand for your cunt, despite your thrusting.<</if>> When you climax, they do, too, one after the other. They quickly switch mouth positions and suck you back to full mast so you can enjoy your shower.
- <<else>>
- You reach down and run a possessive hand across each slave's scalp, neck, and back, eliciting shivers. Then, you gently hook them under the armpits and pull them up a bit, without breaking their lip locks with your nipples, or forcing them to stop playing with your cunt. Each slave ends curled up, mostly face-down, with their mouths still sucking on your <<if $PC.boobs >= 1>>boobs<<else>>chest<</if>> and their free hands trapped between their legs. They get the message and begin to look after themselves, too; their resultant moaning against your nipples grows when you reach down and start teasing their butts. The three of you climax more or less together, and you bounce up with undiminished arousal to enjoy your shower.
- <</if>>
- <br><br>
- By now, the shower is an impenetrable fog of steam. The wet, soapy bodies inside are easy to find, though. _bedSlaves[2].slaveName happens to be closest, so you
- <<if $PC.dick >= 1>>
- kiss _his3 laughing mouth hard and fuck _him3 with _his3 back against the shower wall<<if _bedSlaves[2].boobs > 2000>>, _his3 huge soapy tits sliding around deliciously<</if>>. _He3 does _his3 best to soap your front while _he3 takes cock, and _bedSlaves[3].slaveName washes your back<<if $PC.vagina >= 1>>, reaching under your butt to tease your pussy<</if>>. After a short while, you set _him3 down and seize _bedSlaves[3].slaveName, sliding your cock <<if _bedSlaves[3].butt > 4>>between _his4 huge buttocks and<</if>> up _his4 willing ass, taking _him4 from behind while _bedSlaves[2].slaveName does _his3 best to get _his3 wits back and take over washing duty. They towel you together, and you head back out of the bathroom.
-=======
<<if $PC.dick != 0>>
You begin to thrust gently into _bedSlaves[0].slaveName's mouth. <<if $girl == _girl2>>The $girl<<else>>Your bedmate<</if>>s moan and giggle into you at the signal that you're not going to get up right this instant<<if (hasAnyArms(_bedSlaves[0])) && (hasAnyArms(_bedSlaves[1]))>>, and <<if (_bedSlaves[0].dick > 0) && (_bedSlaves[1].dick > 0)>>start jerking each other off harder, making lewd noises and humping each other's hands<<else>>really start giving each other proper handjobs, jerking around lewdly as their arousal builds<</if>>.<<if $PC.vagina != -1>> They always spare at least one hand for your cunt, despite your thrusting.<</if>><</if>> When you climax, they do, too, one after the other. They quickly switch mouth positions and suck you back to full mast so you can enjoy your shower.
<<else>>
@@ -72,17 +56,12 @@ The bathroom door is open and the shower is running. Though the steam is beginni
By now, the shower is an impenetrable fog of steam. The wet, soapy bodies inside are easy to find, though. _bedSlaves[2].slaveName happens to be closest, so you
<<if $PC.dick != 0>>
kiss _his3 laughing mouth hard and fuck _him3 with _his3 back against the shower wall<<if _bedSlaves[2].boobs > 2000>>, _his3 huge soapy tits sliding around deliciously<</if>>. _He3 does _his3 best to soap your front while _he3 takes cock, and _bedSlaves[3].slaveName washes your back<<if $PC.vagina != -1>>, reaching under your butt to tease your pussy<</if>>. After a short while, you set _him3 down and seize _bedSlaves[3].slaveName, sliding your cock <<if _bedSlaves[3].butt > 4>>between _his4 huge buttocks and<</if>> up _his4 willing ass, taking _him4 from behind while _bedSlaves[2].slaveName does _his3 best to get _his3 wits back and take over washing duty. They towel you together, and you head back out of the bathroom.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<else>>
kiss _his3 laughing mouth hard and trib _him3 with _his3 back against the shower wall<<if _bedSlaves[2].boobs > 2000>>, _his3 huge soapy tits sliding around deliciously<</if>>. _He3 does _his3 best to soap your front while you hump _his3 thigh<<if _bedSlaves[2].vagina > -1>> and pussy<</if>>, and _bedSlaves[3].slaveName washes your back. After a short while, you set _him3 down and seize _bedSlaves[3].slaveName, pushing _his4 face against the wall and sliding your fingers inside _him4 while you straddle one of _his4 legs. _bedSlaves[2].slaveName does _his3 best to get _his3 wits back and take over washing duty. They towel you together, and you head back out of the bathroom.
<</if>>
<br><br>
Your clothes have been laid out, ready for _bedSlaves[0].slaveName and _bedSlaves[1].slaveName to dress you, but
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
next to the neat stack of clothes, the two slaves are bent over the bed with their buttocks spread. You select _bedSlaves[1].slaveName and slide your dick up _his2 <<if _bedSlaves[1].anus > 2>>welcoming asspussy<<elseif _bedSlaves[1].anus > 1>>soft butthole<<else>>tight anus<</if>>, sodomizing _him2 while _bedSlaves[0].slaveName buttons your shirt. When it's done, you push $him down next to _bedSlaves[1].slaveName and switch assholes, letting _bedSlaves[1].slaveName up to do _his2 best to help you into your trousers in the meantime. _He2 gets them on and fastens everything, except the fly, of course.
<<else>>
next to the neat stack of clothes, the two slaves are kneeling on the floor and looking at you with mock innocence. You select _bedSlaves[1].slaveName and straddle _his2 face, letting _him2<<if _bedSlaves[1].lips > 0>> use _his2 big soft lips to<</if>> eat you out while _bedSlaves[0].slaveName helps you into your top. When you're buttoned, you take $his face in your hands and kiss $him deeply, favoring $him with the sensation of kissing $his <<= WrittenMaster(_bedSlaves[0])>> while _heP orgasms. You keep making out with $him while _bedSlaves[1].slaveName dresses your lower half.
@@ -94,11 +73,7 @@ The bathroom door is open and the shower is running. Though the steam is beginni
<</link>>
<br><<link "Leave them exhausted">>
<<replace "#result">>
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
_bedSlaves[0].slaveName feels a hand snake behind $his head and relaxes $his throat, knowing what's coming. You fuck the bitch's mouth hard, and since the pounding pulls your balls out of _bedSlaves[1].slaveName's mouth, you yank _him2 up towards you so you can maul _his2 breasts. The compliant slave thrusts out _his2 chest, presenting _his2 tits for use as toys, and then gasps as you pinch, squeeze, and twist. You blow your load down _bedSlaves[0].slaveName's throat
<<else>>
You shove _bedSlaves[0].slaveName down towards your pussy and grab $his hair. $He takes a deep breath, knowing what's coming. You grind your cunt against the bitch's mouth hard, and since there's no room for _bedSlaves[1].slaveName's hand there any more, you yank _him2 up towards you so you can maul _his2 breasts. The compliant slave thrusts out _his2 chest, presenting _his2 tits for use as toys, and then gasps as you pinch, squeeze, and twist. You climax against _bedSlaves[0].slaveName's face
@@ -106,13 +81,8 @@ The bathroom door is open and the shower is running. Though the steam is beginni
and bounce up to fuck bitches in the shower, knocking _bedSlaves[0].slaveName to the floor and sending _bedSlaves[1].slaveName sprawling. As you go, you tell them they've got ten minutes to get your clothes laid out and their buttholes ready. They nod furiously and scramble.
<br><br>
By now, the shower is an impenetrable fog of steam. The wet, soapy bodies inside are easy to find, though. _bedSlaves[2].slaveName happens to be closest, so you
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
- grab _him3 and shove _him3 into a corner of the shower<<if _bedSlaves[2].boobs > 2000>>, _his3 huge soapy tits slapping painfully against the glass<</if>>. _He3 does _his3 best to angle _his3 hips for you as you push your cock up _his3 ass and give _him3 a good hard reaming. _bedSlaves[3].slaveName does _his4 best to wash your back<<if $PC.vagina >= 1>> and give your pussy some manual attention<</if>>, but finds _himself4 taking _bedSlaves[2].slaveName's place soon enough, smashed into the corner with your dick pistoning in and out of _his4 rectum.
-=======
<<if $PC.dick != 0>>
grab _him3 and shove _him3 into a corner of the shower<<if _bedSlaves[2].boobs > 2000>>, _his3 huge soapy tits slapping painfully against the glass<</if>>. _He3 does _his3 best to angle _his3 hips for you as you push your cock up _his3 ass and give _him3 a good hard reaming. _bedSlaves[3].slaveName does _his4 best to wash your back<<if $PC.vagina != -1>> and give your pussy some manual attention<</if>>, but finds _himself4 taking _bedSlaves[2].slaveName's place soon enough, smashed into the corner with your dick pistoning in and out of _his4 rectum.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<else>>
grab _him3 and shove _him3 into a corner of the shower<<if _bedSlaves[2].boobs > 2000>>, _his3 huge soapy tits slapping painfully against the glass<</if>>. _He3 does _his3 best to angle _his3 hips for you as you fingerfuck _his3 butthole, forcing complete submission out of the compliant _girl3. _bedSlaves[3].slaveName does _his4 best to wash your back, but finds _himself4 taking _bedSlaves[2].slaveName's place soon enough, smashed into the corner with your fingers pistoning in and out of _his4 rectum.
<</if>>
diff --git a/src/uncategorized/reStandardPunishment.tw b/src/uncategorized/reStandardPunishment.tw
index 64a820f32dd..94419272849 100644
--- a/src/uncategorized/reStandardPunishment.tw
+++ b/src/uncategorized/reStandardPunishment.tw
@@ -210,11 +210,6 @@
<<link "Punish $his ass">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- Deciding that the most appropriate punishment is some corrective assrape, you shove the slave to $his knees and stuff <<if $PC.dick >= 1>>your cock<<else>>a formidable dildo<</if>> up $his
- <<if $activeSlave.anus > 2>>
- big butthole. It slides right in, the slave's relaxed sphincter offering no resistance. Announcing that you'll find $his limits, wherever they are, you insert fingers until $he's cruelly stretched and you're almost jerking <<if $PC.dick >= 1>>yourself<<else>>the phallus<</if>> off inside $him.
-=======
Deciding that the most appropriate punishment is some corrective assrape, you shove the slave to <<if hasBothLegs($activeSlave)>>$his knees<<else>>the floor<</if>> and stuff <<if $PC.dick != 0>>your cock<<else>>a formidable dildo<</if>> up $his
<<if $activeSlave.anus > 2>>
big butthole. It slides right in, the slave's relaxed sphincter offering no resistance. Announcing that you'll find $his limits, wherever they are, you insert fingers until $he's cruelly stretched and you're almost jerking <<if $PC.dick != 0>>yourself<<else>>the phallus<</if>> off inside $him.
@@ -237,15 +232,9 @@
<<link "Punish $his pussy">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- Deciding that the most appropriate punishment is some corrective rape, you push the slave down on $his back and shove <<if $PC.dick >= 1>>your cock<<else>>a formidable dildo<</if>> inside $his
- <<if $activeSlave.anus > 2>>
- roomy cunt, which can take it easily. Announcing that you'll find $his limits, wherever they are, you insert fingers until $he's cruelly stretched and you're almost jerking <<if $PC.dick >= 1>>yourself<<else>>the phallus<</if>> off inside $him.
-=======
Deciding that the most appropriate punishment is some corrective rape, you push the slave down on $his back and shove <<if $PC.dick != 0>>your cock<<else>>a formidable dildo<</if>> inside $his
<<if $activeSlave.anus > 2>>
roomy cunt, which can take it easily. Announcing that you'll find $his limits, wherever they are, you insert fingers until $he's cruelly stretched and you're almost jerking <<if $PC.dick != 0>>yourself<<else>>the phallus<</if>> off inside $him.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<elseif $activeSlave.anus > 1>>
poor womanhood. You fuck $him mercilessly, intentionally pulling out far enough that you have to spear $him again. You use $his poor boobs as leverage, pulling against them to batter $him harder.
<<else>>
@@ -264,19 +253,11 @@
<<link "Put $his mouth to better use">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
-<<<<<<< HEAD
- You announce that $he'll have less trouble gossiping instead of being prompt if $his mouth is nice and tired. Comprehension and apprehension dawn on $his face in the moment before you <<if $activeSlave.collar != "none">>grab $him by the collar and pull<<else>>put a hand on $his shoulder and shove<</if>> $him to the ground. $He goes down without resistance, <<if $PC.dick >= 1>>already opening wide for your stiff prick.<<else>>$his look of unconcern vanishing when $he sees you pulling out a strap-on. $He doesn't get to eat pussy today; today $he gets fucked in the face.<</if>> You shove it down $his
- <<if $activeSlave.sexualQuirk == "gagfuck queen">>
- spectacularly unresisting throat. The gagfuck queen has no gag reflex to speak of, but even $he has $his limit. You rape $his face without mercy, deliberately ruining $his practiced ability to breathe while giving a cock deep oral.
- <<elseif ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishKnown == 1)>>
- eager throat. The cumslut loves giving oral, but soon realizes that you have no intention of letting $him love this. You rape $his face without mercy, hilting $his lips against <<if $PC.dick >= 1>>your base<<else>>the harness<</if>>.
-=======
You announce that $he'll have less trouble gossiping instead of being prompt if $his mouth is nice and tired. Comprehension and apprehension dawn on $his face in the moment before you <<if $activeSlave.collar != "none">>grab $him by the collar and pull<<else>>put a hand on $his shoulder and shove<</if>> $him to the ground. $He goes down without resistance, <<if $PC.dick != 0>>already opening wide for your stiff prick.<<else>>$his look of unconcern vanishing when $he sees you pulling out a strap-on. $He doesn't get to eat pussy today; today $he gets fucked in the face.<</if>> You shove it down $his
<<if $activeSlave.sexualQuirk == "gagfuck queen">>
spectacularly unresisting throat. The gagfuck queen has no gag reflex to speak of, but even $he has $his limit. You rape $his face without mercy, deliberately ruining $his practiced ability to breathe while giving a cock deep oral.
<<elseif ($activeSlave.fetish == "cumslut") && ($activeSlave.fetishKnown == 1)>>
eager throat. The cumslut loves giving oral, but soon realizes that you have no intention of letting $him love this. You rape $his face without mercy, hilting $his lips against <<if $PC.dick != 0>>your base<<else>>the harness<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<else>>
gagging throat, enjoying the sensations of $his lips and tongue writhing against you as $he desperately tries to accommodate the intruder.
<</if>>
diff --git a/src/uncategorized/recETS.tw b/src/uncategorized/recETS.tw
index d895d3a3f8f..b6c1a83cbd3 100644
--- a/src/uncategorized/recETS.tw
+++ b/src/uncategorized/recETS.tw
@@ -1622,11 +1622,7 @@ This call is coming from a public kiosk, which is usually an indication that the
<<run newSlave($activeSlave)>>
<<run cashX(forceNeg($contractCost), "slaveTransfer", $activeSlave)>>
<<replace "#result">>
-<<<<<<< HEAD
- Despite $himself, $he sobs with relief when you agree. $He offers to <<if $PC.dick >= 1>>suck you off<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>eat you out<</if>> while you complete the necessary legalities, so you work away with a <<if $PC.dick >= 1>>pair of motherly lips wrapped around your dick<<else>>motherly tongue pleasuring your clit<</if>> as $he pumps away eagerly under the desk. $He's definitely on aphrodisiacs. $He masturbates while $he sucks.
-=======
Despite $himself, $he sobs with relief when you agree. $He offers to <<if $PC.dick != 0>>suck you off<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>eat you out<</if>> while you complete the necessary legalities, so you work away with a <<if $PC.dick != 0>>pair of motherly lips wrapped around your dick<<else>>motherly tongue pleasuring your clit<</if>> as $he pumps away eagerly under the desk. $He's definitely on aphrodisiacs. $He masturbates while $he sucks.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</replace>>
<</link>>
@@ -1708,11 +1704,7 @@ This call is coming from a public kiosk, which is usually an indication that the
<<switch $RecETSevent>>
<<case "addict mother daughter">>
<<set $relative.devotion -= 50>>
-<<<<<<< HEAD
- Despite $himself, $he sobs with relief when you agree. $He offers to <<if $PC.dick >= 1>>suck you off<<else>>eat you out<</if>> while you complete the necessary legalities, but instead you idly place a big dose of aphrodisiac on your desk and tell $him to wait quietly. After ten minutes of careful manipulation, $he's signed away both $his own freedom and $his _daughter2's without realizing it, in return for the drug. $He's masturbating furiously on a chair when $his _daughter2 arrives. $He immediately realizes what's happened and $his eyes fill with all-consuming hatred, but $he can't stop rubbing.
-=======
Despite $himself, $he sobs with relief when you agree. $He offers to <<if $PC.dick != 0>>suck you off<<else>>eat you out<</if>> while you complete the necessary legalities, but instead you idly place a big dose of aphrodisiac on your desk and tell $him to wait quietly. After ten minutes of careful manipulation, $he's signed away both $his own freedom and $his _daughter2's without realizing it, in return for the drug. $He's masturbating furiously on a chair when $his _daughter2 arrives. $He immediately realizes what's happened and $his eyes fill with all-consuming hatred, but $he can't stop rubbing.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<br><br>
Unsurprisingly the _daughter2 is an addict too, and before long _he2's given _his2 signature and is sitting on a different chair on a strong dose of aphrodisiacs. <<if $activeSlave.dick > 0>>Mother and _daughter2 crank it desperately,<<else>>Mother and _daughter2 schlick themselves desperately,<</if>> sobbing in despair as you hurry to complete the nastily complex paperwork. This is going to be fun.
<<case "posh mother daughter">>
diff --git a/src/uncategorized/reputation.tw b/src/uncategorized/reputation.tw
index 93688193c6d..1b605a6bb5b 100644
--- a/src/uncategorized/reputation.tw
+++ b/src/uncategorized/reputation.tw
@@ -158,11 +158,7 @@ _enduringRep = $enduringRep>>
<<if $arcologies[0].FSRestartDecoration == 100>>
As a member of the Societal Elite, your appearance has no bearing on your reputation.
<<else>>
-<<<<<<< HEAD
- <<if ($PC.dick == 0) && ($PC.boobs >= 1) && $PC.title == 0>>
-=======
<<if ($PC.dick == 0) && ($PC.boobs >= 300) && $PC.title == 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $rep > 18000>>
Your reputation is so well-established that society has accepted your notoriously feminine appearance despite how unusual it is for a prominent slaveowner to look like you do.
<<if $arcologies[0].FSGenderRadicalist > 30>>
@@ -185,11 +181,7 @@ _enduringRep = $enduringRep>>
<<= FutureSocieties.Change("GenderFundamentalist", -5)>>
<</if>>
<</if>>
-<<<<<<< HEAD
- <<elseif ($PC.boobs >= 1) || $PC.title == 0>>
-=======
<<elseif ($PC.boobs >= 300) || $PC.title == 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $rep > 15000>>
Your reputation is so strong that society has accepted your feminine appearance despite how unusual it is for a prominent slaveowner to look like you do.
<<if $arcologies[0].FSGenderRadicalist > 30>>
@@ -212,11 +204,7 @@ _enduringRep = $enduringRep>>
<<= FutureSocieties.Change("GenderFundamentalist", -5)>>
<</if>>
<</if>>
-<<<<<<< HEAD
- <<elseif ($PC.dick == 0) || ($PC.vagina >= 1)>>
-=======
<<elseif ($PC.dick == 0) || ($PC.vagina != -1)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $rep > 15000>>
Your reputation is so strong that society has accepted your unorthodox arrangement downstairs, for an arcology owner.
<<if $arcologies[0].FSGenderRadicalist > 30>>
diff --git a/src/uncategorized/resEndowment.tw b/src/uncategorized/resEndowment.tw
index fa235092d9c..9c55bdde15b 100644
--- a/src/uncategorized/resEndowment.tw
+++ b/src/uncategorized/resEndowment.tw
@@ -40,11 +40,7 @@
You receive a personal call from an older member of the Futanari Sisters. Like all of the Sisters, she's very beautiful, but you know how to judge age through the most cutting-edge treatments, and you guess she's in her early forties. That makes her one of the most senior Sisters, at the age when mandatory enslavement will happen very soon for her. She doesn't seem preoccupied by the prospect, though the pair of gorgeous young women cooperating to suck off her enormous cock may have something to do with that.
<<if $PC.slaveSurname>>"<<if $PC.title>>Mr.<<else>>Ms.<</if>> <<print $PC.slaveSurname>>,"<<else>>"<<print $PC.slaveName>>,"<</if>>
she says forthrightly,
-<<<<<<< HEAD
- <<if ($PC.dick >= 1) && ($PC.vagina >= 1) && ($PC.boobs >= 1)>>
-=======
<<if ($PC.dick != 0) && ($PC.vagina != -1) && ($PC.boobs >= 300)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
"You've become quite famous among us.
<<else>>
"$TFS.studentsBought of my Sisters have left us for you. You seem interested in us, and are clearly very wealthy.
diff --git a/src/uncategorized/resSale.tw b/src/uncategorized/resSale.tw
index aedd097e422..c4adf79f6d2 100644
--- a/src/uncategorized/resSale.tw
+++ b/src/uncategorized/resSale.tw
@@ -102,15 +102,9 @@ You pause for a moment, and $he plunges on: "<<if $PC.title != 0>>Sir<<else>>Ma'
My education is complete, and I am ready to unveil the perfection of my form to the world." Naturally, $he's totally nude, yet you still are unable to even guess what sort of equipment $he was born with. "It is my duty and my honor to share myself in eternal servitude, in all manners and mechanisms," $he says in an unnervingly upbeat monotone.
<<else>>
The time has come for me to serve my Sisters by leaving my community and becoming a slave. Our sex skills are unparalleled," $he says proudly. $He's nude, and reclines luxuriantly for the camera, showing $his remarkable body off in all its gorgeous strangeness. $His boobs are huge, $his dick is hard, $his pussy is wet, and $his ass is relaxed. "I love to fuck, <<if $PC.title != 0>>sir<<else>>ma'am<</if>>," $he says, and you believe $him.
-<<<<<<< HEAD
- <<if ($PC.dick >= 1) && ($PC.vagina >= 1)>>
- <br><br>
- <<if ($PC.boobs >= 1)>>
-=======
<<if ($PC.dick != 0) && ($PC.vagina != -1)>>
<br><br>
<<if ($PC.boobs >= 300)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
"I would also adore serving someone like you," $he adds sincerely, $his emphasis making it quite clear the Sisters have heard rumors about your hermaphroditism. "We can't offer any further discount, but I promise I'd worship you with all my heart." $He bats $his eyes at you. "And my other parts, too!"
<<else>>
$His eyes flick downward momentarily, and $he looks nervous, swallowing before continuing. "Please let me be your slave," $he almost begs. "Serving another futa would, oh," and $he pauses, shivering a little. Recollecting $himself, $he goes on, "Wonderful. Serving you would be a dream come true."
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index 2e8ed870de2..a80de379831 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -1062,11 +1062,7 @@
<<if ["be confined in the arcade", "serve in the club", "serve the public", "whore", "work a glory hole", "work in the brothel"].includes($slaves[$i].assignment)>>
$His paraphilia is satisfied by how many dicks $he gets to suck at work.
<<set _para = 1>>
-<<<<<<< HEAD
- <<elseif ($PC.dick >= 1) && ($slaves[$i].toyHole == "mouth") && ["be your Concubine", "please you", "serve in the master suite"].includes($slaves[$i].assignment)>>
-=======
<<elseif ($PC.dick != 0) && ($slaves[$i].toyHole == "mouth") && ["be your Concubine", "please you", "serve in the master suite"].includes($slaves[$i].assignment)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
$His paraphilia is satisfied by constant oral sex with you.
<<set _para = 1>>
<<elseif $slaves[$i].inflation != 0 && $slaves[$i].inflationType == "cum">>
@@ -1398,17 +1394,10 @@
<<elseif $slaves[$i].pregKnown == 1>>
$His paraphilia is satisfied by $his pregnancy.
<<set _para = 1>>
-<<<<<<< HEAD
- <<elseif canGetPregnant($slaves[$i]) && ($PC.dick >= 1) && ($slaves[$i].toyHole == "pussy" && $slaves[$i].mpreg != 1) && ["be your Concubine", "please you", "serve in the master suite"].includes($slaves[$i].assignment)>>
- $His paraphilia is satisfied by constant unprotected vaginal sex with you.
- <<set _para = 1>>
- <<elseif canGetPregnant($slaves[$i]) && ($PC.dick >= 1) && ($slaves[$i].toyHole == "ass" && $slaves[$i].mpreg == 1) && ["be your Concubine", "please you", "serve in the master suite"].includes($slaves[$i].assignment)>>
-=======
<<elseif canGetPregnant($slaves[$i]) && ($PC.dick != 0) && ($slaves[$i].toyHole == "pussy" && $slaves[$i].mpreg != 1) && ["be your Concubine", "please you", "serve in the master suite"].includes($slaves[$i].assignment)>>
$His paraphilia is satisfied by constant unprotected vaginal sex with you.
<<set _para = 1>>
<<elseif canGetPregnant($slaves[$i]) && ($PC.dick != 0) && ($slaves[$i].toyHole == "ass" && $slaves[$i].mpreg == 1) && ["be your Concubine", "please you", "serve in the master suite"].includes($slaves[$i].assignment)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
$His paraphilia is satisfied by constant unprotected anal sex with you.
<<set _para = 1>>
<<elseif $slaves[$i].bellyImplant >= 60000>>
@@ -2114,28 +2103,17 @@
<<elseif (_fetishChangeChance > random(0,100)-20*$assistant)>>
After $his smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
<<if (_vAcc == "bullet vibrator" || _vAcc == "smart bullet vibrator") || (_dAcc == "bullet vibrator" || _dAcc == "smart bullet vibrator")>>
-<<<<<<< HEAD
- and the bullet vibrator $he is wearing encourage many orgasms during <<if $PC.dick >= 1>>unprotected sex<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>loving contact with the female anatomy<</if>>, @@.lightcoral;$he begins to fantasize about pregnancy.@@
-=======
and the bullet vibrator $he is wearing encourage many orgasms during <<if $PC.dick != 0>>unprotected sex<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>loving contact with the female anatomy<</if>>, @@.lightcoral;$he begins to fantasize about pregnancy.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if _vAcc == "bullet vibrator" || _dAcc == "bullet vibrator">>
<<set $slaves[$i].fetish = "pregnancy", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 15>>
<<elseif _vAcc == "smart bullet vibrator" || _dAcc == "smart bullet vibrator">>
<<set $slaves[$i].fetish = "pregnancy", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 20>>
<</if>>
<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
-<<<<<<< HEAD
- and the vibrating dildo in $his pussy encourage many orgasms during <<if $PC.dick >= 1>>unprotected sex<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>loving contact with the female anatomy<</if>>, @@.lightcoral;$he begins to fantasize about pregnancy.@@
- <<set $slaves[$i].fetish = "pregnancy", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 15>>
- <<else>>
- encourages many orgasms during <<if $PC.dick >= 1>>unprotected sex<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>loving contact with the female anatomy<</if>>, @@.lightcoral;$he begins to fantasize about pregnancy.@@
-=======
and the vibrating dildo in $his pussy encourage many orgasms during <<if $PC.dick != 0>>unprotected sex<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>loving contact with the female anatomy<</if>>, @@.lightcoral;$he begins to fantasize about pregnancy.@@
<<set $slaves[$i].fetish = "pregnancy", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 15>>
<<else>>
encourages many orgasms during <<if $PC.dick != 0>>unprotected sex<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>loving contact with the female anatomy<</if>>, @@.lightcoral;$he begins to fantasize about pregnancy.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $slaves[$i].fetish = "pregnancy", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10>>
<</if>>
<</if>>
diff --git a/src/uncategorized/saPleaseYou.tw b/src/uncategorized/saPleaseYou.tw
index d781c956cab..21dcded633c 100644
--- a/src/uncategorized/saPleaseYou.tw
+++ b/src/uncategorized/saPleaseYou.tw
@@ -170,11 +170,7 @@ serves you this week.
<<elseif ($slaves[$i].devotion <= 50)>>
obediently submitting to your use of $his butthole.
<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetish == "buttslut")>>
-<<<<<<< HEAD
- as your adoring anal slave, orgasming to the feel of you<<if $PC.dick >= 1>> shooting your seed<<else>>r favorite strap-on<</if>> up $his ass.
-=======
as your adoring anal slave, orgasming to the feel of you<<if $PC.dick != 0>> shooting your seed<<else>>r favorite strap-on<</if>> up $his ass.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<else>>
warming your bed and devotedly serving your sexual needs with $his anus.
<</if>>
@@ -296,20 +292,6 @@ serves you this week.
<<if ($slaves[$i].fetish == "mindbroken")>>
unaware of your intent to use $his mouth.
<<elseif ($slaves[$i].trust < -20)>>
-<<<<<<< HEAD
- in terrified compliance with your use of $his <<if ($PC.dick >= 1)>>throat<<else>>mouth<</if>>.
- <<elseif ($slaves[$i].devotion < -20)>>
- struggling and gagging as you <<if ($PC.dick >= 1)>>throatfuck $him<<else>>ride $his face<</if>>.
- <<elseif ($slaves[$i].devotion <= 20)>>
- reluctantly <<if ($PC.dick >= 1)>>servicing your cock with $his mouth<<else>>licking your pussy<</if>>.
- <<elseif ($slaves[$i].devotion <= 50)>>
- obediently <<if ($PC.dick >= 1)>>sucking your cock<<else>>eating you out<</if>>.
- <<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetish == "cumslut")>>
- as your adoring oral slave, orgasming when you leave $him with a <<if $PC.dick >= 1>>mouth full of cum<<if $PC.vagina >= 1>> or a <</if>><</if>><<if $PC.vagina >= 1>>face covered in your pussyjuice<</if>>.
- <<if $PC.dick >= 1 && ($fuckSlaves <= ($PC.sexualEnergy/2 + $PC.balls * $PC.balls))>>
- Your balls produce so much cum for $him that $he has replaced half $his diet with your cum, and you often leave $him dizzy with a face and chest covered in your sticky pearly semen.
- <<elseif $PC.dick >= 1 && ($fuckSlaves <= ($PC.sexualEnergy + $PC.balls * $PC.balls))>>
-=======
in terrified compliance with your use of $his <<if ($PC.dick != 0)>>throat<<else>>mouth<</if>>.
<<elseif ($slaves[$i].devotion < -20)>>
struggling and gagging as you <<if ($PC.dick != 0)>>throatfuck $him<<else>>ride $his face<</if>>.
@@ -322,7 +304,6 @@ serves you this week.
<<if $PC.dick != 0 && ($fuckSlaves <= ($PC.sexualEnergy/2 + ($PC.balls-3)))>>
Your balls produce so much cum for $him that $he has replaced half $his diet with your cum, and you often leave $him dizzy with a face and chest covered in your sticky pearly semen.
<<elseif $PC.dick != 0 && ($fuckSlaves <= ($PC.sexualEnergy + ($PC.balls-3)))>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
Your balls produce enough cum that $he usually gets facials after a mouthful of semen, and $he loves you for it.
<<else>>
$He usually has to fight for $his share of cum, making sure to milk cum from your urethra <<if $fuckSlaves > 1>>or suck it out of a pussy<</if>>.
@@ -376,11 +357,7 @@ serves you this week.
<</if>>
sexual abuse fills $him with @@.mediumorchid;revulsion@@ and @@.gold;fear.@@
<<elseif ($slaves[$i].devotion <= 20)>>
-<<<<<<< HEAD
- <<if ($PC.dick >= 1)>>use $his mouth<<else>>make $him eat you out<</if>>
-=======
<<if ($PC.dick != 0)>>use $his mouth<<else>>make $him eat you out<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if ($fuckSlaves <= $PC.sexualEnergy/2)>>
<<set _oralUse = random(21,40)>>
several times a day; constantly
@@ -396,11 +373,7 @@ serves you this week.
<</if>>
performing oral on you @@.hotpink;habituates $him@@ to being your sex slave.
<<else>>
-<<<<<<< HEAD
- <<if ($PC.dick >= 1)>>get a blowjob<<if $PC.vagina >= 1>> and some pussy licking<</if>> from $him<<else>>let $him eat you out<</if>>
-=======
<<if ($PC.dick != 0)>>get a blowjob<<if $PC.vagina != -1>> and some pussy licking<</if>> from $him<<else>>let $him eat you out<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if ($fuckSlaves <= $PC.sexualEnergy/2)>>
<<set _oralUse = random(21,40)>>
several times a day; constantly
@@ -421,26 +394,15 @@ serves you this week.
$He's devoted enough to derive emotional closeness from giving you oral, which @@.green;resolves $his hatred of the act.@@
<<set $slaves[$i].sexualFlaw = "none">>
<</if>>
-<<<<<<< HEAD
- <<if ($slaves[$i].behavioralFlaw == "hates men") && ($PC.dick >= 1) && ($slaves[$i].devotion > 20)>>
- Spending so much time in close proximity to your dick @@.green;reconciles $him to serving cocks.@@
- <<set $slaves[$i].behavioralFlaw = "none">>
- <<elseif ($slaves[$i].behavioralFlaw == "hates women") && ($PC.vagina >= 1) && ($slaves[$i].devotion > 20)>>
-=======
<<if ($slaves[$i].behavioralFlaw == "hates men") && ($PC.dick != 0) && ($slaves[$i].devotion > 20)>>
Spending so much time in close proximity to your dick @@.green;reconciles $him to serving cocks.@@
<<set $slaves[$i].behavioralFlaw = "none">>
<<elseif ($slaves[$i].behavioralFlaw == "hates women") && ($PC.vagina != -1) && ($slaves[$i].devotion > 20)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
Spending so much time in close proximity to your womanhood @@.green;reconciles $him to serving a pussy.@@
<<set $slaves[$i].behavioralFlaw = "none">>
<</if>>
<<if ($slaves[$i].skill.oral < 100)>>
-<<<<<<< HEAD
- After a lot of time spent <<if $PC.dick >= 1>>sucking you off<<if $PC.vagina >= 1>> and eating you out<</if>><<else>>eating you out<</if>>, $his @@.green;oral skill improves.@@
-=======
After a lot of time spent <<if $PC.dick != 0>>sucking you off<<if $PC.vagina != -1>> and eating you out<</if>><<else>>eating you out<</if>>, $his @@.green;oral skill improves.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<= SkillIncrease.Oral($slaves[$i], _trainingEfficiency)>>
<</if>>
<<if $slaves[$i].fetish == "cumslut">>
@@ -452,11 +414,7 @@ serves you this week.
<<set $slaves[$i].devotion += 2>>
<<elseif _fetishChangeChance > random(0,100)>>
<<set $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 10, $slaves[$i].fetish = "cumslut">>
-<<<<<<< HEAD
- $He frequently climaxes with <<if $PC.dick >= 1>>your dick in $his mouth<<else>>$his mouth on your cunt<</if>>, learning that giving @@.lightcoral;blowjobs is a lot of fun.@@
-=======
$He frequently climaxes with <<if $PC.dick != 0>>your dick in $his mouth<<else>>$his mouth on your cunt<</if>>, learning that giving @@.lightcoral;blowjobs is a lot of fun.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</if>>
<</if>>
<<set $slaves[$i].counter.oral += _oralUse, $oralTotal += _oralUse>>
@@ -496,11 +454,7 @@ serves you this week.
<</if>>
You have the sexual energy to
<<if ($slaves[$i].fetish == "mindbroken")>>
-<<<<<<< HEAD
- <<if ($PC.dick >= 1)>>
-=======
<<if ($PC.dick != 0)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $slaves[$i].nipples == "fuckable">>
fuck $his boobs
<<else>>
@@ -526,11 +480,7 @@ serves you this week.
<<elseif ($slaves[$i].trust >= -20) && ($slaves[$i].devotion <= 20)>>
<<if ($fuckSlaves <= $PC.sexualEnergy/2)>>
<<set _mammaryUse = random(21,40)>>
-<<<<<<< HEAD
- <<if ($PC.dick >= 1)>>
-=======
<<if ($PC.dick != 0)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $slaves[$i].nipples == "fuckable">>
fuck $his boobs
<<else>>
@@ -543,11 +493,7 @@ serves you this week.
<<set $slaves[$i].devotion -= 5, $slaves[$i].trust -= 15>>
<<elseif ($fuckSlaves <= $PC.sexualEnergy)>>
<<set _mammaryUse = random(7,14)>>
-<<<<<<< HEAD
- <<if ($PC.dick >= 1)>>
-=======
<<if ($PC.dick != 0)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $slaves[$i].nipples == "fuckable">>
fuck $his boobs
<<else>>
@@ -560,11 +506,7 @@ serves you this week.
<<set $slaves[$i].devotion -= 3, $slaves[$i].trust -= 9>>
<<else>>
<<set _mammaryUse = random(3,7)>>
-<<<<<<< HEAD
- <<if ($PC.dick >= 1)>>
-=======
<<if ($PC.dick != 0)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $slaves[$i].nipples == "fuckable">>
fuck $his boobs
<<else>>
@@ -594,11 +536,7 @@ serves you this week.
<</if>>
submitting to your games @@.hotpink;habituates $him@@ to being your sex slave.
<<else>>
-<<<<<<< HEAD
- <<if ($PC.boobs >= 1)>>have mutual mammary intercourse until you both orgasm to nipple stimulation<<else>>have mammary intercourse with $him<</if>>
-=======
<<if ($PC.boobs >= 300)>>have mutual mammary intercourse until you both orgasm to nipple stimulation<<else>>have mammary intercourse with $him<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if ($fuckSlaves <= $PC.sexualEnergy/2)>>
<<set _mammaryUse = random(21,40)>>
several times a day; constantly
@@ -938,11 +876,7 @@ serves you this week.
<</if>>
/*check*/
<<if ($slaves[$i].fetish != "mindbroken")>>
-<<<<<<< HEAD
- <<if ($slaves[$i].behavioralFlaw == "hates women") && ($PC.title == 0) && ($PC.vagina >= 1) && ($PC.dick == 0) && ($slaves[$i].devotion > 20)>>
-=======
<<if ($slaves[$i].behavioralFlaw == "hates women") && ($PC.title == 0) && ($PC.vagina != -1) && ($PC.dick == 0) && ($slaves[$i].devotion > 20)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
Spending so much intimate time with an attractive woman @@.green;reconciles $him to serving the fairer sex.@@
<<set $slaves[$i].behavioralFlaw = "none">>
<</if>>
@@ -1110,15 +1044,6 @@ serves you this week.
<<elseif ($slaves[$i].trust < -20)>>
$He is afraid of you and does $his best to offer you $his
<<if canDoAnal($slaves[$i]) && canDoVaginal($slaves[$i])>>
-<<<<<<< HEAD
- mouth, vagina<<if $PC.dick >= 1 && $slaves[$i].nipples == "fuckable">>, nipples<</if>> and asshole
- <<elseif ($slaves[$i].vagina == -1) && canDoAnal($slaves[$i])>>
- mouth<<if $PC.dick >= 1 && $slaves[$i].nipples == "fuckable">>, nipples<</if>> and asshole
- <<elseif ($slaves[$i].vagina > -1) && !canDoVaginal($slaves[$i]) && canDoAnal($slaves[$i])>>
- mouth<<if $PC.dick >= 1 && $slaves[$i].nipples == "fuckable">>, nipples<</if>> and, since $his pussy is covered by $his chastity belt, asshole
- <<else>>
- mouth<<if $PC.dick >= 1 && $slaves[$i].nipples == "fuckable">>and nipples<</if>>
-=======
mouth, vagina<<if $PC.dick != 0 && $slaves[$i].nipples == "fuckable">>, nipples<</if>> and asshole
<<elseif ($slaves[$i].vagina == -1) && canDoAnal($slaves[$i])>>
mouth<<if $PC.dick != 0 && $slaves[$i].nipples == "fuckable">>, nipples<</if>> and asshole
@@ -1126,7 +1051,6 @@ serves you this week.
mouth<<if $PC.dick != 0 && $slaves[$i].nipples == "fuckable">>, nipples<</if>> and, since $his pussy is covered by $his chastity belt, asshole
<<else>>
mouth<<if $PC.dick != 0 && $slaves[$i].nipples == "fuckable">>and nipples<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</if>>
to save $himself from worse treatment than mere rape.
<<if ($slaves[$i].dick != 0) && canAchieveErection($slaves[$i]) && !($slaves[$i].chastityPenis)>>
@@ -1195,11 +1119,7 @@ serves you this week.
<</if>>
<<if $slaves[$i].fetish != "mindbroken">>
<<if ($slaves[$i].skill.oral < 100)>>
-<<<<<<< HEAD
- After a lot of time spent with <<if $PC.dick >= 1>>your dick in $his mouth<<else>>$his mouth on your cunt<</if>>, $his @@.green;oral skill improves.@@
-=======
After a lot of time spent with <<if $PC.dick != 0>>your dick in $his mouth<<else>>$his mouth on your cunt<</if>>, $his @@.green;oral skill improves.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<= SkillIncrease.Oral($slaves[$i], _trainingEfficiency)>>
<<elseif ($slaves[$i].skill.vaginal < 100) && ($slaves[$i].vagina > 0) && canDoVaginal($slaves[$i])>>
After a lot of time spent getting fucked, $his @@.green;vaginal skill improves.@@
@@ -1221,11 +1141,7 @@ serves you this week.
<</if>>
<<set _cervixPump = 0>>
-<<<<<<< HEAD
-<<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $slaves[$i].cervixImplant == 1 || $slaves[$i].cervixImplant == 3>>
<<set _cervixPump += 10*($PC.balls-2)*_vaginalUse>>
<</if>>
diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw
index b27cc88925f..b49c1168c70 100644
--- a/src/uncategorized/saRelationships.tw
+++ b/src/uncategorized/saRelationships.tw
@@ -18,11 +18,7 @@
and does nothing but eat, sleep, and make love to your other fucktoys, $he slowly loses sight of any distinction between emotional attachment and sexual congress. @@.lightgreen;$He's become an emotional slut!@@
<<set _SlaveI.relationship = -1>>
<<elseif (_SlaveI.assignment == "please you") || (_SlaveI.assignment == "serve in the master suite")>>
-<<<<<<< HEAD
- and spends $his days worshipping your <<if $PC.dick >= 1>>cock<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>cunt<</if>>, $he begins to focus more and more of $his happiness on how happy you are. @@.lightgreen;$He's become emotionally bonded to you!@@
-=======
and spends $his days worshipping your <<if $PC.dick != 0>>cock<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>cunt<</if>>, $he begins to focus more and more of $his happiness on how happy you are. @@.lightgreen;$He's become emotionally bonded to you!@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set _SlaveI.relationship = -2>>
<<elseif (_SlaveI.assignment == "serve the public") || (_SlaveI.assignment == "serve in the club")>>
and $his life is an endless stream of lovers, $he unconsciously loses any sense of emotional attachment outside the intimacy of sex. @@.lightgreen;$He's become an emotional slut!@@
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index 0dc72deb56c..7f8339ebb5b 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -5418,11 +5418,7 @@
<<if $slaves.length > 2 || $menials > 0>>
Under the rules, $he finds $himself constantly molested by other slaves, and lives $his life constantly @@.gold;afraid.@@
<<else>>
-<<<<<<< HEAD
- Under the rules, $he is free game for other slaves to molest, and lives $his life constantly @@.gold;afraid@@ of the day you bring home slaves.
-=======
Under the rules, $he is free game for other slaves to molest, and lives $his life constantly @@.gold;afraid@@ of the day you bring home more slaves.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</if>>
<<set $slaves[$i].trust -= 2>>
<<else>>
diff --git a/src/uncategorized/seNicaeaAnnouncement.tw b/src/uncategorized/seNicaeaAnnouncement.tw
index df50213d058..183bf55aeb2 100644
--- a/src/uncategorized/seNicaeaAnnouncement.tw
+++ b/src/uncategorized/seNicaeaAnnouncement.tw
@@ -5,11 +5,7 @@
<<set $nicaeaAnnounced = 1, $nicaeaPreparation = 1, $nicaeaInvolvement = 0, $nicaeaPower = 1>>
<<set $nicaeaName = "Council of " + setup.ArcologyNamesChattelReligionist.random()>>
-<<<<<<< HEAD
-<<if $PC.title == 1>><<set _advocate = "male">><<elseif $PC.dick >= 1>><<set _advocate = "futa">><<else>><<set _advocate = "female">><</if>>
-=======
<<if $PC.title == 1>><<set _advocate = "male">><<elseif $PC.dick != 0>><<set _advocate = "futa">><<else>><<set _advocate = "female">><</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
Religion is full of politics.
<br><br>
diff --git a/src/uncategorized/seWeddingDouble.tw b/src/uncategorized/seWeddingDouble.tw
index ac6aa9c98fe..d62affc1821 100644
--- a/src/uncategorized/seWeddingDouble.tw
+++ b/src/uncategorized/seWeddingDouble.tw
@@ -1550,11 +1550,7 @@
There is no ring for you, since this marriage does not bind you.
<br><br>
/* TODO: marked for rewrite */
-<<<<<<< HEAD
- Once the ceremony is complete, you scoop up your new, protesting, slave <<if $wife == _wife2>>$wives<<else>>spouses<</if>> to carry them back into the master bedroom. They rest their heads against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time they're home, they're fast asleep. You set them gently down on the bed and curl up behind them, feeling the animal warmth of their bodies as the exhausted slaves' chest rise and fall with their breathing. They squirms slightly in their sleep to the unwelcome feeling of your arm around them.
-=======
Once the ceremony is complete, you scoop up your new, protesting, slave <<if $wife == _wife2>>$wives<<else>>spouses<</if>> to carry them back into the master bedroom. They rest their heads against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time they're home, they're fast asleep. You set them gently down on the bed and curl up behind them, feeling the animal warmth of their bodies as the exhausted slaves' chest rise and fall with their breathing. They squirms slightly in their sleep to the unwelcome feeling of your arm around them.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<elseif _slave1.devotion < -20>>
/* TODO: rewrite for slaves that can't walk */
They spent the day before resting and crying to themselves, and this was a necessary precaution. They spend most of the daylong party at the center of a nonstop gangbang, screaming mixed cries of pleasure and horror. The theory is that they'll be bound to you as your slave <<if $wife == _wife2>>$wives<<else>>spouses<</if>> from this day onward, so they must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter unwillingness. Many brought their own slaves to participate, too. _slave1.slaveName and _slave2.slaveName spend hours with numerous cocks inside them, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, they're extracted and taken off to be bathed.
@@ -1625,11 +1621,7 @@
<br><br>
$He returns shortly, looking exhausted but otherwise uncaring. $He's naked still, $his skin clean and _slave1.skin, and is led to you for the ceremony by another slave. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He can't conceal $his tiredness, and leans against you subconsciously. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms(_slave1)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
<br><br>
-<<<<<<< HEAD
- Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, and by the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
-=======
Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, and by the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<elseif _slave1.devotion+_slave1.trust >= 175>>
_slave1.slaveName spent the day before resting and preparing $himself, and this was a necessary precaution. $He spends most of the daylong party at the center of a nonstop gangbang. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, @@.green;your guests take part with enthusiasm,@@ many having brought their own slaves to participate, too. _slave1.slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
<br><br>
@@ -1673,31 +1665,19 @@
<br><br>
_He2 returns shortly, looking exhausted but otherwise uncaring. _He2's naked still, _his2 skin clean and _slave2.skin, and is led to you for the ceremony by another slave. The only evident signs that _he2's had sex with more than a hundred people today is _his2 ass, which looks rather well traveled, and _his2 tiredness. _He2 can't conceal _his2 tiredness, and leans against you subconsciously. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for _him2, and you place a simple steel ring <<if !hasAnyArms(_slave2)>>on a cord around _his2 neck, since _he2 lacks fingers to wear it on<<else>>on _his2 finger<</if>>. There is no ring for you, since this marriage does not bind you.
<br><br>
-<<<<<<< HEAD
- Once the ceremony is complete, you scoop up your new slave _wife2 to carry _him2 back into the master bedroom. _He2 rests _his2 head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle _him2 in your arms, and by the time _he2's home, _he2's fast asleep. You set _him2 gently down on the bed and curl up behind _him2, feeling the animal warmth of _his2 body as the exhausted slave's chest rises and falls with _his2 breathing.
-=======
Once the ceremony is complete, you scoop up your new slave _wife2 to carry _him2 back into the master bedroom. _He2 rests _his2 head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle _him2 in your arms, and by the time _he2's home, _he2's fast asleep. You set _him2 gently down on the bed and curl up behind _him2, feeling the animal warmth of _his2 body as the exhausted slave's chest rises and falls with _his2 breathing.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<elseif _slave2.devotion+_slave2.trust >= 175>>
spent the day before resting and preparing _himself2, and this was a necessary precaution. _He2 spends most of the daylong party at the center of a nonstop gangbang. The theory is that _he2'll be bound to you as your slave _wife2 from this day onward, so _he2 must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, @@.green;your guests take part with enthusiasm,@@ many having brought their own slaves to participate, too. _slave2.slaveName spends hours with numerous cocks inside _him2, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, _he2's extracted and taken off to be bathed.
<br><br>
_He2 returns shortly, looking exhausted but rather proud of _himself2 for getting through all that. _He2's naked still, _his2 skin clean and _slave2.skin, and comes confidently to stand by you for the ceremony. The only evident signs that _he2's had sex with more than a hundred people today is _his2 ass, which looks rather well-traveled, and _his2 tiredness. _He2 does _his2 best to conceal how ready to sleep _he2 is, but _he2 leans against you a little. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for _him2, and you place a simple steel ring <<if !hasAnyArms(_slave2)>>on a cord around _his2 neck, since _he2 lacks fingers to wear it on<<else>>on _his2 finger<</if>>. There is no ring for you, since this marriage does not bind you.
<br><br>
-<<<<<<< HEAD
- Once the ceremony is complete, you scoop up your new slave _wife2 to carry _him2 back into the master bedroom. _He2 rests _his2 head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle _him2 in your arms, and by the time _he2's home, _he2's fast asleep. You set _him2 gently down on the bed and curl up behind _him2, feeling the animal warmth of _his2 body as the exhausted slave's chest rises and falls with _his2 breathing.
-=======
Once the ceremony is complete, you scoop up your new slave _wife2 to carry _him2 back into the master bedroom. _He2 rests _his2 head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle _him2 in your arms, and by the time _he2's home, _he2's fast asleep. You set _him2 gently down on the bed and curl up behind _him2, feeling the animal warmth of _his2 body as the exhausted slave's chest rises and falls with _his2 breathing.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<elseif _slave2.devotion < -20 && _slave2.trust > 20>>
spent the day before resting and trying to ready _himself2, and this was a necessary precaution. _He2 spends most of the daylong party at the center of a nonstop gangbang, screaming mixed cries of pleasure and horror. The theory is that _he2'll be bound to you as your slave _wife2 from this day onward, so _he2 must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter unwillingness. Many brought their own slaves to participate, too. _slave2.slaveName spends hours with numerous cocks inside _him2, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, _he2's extracted and taken off to be bathed.
<br><br>
_He2 returns shortly, looking exhausted and annoyed. _He2's naked still, _his2 skin clean and _slave2.skin, and comes reluctantly to stand by you for the ceremony, glaring at you the whole time. The only evident signs that _he2's had sex with more than a hundred people today is _his2 ass, which looks rather well traveled, and _his2 tiredness. _He2 does _his2 best to conceal _his2 tiredness and look stronger than _he2 is, choosing to struggle to stand instead of leaning against you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for _him2, and you place a simple steel ring <<if !hasAnyArms(_slave2)>>on a cord around _his2 neck, since _he2 lacks fingers to wear it on<<else>>on _his2 finger<</if>>. There is no ring for you, since this marriage does not bind you.
<br><br>
-<<<<<<< HEAD
- Once the ceremony is complete, you scoop up your new, protesting, slave _wife2 to carry _him2 back into the master bedroom. _He2 rests _his2 head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time _he2's home, _he2's fast asleep. You set _him2 gently down on the bed and curl up behind _him2, feeling the animal warmth of _his2 body as the exhausted slave's chest rises and falls with _his2 breathing. _He2 squirms slightly in _his2 sleep to the unwelcome feeling of your arm around _him2.
-=======
Once the ceremony is complete, you scoop up your new, protesting, slave _wife2 to carry _him2 back into the master bedroom. _He2 rests _his2 head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time _he2's home, _he2's fast asleep. You set _him2 gently down on the bed and curl up behind _him2, feeling the animal warmth of _his2 body as the exhausted slave's chest rises and falls with _his2 breathing. _He2 squirms slightly in _his2 sleep to the unwelcome feeling of your arm around _him2.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<elseif _slave2.devotion < -20>>
spent the day before resting and crying to _himself2, and this was a necessary precaution. _He2 spends most of the daylong party at the center of a nonstop gangbang, screaming mixed cries of pleasure and horror. The theory is that _he2'll be bound to you as your slave _wife2 from this day onward, so _he2 must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter unwillingness. Many brought their own slaves to participate, too. _slave2.slaveName spends hours with numerous cocks inside _him2, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, _he2's extracted and taken off to be bathed.
<br><br>
@@ -2418,22 +2398,8 @@
<</link>>
</span>
<</if>>
-<<<<<<< HEAD
- <br><br> Then, you flip their veils over their heads so they can <<if $PC.dick >= 1>>suck your dick<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>eat you out<</if>> in front of your guests, as the ceremony requires.
- <<if ((_slave1.fetish == "mindbroken") && (_slave2.fetish == "mindbroken")) || ((_slave1.devotion+_slave1.trust >= 175) && (_slave2.devotion+_slave2.trust >= 175)) || ((_slave1.devotion < -20 && _slave1.trust > 20) && (_slave2.devotion < -20 && _slave2.trust > 20)) || ((_slave1.devotion < -20) && (_slave2.devotion < -20)) || ((_slave1.devotion >= -20 && _slave2.devotion >= -20))>>
- They approach their task
- <<if _slave1.fetish == "mindbroken">>
- with robotic obedience. You climax promptly, <<if $PC.dick >= 1>>shooting your cum down _slave1.slaveName's throat<<else>>covering _slave1.slaveName's face in girlcum<</if>>. Your guests and their attendant slaves @@.green;applaud at the consummation,@@ or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave <<if $wife == _wife2>>$wives<<else>>spouses<</if>> to carry them back into the master bedroom. They absentmindedly rests their head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle them in your arms, gazing up at you with empty eyes. /* TODO: will need a rewrite*/
- <<elseif _slave1.devotion+_slave1.trust >= 175>>
- <<if (_slave1.fetish == "cumslut")>>enthusiastically<<else>>with a will<</if>>, and you climax promptly, <<if $PC.dick >= 1>>shooting your cum down _slave1.slaveName's throat<<else>>covering _slave1.slaveName's face in girlcum<</if>>. Your guests and their attendant slaves @@.green;applaud at the consummation,@@ or rather, at the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave <<if $wife == _wife2>>$wives<<else>>spouses<</if>> to carry them back into the master bedroom. They rest their head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle them in your arms, staring up at you. /* TODO: will need a rewrite*/
- <<elseif _slave1.devotion < -20 && _slave1.trust > 20>>
- with apprehension, so much so that things are taking too long, so you grab _slave1.slaveName's head and facefuck $him instead. $He gags and sputters, tears running down $his cheeks, as you violate $his mouth publicly. You climax promptly, <<if $PC.dick >= 1>>shooting your cum down $his throat<<else>>covering $his face in girlcum<</if>>. Your guests and their attendant slaves @@.green;applaud at the consummation,@@ or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave <<if $wife == _wife2>>$wives<<else>>spouses<</if>> to carry them back into the master bedroom. They look up at you with fearful, hate-filled eyes, blaming you for everything that has happened so far. /* TODO: will need a rewrite*/
- <<elseif _slave1.devotion < -20>>
- with apprehension, so much so that things are taking too long, so you grab _slave1.slaveName's head and facefuck $him instead. $He gags and sputters, tears running down $his cheeks, as you violate $his mouth publicly. You climax promptly, <<if $PC.dick >= 1>>shooting your cum down $his throat<<else>>covering $his face in girlcum<</if>>. Your guests and their attendant slaves @@.green;applaud at the consummation,@@ or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave <<if $wife == _wife2>>$wives<<else>>spouses<</if>> to carry them back into the master bedroom. They look up at you with fearful, tear-filled eyes as if pleading for you not to do them. /* TODO: will need a rewrite*/
- <<else>>
- with a will. They approaches their task <<if (_slave1.fetish == "cumslut")>>enthusiastically<<else>>obediently<</if>>, and you climax promptly, <<if $PC.dick >= 1>>shooting your cum down their throat<<else>>covering their face in girlcum<</if>>. Your guests and their attendant slaves @@.green;applaud at the consummation,@@ or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave <<if $wife == _wife2>>$wives<<else>>spouses<</if>> to carry them back into the master bedroom. They look up at you, their eyes unsure. /* TODO: will need a rewrite*/
-=======
- <br><br> Then, you flip their veils over their heads so they can <<if $PC.dick != 0>>suck your dick<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>eat you out<</if>> in front of your guests, as the ceremony requires.
+ <br><br>
+ Then, you flip their veils over their heads so they can <<if $PC.dick != 0>>suck your dick<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>eat you out<</if>> in front of your guests, as the ceremony requires.
<<if ((_slave1.fetish == "mindbroken") && (_slave2.fetish == "mindbroken")) || ((_slave1.devotion+_slave1.trust >= 175) && (_slave2.devotion+_slave2.trust >= 175)) || ((_slave1.devotion < -20 && _slave1.trust > 20) && (_slave2.devotion < -20 && _slave2.trust > 20)) || ((_slave1.devotion < -20) && (_slave2.devotion < -20)) || ((_slave1.devotion >= -20 && _slave2.devotion >= -20))>>
They approach their task
<<if _slave1.fetish == "mindbroken">>
@@ -2446,34 +2412,10 @@
with apprehension, so much so that things are taking too long, so you grab _slave1.slaveName's head and facefuck $him instead. $He gags and sputters, tears running down $his cheeks, as you violate $his mouth publicly. You climax promptly, <<if $PC.dick != 0>>shooting your cum down $his throat<<else>>covering $his face in girlcum<</if>>. Your guests and their attendant slaves @@.green;applaud at the consummation,@@ or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave <<if $wife == _wife2>>$wives<<else>>spouses<</if>> to carry them back into the master bedroom. They look up at you with fearful, tear-filled eyes as if pleading for you not to do them. /* TODO: will need a rewrite*/
<<else>>
with a will. They approaches their task <<if (_slave1.fetish == "cumslut")>>enthusiastically<<else>>obediently<</if>>, and you climax promptly, <<if $PC.dick != 0>>shooting your cum down their throat<<else>>covering their face in girlcum<</if>>. Your guests and their attendant slaves @@.green;applaud at the consummation,@@ or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave <<if $wife == _wife2>>$wives<<else>>spouses<</if>> to carry them back into the master bedroom. They look up at you, their eyes unsure. /* TODO: will need a rewrite*/
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</if>>
<<else>>
_slave1.slaveName is first. $He approaches $his task
<<if _slave1.fetish == "mindbroken">>
-<<<<<<< HEAD
- with robotic obedience. You climax promptly, <<if $PC.dick >= 1>>shooting your cum down $his throat<<else>>covering $his face in girlcum<</if>>. Your guests and their attendant slaves @@.green;applaud at the consummation,@@ or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave $wife to carry $him back into the master bedroom. $He absentmindedly rests $his head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, gazing up at you with empty eyes.
- <<elseif _slave1.devotion+_slave1.trust >= 175>>
- <<if (_slave1.fetish == "cumslut")>>enthusiastically<<else>>with a will<</if>>, and you climax promptly, <<if $PC.dick >= 1>>shooting your cum down $his throat<<else>>covering $his face in girlcum<</if>>. Your guests and their attendant slaves @@.green;applaud at the consummation,@@ or rather, at the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, staring up at you.
- <<elseif _slave1.devotion < -20 && _slave1.trust > 20>>
- with apprehension, so much so that things are taking too long, so you grab $his head and facefuck $him instead. $He gags and sputters, tears running down $his cheeks, as you violate $his mouth publicly. You climax promptly, <<if $PC.dick >= 1>>shooting your cum down $his throat<<else>>covering $his face in girlcum<</if>>. Your guests and their attendant slaves @@.green;applaud at the consummation,@@ or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave $wife to carry $him back into the master bedroom. $He looks up at you with fearful, hate-filled eyes, blaming you for everything that has happened so far.
- <<elseif _slave1.devotion < -20>>
- with apprehension, so much so that things are taking too long, so you grab $his head and facefuck $him instead. $He gags and sputters, tears running down $his cheeks, as you violate $his mouth publicly. You climax promptly, <<if $PC.dick >= 1>>shooting your cum down $his throat<<else>>covering $his face in girlcum<</if>>. Your guests and their attendant slaves @@.green;applaud at the consummation,@@ or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave $wife to carry $him back into the master bedroom. $He looks up at you with fearful, tear-filled eyes as if pleading for you not to do this.
- <<else>>
- with a will. $He approaches $his task <<if (_slave1.fetish == "cumslut")>>enthusiastically<<else>>obediently<</if>>, and you climax promptly, <<if $PC.dick >= 1>>shooting your cum down $his throat<<else>>covering $his face in girlcum<</if>>. Your guests and their attendant slaves @@.green;applaud at the consummation,@@ or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave $wife to carry $him back into the master bedroom. $He looks up at you, $his eyes unsure.
- <</if>>
- Next, it's _slave2.slaveName's turn. _He2 takes on _his2 task
- <<if _slave2.fetish == "mindbroken">>
- with robotic obedience. You climax promptly, <<if $PC.dick >= 1>>shooting your cum down _his2 throat<<else>>covering _his2 face in girlcum<</if>>. Your guests and their attendant slaves @@.green;applaud at the consummation,@@ or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave _wife2 to carry _him2 back into the master bedroom. _He2 absentmindedly rests _his2 head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle _him2 in your arms, gazing up at you with empty eyes.
- <<elseif _slave2.devotion+_slave2.trust >= 175>>
- <<if (_slave2.fetish == "cumslut")>>enthusiastically<<else>>with a will<</if>>, and you climax promptly, <<if $PC.dick >= 1>>shooting your cum down _his2 throat<<else>>covering _his2 face in girlcum<</if>>. Your guests and their attendant slaves @@.green;applaud at the consummation,@@ or rather, at the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave _wife2 to carry _him2 back into the master bedroom. _He2 rests _his2 head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle _him2 in your arms, staring up at you.
- <<elseif _slave2.devotion < -20 && _slave2.trust > 20>>
- with apprehension, so much so that things are taking too long, so you grab _his2 head and facefuck _him2 instead. _He2 gags and sputters, tears running down _his2 cheeks, as you violate _his2 mouth publicly. You climax promptly, <<if $PC.dick >= 1>>shooting your cum down _his2 throat<<else>>covering _his2 face in girlcum<</if>>. Your guests and their attendant slaves @@.green;applaud at the consummation,@@ or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave _wife2 to carry _him2 back into the master bedroom. _He2 looks up at you with fearful, hate-filled eyes, blaming you for everything that has happened so far.
- <<elseif _slave2.devotion < -20>>
- with apprehension, so much so that things are taking too long, so you grab _his2 head and facefuck _him2 instead. _He2 gags and sputters, tears running down _his2 cheeks, as you violate _his2 mouth publicly. You climax promptly, <<if $PC.dick >= 1>>shooting your cum down _his2 throat<<else>>covering _his2 face in girlcum<</if>>. Your guests and their attendant slaves @@.green;applaud at the consummation,@@ or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave _wife2 to carry _him2 back into the master bedroom. _He2 looks up at you with fearful, tear-filled eyes as if pleading for you not to do this.
- <<else>>
- with a will. _He2 approaches _his2 task <<if (_slave2.fetish == "cumslut")>>enthusiastically<<else>>obediently<</if>>, and you climax promptly, <<if $PC.dick >= 1>>shooting your cum down _his2 throat<<else>>covering _his2 face in girlcum<</if>>. Your guests and their attendant slaves @@.green;applaud at the consummation,@@ or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave _wife2wiv to carry _him2 back into the master bedroom. _He2 looks up at you, _his2 eyes unsure.
-=======
with robotic obedience. You climax promptly, <<if $PC.dick != 0>>shooting your cum down $his throat<<else>>covering $his face in girlcum<</if>>. Your guests and their attendant slaves @@.green;applaud at the consummation,@@ or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave $wife to carry $him back into the master bedroom. $He absentmindedly rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, gazing up at you with empty eyes.
<<elseif _slave1.devotion+_slave1.trust >= 175>>
<<if (_slave1.fetish == "cumslut")>>enthusiastically<<else>>with a will<</if>>, and you climax promptly, <<if $PC.dick != 0>>shooting your cum down $his throat<<else>>covering $his face in girlcum<</if>>. Your guests and their attendant slaves @@.green;applaud at the consummation,@@ or rather, at the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, staring up at you.
@@ -2495,7 +2437,6 @@
with apprehension, so much so that things are taking too long, so you grab _his2 head and facefuck _him2 instead. _He2 gags and sputters, tears running down _his2 cheeks, as you violate _his2 mouth publicly. You climax promptly, <<if $PC.dick != 0>>shooting your cum down _his2 throat<<else>>covering _his2 face in girlcum<</if>>. Your guests and their attendant slaves @@.green;applaud at the consummation,@@ or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave _wife2 to carry _him2 back into the master bedroom. _He2 looks up at you with fearful, tear-filled eyes as if pleading for you not to do this.
<<else>>
with a will. _He2 approaches _his2 task <<if (_slave2.fetish == "cumslut")>>enthusiastically<<else>>obediently<</if>>, and you climax promptly, <<if $PC.dick != 0>>shooting your cum down _his2 throat<<else>>covering _his2 face in girlcum<</if>>. Your guests and their attendant slaves @@.green;applaud at the consummation,@@ or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave _wife2wiv to carry _him2 back into the master bedroom. _He2 looks up at you, _his2 eyes unsure.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</if>>
<</if>>
diff --git a/src/uncategorized/seWeddingSingle.tw b/src/uncategorized/seWeddingSingle.tw
index e086af3cb3c..f00c4582e46 100644
--- a/src/uncategorized/seWeddingSingle.tw
+++ b/src/uncategorized/seWeddingSingle.tw
@@ -554,41 +554,25 @@ In the days leading up to your wedding, $slaves[_wedS].slaveName spent $his time
<br><br>
$He returns shortly, looking exhausted but otherwise uncaring. $He's naked still, $his skin clean and $slaves[_wedS].skin, and is led to you for the ceremony by another slave. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He can't conceal $his tiredness, and leans against you subconsciously. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($slaves[_wedS])>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
<br><br>
-<<<<<<< HEAD
- Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, and by the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
-=======
Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, and by the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<elseif $slaves[_wedS].devotion+$slaves[_wedS].trust >= 175>>
$He spent the day before resting and preparing $himself, and this was a necessary precaution. $He spends most of the daylong party at the center of a nonstop gangbang. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, @@.green;your guests take part with enthusiasm,@@ many having brought their own slaves to participate, too. $slaves[_wedS].slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
<br><br>
$He returns shortly, looking exhausted but rather proud of $himself for getting through all that. $He's naked still, $his skin clean and $slaves[_wedS].skin, and comes confidently to stand by you for the ceremony. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well-traveled, and $his tiredness. $He does $his best to conceal how ready to sleep $he is, but $he leans against you a little. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($slaves[_wedS])>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
<br><br>
-<<<<<<< HEAD
- Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, and by the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
-=======
Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, and by the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<elseif $slaves[_wedS].devotion < -20 && $slaves[_wedS].trust > 20>>
$He spent the day before resting and trying to ready $himself, and this was a necessary precaution. $He spends most of the daylong party at the center of a nonstop gangbang, screaming mixed cries of pleasure and horror. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter unwillingness. Many brought their own slaves to participate, too. $slaves[_wedS].slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
<br><br>
$He returns shortly, looking exhausted and annoyed. $He's naked still, $his skin clean and $slaves[_wedS].skin, and comes reluctantly to stand by you for the ceremony, glaring at you the whole time. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal $his tiredness and look stronger than $he is, choosing to struggle to stand instead of leaning against you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($slaves[_wedS])>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
<br><br>
-<<<<<<< HEAD
- Once the ceremony is complete, you scoop up your new, protesting, slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing. $He squirms slightly in $his sleep to the unwelcome feeling of your arm around $him.
-=======
Once the ceremony is complete, you scoop up your new, protesting, slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing. $He squirms slightly in $his sleep to the unwelcome feeling of your arm around $him.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<elseif $slaves[_wedS].devotion < -20>>
$He spent the day before resting and crying to $himself, and this was a necessary precaution. $He spends most of the daylong party at the center of a nonstop gangbang, screaming mixed cries of pleasure and horror. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter unwillingness. Many brought their own slaves to participate, too. $slaves[_wedS].slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
<br><br>
$He returns shortly, looking exhausted and depressed. $He's naked still, $his skin clean and $slaves[_wedS].skin, and comes reluctantly to stand by you for the ceremony, just wanting it to be over. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal $his tiredness out of fear of punishment, and $he leans against you for support despite $his feelings on the wedding and you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($slaves[_wedS])>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
<br><br>
-<<<<<<< HEAD
- Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
-=======
Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<else>>
$He spent the day before resting and reluctantly preparing $himself, and this was a necessary precaution. $He spends most of the daylong party at the center of a nonstop gangbang, moaning and wincing as $he takes cock after cock. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's lack of passion. Many brought their own slaves to participate, too. $slaves[_wedS].slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
<br><br>
@@ -824,20 +808,8 @@ In the days leading up to your wedding, $slaves[_wedS].slaveName spent $his time
<</link>>
</span>
<</if>>
-<<<<<<< HEAD
- <br><br> Then, you flip $his veil over $his head so $he can <<if $PC.dick >= 1>>suck your dick<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>eat you out<</if>> in front of your guests, as the ceremony requires. $He approaches $his task
- <<if $slaves[_wedS].fetish == "mindbroken">>
- with robotic obedience. You climax promptly, <<if $PC.dick >= 1>>shooting your cum down $his throat<<else>>covering $his face in girlcum<</if>>. Your guests and their attendant slaves applaud at the consummation, or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave $wife to carry $him back into the master bedroom. $He absentmindedly rests $his head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, gazing up at you with empty eyes.
- <<elseif $slaves[_wedS].devotion+$slaves[_wedS].trust >= 175>>
- <<if ($slaves[_wedS].fetish == "cumslut")>>enthusiastically<<else>>with a will<</if>>, and you climax promptly, <<if $PC.dick >= 1>>shooting your cum down $his throat<<else>>covering $his face in girlcum<</if>>. Your guests and their attendant slaves @@.green;applaud at the consummation,@@ or rather, at the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, staring up at you.
- <<elseif $slaves[_wedS].devotion < -20 && $slaves[_wedS].trust > 20>>
- with apprehension, so much so that things are taking too long, so you grab $his head and facefuck $him instead. $He gags and sputters, tears running down $his cheeks, as you violate $his mouth publicly. You climax promptly, <<if $PC.dick >= 1>>shooting your cum down $his throat<<else>>covering $his face in girlcum<</if>>. Your guests and their attendant slaves applaud at the consummation, or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave $wife to carry $him back into the master bedroom. $He looks up at you with fearful, hate-filled eyes, blaming you for everything that has happened so far.
- <<elseif $slaves[_wedS].devotion < -20>>
- with apprehension, so much so that things are taking too long, so you grab $his head and facefuck $him instead. $He gags and sputters, tears running down $his cheeks, as you violate $his mouth publicly. You climax promptly, <<if $PC.dick >= 1>>shooting your cum down $his throat<<else>>covering $his face in girlcum<</if>>. Your guests and their attendant slaves applaud at the consummation, or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave $wife to carry $him back into the master bedroom. $He looks up at you with fearful, tear-filled eyes as if pleading for you not to do this.
- <<else>>
- with a will. $He approaches $his task <<if ($slaves[_wedS].fetish == "cumslut")>>enthusiastically<<else>>obediently<</if>>, and you climax promptly, <<if $PC.dick >= 1>>shooting your cum down $his throat<<else>>covering $his face in girlcum<</if>>. Your guests and their attendant slaves applaud at the consummation, or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave $wife to carry $him back into the master bedroom. $He looks up at you, $his eyes unsure.
-=======
- <br><br> Then, you flip $his veil over $his head so $he can <<if $PC.dick != 0>>suck your dick<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>eat you out<</if>> in front of your guests, as the ceremony requires. $He approaches $his task
+ <br><br>
+ Then, you flip $his veil over $his head so $he can <<if $PC.dick != 0>>suck your dick<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>eat you out<</if>> in front of your guests, as the ceremony requires. $He approaches $his task
<<if $slaves[_wedS].fetish == "mindbroken">>
with robotic obedience. You climax promptly, <<if $PC.dick != 0>>shooting your cum down $his throat<<else>>covering $his face in girlcum<</if>>. Your guests and their attendant slaves applaud at the consummation, or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave $wife to carry $him back into the master bedroom. $He absentmindedly rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, gazing up at you with empty eyes.
<<elseif $slaves[_wedS].devotion+$slaves[_wedS].trust >= 175>>
diff --git a/src/uncategorized/seWeddingTriple.tw b/src/uncategorized/seWeddingTriple.tw
index 9568ef9e417..55f15048bcb 100644
--- a/src/uncategorized/seWeddingTriple.tw
+++ b/src/uncategorized/seWeddingTriple.tw
@@ -95,21 +95,13 @@ In the days leading up to your wedding, your <<if $wife == _wife2>>$wives<<else>
<br><br>
$He returns shortly, looking exhausted and annoyed. $He's naked still, $his skin clean and $activeSlave.skin, and comes reluctantly to stand by you for the ceremony, glaring at you the whole time. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal $his tiredness and look stronger than $he is, choosing to struggle to stand instead of leaning against you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($activeSlave)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
<br><br>
-<<<<<<< HEAD
- Once the ceremony is complete, you scoop up your new, protesting, slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing. $He squirms slightly in $his sleep to the unwelcome feeling of your arm around $him.
-=======
Once the ceremony is complete, you scoop up your new, protesting, slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing. $He squirms slightly in $his sleep to the unwelcome feeling of your arm around $him.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<elseif $activeSlave.devotion < -20>>
$He spent the day before resting and crying to $himself, and this was a necessary precaution. $He spends most of the daylong party at the center of a nonstop gangbang, screaming mixed cries of pleasure and horror. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's utter unwillingness. Many brought their own slaves to participate, too. $activeSlave.slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
<br><br>
$He returns shortly, looking exhausted and depressed. $He's naked still, $his skin clean and $activeSlave.skin, and comes reluctantly to stand by you for the ceremony, just wanting it to be over. The only evident signs that $he's had sex with more than a hundred people today is $his ass, which looks rather well traveled, and $his tiredness. $He does $his best to conceal $his tiredness out of fear of punishment, and $he leans against you for support despite $his feelings on the wedding and you. <<if $assistantName == "your personal assistant">>Your personal assistant<<else>>$assistantName<</if>> reads the short recitation for $him, and you place a simple steel ring <<if !hasAnyArms($activeSlave)>>on a cord around $his neck, since $he lacks fingers to wear it on<<else>>on $his finger<</if>>. There is no ring for you, since this marriage does not bind you.
<br><br>
-<<<<<<< HEAD
- Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
-=======
Once the ceremony is complete, you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>>, simply too tired to care anymore. By the time $he's home, $he's fast asleep. You set $him gently down on the bed and curl up behind $him, feeling the animal warmth of $his body as the exhausted slave's chest rises and falls with $his breathing.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<else>>
$He spent the day before resting and reluctantly preparing $himself, and this was a necessary precaution. $He spends most of the daylong party at the center of a nonstop gangbang, moaning and wincing as $he takes cock after cock. The theory is that $he'll be bound to you as your slave $wife from this day onward, so $he must get the promiscuity that is a sex slave's responsibility out of the way now. Whatever their opinions on the idea, your guests take part with enthusiasm, completely unhampered by your slave's lack of passion. Many brought their own slaves to participate, too. $activeSlave.slaveName spends hours with numerous cocks inside $him, with attending slaves using their mouths on any erogenous zones they can reach. When the moment of the ceremony nears, $he's extracted and taken off to be bathed.
<br><br>
@@ -346,20 +338,8 @@ In the days leading up to your wedding, your <<if $wife == _wife2>>$wives<<else>
<</link>>
</span>
<</if>>
-<<<<<<< HEAD
- <br><br> Then, you flip $his veil over $his head so $he can <<if $PC.dick >= 1>>suck your dick<<if $PC.vagina >= 1>> and <</if>><</if>><<if $PC.vagina >= 1>>eat you out<</if>> in front of your guests, as the ceremony requires. $He approaches $his task
- <<if $activeSlave.fetish == "mindbroken">>
- with robotic obedience. You climax promptly, <<if $PC.dick >= 1>>shooting your cum down $his throat<<else>>covering $his face in girlcum<</if>>. Your guests and their attendant slaves applaud at the consummation, or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave $wife to carry $him back into the master bedroom. $He absentmindedly rests $his head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, gazing up at you with empty eyes.
- <<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
- <<if ($activeSlave.fetish == "cumslut")>>enthusiastically<<else>>with a will<</if>>, and you climax promptly, <<if $PC.dick >= 1>>shooting your cum down $his throat<<else>>covering $his face in girlcum<</if>>. Your guests and their attendant slaves @@.green;applaud at the consummation,@@ or rather, at the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave $wife to carry $him back into the master bedroom. $He rests $his head against your <<if $PC.boobs >= 1>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, staring up at you.
- <<elseif $activeSlave.devotion < -20 && $activeSlave.trust > 20>>
- with apprehension, so much so that things are taking too long, so you grab $his head and facefuck $him instead. $He gags and sputters, tears running down $his cheeks, as you violate $his mouth publicly. You climax promptly, <<if $PC.dick >= 1>>shooting your cum down $his throat<<else>>covering $his face in girlcum<</if>>. Your guests and their attendant slaves applaud at the consummation, or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave $wife to carry $him back into the master bedroom. $He looks up at you with fearful, hate-filled eyes, blaming you for everything that has happened so far.
- <<elseif $activeSlave.devotion < -20>>
- with apprehension, so much so that things are taking too long, so you grab $his head and facefuck $him instead. $He gags and sputters, tears running down $his cheeks, as you violate $his mouth publicly. You climax promptly, <<if $PC.dick >= 1>>shooting your cum down $his throat<<else>>covering $his face in girlcum<</if>>. Your guests and their attendant slaves applaud at the consummation, or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave $wife to carry $him back into the master bedroom. $He looks up at you with fearful, tear-filled eyes as if pleading for you not to do this.
- <<else>>
- with a will. $He approaches $his task <<if ($activeSlave.fetish == "cumslut")>>enthusiastically<<else>>obediently<</if>>, and you climax promptly, <<if $PC.dick >= 1>>shooting your cum down $his throat<<else>>covering $his face in girlcum<</if>>. Your guests and their attendant slaves applaud at the consummation, or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave $wife to carry $him back into the master bedroom. $He looks up at you, $his eyes unsure.
-=======
- <br><br> Then, you flip $his veil over $his head so $he can <<if $PC.dick != 0>>suck your dick<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>eat you out<</if>> in front of your guests, as the ceremony requires. $He approaches $his task
+ <br><br>
+ Then, you flip $his veil over $his head so $he can <<if $PC.dick != 0>>suck your dick<<if $PC.vagina != -1>> and <</if>><</if>><<if $PC.vagina != -1>>eat you out<</if>> in front of your guests, as the ceremony requires. $He approaches $his task
<<if $activeSlave.fetish == "mindbroken">>
with robotic obedience. You climax promptly, <<if $PC.dick != 0>>shooting your cum down $his throat<<else>>covering $his face in girlcum<</if>>. Your guests and their attendant slaves applaud at the consummation, or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave $wife to carry $him back into the master bedroom. $He absentmindedly rests $his head against your <<if $PC.boobs >= 300>>breasts<<elseif $PC.title == 0>>flat chest<<else>>strong chest<</if>> as you cradle $him in your arms, gazing up at you with empty eyes.
<<elseif $activeSlave.devotion+$activeSlave.trust >= 175>>
@@ -370,7 +350,6 @@ In the days leading up to your wedding, your <<if $wife == _wife2>>$wives<<else>
with apprehension, so much so that things are taking too long, so you grab $his head and facefuck $him instead. $He gags and sputters, tears running down $his cheeks, as you violate $his mouth publicly. You climax promptly, <<if $PC.dick != 0>>shooting your cum down $his throat<<else>>covering $his face in girlcum<</if>>. Your guests and their attendant slaves applaud at the consummation, or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave $wife to carry $him back into the master bedroom. $He looks up at you with fearful, tear-filled eyes as if pleading for you not to do this.
<<else>>
with a will. $He approaches $his task <<if ($activeSlave.fetish == "cumslut")>>enthusiastically<<else>>obediently<</if>>, and you climax promptly, <<if $PC.dick != 0>>shooting your cum down $his throat<<else>>covering $his face in girlcum<</if>>. Your guests and their attendant slaves applaud at the consummation, or rather, the first stage of the consummation. The balance will take place privately, however, and you scoop up your new slave $wife to carry $him back into the master bedroom. $He looks up at you, $his eyes unsure.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</if>>
<<if $activeSlave.relationship != 0>>
<<if $activeSlave.devotion+$activeSlave.trust >= 175>>
diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw
index fc39715722b..cae5087bfe4 100644
--- a/src/uncategorized/sellSlave.tw
+++ b/src/uncategorized/sellSlave.tw
@@ -209,11 +209,7 @@ A reputable slave appraiser arrives promptly to inspect $him and certify $his qu
<</if>>
I have examined your slave in accordance with the Book.
<<case "Elite">>
-<<<<<<< HEAD
- a member of the Societal Elite you are familiar with greets you respectfully and <<if $PC.dick >= 1>>tosses you a wink as she pats her rounded belly. "He's doing well.<<else>>calms her kicking child so she can continue. "Think he'll look as good as his father?<</if>> Anyway, as I'm sure you know, <<= properTitle()>>," she says as she uses curt instructions to direct $activeSlave.slaveName, "appraisals are based on a slave's potential worth as a toy, with modifiers for special characteristics." She scrolls down the list. "I'll just mention the interesting ones.
-=======
a member of the Societal Elite you are familiar with greets you respectfully and <<if $PC.dick != 0>>tosses you a wink as she pats her rounded belly. "He's doing well.<<else>>calms her kicking child so she can continue. "Think he'll look as good as his father?<</if>> Anyway, as I'm sure you know, <<= properTitle()>>," she says as she uses curt instructions to direct $activeSlave.slaveName, "appraisals are based on a slave's potential worth as a toy, with modifiers for special characteristics." She scrolls down the list. "I'll just mention the interesting ones.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<case "futa">>
a curvy, middle aged, and quite attractive woman wearing a tank top and yoga pants greets you cheerfully and turns to the slave. As she does, you can't help but notice that the yoga pants make it obvious she has a penis almost as long as one of her forearms. She makes notes on a tablet, flipping through videos that display the slave in action as she works. "<<= properTitle()>>, I'm, like, sorry to have to say this to you since I know you know it better than I do, but it's the script, you know? Anyway appraisals are based on a slave's potential performance as a public slut, with modifiers for special characteristics." She makes notes. "I'll just mention the significant ones.
<<case "businesswoman">>
@@ -720,11 +716,7 @@ A reputable slave appraiser arrives promptly to inspect $him and certify $his qu
<<case "futa">>
That's all. Thanks! Cute $girl." She goes, but pauses in the doorway to give you a little wave.
<<case "Elite">>
-<<<<<<< HEAD
- That's all. <<if $PC.dick >= 1>>See you around! Have to have a few other guy's kids before we can have some more fun, but I'll keep you in mind!<<else>>See you around, we'll have to go drinking after I'm done sometime!<</if>>" She waves as she leaves.
-=======
That's all. <<if $PC.dick != 0>>See you around! Have to have a few other guy's kids before we can have some more fun, but I'll keep you in mind!<<else>>See you around, we'll have to go drinking after I'm done sometime!<</if>>" She waves as she leaves.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<case "businesswoman">>
That will be all. Thank you, and good day." She bows curtly and goes.
<<case "slaver">>
diff --git a/src/uncategorized/shops.tw b/src/uncategorized/shops.tw
index 5da438a2940..92473ab12a3 100644
--- a/src/uncategorized/shops.tw
+++ b/src/uncategorized/shops.tw
@@ -15,17 +15,10 @@ This is a section of the promenade
<span id="result"><<link "Put in an appearance">><<replace "#result">>You decide to stop in at one of these establishments, and of course your money's no good. You're welcomed with considerable bonhomie, and much less formality than you usually receive at social events in your arcology. Everyone's $arcologies[0].FSSupremacistRace here, and in that you're all equal, and all good friends. Everyone wants to have at least a quick word, and you stay longer than you originally meant to.<</replace>><</link>></span>
<<case "Gender Radicalist">>
dedicated to Gender Radicalism. The shops here offer a bewildering cornucopia of sex toys. Citizens can kit themselves and their slaves out for anything, regardless of bodily layout. A female citizen is looking over the latest strap-ons, while a male peer is considering versions designed to enable double penetration by one person.
-<<<<<<< HEAD
- <span id="result"><<link "Try one">><<replace "#result">>You decide to try one of the latest models. Naturally, the store is eager to have you seen considering their products. The harness is very comfortable, and it <<if $PC.dick >= 1>>equips you with a second phallus. The slave sales<<= _girlU>> lacks a vagina, but encourages you to try the setup on _himU anyway, promising that _hisU backpussy can accept double penetration. It can.<<else>>provides you with an extremely large phallus, which cums from an internal reservoir. The slave sales<<= _girlU>> encourages you to try the setup on _himU, promising that _hisU holes can accommodate it. They can.<</if>><</replace>><</link>></span>
-<<case "Gender Fundamentalist">>
- dedicated to Gender Fundamentalism. The establishments here are mostly focused on <<if $arcologies[0].FSRestart != "unset">>keeping slaves attractively feminine. There are shops offering all kinds of treatments, drugs, clothes, and furniture to satisfy even the most discerning lady<<else>>citizen reproduction with slaves. There are shops offering all kinds of treatments, drugs, clothes, and furniture to facilitate the successful impregnation of one's chattel, along with a variety of beauty products to keep them soft and feminine<</if>>.
- <span id="result"><<link "Get a massage">><<replace "#result">>You decide to put in an appearance at a tenant business, and the massage parlors are of course very eager to offer you complimentary services. The masseuse is very well-trained, and not at all a sex toy with poor massage skills as a veneer for handjob services. _HeU releases the muscle soreness from your latest workout, and uses _hisU delicate touch to bring you to an enjoyable orgasm; _heU <<if $PC.dick >= 1>>catches your cum in _hisU mouth and swallows it<<else>>swallows your femcum<</if>> with every appearance of appetite.<</replace>><</link>></span>
-=======
<span id="result"><<link "Try one">><<replace "#result">>You decide to try one of the latest models. Naturally, the store is eager to have you seen considering their products. The harness is very comfortable, and it <<if $PC.dick != 0>>equips you with a second phallus. The slave sales<<= _girlU>> lacks a vagina, but encourages you to try the setup on _himU anyway, promising that _hisU backpussy can accept double penetration. It can.<<else>>provides you with an extremely large phallus, which cums from an internal reservoir. The slave sales<<= _girlU>> encourages you to try the setup on _himU, promising that _hisU holes can accommodate it. They can.<</if>><</replace>><</link>></span>
<<case "Gender Fundamentalist">>
dedicated to Gender Fundamentalism. The establishments here are mostly focused on <<if $arcologies[0].FSRestart != "unset">>keeping slaves attractively feminine. There are shops offering all kinds of treatments, drugs, clothes, and furniture to satisfy even the most discerning lady<<else>>citizen reproduction with slaves. There are shops offering all kinds of treatments, drugs, clothes, and furniture to facilitate the successful impregnation of one's chattel, along with a variety of beauty products to keep them soft and feminine<</if>>.
<span id="result"><<link "Get a massage">><<replace "#result">>You decide to put in an appearance at a tenant business, and the massage parlors are of course very eager to offer you complimentary services. The masseuse is very well-trained, and not at all a sex toy with poor massage skills as a veneer for handjob services. _HeU releases the muscle soreness from your latest workout, and uses _hisU delicate touch to bring you to an enjoyable orgasm; _heU <<if $PC.dick != 0>>catches your cum in _hisU mouth and swallows it<<else>>swallows your femcum<</if>> with every appearance of appetite.<</replace>><</link>></span>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<case "Paternalist">>
dedicated to Paternalism. Many of the establishments here cater to slaves, some even to slaves exclusively. They offer luxurious and relaxing treatment for good <<= _girlU>>s whose owners send them here as rewards. Trusted slaves enter and exit these without any visible restraint or accompaniment, looking for all the world like pretty <<= _girlU>>s on a day out.
<span id="result"><<link "Tour the area">><<replace "#result">>You decide to put in an appearance at these establishments, and tour their front lobbies, listening politely to the educated slave receptionists' polished descriptions of the services offered. You stay out of the back areas, of course; those are for relaxing slaves, and owners typically leave them be while they're there. Most of the slaves moving through the area know who you are, and many of them are confident enough to give you respectful smiles.<</replace>><</link>></span>
@@ -34,11 +27,7 @@ This is a section of the promenade
<span id="result"><<link "Try a round">><<replace "#result">>You decide to put in an appearance at a tenant business and show off your skills, and the torture parlors are very eager to have you accept a complimentary round. You select a pretty _girlU sent to a torture parlor for some unknown failing by _hisU owner, and use a switch to flog _hisU calves, inner thighs, and breasts until _heU <<if $seePee == 1>>loses control of _hisU bladder<<else>>passes out<</if>>. <<if $PC.skill.slaving >= 100>>You're skilled at this. The trick is to stop just short of blows that will break the skin, applying all possible pain without any inconvenient blood.<<else>>There's a bit of blood, but _hisU owner will expect that.<</if>><</replace>><</link>></span>
<<case "Body Purist">>
dedicated to Body Purism. There are high end clinics for citizens, with medical specialists skilled in the latest longevity treatments. Shops offer beauty treatments, anti-aging products, and personal massage services. The slave masseuses are naturally beautiful, and their bodies are obviously part of the services offered.
-<<<<<<< HEAD
- <span id="result"><<link "Get a massage">><<replace "#result">>You decide to put in an appearance at a tenant business, and the massage parlors are of course very eager to offer you complimentary services. The masseuse is very well-trained, and not at all a sex toy with poor massage skills as a veneer for handjob services. _HeU releases the muscle soreness from your latest workout, and uses _hisU delicate touch to bring you to an enjoyable orgasm; _heU <<if $PC.dick >= 1>>catches your cum in _hisU mouth and swallows it<<else>>swallows your femcum<</if>> with every appearance of appetite.<</replace>><</link>></span>
-=======
<span id="result"><<link "Get a massage">><<replace "#result">>You decide to put in an appearance at a tenant business, and the massage parlors are of course very eager to offer you complimentary services. The masseuse is very well-trained, and not at all a sex toy with poor massage skills as a veneer for handjob services. _HeU releases the muscle soreness from your latest workout, and uses _hisU delicate touch to bring you to an enjoyable orgasm; _heU <<if $PC.dick != 0>>catches your cum in _hisU mouth and swallows it<<else>>swallows your femcum<</if>> with every appearance of appetite.<</replace>><</link>></span>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<case "Transformation Fetishist">>
dedicated to Transformation Fetishism. Autosurgeries are expensive, and require a lot of infrastructure, so almost all of your citizens have to send their slaves to clinics for surgical transformation. These establishments attempt to differentiate themselves by specializing in different surgeries, and advertising what they're best at.
<span id="result"><<link "Shop around">><<replace "#result">>You decide to shop around the best surgery clinics, to put in an appearance and check out the latest developments available to citizens less exalted than yourself. The slave sales<<= _girlU>>s are all heavily modified silicone bimbos, with an emphasis on whatever their owner's surgical specialty is. The lip specialists' sales<<= _girlU>>s have facepussies so huge they can't talk at all, so they wear touchscreens around their necks that do the talking for them.<</replace>><</link>></span>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 2cebcc001fd..d270559bb45 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -143,11 +143,7 @@
<</if>>
<</if>>
</span>
-<<<<<<< HEAD
- <<if hasAnyLegs($activeSlave) && $PC.dick == 1>>
-=======
<<if hasAnyLegs($activeSlave) && $PC.dick > 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
| <<link "Get a footjob">><<replace "#miniscene">><<include "FFeet">><br> <</replace>><</link>>
<</if>>
<span id = "impreg">
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index 38900a91e07..5c42e2d03e0 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -193,11 +193,7 @@ As the remote surgery's long recovery cycle completes,
<<set $slaves[$j].relationshipTarget = 0>>
<</if>>
<<elseif $activeSlave.relationship < 0>>
-<<<<<<< HEAD
- $His @@.lightsalmon;slave relationship to you is effectively over,@@ since everyone in the world outside $his suit is created equal to $him. $He'll probably forget to distinguish your <<if $PC.dick >= 1>>dick if it's pushed inside $his<<else>>pussy if it's pressed against $his face hole<</if>> soon enough.
-=======
$His @@.lightsalmon;slave relationship to you is effectively over,@@ since everyone in the world outside $his suit is created equal to $him. $He'll probably forget to distinguish your <<if $PC.dick != 0>>dick if it's pushed inside $his<<else>>pussy if it's pressed against $his face hole<</if>> soon enough.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</if>>
<<else>>
<<if $activeSlave.relation != 0>>
@@ -220,11 +216,7 @@ As the remote surgery's long recovery cycle completes,
<<set $slaves[$j].relationshipTarget = 0>>
<</if>>
<<elseif $activeSlave.relationship < 0>>
-<<<<<<< HEAD
- $His @@.lightsalmon;slave relationship to you is effectively over,@@ since everyone in the world outside $his suit is created equal to $him. $He'll probably forget to distinguish your <<if $PC.dick >= 1>>dick if it's pushed inside $his<<else>>pussy if it's pressed against $his face hole<</if>> soon enough.
-=======
$His @@.lightsalmon;slave relationship to you is effectively over,@@ since everyone in the world outside $his suit is created equal to $him. $He'll probably forget to distinguish your <<if $PC.dick != 0>>dick if it's pushed inside $his<<else>>pussy if it's pressed against $his face hole<</if>> soon enough.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</if>>
<</if>> /*closes extended family mode */
<<if $activeSlave.rivalry != 0>>
diff --git a/src/uncategorized/tfsFarmUpgrade.tw b/src/uncategorized/tfsFarmUpgrade.tw
index e9d30bda596..2513fa3268f 100644
--- a/src/uncategorized/tfsFarmUpgrade.tw
+++ b/src/uncategorized/tfsFarmUpgrade.tw
@@ -3,13 +3,8 @@
<<set $nextButton = "Continue", $nextLink = "Scheduled Event">>
<<set $TFS.farmUpgradeAsked = $week>>
-<<<<<<< HEAD
-You receive yet another personal call from an older Futanari Sister, one of the Sisters who lives in your arcology; you've given up trying to tell them apart. Unusually, this one has taken a break from the Sisters' constant sexual communion to concentrate on speaking with you, and she looks serious, though she's still a gorgeous naked futa whose boobs fill half the screen, and whose perpetually erect dick pokes insistently into frame. "<<if $PC.surname>><<if $PC.title>>Mr.<<else>>Ms.<</if>> <<print $PC.surname>><<else>><<print $PC.name>><</if>>," she says
-<<if ($PC.dick >= 1) && ($PC.vagina >= 1) && ($PC.boobs >= 1)>>
-=======
You receive yet another personal call from an older Futanari Sister, one of the Sisters who lives in your arcology; you've given up trying to tell them apart. Unusually, this one has taken a break from the Sisters' constant sexual communion to concentrate on speaking with you, and she looks serious, though she's still a gorgeous naked futa whose boobs fill half the screen, and whose perpetually erect dick pokes insistently into frame. "<<if $PC.slaveSurname>><<if $PC.title>>Mr.<<else>>Ms.<</if>> <<print $PC.slaveSurname>><<else>><<print $PC.slaveName>><</if>>," she says
<<if ($PC.dick != 0) && ($PC.vagina != -1) && ($PC.boobs >= 300)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
submissively, "I would like to beg a favor of you." She looks uncharacteristically uncomfortable, but steels herself and asks. "Please, may we use your organ farm? We're not... complete. Like you." She hugs herself unconsciously, her arms pressing her enormous breasts against her chest. "We... I... would like to be like you, and we
<<else>>
politely, "I would like to ask a favor of you on behalf of myself and my Sisters." She looks less confident than the older Sisters usually do, but steels herself and asks. "May we use your organ farm? We would like to really complete our transformations. We
@@ -19,11 +14,7 @@ You receive yet another personal call from an older Futanari Sister, one of the
<br><br>
"I know that you could demand thousands of credits," she continues, "but the discount we already give you is all we can afford without selling Sisters early.
-<<<<<<< HEAD
-<<if ($PC.dick >= 1) && ($PC.vagina >= 1) && ($PC.boobs >= 1)>>
-=======
<<if ($PC.dick != 0) && ($PC.vagina != -1) && ($PC.boobs >= 300)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
I would pretend to be independent and offer you the choice of how we approach this, but you've already given us so much, and you're... so perfect. We'll do whatever you say. If you do give us this priceless gift, it's your decision
<<else>>
All we have to offer for this priceless gift is your decision on an important question:
diff --git a/src/uncategorized/theFutanariSisters.tw b/src/uncategorized/theFutanariSisters.tw
index 7b85436941b..551c1f2a244 100644
--- a/src/uncategorized/theFutanariSisters.tw
+++ b/src/uncategorized/theFutanariSisters.tw
@@ -35,23 +35,14 @@ This is a large, circular room with a shallow depression in the floor, filled wi
<br><br>
Visitors are not common: in fact, visitors are only as frequent as you feel like visiting. It takes a while before they notice you. When a dreamy-eyed young futa finally does, she reaches a lazy hand over to alert the eldest one present by tugging on one of her nipples and pointing in your direction. The elder looks over at you and gives you a friendly wave followed by a wait-one-moment gesture. She's curled up on her back with her cockhead in her own mouth, using both hands to give her own shaft a boob job while a younger futa is eats her ass and fingers her pussy. The futa matron orgasms promptly, sucking down her own cum. She gets up languidly, her plush body, softening forearm-sized dick, and enormous natural boobs making it a wonderful sight.
<br><br>
-<<<<<<< HEAD
-<<if $PC.title == 1>>"Protector,<<else>>"Protectrix,<</if>> thank you so much for coming to see us. Our own Selection of a Sister to serve in slavery is not to take place for some time, but our communications interface in that side room," she points, "will permit you to access a regional listing of Selected Sisters<<if $TFS.farmUpgrade > 0>>, all of which are fully fertile and produce their own natural female hormones, thanks to you<</if>>." She looks uncharacteristically uncertain. "Will you permit me to <<if $PC.dick >= 1>><<if $PC.vagina >= 1>>worship your perfect genitalia<<else>>serve your cock<</if>><<else>>adore your pussy<</if>> while you use it? I think my Sisters will forgive me the infidelity." <<if ($PC.dick >= 1) && ($PC.vagina >= 1) && ($PC.boobs >= 1)>>She looks at you speculatively. "Or you could join us for a while."<</if>>
-=======
<<if $PC.title == 1>>"Protector,<<else>>"Protectrix,<</if>> thank you so much for coming to see us. Our own Selection of a Sister to serve in slavery is not to take place for some time, but our communications interface in that side room," she points, "will permit you to access a regional listing of Selected Sisters<<if $TFS.farmUpgrade > 0>>, all of which are fully fertile and produce their own natural female hormones, thanks to you<</if>>." She looks uncharacteristically uncertain. "Will you permit me to <<if $PC.dick != 0>><<if $PC.vagina != -1>>worship your perfect genitalia<<else>>serve your cock<</if>><<else>>adore your pussy<</if>> while you use it? I think my Sisters will forgive me the infidelity." <<if ($PC.dick != 0) && ($PC.vagina != -1) && ($PC.boobs >= 300)>>She looks at you speculatively. "Or you could join us for a while."<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<br><br>
<span id="result">
<<link "Let her give you oral while you browse">>
<<replace "#result">>
You accept her offer, and she walks seductively over to the interface with the listing of available Sisters, getting down on her knees below it. When you step up to look through the listing, she presses her huge soft tits against your knees
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
- <<if $PC.vagina >= 1>>
-=======
<<if $PC.dick != 0>>
<<if $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
and nuzzles her plush lips and hot tongue against your womanhood, using one hand to massage your shaft languidly. Perusing the very thorough pictures and videos of the pretty futanari for sale here is arousing enough without a truly masterful oral queen pleasing both your cock and your pussy, and you cum quickly. She drinks your cum rapturously and returns her mouth to your wet cunt, eagerly working to bring more forth.
<<else>>
and snuggles her face between your thighs, nuzzling her nose into your ballsack before licking it with appetite and then sucking each of your balls gently, one by one. Meanwhile one of her clever hands is languidly massaging your shaft, bringing forth a drop of precum which she laps up with appetite. Humming with pleasure, she deepthroats you without apparent effort, her mischievous tongue flicking forward to lap at your scrotum. You blow your load down her throat, and she starts to suck you hard again.
@@ -61,11 +52,7 @@ Visitors are not common: in fact, visitors are only as frequent as you feel like
<</if>>
<</replace>>
<</link>>
-<<<<<<< HEAD
-<<if ($PC.dick >= 1) && ($PC.vagina >= 1) && ($PC.boobs >= 1)>>
-=======
<<if ($PC.dick != 0) && ($PC.vagina >= 0) && ($PC.boobs >= 300)>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<br><<link "Join the Sisters' orgy">>
<<replace "#result">>
<<set $futaAddiction += 1>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 3d06df7f47c..bb36bbde986 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -1499,11 +1499,7 @@ $He's got a
<<if $activeSlave.fuckdoll <= 45>>
$he is only fit to be locked in place so $his rear hole can be raped.
<<else>>
-<<<<<<< HEAD
- $he can be instructed to rhythmically squeeze <<if $PC.dick >= 1>>cocks<<else>>anything<</if>> inserted into $his rear hole.
-=======
$he can be instructed to rhythmically squeeze <<if $PC.dick != 0>>cocks<<else>>anything<</if>> inserted into $his rear hole.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.fuckdoll <= 85>>
$He can also be ordered to bounce atop objects in $his anus.
<</if>>
@@ -4109,15 +4105,9 @@ $He's got a
<<if $activeSlave.fuckdoll <= 45>>
is mostly useful when $he's restrained for rape.
<<else>>
-<<<<<<< HEAD
- will massage <<if $PC.dick >= 1>>cocks<<else>>anything<</if>> placed inside it on command.
- <<if $activeSlave.fuckdoll <= 85>>
- $He is even capable of riding <<if $PC.dick >= 1>>dick<<else>>a strap-on<</if>>.
-=======
will massage <<if $PC.dick != 0>>cocks<<else>>anything<</if>> placed inside it on command.
<<if $activeSlave.fuckdoll <= 85>>
$He is even capable of riding <<if $PC.dick != 0>>dick<<else>>a strap-on<</if>>.
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<</if>>
<</if>>
<</if>>
@@ -4563,11 +4553,7 @@ $He has
<<= App.Desc.mods($activeSlave, "tongue")>>
<<if $activeSlave.fuckdoll > 0>>
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>Sticking a dick<<else>>Sliding a dildo<</if>> into $his <<if $activeSlave.lips > 95>>facepussy<<else>>mouth insert<</if>>
-=======
<<if $PC.dick != 0>>Sticking a dick<<else>>Sliding a dildo<</if>> into $his <<if $activeSlave.lips > 95>>facepussy<<else>>mouth insert<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $activeSlave.fuckdoll <= 45>>
mostly results in gagging.
<<else>>
diff --git a/src/utility/descriptionWidgetsTattoos.tw b/src/utility/descriptionWidgetsTattoos.tw
index 6de72ceeaff..c90b5458b70 100644
--- a/src/utility/descriptionWidgetsTattoos.tw
+++ b/src/utility/descriptionWidgetsTattoos.tw
@@ -287,11 +287,7 @@
A line-art rendition of $activeSlave.slaveName $himself nursing a pair of $his fellow slaves is tattooed across $his entire back.
<<elseif $activeSlave.skill.vaginal >= 100>>
A line-art rendition of $activeSlave.slaveName $himself performing reverse cowgirl and spreading $his pussy is tattooed across $his entire back.
-<<<<<<< HEAD
- <<elseif $PC.vagina >= 1>>
-=======
<<elseif $PC.vagina != -1>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
A line-art rendition of $activeSlave.slaveName $himself eating pussy is tattooed across $his entire back.
<<else>>
A line-art rendition of $activeSlave.slaveName $himself deepthroating a cock is tattooed across $his entire back.
@@ -447,11 +443,7 @@
<<case "rude words">>
$His abdomen reads <<if $activeSlave.vagina < 0>>'Useless, Rape Ass Instead' with an arrow pointing downward<<else>>'Fucktoy'<</if>>.
<<case "degradation">>
-<<<<<<< HEAD
- $His abdomen is tattooed with <<if $activeSlave.dick != 0>>a downward-pointing arrow which reads 'Bounces When Buttfucked.'<<else>>gothic script that reads '<<if $PC.dick >= 1>><<if $PC.vagina >= 1>>Futa<<else>>Cock<</if>><<else>>Cunt<</if>> Pleaser.'<</if>>
-=======
$His abdomen is tattooed with <<if $activeSlave.dick != 0>>a downward-pointing arrow which reads 'Bounces When Buttfucked.'<<else>>gothic script that reads '<<if $PC.dick != 0>><<if $PC.vagina != -1>>Futa<<else>>Cock<</if>><<else>>Cunt<</if>> Pleaser.'<</if>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<case "Asian art">>
$He has formal Asian characters tattooed across $his abdomen. To those who do not know the language, they look elegant, but roughly translated, they read
<<if ($activeSlave.dick > 0) && canAchieveErection($activeSlave)>>
diff --git a/src/utility/extendedFamilyWidgets.tw b/src/utility/extendedFamilyWidgets.tw
index 8cb74009dc3..1872c453e6c 100644
--- a/src/utility/extendedFamilyWidgets.tw
+++ b/src/utility/extendedFamilyWidgets.tw
@@ -787,11 +787,7 @@
<<set $activeSlave.mother = 0>>
<<redisplayFamily>>
<</link>>
-<<<<<<< HEAD
-<<if $PC.vagina >= 1 && (($PC.actualAge - $activeSlave.actualAge) >= $fertilityAge) && (($PC.mother != $activeSlave.mother) || ($activeSlave.mother == 0)) && $saveImported == 0>>
-=======
<<if $PC.vagina > 0 && (($PC.actualAge - $activeSlave.actualAge) >= $fertilityAge) && (($PC.mother != $activeSlave.mother) || ($activeSlave.mother == 0)) && $saveImported == 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
| <<link "You">><<set $activeSlave.mother = $PC.ID>><<redisplayFamily>><</link>>
<</if>>
<<for _efw = 0; _efw < $slaves.length; _efw++>>
@@ -813,11 +809,7 @@
<<set $activeSlave.father = 0>>
<<redisplayFamily>>
<</link>>
-<<<<<<< HEAD
-<<if ($PC.dick >= 1) && (($PC.actualAge - $activeSlave.actualAge) >= $potencyAge) && (($PC.father != $activeSlave.father) || ($activeSlave.father == 0)) && $saveImported == 0>>
-=======
<<if ($PC.dick > 0) && (($PC.actualAge - $activeSlave.actualAge) >= $potencyAge) && (($PC.father != $activeSlave.father) || ($activeSlave.father == 0)) && $saveImported == 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
| <<link "You">><<set $activeSlave.father = $PC.ID>><<redisplayFamily>><</link>>
<</if>>
<<for _efw = 0; _efw < $slaves.length; _efw++>>
diff --git a/src/utility/saRulesWidgets.tw b/src/utility/saRulesWidgets.tw
index 99e1245b2fa..de2f27f8405 100644
--- a/src/utility/saRulesWidgets.tw
+++ b/src/utility/saRulesWidgets.tw
@@ -45,11 +45,7 @@ and
<<case "submissive">>
hold $him down and fuck $him
<<case "cumslut">>
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
cum in $his mouth
<<else>>
use your strap-on on $his mouth
@@ -69,13 +65,9 @@ and
<<case "masochist">>
hurt $him
<<case "dom">>
- let $him help you use other slaves
+ let $him help you use other slaves
<<case "pregnancy">>
-<<<<<<< HEAD
- <<if isFertile($slaves[$i]) && $PC.dick >= 1>>
-=======
<<if isFertile($slaves[$i]) && $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
put a baby in $him
<<elseif $slaves[$i].bellyPreg >= 1500 || $slaves[$i].bellyImplant >= 1500>>
enjoy $his fecund curves
@@ -136,11 +128,7 @@ and
<<case "submissive">>
hold $him down and fuck $him; @@.lightcoral;$he's a submissive!@@
<<case "cumslut">>
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
cum in $his mouth; @@.lightcoral;$he's a cumslut!@@
<<else>>
use your strap-on in $his mouth; @@.lightcoral;$he's a cumslut!@@
@@ -158,11 +146,7 @@ and
<<case "dom">>
let $him help you use other slaves; @@.lightcoral;$he's dominant!@@
<<case "pregnancy">>
-<<<<<<< HEAD
- <<if $PC.dick >= 1>>
-=======
<<if $PC.dick != 0>>
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if $slaves[$i].mpreg == 0>>
come <<if canDoVaginal($slaves[$i])>>inside<<else>>on<</if>> $him; @@.lightcoral;$he's a pregnancy fetishist!@@
<<else>>
@@ -396,11 +380,7 @@ and
<<if $slaves[$i].drugs == "super fertility drugs" && canGetPregnant($slaves[$i])>>
$His reproductive system is in overdrive,
<<if $slaves[$i].dick > 9>>
-<<<<<<< HEAD
- leaving $him @@.mediumorchid;desperately fucking $himself@@ in an effort to get pregnant since @@.gold;you won't <<if $PC.dick >= 1>>give $him<<else>>let $him find<</if>> the dick $he needs.@@
-=======
leaving $him @@.mediumorchid;desperately fucking $himself@@ in an effort to get pregnant since @@.gold;you won't <<if $PC.dick != 0>>give $him<<else>>let $him find<</if>> the dick $he needs.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<if canImpreg($slaves[$i], $slaves[$i])>>
<<= knockMeUp($slaves[$i], 5, 2, $slaves[$i].ID, 1)>>
<</if>>
@@ -413,11 +393,7 @@ and
<</if>>
<<set $slaves[$i].devotion -= 3, $slaves[$i].trust -= 2>>
<<elseif ($slaves[$i].devotion >= -20)>>
-<<<<<<< HEAD
- leaving $him @@.mediumorchid;completely unfulfilled@@ since @@.gold;you won't <<if $PC.dick >= 1>>give $him<<else>>let $him find<</if>> the dick $he needs.@@
-=======
leaving $him @@.mediumorchid;completely unfulfilled@@ since @@.gold;you won't <<if $PC.dick != 0>>give $him<<else>>let $him find<</if>> the dick $he needs.@@
->>>>>>> ec1b06254d4a0d702794bafe0320178c5fce6ee1
<<set $slaves[$i].devotion -= 3, $slaves[$i].trust -= 2>>
<<else>>
leaving $him desperate for a thorough seeding @@.mediumorchid;that you've forbidden $him from having.@@
--
GitLab