From af55efcaa3c6b4a2b3b7c664f90b325f2f1f251d Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Tue, 2 Feb 2021 22:22:18 +0100 Subject: [PATCH] Floors now properly select a destruction method to use when blown up (#56560) --- code/game/objects/effects/effect_system/effects_explosion.dm | 2 +- code/game/turfs/open/floor.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/effects/effect_system/effects_explosion.dm b/code/game/objects/effects/effect_system/effects_explosion.dm index 00c07734c20..7fc164b7673 100644 --- a/code/game/objects/effects/effect_system/effects_explosion.dm +++ b/code/game/objects/effects/effect_system/effects_explosion.dm @@ -10,7 +10,7 @@ /obj/effect/particle_effect/expl_particles/LateInitialize() var/direct = pick(GLOB.alldirs) - var/steps_amt = pick(1;25,2;50,3,4;200) + var/steps_amt = pick(25;1,50;2,100;3,200;4) for(var/j in 1 to steps_amt) step(src, direct) sleep(1) diff --git a/code/game/turfs/open/floor.dm b/code/game/turfs/open/floor.dm index ed019fde149..58d440d38e0 100644 --- a/code/game/turfs/open/floor.dm +++ b/code/game/turfs/open/floor.dm @@ -74,7 +74,7 @@ if(1) ScrapeAway(2, flags = CHANGETURF_INHERIT_AIR) if(2) - switch(pick(1,2;75,3)) + switch(rand(1,3)) if(1) if(!length(baseturfs) || !ispath(baseturfs[baseturfs.len-1], /turf/open/floor)) ScrapeAway(flags = CHANGETURF_INHERIT_AIR)