Merge branch 'hotfixes' into 'pregmod-master'

NaN Fixes

See merge request pregmodfan/fc-pregmod!3433

src/facilities/farmyard/saWorkTheFarm.tw

@@ -233,10 +233,10 @@ $He also puts on shows with animals this week.
 
 	/* CLOSE FS SUBSECTION */
 
-	<<if setup.entertainmentCareers.includes($slaves[_i].career)>>
+	<<if setup.entertainmentCareers.includes(_slave.career)>>
 	<</if>>
 
-	<<if setup.farmerCareers.includes($slaves[_i].career)>>
+	<<if setup.farmerCareers.includes(_slave.career)>>
 	<</if>>
 
 	<<if _slave.prestige == 1>>
@@ -439,7 +439,7 @@ $He also puts on shows with animals this week.
 
 <<if _slave.assignment == "work as a farmhand">>
 <<if $farmyardDecoration != "standard">>
-<<set _fsGain = Math.min(0.0001*$FSSingleSlaveRep*(_food+5*$cum), 1)>>
+<<set _fsGain = Math.min(0.0001*$FSSingleSlaveRep*(_food), 1)>>
 <<switch $farmyardDecoration>>
 <<case "Roman Revivalist">>
 	<<set $arcologies[0].FSRomanRevivalist = Math.clamp($arcologies[0].FSRomanRevivalist += _fsGain,0,100)>>