mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-25 21:19:00 +01:00
Stamina damage no longer bypass some checks (#23447)
* adjusting stamina damage no longer bypass some checks * no illness changes * i surrender on this, let it be
This commit is contained in:
@@ -330,7 +330,7 @@
|
||||
busy = TRUE
|
||||
target.visible_message("<span class='danger'>[user] has touched [target] with [parent]!</span>", \
|
||||
"<span class='userdanger'>[user] touches you with [parent], and you feel a strong jolt!</span>")
|
||||
target.adjustStaminaLoss(60)
|
||||
target.apply_damage(60, STAMINA)
|
||||
target.KnockDown(10 SECONDS)
|
||||
playsound(get_turf(parent), 'sound/machines/defib_zap.ogg', 50, 1, -1)
|
||||
target.emote("gasp")
|
||||
@@ -345,7 +345,7 @@
|
||||
if(!istype(target))
|
||||
return
|
||||
busy = TRUE
|
||||
target.adjustStaminaLoss(60)
|
||||
target.apply_damage(60, STAMINA)
|
||||
target.emote("gasp")
|
||||
add_attack_logs(user, target, "Stunned with [parent]")
|
||||
target.KnockDown(4 SECONDS)
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
if(ishuman(user)) //this weapon wasn't meant for mortals.
|
||||
var/mob/living/carbon/human/U = user
|
||||
if(!istype(U.dna.species, /datum/species/skeleton))
|
||||
U.adjustStaminaLoss(35) //Extra Damage
|
||||
U.apply_damage(35, STAMINA) //Extra Damage
|
||||
U.Jitter(70 SECONDS)
|
||||
U.SetStuttering(40 SECONDS)
|
||||
if(U.getStaminaLoss() > 95)
|
||||
@@ -23,7 +23,7 @@
|
||||
C.Jitter(70 SECONDS)
|
||||
C.SetStuttering(40 SECONDS)
|
||||
if(!istype(H.dna.species, /datum/species/diona) && !istype(H.dna.species, /datum/species/machine) && !istype(H.dna.species, /datum/species/slime) && !istype(H.dna.species, /datum/species/golem) && !istype(H.dna.species, /datum/species/plasmaman))
|
||||
C.adjustStaminaLoss(25) //boneless humanoids don't lose the will to live
|
||||
C.apply_damage(25, STAMINA) //boneless humanoids don't lose the will to live
|
||||
to_chat(C, "<font color='red' size='4'><B>DOOT</B></font>")
|
||||
spectral_change(H)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user