From c5f3aa7043d5c258fce6d9ec8bea9dfd8ef82440 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 19 Feb 2018 16:18:05 -0500 Subject: [PATCH 1/2] Merge pull request #35793 from DaedalusGame/naksu-pls Fixes up foam and smoke code and comments again to atleast be correct --- code/game/objects/effects/effect_system/effects_foam.dm | 2 +- code/game/objects/effects/effect_system/effects_smoke.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm index 5cb1af5389..28245e638e 100644 --- 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) ..() diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm index dcc0c49c6b..80e5877fe7 100644 --- 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 = ""