Merge branch 'master' into upstream-merge-31222

2017-10-04 21:50:07 -04:00
parent 4e648765db e2738722fc
commit 365adf852c
100 changed files with 1202 additions and 499 deletions
@@ -63,7 +63,7 @@

 	if(isnum(.)) //Numerical values of drained handle their feedback here, Alpha values handle it themselves (Research hacking)
 		if(.)
-			to_chat(H, "<span class='notice'>Gained <B>[.]</B> energy from \the [A].</span>")
+			to_chat(H, "<span class='notice'>Gained <B>[DisplayPower(.)]</B> of energy from [A].</span>")
 		else
 			to_chat(H, "<span class='danger'>\The [A] has run dry of power, you must find another source!</span>")
 	else