Merge branch 'minorTweaking' into 'pregmod-master'

minorTweaking 1/2

Closes #2217

See merge request pregmodfan/fc-pregmod!7636

src/002-config/fc-version.js

@@ -2,5 +2,5 @@ App.Version = {
 	base: "0.10.7.1", // The vanilla version the mod is based off of, this should never be changed.
 	pmod: "3.7.1",
 	commitHash: null,
-	release: 1093
+	release: 1094
 };

src/Mods/SecExp/securityReport.tw

@@ -510,26 +510,29 @@ Due to the deterioration of the old world countries, organized crime focuses mor
 	<</if>>
 <</if>>
 
-<<if $SecExp.buildings.weapManu && jsDef($SecExp.buildings.weapManu.upgrades.queue) && $SecExp.buildings.weapManu.upgrades.queue[0].time > 0>>
-	<<set _current = App.SecExp.weapManuUpgrade.current(), $SecExp.buildings.weapManu.upgrades.queue[0].time-->>
-	<br>In the research lab, _current.dec
-	<<switch _current.dec>>
-	<<case "adaptive armored frames" "advanced synthetic alloys" "ceramo-metallic alloys" "rapid action stimulants" "universal cyber enhancements" "remote neural links" "combined training regimens with the special force">>
-		are
-	<<default>>
-		is
-	<</switch>>
-	being developed with the aim of enhancing _current.unit' _current.purpose.
-	<<if $SecExp.buildings.weapManu.upgrades.queue[0].time <= 0>>
-		Reports indicate it is ready for deployment and will be issued in the following days.
-		<<set $SecExp.buildings.weapManu.upgrades.completed.push(_current.ID)>>
-		<<run $SecExp.buildings.weapManu.upgrades.queue.splice(0, 1)>>
-	<<else>>
-		It will be finished in <<= numberWithPluralOne($SecExp.buildings.weapManu.upgrades.queue[0].time, "week")>>.
+<<if $SecExp.buildings.weapManu>>
+	<<if App.SecExp.weapManuUpgrade.fully().bots && App.SecExp.weapManuUpgrade.fully().human>> <<run delete $SecExp.buildings.weapManu.upgrades.queue>> <</if>>
+	<<if jsDef($SecExp.buildings.weapManu.upgrades.queue) && $SecExp.buildings.weapManu.upgrades.queue[0].time > 0>>
+		<<set _current = App.SecExp.weapManuUpgrade.current(), $SecExp.buildings.weapManu.upgrades.queue[0].time-->>
+		<br>In the research lab, _current.dec
+		<<switch _current.dec>>
+		<<case "adaptive armored frames" "advanced synthetic alloys" "ceramo-metallic alloys" "rapid action stimulants" "universal cyber enhancements" "remote neural links" "combined training regimens with the special force">>
+			are
+		<<default>>
+			is
+		<</switch>>
+		being developed with the aim of enhancing _current.unit' _current.purpose.
+		<<if $SecExp.buildings.weapManu.upgrades.queue[0].time <= 0>>
+			Reports indicate it is ready for deployment and will be issued in the following days.
+			<<set $SecExp.buildings.weapManu.upgrades.completed.push(_current.ID)>>
+			<<run $SecExp.buildings.weapManu.upgrades.queue.splice(0, 1)>>
+		<<else>>
+			It will be finished in <<= numberWithPluralOne($SecExp.buildings.weapManu.upgrades.queue[0].time, "week")>>.
+		<</if>>
+		<<for _i = 1; _i < $SecExp.buildings.weapManu.upgrades.queue.length; _i++>>
+			<<set _current = App.SecExp.weapManuUpgrade.current($SecExp.buildings.weapManu.upgrades.queue[_i].ID)>>
+			<br><<= ordinalSuffix(_i + 1)>> in queue:
+			_current.dec for _current.unit. It will enhance their _current.purpose.
+		<</for>>
 	<</if>>
-	<<for _i = 1; _i < $SecExp.buildings.weapManu.upgrades.queue.length; _i++>>
-		<<set _current = App.SecExp.weapManuUpgrade.current($SecExp.buildings.weapManu.upgrades.queue[_i].ID)>>
-		<br><<= ordinalSuffix(_i + 1)>> in queue:
-		_current.dec for _current.unit. It will enhance their _current.purpose.
-	<</for>>
 <</if>>
\ No newline at end of file