Stamina Damage Rework (#12591)

This commit is contained in:
Fox McCloud
2019-10-27 00:23:22 -04:00
committed by variableundefined
parent 573d390d93
commit 00f5e0613c
39 changed files with 91 additions and 67 deletions
@@ -71,7 +71,7 @@
return
if(!victim)
return
if(!victim.stat && !victim.restrained() && !victim.weakened)
if(!victim.stat && !victim.restrained() && !victim.IsWeakened())
to_chat(user, "<span class='warning'>They're moving too much to feed to His Grace!</span>")
return
user.visible_message("<span class='userdanger'>[user] is trying to feed [victim] to [src]!</span>")
+1 -1
View File
@@ -132,7 +132,7 @@
if(user.restrained() || user.buckled)
to_chat(user, "<span class='notice'>You need your hands and legs free for this.</span>")
return 0
if(user.stat || user.paralysis || user.sleeping || user.lying || user.weakened)
if(user.stat || user.paralysis || user.sleeping || user.lying || user.IsWeakened())
return 0
if(issilicon(user))
to_chat(user, "<span class='notice'>You need hands for this.</span>")
@@ -270,7 +270,7 @@
return
if(O.loc == user)
return
if(user.restrained() || user.stat || user.weakened || user.stunned || user.paralysis || user.lying)
if(user.restrained() || user.stat || user.IsWeakened() || user.stunned || user.paralysis || user.lying)
return
if((!( istype(O, /atom/movable) ) || O.anchored || get_dist(user, src) > 1 || get_dist(user, O) > 1 || user.contents.Find(src)))
return
+1 -1
View File
@@ -696,7 +696,7 @@
return
/obj/structure/rack/attack_hand(mob/living/user)
if(user.weakened || user.resting || user.lying)
if(user.IsWeakened() || user.resting || user.lying)
return
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src, ATTACK_EFFECT_KICK)