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

Pregmod master

See merge request pregmodfan/fc-pregmod!1755

devTools/check.py

@@ -7,7 +7,7 @@ WARNING = '\033[93m'
 ENDC = '\033[0m'
 
 def myprint(*args):
-    print(WARNING, filename + ":", ENDC,*args)
+    print(WARNING, fileinput.filename() + ":", ENDC,*args)
 
 def yield_line_and_islastline(f):
     global filename
@@ -72,6 +72,7 @@ try:
 except UnicodeDecodeError as e:
     myprint(e)
     print("   Hint: In linux, you can get more details about unicode errors by running:")
-    print("     isutf8", filename) 
+    print("     isutf8", fileinput.filename())
+    print("   :Note it might be caused by ", filename)
 
 

src/uncategorized/reFSNonconformist.tw

@@ -68,7 +68,7 @@ so you hear them out. Apparently, they're here about a peer, a fellow citizen wi
 <br><br>
 The nonconformist
 <<if $FSNonconformist == "Pastoralist">>
-	has long been a vocal skeptic of the tastefulness of grown citizens drinking milk from slaves' breasts. Unfortunately, it seems that they've now edged over into open revolt against pastoralism. They're planning to publish an exposé that purports to reveal abuses in the human milk industry.
+	has long been a vocal skeptic of the tastefulness of grown citizens drinking milk from slaves' breasts. Unfortunately, it seems that they've now edged over into open revolt against pastoralism. They're planning to publish an exposé that purports to reveal abuses in the human milk industry.
 <<elseif $FSNonconformist == "Supremacist">>
 	is a hardline egalitarianist who believes that all men are created equal, even if some then become slaves. They themselves are $arcologies[0].FSSubjugationistRace, and they insist on flaunting their $arcologies[0].FSSupremacistRace slaves. Unfortunately, it seems that they've now edged over into open revolt against $arcologies[0].FSSupremacistRace supremacism. After a brutal but deserved public punishment of a $arcologies[0].FSSubjugationistRace slave by one of the group of concerned citizens, the nonconformist is planning on visiting the same horrors on one of their $arcologies[0].FSSupremacistRace slaves, on a very weak pretext.
 <<elseif $FSNonconformist == "Subjugationist">>
@@ -100,7 +100,7 @@ The nonconformist
 <<elseif $FSNonconformist == "Physical Idealist">>
 	rarely misses a chance to lecture on the perils of toxic masculinity and excessive public standards of beauty. Unfortunately, it seems that they've now edged over into open revolt against the Valhalla of physical perfection the arcology is rapidly becoming. They're rumored to be preparing a manifesto on beauty at any size, along with the necessary funds to bribe neutral third parties into going along.
 <<elseif $FSNonconformist == "Hedonistic Decadence">>
-	has long been a vocal opponent of over-indulgence and its effects on society. Unfortunately, it seems that they've now edged over into open revolt against hedonism. They're planning to publish an exposé that reveals numerous statistics regarding average health and lifespans, the rising maintenance costs to accommodate the widening population, and a rather alarming report that the arcology has in fact //sunk// several centimeters since hedonism became commonplace among the citizenry.
+	has long been a vocal opponent of over-indulgence and its effects on society. Unfortunately, it seems that they've now edged over into open revolt against hedonism. They're planning to publish an exposé that reveals numerous statistics regarding average health and lifespans, the rising maintenance costs to accommodate the widening population, and a rather alarming report that the arcology has in fact //sunk// several centimeters since hedonism became commonplace among the citizenry.
 <<elseif $FSNonconformist == "Chattel Religionist">>
 	originally moved to the Free Cities to get away from religion entirely, and has never missed a chance to register disdain for the new faith. Unfortunately, it seems that they've now edged over into open heresy. Typically, they're going about it in a hypocritical way. It's rumored that they've engaged the services of a charismatic itinerant preacher of one of the more popular old world faiths, and intend to bring him to the arcology to inveigh against the chattel religion.
 <<elseif $FSNonconformist == "Roman Revivalist">>
@@ -131,7 +131,7 @@ The nonconformist is far too prominent and prosperous to make this an easy dilem
 	<<replace "#result">><<nobr>>
 	You communicate polite concern, but offer no specific plans. The prominent citizens go away muttering, @@.red;very disappointed@@ that you are not taking their concerns seriously. The nonconformist
 	<<if $FSNonconformist == "Pastoralist">>
-		publishes the exposé, @@.red;setting back adoption@@ of pastoralism.
+		publishes the exposé, @@.red;setting back adoption@@ of pastoralism.
 		<<set $arcologies[0].FSPastoralist -= 10>>
 	<<elseif $FSNonconformist == "Supremacist">>
 		publicly flogs one of their $arcologies[0].FSSupremacistRace slaves halfway to exsanguination, @@.red;setting back acceptance@@ of $arcologies[0].FSSupremacistRace supremacy.
@@ -222,7 +222,7 @@ The nonconformist is far too prominent and prosperous to make this an easy dilem
 	You promise to deal with the situation. The prominent citizens trust you enough to leave the problem in your hands, and they are not disappointed. The nonconformist
 <</if>>
 	<<if $FSNonconformist == "Pastoralist">>
-		publishes the exposé, but finds it effectively defused by a nuanced pro-dairy campaign leveraging your dominance of the arcology's media.
+		publishes the exposé, but finds it effectively defused by a nuanced pro-dairy campaign leveraging your dominance of the arcology's media.
 	<<elseif $FSNonconformist == "Supremacist">>
 		is intent on publicly flogging the unfortunate $arcologies[0].FSSupremacistRace slave, but quickly finds that you've manipulated their contracts with you to forbid such displays. Frustrated, they subside for now.
 	<<elseif $FSNonconformist == "Subjugationist">>