From a6d134ab468bb0cd21fa1fc24a5cba57b1d76334 Mon Sep 17 00:00:00 2001
From: Viz <107632879+Inadvizable@users.noreply.github.com>
Date: Wed, 27 Jul 2022 20:07:00 +0200
Subject: [PATCH] god i hate these things (#18584)
---
.../mob/living/carbon/carbon_defense.dm | 23 +++++++------------
1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index d6f4dd4c8fe..b7add0ebf05 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -51,21 +51,14 @@
/mob/living/carbon/attack_slime(mob/living/simple_animal/slime/M)
if(..()) //successful slime attack
if(M.powerlevel > 0)
- var/stunprob = M.powerlevel * 7 + 10 // 17 at level 1, 80 at level 10
- if(prob(stunprob))
- M.powerlevel -= 3
- if(M.powerlevel < 0)
- M.powerlevel = 0
-
- visible_message("[M] has shocked [src]!", "[M] has shocked you!")
-
- do_sparks(5, TRUE, src)
- var/power = (M.powerlevel + rand(0,3)) STATUS_EFFECT_CONSTANT
- Stun(power)
- Stuttering(power)
- if(prob(stunprob) && M.powerlevel >= 8)
- adjustFireLoss(M.powerlevel * rand(6,10))
- updatehealth("slime attack")
+ do_sparks(5, TRUE, src)
+ adjustStaminaLoss(M.powerlevel * 5) //5-50 stamina damage, at starting power level 10 this means 50, 35, 20 on consecutive hits - stamina crit in 3 hits
+ KnockDown(M.powerlevel SECONDS)
+ Stuttering(M.powerlevel SECONDS)
+ visible_message("[M] has shocked [src]!", "[M] has shocked you!")
+ M.powerlevel -= 3
+ if(M.powerlevel < 0)
+ M.powerlevel = 0
return 1
/mob/living/carbon/is_mouth_covered(head_only = FALSE, mask_only = FALSE)