diff --git a/code/game/objects/effects/decals/cleanable/aliens.dm b/code/game/objects/effects/decals/cleanable/aliens.dm index f4cd4357fae..1ef7c5cc891 100644 --- a/code/game/objects/effects/decals/cleanable/aliens.dm +++ b/code/game/objects/effects/decals/cleanable/aliens.dm @@ -26,11 +26,12 @@ random_icon_states = list("xgib1", "xgib2", "xgib3", "xgib4", "xgib5", "xgib6") mergeable_decal = FALSE -/obj/effect/decal/cleanable/xenoblood/xgibs/proc/streak(list/directions) +/obj/effect/decal/cleanable/xenoblood/xgibs/proc/streak(list/directions, mapload=FALSE) set waitfor = FALSE var/direction = pick(directions) for(var/i = 0, i < pick(1, 200; 2, 150; 3, 50), i++) - sleep(2) + if (!mapload) + sleep(2) if(i > 0) new /obj/effect/decal/cleanable/xenoblood/xsplatter(loc) if(!step_to(src, get_step(src, direction), 0)) diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm index 4500755446a..ef5a07a49e4 100644 --- a/code/game/objects/effects/decals/cleanable/humans.dm +++ b/code/game/objects/effects/decals/cleanable/humans.dm @@ -78,13 +78,14 @@ playsound(loc, 'sound/effects/gib_step.ogg', HAS_TRAIT(L, TRAIT_LIGHT_STEP) ? 20 : 50, TRUE) . = ..() -/obj/effect/decal/cleanable/blood/gibs/proc/streak(list/directions) +/obj/effect/decal/cleanable/blood/gibs/proc/streak(list/directions, mapload=FALSE) set waitfor = FALSE var/list/diseases = list() SEND_SIGNAL(src, COMSIG_GIBS_STREAK, directions, diseases) var/direction = pick(directions) for(var/i in 0 to pick(0, 200; 1, 150; 2, 50)) - sleep(2) + if (!mapload) + sleep(2) if(i > 0) new /obj/effect/decal/cleanable/blood/splatter(loc, diseases) if(!step_to(src, get_step(src, direction), 0)) diff --git a/code/game/objects/effects/decals/cleanable/robots.dm b/code/game/objects/effects/decals/cleanable/robots.dm index 0d7c5f8e09e..5091102f49c 100644 --- a/code/game/objects/effects/decals/cleanable/robots.dm +++ b/code/game/objects/effects/decals/cleanable/robots.dm @@ -12,15 +12,16 @@ mergeable_decal = FALSE beauty = -50 -/obj/effect/decal/cleanable/robot_debris/proc/streak(list/directions) +/obj/effect/decal/cleanable/robot_debris/proc/streak(list/directions, mapload=FALSE) set waitfor = FALSE var/direction = pick(directions) for (var/i = 0, i < pick(1, 200; 2, 150; 3, 50), i++) - sleep(2) + if (!mapload) + sleep(2) if (i > 0) if (prob(40)) new /obj/effect/decal/cleanable/oil/streak(src.loc) - else if (prob(10)) + else if (prob(10) && !mapload) var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread s.set_up(3, 1, src) s.start() diff --git a/code/game/objects/effects/spawners/gibspawner.dm b/code/game/objects/effects/spawners/gibspawner.dm index b05730bdc43..cc0a2f3eeba 100644 --- a/code/game/objects/effects/spawners/gibspawner.dm +++ b/code/game/objects/effects/spawners/gibspawner.dm @@ -53,7 +53,7 @@ var/list/directions = gibdirections[i] if(isturf(loc)) if(directions.len) - gib.streak(directions) + gib.streak(directions, mapload) return INITIALIZE_HINT_QDEL diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 4845c0a7798..06c22220649 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -411,7 +411,7 @@ update() /obj/machinery/light/proc/broken_sparks(start_only=FALSE) - if(!QDELETED(src) && status == LIGHT_BROKEN && has_power()) + if(!QDELETED(src) && status == LIGHT_BROKEN && has_power() && Master.current_runlevel) if(!start_only) do_sparks(3, TRUE, src) var/delay = rand(BROKEN_SPARKS_MIN, BROKEN_SPARKS_MAX)