cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 18:44:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Held items no longer prevent Xenomorph disarm knockdown + stamina damage (#19142)

Browse Source 
* Held items no longer prevent xenomorph disarm knockdown + stamina damage

* Stam damage is now handled by a var, no longer fixed to 30
This commit is contained in:
FloFluoro
2022-09-27 11:23:47 -04:00
committed by GitHub
parent ebf9a7b5e8
commit 32db03c463
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/human_defense.dm
+9 -12
View File
@@ -636,23 +636,20 @@ emp_act
add_attack_logs(M, src, "Alien attacked")
updatehealth("alien attack")
if(M.a_intent == INTENT_DISARM) //If not absorbed, always drop item in hand, if no item, get stun instead.
if(M.a_intent == INTENT_DISARM) //If not absorbed, you get disarmed, knocked down, and hit with stamina damage.
if(absorb_stun(0))
visible_message("<span class='warning'>[src] is not affected by [M]'s disarm attempt!</span>")
playsound(loc, 'sound/weapons/punchmiss.ogg', 25, 1, -1)
return FALSE
var/obj/item/I = get_active_hand()
if(I && unEquip(I))
playsound(loc, 'sound/weapons/slash.ogg', 25, TRUE, -1)
visible_message("<span class='danger'>[M] disarms [src]!</span>", "<span class='userdanger'>[M] disarms you!</span>", "<span class='hear'>You hear aggressive shuffling!</span>")
to_chat(M, "<span class='danger'>You disarm [src]!</span>")
else
var/obj/item/organ/external/affecting = get_organ(ran_zone(M.zone_selected))
playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
apply_effect(10 SECONDS, KNOCKDOWN, run_armor_check(affecting, MELEE))
adjustStaminaLoss(M.alien_disarm_damage)
add_attack_logs(M, src, "Alien tackled")
visible_message("<span class='danger'>[M] has tackled down [src]!</span>")
if(I)
unEquip(I)
var/obj/item/organ/external/affecting = get_organ(ran_zone(M.zone_selected))
playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
apply_effect(10 SECONDS, KNOCKDOWN, run_armor_check(affecting, MELEE))
adjustStaminaLoss(M.alien_disarm_damage)
add_attack_logs(M, src, "Alien tackled")
visible_message("<span class='danger'>[M] has tackled down [src]!</span>", "<span class='hear'>You hear aggressive shuffling!</span>")
/mob/living/carbon/human/attack_animal(mob/living/simple_animal/M)
. = ..()