diff --git a/src/facilities/farmyard/farmyardReport.tw b/src/facilities/farmyard/farmyardReport.tw
index 72e3b5db29f89a3910bc1b8f75f31ff228b2403e..31c5009c61ce7f69a230479ac57931b78043fb3f 100644
--- a/src/facilities/farmyard/farmyardReport.tw
+++ b/src/facilities/farmyard/farmyardReport.tw
@@ -178,7 +178,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -188,7 +188,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
@@ -255,7 +255,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -267,7 +267,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
diff --git a/src/facilities/nursery/nurseryWidgets.js b/src/facilities/nursery/nurseryWidgets.js
index 40bcc3a84550772c1d95d44e808633cf1e61ec19..d50ba1e6f300debf55529c125d67de90ce5d3c84 100644
--- a/src/facilities/nursery/nurseryWidgets.js
+++ b/src/facilities/nursery/nurseryWidgets.js
@@ -19080,17 +19080,17 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() {
r += `<<include "SA rules">>`;
r += `<<include "SA diet">>`;
r += `<<include "SA long term effects">>`;
- r += `<<include "SA drugs">>`;
+ r += `${saDrugs(Matron)}`;
r += `<<include "SA relationships">>`;
r += `<<include "SA rivalries">>`;
r += `<br><<include "SA devotion">>`;
} else {
r += `<<silently>>
- ${saChoosesOwnClothes(Matron)}
+ ${saChoosesOwnClothes(Matron)};
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ ${saDrugs(Matron);
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
@@ -19156,7 +19156,7 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() {
r += `${saChoosesOwnClothes(slave)} ${saRules(slave)}`;
r += `<<include "SA diet">>`; // TODO:
r += `<<include "SA long term effects">>`; // TODO:
- r += `<<include "SA drugs">>`; // TODO:
+ r += `${saDrugs(slave)}`; // TODO:
r += `<<include "SA relationships">>`; // TODO:
r += `<<include "SA rivalries">>`; // TODO:
r += `<br><<include "SA devotion">>`; // TODO:
@@ -19165,7 +19165,7 @@ App.Facilities.Nursery.nurseryReport = function nurseryReport() {
r += `${choosesOwnJob(slave)} ${saNanny(slave)} ${saChoosesOwnClothes(slave)} ${saRules(slave)}`;
r += `<<include "SA diet">>`;
r += `<<include "SA long term effects">>`;
- r += `<<include "SA drugs">>`;
+ r += `${saDrugs(slave)}`;
r += `<<include "SA relationships">>`;
r += `<<include "SA rivalries">>`;
r += `<<include "SA devotion">>`;
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index 40a1774a99d0bb196840d2be2944b1bb6001008a..b9de81bf9a6c2a140ab5e23dd879c8a3d28ca791 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -144,7 +144,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -153,7 +153,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
diff --git a/src/uncategorized/brothelReport.tw b/src/uncategorized/brothelReport.tw
index d72678b26bd9a10e83758d4fe18cfeb2d1c055b6..46c4650b86f9258d1cf68db1d40657c079727c88 100644
--- a/src/uncategorized/brothelReport.tw
+++ b/src/uncategorized/brothelReport.tw
@@ -201,7 +201,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -212,7 +212,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
@@ -292,7 +292,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -304,7 +304,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
diff --git a/src/uncategorized/cellblockReport.tw b/src/uncategorized/cellblockReport.tw
index 5251f5809c2a4c52b2bc51ebe8518f0557749ca0..fc7d032af4309216d914739489cd6dae4b5d545a 100644
--- a/src/uncategorized/cellblockReport.tw
+++ b/src/uncategorized/cellblockReport.tw
@@ -145,7 +145,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -156,7 +156,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
@@ -269,7 +269,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -280,7 +280,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
diff --git a/src/uncategorized/clinicReport.tw b/src/uncategorized/clinicReport.tw
index 1ffad45a1861219ad7aebddac1231c2769dc86b1..98b84d44f1c0564f72e2e3eae232eb8353c8136b 100644
--- a/src/uncategorized/clinicReport.tw
+++ b/src/uncategorized/clinicReport.tw
@@ -217,7 +217,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -228,7 +228,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
@@ -363,7 +363,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -375,7 +375,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
diff --git a/src/uncategorized/clubReport.tw b/src/uncategorized/clubReport.tw
index 62e3e1e557c8d8dc390a89fa86cb9b86eacc9f57..0365f3ad2954a233221535e6f6ab2f00ca0e8ab0 100644
--- a/src/uncategorized/clubReport.tw
+++ b/src/uncategorized/clubReport.tw
@@ -124,7 +124,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -135,7 +135,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
@@ -201,7 +201,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -213,7 +213,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw
index 8b4b65f1ede7ae6a2e586bb56525f7806695fca2..dc7f7d9b32f5746d10eed941133e494b6b2bdbb9 100644
--- a/src/uncategorized/dairyReport.tw
+++ b/src/uncategorized/dairyReport.tw
@@ -296,7 +296,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -307,7 +307,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
@@ -403,7 +403,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -414,7 +414,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
diff --git a/src/uncategorized/fullReport.tw b/src/uncategorized/fullReport.tw
index e714555be74943edfb81d12df9f9cfc5e8939d0a..196169848a376c1f5763c6b6f615fb119dd9e2a2 100644
--- a/src/uncategorized/fullReport.tw
+++ b/src/uncategorized/fullReport.tw
@@ -68,7 +68,7 @@
<<run saChoosesOwnClothes($slaves[$i])>>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<</silently>>
@@ -77,7 +77,7 @@
<<= saChoosesOwnClothes($slaves[$i])>>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br>
diff --git a/src/uncategorized/masterSuiteReport.tw b/src/uncategorized/masterSuiteReport.tw
index 3fa83660644f7a5e1ccd1db9a1c700e93d324991..dc52252ef2c1a4a88e61021894f4de9e6f6f3c3d 100644
--- a/src/uncategorized/masterSuiteReport.tw
+++ b/src/uncategorized/masterSuiteReport.tw
@@ -378,7 +378,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -395,7 +395,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
diff --git a/src/uncategorized/saLiveWithHG.tw b/src/uncategorized/saLiveWithHG.tw
index a00a3765768657a36503a1b34f3750b097bedbb3..02c73dfecc759cf582919ae1fd29a69b8f2137d5 100644
--- a/src/uncategorized/saLiveWithHG.tw
+++ b/src/uncategorized/saLiveWithHG.tw
@@ -1020,7 +1020,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
@@ -1030,7 +1030,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
diff --git a/src/uncategorized/schoolroomReport.tw b/src/uncategorized/schoolroomReport.tw
index cfb9bd5cd9ac49148ec30706efe6d37d9fe16ad7..c7048109cdbfda10cc67746c5b5da985820c5c8e 100644
--- a/src/uncategorized/schoolroomReport.tw
+++ b/src/uncategorized/schoolroomReport.tw
@@ -125,7 +125,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -136,7 +136,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
@@ -234,7 +234,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -246,7 +246,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
diff --git a/src/uncategorized/servantsQuartersReport.tw b/src/uncategorized/servantsQuartersReport.tw
index 4ee8d3dac30783da6e251a5182ab3d0c2b9f0f88..3db2eae19d40a48e6ad3698b2a84750e2c22fb6c 100644
--- a/src/uncategorized/servantsQuartersReport.tw
+++ b/src/uncategorized/servantsQuartersReport.tw
@@ -198,7 +198,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -209,7 +209,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
@@ -295,7 +295,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -311,7 +311,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index 1fcc3fd131833cb1079dc0ee271172abcb350662..bc108dc5141f431b768213d2115f03fb4e79c54d 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -239,7 +239,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -250,7 +250,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>
@@ -346,7 +346,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<= saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<br><<include "SA devotion">>
@@ -358,7 +358,7 @@
<<include "SA rules">>
<<include "SA diet">>
<<include "SA long term effects">>
- <<include "SA drugs">>
+ <<run saDrugs($slaves[$i])>>
<<include "SA relationships">>
<<include "SA rivalries">>
<<include "SA devotion">>