mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2025-12-25 17:41:56 +00:00
Removes pepperspray and telebaton stun (#4946)
-removes pepperspray instant stun if the mouth is not covered, instead it will cause pain -removes telebaton stun when aiming for the legs, the telebaton will now deal halloss when attacking in disarm intent Those changes are in the same line as the flash stun removal, stunbatons and etc. Feedback thread: https://forums.aurorastation.org/viewtopic.php?p=102122
This commit is contained in:
@@ -95,22 +95,12 @@
|
||||
user.take_organ_damage(2*force)
|
||||
return
|
||||
if(..() == 1)
|
||||
playsound(src.loc, "swing_hit", 50, 1, -1)
|
||||
if (target_zone == "r_leg" || target_zone == "l_leg")
|
||||
var/stun_chance = 100
|
||||
if(user.a_intent == I_DISARM)
|
||||
if(ishuman(target))
|
||||
var/mob/living/carbon/human/T = target
|
||||
var/armor = T.run_armor_check(target_zone,"melee")
|
||||
stun_chance -= armor
|
||||
|
||||
if(T.shoes && (T.shoes.item_flags & NOSLIP) && istype(T.shoes, /obj/item/clothing/shoes/magboots))
|
||||
stun_chance -= 10
|
||||
|
||||
if(T.species.brute_mod<0.8)
|
||||
stun_chance -= 10
|
||||
|
||||
if(prob(stun_chance))
|
||||
T.Weaken(5) //nerfed, because yes.
|
||||
return
|
||||
T.apply_damage(40, HALLOSS, target_zone, armor)
|
||||
return
|
||||
else
|
||||
return ..()
|
||||
return ..()
|
||||
@@ -623,8 +623,8 @@
|
||||
message = "<span class='danger'>Your face and throat burn!</span>"
|
||||
if(prob(25))
|
||||
M.custom_emote(2, "[pick("coughs!","coughs hysterically!","splutters!")]")
|
||||
M.Stun(5)
|
||||
M.Weaken(5)
|
||||
M.apply_effect(40, AGONY, 0)
|
||||
|
||||
#undef EYES_PROTECTED
|
||||
#undef EYES_MECH
|
||||
|
||||
|
||||
Reference in New Issue
Block a user