uncomment foam + style fixes

ss220-space · Dec 22, 2024 · 91e3d31 · 91e3d31
1 parent e9dc3f8
commit 91e3d31
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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)