From fb9f2a6bb583bcdfd4b4c9a294868eb83a366170 Mon Sep 17 00:00:00 2001 From: Joan Lung Date: Sun, 4 Sep 2016 17:57:29 -0400 Subject: [PATCH] Tweaks smoke and foam layers --- code/game/objects/effects/effect_system/effects_foam.dm | 2 +- code/game/objects/effects/effect_system/effects_smoke.dm | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm index 7ca593e3c3e..3e68fc24e98 100644 --- a/code/game/objects/effects/effect_system/effects_foam.dm +++ b/code/game/objects/effects/effect_system/effects_foam.dm @@ -7,7 +7,7 @@ opacity = 0 anchored = 1 density = 0 - layer = ABOVE_ALL_MOB_LAYER + layer = WALL_OBJ_LAYER mouse_opacity = 0 var/amount = 3 animate_movement = 0 diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm index 1c2bd7c4b8e..20ac8176ef4 100644 --- a/code/game/objects/effects/effect_system/effects_smoke.dm +++ b/code/game/objects/effects/effect_system/effects_smoke.dm @@ -9,6 +9,7 @@ pixel_x = -32 pixel_y = -32 opacity = 0 + layer = FLY_LAYER anchored = 1 mouse_opacity = 0 animate_movement = 0 @@ -25,6 +26,8 @@ var/step = alpha / frames for(var/i = 0, i < frames, i++) alpha -= step + if(alpha < 160) + opacity = 0 //if we were blocking view, we aren't now because we're fading out stoplag() /obj/effect/particle_effect/smoke/New()