Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265

2020-01-18 01:23:08 +01:00
parent 1d948907f6 eb3597ecc3
commit 9c0b78bc09
240 changed files with 3333 additions and 2300 deletions
@@ -128,8 +128,7 @@
 		target.visible_message("<span class='danger'>[M] has been splashed with something!</span>", \
 						"<span class='userdanger'>[M] has been splashed with something!</span>")
 		for(var/datum/reagent/A in reagents.reagent_list)
-			R += A.type + " ("
-			R += num2text(A.volume) + "),"
+			R += "[A.type] ([A.volume]),"

 		if(thrownby)
 			log_combat(thrownby, M, "splashed", R)