Merge pull request #5598 from Citadel-Station-13/upstream-merge-35793

[MIRROR] Fixes up foam and smoke code and comments again to atleast be correct
2018-02-20 15:20:51 +00:00
parent 6943a24618 f9a04916a9
commit e70ba8d322
2 changed files with 2 additions and 2 deletions
--- a/code/game/objects/effects/effect_system/effects_foam.dm
+++ b/code/game/objects/effects/effect_system/effects_foam.dm
@@ -239,7 +239,7 @@
 		location = get_turf(loca)

 	amount = round(sqrt(amt / 2), 1)
-	carry.copy_to(chemholder, 4*carry.total_volume) //The foam holds 4 times the total reagents volume for balance purposes.
+	carry.copy_to(chemholder, carry.total_volume)

 /datum/effect_system/foam_spread/metal/set_up(amt=5, loca, datum/reagents/carry = null, metaltype)
 	..()
--- a/code/game/objects/effects/effect_system/effects_smoke.dm
+++ b/code/game/objects/effects/effect_system/effects_smoke.dm
@@ -271,7 +271,7 @@
 	else
 		location = get_turf(loca)
 	amount = radius
-	carry.copy_to(chemholder, 4*carry.total_volume) //The smoke holds 4 times the total reagents volume for balance purposes.
+	carry.copy_to(chemholder, carry.total_volume)

 	if(!silent)
 		var/contained = ""