Merge branch 'pregmod-master' into ScalingRepX

efe21994 · Jones · 261b8b62 · cfe9729c · efe21994 · efe21994
Commit efe21994 authored 6 years ago by Jones
--- a/src/SpecialForce/Firebase.tw
+++ b/src/SpecialForce/Firebase.tw
@@ -71,4 +71,4 @@
 		@@.red;<<print cashFormat(Math.ceil((750000*(1.15+($SF.Size/1000))*(1.15+($SF.Squad.Firebase/10)))*_Env))>>@@
 	<</if>>	
 	<br>[[Tour the firebase|Firebase][$Tour = 1]]
-<<else>> <<= FlavourText()>> <br>[[Return to Operations|Firebase][$Tour=0]] <</if>>
\ No newline at end of file
+<<else>> <<= FlavourText()>> <</if>>
\ No newline at end of file
--- a/src/SpecialForce/SpecialForce.js
+++ b/src/SpecialForce/SpecialForce.js
--- a/src/js/walkPastJS.js
+++ b/src/js/walkPastJS.js
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw