Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161

[MIRROR] 512 forward compatibility merge
This commit is contained in:
LetterJay
2017-11-12 23:06:55 -06:00
committed by GitHub
227 changed files with 5313 additions and 5275 deletions

View File

@@ -106,7 +106,7 @@
if (selected_material == mat_id)
dat += " <i>Smelting</i>"
else
dat += " <A href='?src=\ref[CONSOLE];material=[mat_id]'><b>Not Smelting</b></A> "
dat += " <A href='?src=[REF(CONSOLE)];material=[mat_id]'><b>Not Smelting</b></A> "
dat += "<br>"
dat += "<br><br>"
@@ -118,16 +118,16 @@
if (selected_alloy == D.id)
dat += " <i>Smelting</i>"
else
dat += " <A href='?src=\ref[CONSOLE];alloy=[D.id]'><b>Not Smelting</b></A> "
dat += " <A href='?src=[REF(CONSOLE)];alloy=[D.id]'><b>Not Smelting</b></A> "
dat += "<br>"
dat += "<br><br>"
//On or off
dat += "Machine is currently "
if (on)
dat += "<A href='?src=\ref[CONSOLE];set_on=off'>On</A> "
dat += "<A href='?src=[REF(CONSOLE)];set_on=off'>On</A> "
else
dat += "<A href='?src=\ref[CONSOLE];set_on=on'>Off</A> "
dat += "<A href='?src=[REF(CONSOLE)];set_on=on'>Off</A> "
return dat