Makes martial arts use Knockdown() instead of Stun() for their stuns (#5617)

This commit is contained in:
deathride58
2018-02-24 01:19:23 +00:00
committed by Poojawa
parent 01246a62df
commit 2e84b30841
2 changed files with 5 additions and 5 deletions
+2 -2
View File
@@ -47,7 +47,7 @@
if(!istype(D.head,/obj/item/clothing/head/helmet/) && !istype(D.head,/obj/item/clothing/head/hardhat))
D.adjustBrainLoss(5)
A.Stun(rand(10,45))
D.Stun(rand(5,30))
D.Knockdown(rand(5,30))//CIT CHANGE - makes stuns from martial arts always use Knockdown instead of Stun for the sake of consistency
if(5,6)
A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
atk_verb = pick("punches", "kicks", "hits", "slams into")
@@ -63,4 +63,4 @@
if(atk_verb)
add_logs(A, D, "[atk_verb] (Psychotic Brawling)")
return 1
return 1
+3 -3
View File
@@ -43,7 +43,7 @@
D.emote("scream")
D.dropItemToGround(D.get_active_held_item())
D.apply_damage(5, BRUTE, pick("l_arm", "r_arm"))
D.Stun(60)
D.Knockdown(60)//CIT CHANGE - makes sleepingcarp use knockdown() for its stuns instead of stun()
return 1
add_logs(A, D, "wrist wrenched (Sleeping Carp)")
return basic_hit(A,D)
@@ -67,7 +67,7 @@
"<span class='userdanger'>[A] winds you with a knee in the stomach!</span>")
D.audible_message("<b>[D]</b> gags!")
D.losebreath += 3
D.Stun(40)
D.Knockdown(40)//CIT CHANGE - makes sleepingcarp use knockdown() for its stuns instead of stun()
playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1)
return 1
add_logs(A, D, "stomach kneed (Sleeping Carp)")
@@ -81,7 +81,7 @@
D.apply_damage(20, BRUTE, "head")
D.drop_all_held_items()
playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1)
D.Stun(80)
D.Knockdown(80)//CIT CHANGE - makes sleepingcarp use knockdown() for its stuns instead of stun()
return 1
add_logs(A, D, "head kicked (Sleeping Carp)")
return basic_hit(A,D)