From 91e3d3106051e1e0eb7d906dc30bb1efe5757c81 Mon Sep 17 00:00:00 2001 From: dageavtobusnick <71216640+dageavtobusnick@users.noreply.github.com> Date: Sun, 22 Dec 2024 17:00:15 +0500 Subject: [PATCH] uncomment foam + style fixes --- code/controllers/subsystem/fluids.dm | 3 +-- .../effects/effect_system/fluid_spread/effects_smoke.dm | 3 ++- code/modules/mob/living/carbon/carbon.dm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/controllers/subsystem/fluids.dm b/code/controllers/subsystem/fluids.dm index 76273abe4cc..63ffe9ef19c 100644 --- a/code/controllers/subsystem/fluids.dm +++ b/code/controllers/subsystem/fluids.dm @@ -242,11 +242,10 @@ FLUID_SUBSYSTEM_DEF(smoke) name = "Smoke" spread_wait = 0.1 SECONDS effect_wait = 2.0 SECONDS -/* + /// The subsystem responsible for processing foam propagation and effects. FLUID_SUBSYSTEM_DEF(foam) name = "Foam" wait = 0.1 SECONDS // Makes effect bubbling work with foam. spread_wait = 0.2 SECONDS effect_wait = 0.2 SECONDS -*/ // Not used diff --git a/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm b/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm index fe5681a9437..252b2a8928c 100644 --- a/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm +++ b/code/game/objects/effects/effect_system/fluid_spread/effects_smoke.dm @@ -90,7 +90,8 @@ spread_smoke.add_atom_colour(color, FIXED_COLOUR_PRIORITY) spread_smoke.lifetime = lifetime - SSsmoke.queue_spread(spread_smoke) + // the smoke spreads rapidly, but not instantly + SSfoam.queue_spread(spread_smoke) /obj/effect/particle_effect/fluid/smoke/process(seconds_per_tick) diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index f7e356b1b25..d4f89e28eb6 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -29,7 +29,7 @@ return else show_message(span_userdanger("Блоб атакует!")) - adjustBruteLoss(10) + adjustBruteLoss(10) /mob/living/carbon/Move(atom/newloc, direct = NONE, glide_size_override = 0, update_dir = TRUE)