This commit is contained in:
kevinz000
2020-01-16 00:18:40 -07:00
parent 26525b8fa7
commit 350c5aa060
11 changed files with 18 additions and 16 deletions
+2 -1
View File
@@ -97,7 +97,8 @@
/datum/action/proc/IsAvailable()
if(!owner)
return FALSE
if(!CHECK_ALL_MOBILITY(owner, required_mobility_flags))
var/mob/living/L = owner
if(istype(L) && !CHECK_ALL_MOBILITY(L, required_mobility_flags))
return FALSE
if(check_flags & AB_CHECK_RESTRAINED)
if(owner.restrained())
+2 -1
View File
@@ -117,7 +117,8 @@
if(DEAD)
to_chat(user, "<span class='notice'>You cannot [key] while dead.</span>")
return FALSE
if(restraint_check && !CHECK_MOBILITY(user, MOBILITY_MOVE))
var/mob/living/L = user
if(restraint_check && (istype(L) && !CHECK_MOBILITY(user, MOBILITY_USE)))
if(!intentional)
return FALSE
to_chat(user, "<span class='notice'>You cannot [key] while stunned.</span>")
+1 -1
View File
@@ -227,7 +227,7 @@
H.visible_message("<span class='warning'>[H] collapses!</span>", \
"<span class='userdanger'>Your legs give out!</span>")
H.DefaultCombatKnockdown(80)
if(H.staminaloss && !_REFACTORING_H.IsSleeping())
if(H.staminaloss && !H._REFACTORING_IsSleeping())
var/total_health = (H.health - H.staminaloss)
if(total_health <= HEALTH_THRESHOLD_CRIT && !H.stat)
H.visible_message("<span class='warning'>[user] delivers a heavy hit to [H]'s head, knocking [H.p_them()] out cold!</span>", \