From a9adda0459b286bf28590f9fefcdc29319adcd0d Mon Sep 17 00:00:00 2001 From: Bop Date: Sat, 20 Apr 2024 09:48:53 +0700 Subject: [PATCH 1/3] Update energy_ball.dm --- code/modules/power/tesla/energy_ball.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm index 38dca34c30b0..3e2ce0e73192 100644 --- a/code/modules/power/tesla/energy_ball.dm +++ b/code/modules/power/tesla/energy_ball.dm @@ -38,7 +38,7 @@ icon_state = "smenergy_ball" energy = 10000 max_balls = 20 - zap_range = 20 + zap_range = 7 hypercharged = TRUE /obj/singularity/energy_ball/supermatter/small_crystals From bbbd7c36b3c5acb4335fd5a58d1e91ca2701061d Mon Sep 17 00:00:00 2001 From: Bop Date: Sat, 20 Apr 2024 10:46:26 +0700 Subject: [PATCH 2/3] mahs --- code/modules/mob/living/carbon/carbon_defense.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 0e08822fbc03..d10a076ffe2e 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -434,7 +434,7 @@ adjust_jitter(10 SECONDS) adjustOrganLoss(ORGAN_SLOT_BRAIN, 100, 199) - if(gib && siemens_coeff > 0) + if(gib && siemens_coeff > 0 && stat == SOFT_CRIT) visible_message( span_danger("[src] body is emitting a loud noise!"), \ span_userdanger("You feel like you are about to explode!"), \ From 4c040bb158b78d7a533e0de3cb10e647184d8f7a Mon Sep 17 00:00:00 2001 From: Bop Date: Sat, 20 Apr 2024 10:47:20 +0700 Subject: [PATCH 3/3] e --- code/modules/mob/living/carbon/carbon_defense.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index d10a076ffe2e..78ab72b586e5 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -434,7 +434,7 @@ adjust_jitter(10 SECONDS) adjustOrganLoss(ORGAN_SLOT_BRAIN, 100, 199) - if(gib && siemens_coeff > 0 && stat == SOFT_CRIT) + if(gib && siemens_coeff > 0 && stat >= SOFT_CRIT) visible_message( span_danger("[src] body is emitting a loud noise!"), \ span_userdanger("You feel like you are about to explode!"), \