Skip to content
Snippets Groups Projects
Commit 03a6a3fd authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'SF-bugFix' into 'pregmod-master'

SF-bugFix

See merge request pregmodfan/fc-pregmod!4878
parents 843dbb24 73510578
No related branches found
No related tags found
No related merge requests found
...@@ -58,8 +58,8 @@ ...@@ -58,8 +58,8 @@
<<= App.SF.fsIntegration()>> <<= App.SF.fsIntegration()>>
<<if $SF.MercCon.History >= 1>> <br> <<if $SF.MercCon.History >= 1>> <br>
<<link "Merc meetup report.">> <<replace "#result0">> <<link "Merc meetup report.">> <<replace "#result0">>
<br><br>While at the recent merc meetup, The Colonel made @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Income))>>@@ selling generic schematics to her friends, <<print num($SF.MercCon.Menials)>> menial slaves were won in a poker game, and <<print num($SF.MercCon.TotalMercs)>> mercenaries were persuaded to join $SF.Lower. <br><br>While at the recent merc meetup, The Colonel made @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Income))>>@@ selling generic schematics to her friends, <<print num($SF.MercCon.Menials)>> menial slaves were won in a poker game, and <<print num($SF.MercCon.Mercs)>> mercenaries were persuaded to join $SF.Lower.
<br>Total earnings thus far: @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Revenue))>>@@ in income, <<print num($SF.MercCon.TotalMenials)>> menial slaves and <<print num($SF.MercCon.Mercs)>> mercenaries joined across $SF.MercCon.History meetups. <br>Total earnings thus far: @@.yellowgreen;<<print cashFormat(Math.ceil($SF.MercCon.Revenue))>>@@ in income, <<print num($SF.MercCon.TotalMenials)>> menial slaves and <<print num($SF.MercCon.TotalMercs)>> mercenaries joined across $SF.MercCon.History meetups.
<</replace>> <</link>> <</replace>> <</link>>
<</if>> <</if>>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment