diff --git a/src/uncategorized/initRules.tw b/src/uncategorized/initRules.tw
index d381c9288c251d83d78f9cfdac6e76b56b6b5311..fdaa6cd375fc9bf4242c0efb5fcb3c4a4a730241 100644
--- a/src/uncategorized/initRules.tw
+++ b/src/uncategorized/initRules.tw
@@ -3,7 +3,6 @@
<<silently>>
<<set $defaultRules = []>>
-<<<<<<< HEAD
<<set _activeRule = {ID: 1, name: "Obedient Slaves", condition: {id: ">=", first: {id: "(name)", name: "devotion"}, second: {id: "(number)", value: 20}}, releaseRules: "no default setting", clitSetting: "no default setting", clitSettingXY: "no default setting", clitSettingXX: "no default setting", clitSettingEnergy: "no default setting", speechRules: "no default setting", clothes: "no default setting", collar: "no default setting", shoes: "no default setting", virginAccessory: "no default setting", aVirginAccessory: "no default setting", vaginalAccessory: "no default setting", aVirginDickAccessory: "no default setting", dickAccessory: "no default setting", bellyAccessory: "no default setting", aVirginButtplug: "no default setting", buttplug: "no default setting", eyeColor: "no default setting", makeup: "no default setting", nails: "no default setting", hColor: "no default setting", hLength: "no default setting", hStyle: "no default setting", pubicHColor: "no default setting", pubicHStyle: "no default setting", nipplesPiercing: "no default setting", areolaePiercing: "no default setting", clitPiercing: "no default setting", vaginaLube: "no default setting", vaginaPiercing: "no default setting", dickPiercing: "no default setting", anusPiercing: "no default setting", lipsPiercing: "no default setting", tonguePiercing: "no default setting", earPiercing: "no default setting", nosePiercing: "no default setting", eyebrowPiercing: "no default setting", navelPiercing: "no default setting", corsetPiercing: "no default setting", boobsTat: "no default setting", buttTat: "no default setting", vaginaTat: "no default setting", dickTat: "no default setting", lipsTat: "no default setting", anusTat: "no default setting", shouldersTat: "no default setting", armsTat: "no default setting", legsTat: "no default setting", backTat: "no default setting", stampTat: "no default setting", curatives: "no default setting", livingRules: "no default setting", relationshipRules: "no default setting", standardPunishment: "no default setting", standardReward: "no default setting", diet: "no default setting", dietCum: "no default setting", dietMilk: "no default setting", muscles: "no default setting", XY: "no default setting", XX: "no default setting", gelding: "no default setting", drug: "no default setting", preg: "no default setting", growth: "no default setting", aphrodisiacs: "no default setting", autoSurgery: 0, autoBrand: 0, pornFameSpending: "no default setting", dietGrowthSupport: 0, eyewear: "no default setting", assignment: [], excludeAssignment: [], setAssignment: "none", facility: [], excludeFacility: [], assignFacility: "none", excludeSpecialSlaves: false, facilityRemove: false, removalAssignment: "rest", selectedSlaves: [], excludedSlaves: [], surgery: {lactation: "no default setting", cosmetic: 0, accent: "no default setting", shoulders: "no default setting", shouldersImplant: "no default setting", boobs: "no default setting", hips: "no default setting", hipsImplant: "no default setting", butt: "no default setting", faceShape: "no default setting", lips: "no default setting", holes: 0}, underArmHColor: "no default setting", underArmHStyle: "no default setting" }>>
<<set $defaultRules.push(_activeRule)>>
@@ -19,122 +18,5 @@
<<set $defaultRules.push(_activeRule)>>
<<set _activeRule = {ID: 3, name: "Unhealthy Slaves", condition: {id: "<", first: {id: "(name)", name: "health"}, second: {id: "(number)", value: -10}}, releaseRules: "no default setting", clitSetting: "no default setting", clitSettingXY: "no default setting", clitSettingXX: "no default setting", clitSettingEnergy: "no default setting", speechRules: "no default setting", clothes: "no default setting", collar: "no default setting", shoes: "no default setting", virginAccessory: "no default setting", aVirginAccessory: "no default setting", vaginalAccessory: "no default setting", dickAccessory: "no default setting", aVirginDickAccessory: "no default setting", bellyAccessory: "no default setting", aVirginButtplug: "no default setting", buttplug: "no default setting", eyeColor: "no default setting", makeup: "no default setting", nails: "no default setting", hColor: "no default setting", hLength: "no default setting", hStyle: "no default setting", pubicHColor: "no default setting", pubicHStyle: "no default setting", nipplesPiercing: "no default setting", areolaePiercing: "no default setting", clitPiercing: "no default setting", vaginaLube: "no default setting", vaginaPiercing: "no default setting", dickPiercing: "no default setting", anusPiercing: "no default setting", lipsPiercing: "no default setting", tonguePiercing: "no default setting", earPiercing: "no default setting", nosePiercing: "no default setting", eyebrowPiercing: "no default setting", navelPiercing: "no default setting", corsetPiercing: "no default setting", boobsTat: "no default setting", buttTat: "no default setting", vaginaTat: "no default setting", dickTat: "no default setting", lipsTat: "no default setting", anusTat: "no default setting", shouldersTat: "no default setting", armsTat: "no default setting", legsTat: "no default setting", backTat: "no default setting", stampTat: "no default setting", curatives: "applied", livingRules: "no default setting", relationshipRules: "no default setting", standardPunishment: "no default setting", standardReward: "no default setting", diet: "no default setting", dietCum: "no default setting", dietMilk: "no default setting", muscles: "no default setting", XY: "no default setting", XX: "no default setting", gelding: "no default setting", preg: "no default setting", growth: "no default setting", aphrodisiacs: "no default setting", autoSurgery: 0, autoBrand: 0, pornFameSpending: "no default setting", dietGrowthSupport: 0, eyewear: "no default setting", assignment: [], excludeAssignment: [], setAssignment: "none", facility: [], excludeFacility: [], assignFacility: "none", excludeSpecialSlaves: false, facilityRemove: false, removalAssignment: "rest", selectedSlaves: [], excludedSlaves: [], surgery: {lactation: "no default setting", cosmetic: 0, accent: "no default setting", shoulders: "no default setting", shouldersImplant: "no default setting", boobs: "no default setting", hips: "no default setting", hipsImplant: "no default setting", butt: "no default setting", faceShape: "no default setting", lips: "no default setting", holes: 0}, underArmHColor: "no default setting", underArmHStyle: "no default setting", drug: "no default setting"}>>
->>>>>>> upstream/pregmod-master
-<<set $defaultRules.push(_activeRule)>>
-
-<<set $drugs = []>>
-
-<<set _activeAccessory = {name: "No default setting", value: "no default setting"}>>
-<<set $drugs.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "None", value: "none"}>>
-<<set $drugs.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "Psychosuppresants", value: "psychosuppresants"}>>
-<<set $drugs.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "Steroids", value: "steroids"}>>
-<<set $drugs.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "Puberty enducers", value: "hormone injections", fs: "puberty"}>>
-<<set $drugs.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "Natural hormone enhancers", value: "hormone enhancers"}>>
-<<set $drugs.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "Nipple Reducers", value: "nipple atrophiers", fs: "slimness"}>>
-<<set $drugs.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "Weight-loss pills", value: "appetite suppresors", fs: "slimness"}>>
-<<set $drugs.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "Anti-aging cream", value: "anti-aging cream", fs: "youth"}>>
-<<set $drugs.push(_activeAccessory)>>
-
-<<set $bellyAccessories = []>>
-
-<<set _activeAccessory = {name: "No default setting", value: "no default setting"}>>
-<<set $bellyAccessories.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "None", value: "none"}>>
-<<set $bellyAccessories.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "Tight corset", value: "a corset"}>>
-<<set $bellyAccessories.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "Extreme corset", value: "an extreme corset"}>>
-<<set $bellyAccessories.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "1st Trimester belly", value: "a small empathy belly", fs: "repopulation"}>>
-<<set $bellyAccessories.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "2nd Trimester belly", value: "a medium empathy belly", fs: "repopulation"}>>
-<<set $bellyAccessories.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "3rd Trimester belly", value: "a large empathy belly", fs: "repopulation"}>>
-<<set $bellyAccessories.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "3rd Trimester twins belly", value: "a huge empathy belly", fs: "repopulation"}>>
-<<set $bellyAccessories.push(_activeAccessory)>>
-
-<<set $vaginalAccessories = []>>
-
-<<set _activeAccessory = {name: "No default setting", value: "no default setting"}>>
-<<set $vaginalAccessories.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "None", value: "none"}>>
-<<set $vaginalAccessories.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "Dildo", value: "dildo"}>>
-<<set $vaginalAccessories.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "Large dildo", value: "large dildo"}>>
-<<set $vaginalAccessories.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "Huge dildo", value: "huge dildo"}>>
-<<set $vaginalAccessories.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "Chastity belt", value: "chastity belt"}>>
-<<set $vaginalAccessories.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "Anal chastity belt", value: "anal chastity"}>>
-<<set $vaginalAccessories.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "Combined chastity belt", value: "combined chastity"}>>
-<<set $vaginalAccessories.push(_activeAccessory)>>
-
-<<set $dickAccessories = []>>
-
-<<set _activeAccessory = {name: "No default setting", value: "no default setting"}>>
-<<set $dickAccessories.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "None", value: "none"}>>
-<<set $dickAccessories.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "Chastity cage", value: "chastity"}>>
-<<set $dickAccessories.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "Anal chastity", value: "anal chastity"}>>
-<<set $dickAccessories.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "Combined chastity", value: "combined chastity"}>>
-<<set $dickAccessories.push(_activeAccessory)>>
-
-<<set $buttplugs = []>>
-
-<<set _activeAccessory = {name: "No default setting", value: "no default setting"}>>
-<<set $buttplugs.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "None", value: "none"}>>
-<<set $buttplugs.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "Standard plug", value: "plug"}>>
-<<set $buttplugs.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "Large plug", value: "large plug"}>>
-<<set $buttplugs.push(_activeAccessory)>>
-
-<<set _activeAccessory = {name: "Huge plug", value: "huge plug"}>>
-<<set $buttplugs.push(_activeAccessory)>>
<</silently>>
diff --git a/src/uncategorized/rulesAssistant.tw b/src/uncategorized/rulesAssistant.tw
index 02637c5bc798972b214a5bc1e1bd37aa1382d32f..0be5881ad7d84ca9589924c0ceb66cefaced71d4 100644
--- a/src/uncategorized/rulesAssistant.tw
+++ b/src/uncategorized/rulesAssistant.tw
@@ -854,7 +854,6 @@ Collar: ''$currentRule.collar.''
Shoes: ''$currentRule.shoes.''
</span>
-<<<<<<< HEAD
<<for _i = 0; _i < setup.shoes.length; _i++>>
<<if _i != 0>>
|
@@ -868,56 +867,12 @@ Shoes: ''$currentRule.shoes.''
<</link>>
<</capture>>
<</for>>
-=======
-<<link "No default footwear setting">>
- <<set $currentRule.shoes = "no default setting">>
- <<RAChangeShoes>>
- <<RAChangeSave>>
- <<RAChangeApply>>
-<</link>>
-|
-<<link "Barefoot">>
- <<set $currentRule.shoes = "none">>
- <<RAChangeShoes>>
- <<RAChangeSave>>
- <<RAChangeApply>>
-<</link>>
-|
-<<link "Flats">>
- <<set $currentRule.shoes = "flats">>
- <<RAChangeShoes>>
- <<RAChangeSave>>
- <<RAChangeApply>>
-<</link>>
-|
-<<link "Heels">>
- <<set $currentRule.shoes = "heels">>
- <<RAChangeShoes>>
- <<RAChangeSave>>
- <<RAChangeApply>>
-<</link>>
-|
-<<link "Thigh boots">>
- <<set $currentRule.shoes = "boots">>
- <<RAChangeShoes>>
- <<RAChangeSave>>
- <<RAChangeApply>>
-<</link>>
-|
-<<link "Painfully extreme heels">>
- <<set $currentRule.shoes = "extreme heels">>
- <<RAChangeShoes>>
- <<RAChangeSave>>
- <<RAChangeApply>>
-<</link>>
->>>>>>> upstream/pregmod-master
<br>
<span id = "baccessory">
Torso accessory: ''$currentRule.bellyAccessory.''
</span>
-<<<<<<< HEAD
<<for _i = 0; _i < setup.bellyAccessories.length; _i++>>
<<if _i == 0>>
<<elseif ndef setup.bellyAccessories[_i].fs>>
@@ -925,27 +880,13 @@ Torso accessory: ''$currentRule.bellyAccessory.''
<<elseif $cheatMode == 1>>
| //FS//
<<elseif (setup.bellyAccessories[_i].fs == "repopulation") && (($arcologies[0].FSRepopulationFocus != "unset") || ($clothesBoughtBelly == 1))>>
-=======
-<<for _i = 0; _i < $bellyAccessories.length; _i++>>
- <<if _i == 0>>
- <<elseif ndef $bellyAccessories[_i].fs>>
- |
- <<elseif $cheatMode == 1>>
- | //FS//
- <<elseif ($bellyAccessories[_i].fs == "repopulation") && (($arcologies[0].FSRepopulationFocus != "unset") || ($clothesBoughtBelly == 1))>>
->>>>>>> upstream/pregmod-master
| //FS//
<<else>>
<<continue>>
<</if>>
<<capture _i>>
-<<<<<<< HEAD
<<link setup.bellyAccessories[_i].name>>
<<set $currentRule.bellyAccessory = setup.bellyAccessories[_i].value>>
-=======
- <<link $bellyAccessories[_i].name>>
- <<set $currentRule.bellyAccessory = $bellyAccessories[_i].value>>
->>>>>>> upstream/pregmod-master
<<RAChangeBelly>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -959,32 +900,19 @@ Vaginal accessories for virgins: ''$currentRule.virginAccessory.''
</span>
<br>
-<<<<<<< HEAD
<<for _i =0; _i < setup.vaginalAccessories.length; _i++>>
-=======
-<<for _i =0; _i < $vaginalAccessories.length; _i++>>
->>>>>>> upstream/pregmod-master
<<if _i != 0>>
|
<</if>>
<<capture _i>>
-<<<<<<< HEAD
<<link setup.vaginalAccessories[_i].name>>
<<set $currentRule.virginAccessory = setup.vaginalAccessories[_i].value>>
-=======
- <<link $vaginalAccessories[_i].name>>
- <<set $currentRule.virginAccessory = $vaginalAccessories[_i].value>>
->>>>>>> upstream/pregmod-master
<<RAChangeVAccessory 0>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
<</capture>>
-<<<<<<< HEAD
<<if setup.vaginalAccessories[_i].value == "huge dildo">>
-=======
- <<if $vaginalAccessories[_i].value == "huge dildo">>
->>>>>>> upstream/pregmod-master
//Will permanently gape pussies//
<</if>>
<</for>>
@@ -995,32 +923,19 @@ Vaginal accessories for anal virgins: ''$currentRule.aVirginAccessory.''
</span>
<br>
-<<<<<<< HEAD
<<for _i = 0; _i < setup.vaginalAccessories.length; _i++>>
-=======
-<<for _i = 0; _i < $vaginalAccessories.length; _i++>>
->>>>>>> upstream/pregmod-master
<<if _i != 0>>
|
<</if>>
<<capture _i>>
-<<<<<<< HEAD
<<link setup.vaginalAccessories[_i].name>>
<<set $currentRule.aVirginAccessory = setup.vaginalAccessories[_i].value>>
-=======
- <<link $vaginalAccessories[_i].name>>
- <<set $currentRule.aVirginAccessory = $vaginalAccessories[_i].value>>
->>>>>>> upstream/pregmod-master
<<RAChangeVAccessory 1>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
<</capture>>
-<<<<<<< HEAD
<<if setup.vaginalAccessories[_i].value == "huge dildo">>
-=======
- <<if $vaginalAccessories[_i].value == "huge dildo">>
->>>>>>> upstream/pregmod-master
//Will permanently gape pussies//
<</if>>
<</for>>
@@ -1032,32 +947,19 @@ Vaginal accessories for other slaves: ''$currentRule.vaginalAccessory.''
</span>
<br>
-<<<<<<< HEAD
<<for _i = 0; _i < setup.vaginalAccessories.length; _i++>>
-=======
-<<for _i = 0; _i < $vaginalAccessories.length; _i++>>
->>>>>>> upstream/pregmod-master
<<if _i != 0>>
|
<</if>>
<<capture _i>>
-<<<<<<< HEAD
<<link setup.vaginalAccessories[_i].name>>
<<set $currentRule.vaginalAccessory = setup.vaginalAccessories[_i].value>>
-=======
- <<link $vaginalAccessories[_i].name>>
- <<set $currentRule.vaginalAccessory = $vaginalAccessories[_i].value>>
->>>>>>> upstream/pregmod-master
<<RAChangeVAccessory 2>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
<</capture>>
-<<<<<<< HEAD
<<if setup.vaginalAccessories[_i].value == "huge dildo">>
-=======
- <<if $vaginalAccessories[_i].value == "huge dildo">>
->>>>>>> upstream/pregmod-master
//Will permanently gape pussies//
<</if>>
<</for>>
@@ -1068,22 +970,13 @@ Vaginal accessories for other slaves: ''$currentRule.vaginalAccessory.''
Dick accessories for anal virgins: ''$currentRule.aVirginDickAccessory.''
</span>
-<<<<<<< HEAD
<<for _i = 0; _i < setup.dickAccessories.length; _i++>>
-=======
-<<for _i = 0; _i < $dickAccessories.length; _i++>>
->>>>>>> upstream/pregmod-master
<<if _i != 0>>
|
<</if>>
<<capture _i>>
-<<<<<<< HEAD
<<link setup.dickAccessories[_i].name>>
<<set $currentRule.aVirginDickAccessory = setup.dickAccessories[_i].value>>
-=======
- <<link $dickAccessories[_i].name>>
- <<set $currentRule.aVirginDickAccessory = $dickAccessories[_i].value>>
->>>>>>> upstream/pregmod-master
<<RAChangeDAccessory 0>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -1097,22 +990,13 @@ Dick accessories for anal virgins: ''$currentRule.aVirginDickAccessory.''
Dick accessories for other slaves: ''$currentRule.dickAccessory.''
</span>
-<<<<<<< HEAD
<<for _i = 0; _i < setup.dickAccessories.length; _i++>>
-=======
-<<for _i = 0; _i < $dickAccessories.length; _i++>>
->>>>>>> upstream/pregmod-master
<<if _i != 0>>
|
<</if>>
<<capture _i>>
-<<<<<<< HEAD
<<link setup.dickAccessories[_i].name>>
<<set $currentRule.dickAccessory = setup.dickAccessories[_i].value>>
-=======
- <<link $dickAccessories[_i].name>>
- <<set $currentRule.dickAccessory = $dickAccessories[_i].value>>
->>>>>>> upstream/pregmod-master
<<RAChangeDAccessory 1>>
<<RAChangeSave>>
<<RAChangeApply>>
@@ -1127,32 +1011,19 @@ Dick accessories for other slaves: ''$currentRule.dickAccessory.''
Buttplugs for anal virgins: ''$currentRule.aVirginButtplug.''
</span>
-<<<<<<< HEAD
<<for _i = 0; _i < setup.buttplugs.length; _i++>>
-=======
-<<for _i = 0; _i < $buttplugs.length; _i++>>
->>>>>>> upstream/pregmod-master
<<if _i != 0>>
|
<</if>>
<<capture _i>>
-<<<<<<< HEAD
<<link setup.buttplugs[_i].name>>
<<set $currentRule.aVirginButtplug = setup.buttplugs[_i].value>>
-=======
- <<link $buttplugs[_i].name>>
- <<set $currentRule.aVirginButtplug = $buttplugs[_i].value>>
->>>>>>> upstream/pregmod-master
<<RAChangeBAccessory 0>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
<</capture>>
-<<<<<<< HEAD
<<if setup.buttplugs[_i].value == "huge plug">>
-=======
- <<if $buttplugs[_i].value == "huge plug">>
->>>>>>> upstream/pregmod-master
//Will permanently gape assholes//
<</if>>
<</for>>
@@ -1162,32 +1033,19 @@ Buttplugs for anal virgins: ''$currentRule.aVirginButtplug.''
Buttplugs for other slaves: ''$currentRule.buttplug.''
</span>
-<<<<<<< HEAD
<<for _i = 0; _i < setup.buttplugs.length; _i++>>
-=======
-<<for _i = 0; _i < $buttplugs.length; _i++>>
->>>>>>> upstream/pregmod-master
<<if _i != 0>>
|
<</if>>
<<capture _i>>
-<<<<<<< HEAD
<<link setup.buttplugs[_i].name>>
<<set $currentRule.buttplug = setup.buttplugs[_i].value>>
-=======
- <<link $buttplugs[_i].name>>
- <<set $currentRule.buttplug = $buttplugs[_i].value>>
->>>>>>> upstream/pregmod-master
<<RAChangeBAccessory 1>>
<<RAChangeSave>>
<<RAChangeApply>>
<</link>>
<</capture>>
-<<<<<<< HEAD
<<if setup.buttplugs[_i].value == "huge plug">>
-=======
- <<if $buttplugs[_i].value == "huge plug">>
->>>>>>> upstream/pregmod-master
//Will permanently gape assholes//
<</if>>
<</for>>
@@ -1682,7 +1540,6 @@ Hormones for geldings:
Other drugs: // Will be overriden by hormones and other drugs where applicable.// ''$currentRule.drug.''
</span>
-<<<<<<< HEAD
<<for _i = 0; _i < setup.drugs.length; _i++>>
<<if _i == 0>>
<<elseif ndef setup.drugs[_i].fs>>
@@ -1694,31 +1551,13 @@ Other drugs: // Will be overriden by hormones and other drugs where applicable./
<<elseif (setup.drugs[_i].fs == "youth" && $arcologies[0].FSYouthPreferentialistResearch == 1)>>
| //FS//
<<elseif (setup.drugs[_i].fs == "puberty" && $precociousPuberty == 1 && $pubertyHormones == 1)>>
-=======
-<<for _i = 0; _i < $drugs.length; _i++>>
- <<if _i == 0>>
- <<elseif ndef $drugs[_i].fs>>
- |
- <<elseif $cheatMode == 1>>
- | //FS//
- <<elseif ($drugs[_i].fs == "slimness" && $arcologies[0].FSSlimnessEnthusiastResearch == 1)>>
- | //FS//
- <<elseif ($drugs[_i].fs == "youth" && $arcologies[0].FSYouthPreferentialistResearch == 1)>>
- | //FS//
- <<elseif ($drugs[_i].fs == "puberty" && $precociousPuberty == 1 && $pubertyHormones == 1)>>
->>>>>>> upstream/pregmod-master
|
<<else>>
<<continue>>
<</if>>
<<capture _i>>
-<<<<<<< HEAD
<<link setup.drugs[_i].name>>
<<set $currentRule.drug = setup.drugs[_i].value>>
-=======
- <<link $drugs[_i].name>>
- <<set $currentRule.drug = $drugs[_i].value>>
->>>>>>> upstream/pregmod-master
<<RAChangeDrugs>>
<<RAChangeSave>>
<<RAChangeApply>>