Can Point While Lying Down

This commit is contained in:
Fox-McCloud
2017-07-23 04:25:46 -04:00
parent b03d226f8c
commit 46b8b05b10
6 changed files with 16 additions and 20 deletions
+1 -1
View File
@@ -657,7 +657,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
return FALSE
/mob/dead/observer/incapacitated()
/mob/dead/observer/incapacitated(ignore_restraints = FALSE, ignore_grab = FALSE, ignore_lying = FALSE)
return TRUE
//this is a mob verb instead of atom for performance reasons
+7 -7
View File
@@ -168,23 +168,23 @@
//same as above
/mob/living/pointed(atom/A as mob|obj|turf in view())
if(incapacitated())
return 0
if(incapacitated(ignore_lying = TRUE))
return FALSE
if(status_flags & FAKEDEATH)
return 0
return FALSE
if(!..())
return 0
return FALSE
var/obj/item/hand_item = get_active_hand()
if(istype(hand_item, /obj/item/weapon/gun) && A != hand_item)
if(a_intent == INTENT_HELP || !ismob(A))
visible_message("<b>[src]</b> points to [A] with [hand_item]")
return 1
return TRUE
A.visible_message("<span class='danger'>[src] points [hand_item] at [A]!</span>",
"<span class='userdanger'>[src] points [hand_item] at you!</span>")
A << 'sound/weapons/TargetOn.ogg'
return 1
return TRUE
visible_message("<b>[src]</b> points to [A]")
return 1
return TRUE
/mob/living/verb/succumb()
set hidden = 1
+1 -5
View File
@@ -260,8 +260,4 @@
if(!supress_message)
visible_message("<span class='warning'>[user] has grabbed [src] passively!</span>")
return G
/mob/living/incapacitated()
if(stat || paralysis || stunned || weakened || restrained())
return 1
return G
@@ -1,7 +1,7 @@
// No args for restraints because robots don't have those
/mob/living/silicon/robot/incapacitated()
/mob/living/silicon/robot/incapacitated(ignore_restraints = FALSE, ignore_grab = FALSE, ignore_lying = FALSE)
if(stat || lockcharge || weakened || stunned || paralysis || !is_component_functioning("actuator"))
return 1
return TRUE
/mob/living/silicon/robot/update_stat()
if(status_flags & GODMODE)
+3 -3
View File
@@ -56,9 +56,9 @@
return !(weakened || paralysis || stat || (status_flags & FAKEDEATH))
// Whether the mob is capable of actions or not
/mob/living/incapacitated(ignore_restraints = 0, ignore_grab = 0, ignore_lying = 0)
if(stat || paralysis || stunned || (weakened && lying) || (!ignore_restraints && restrained()) || (!ignore_lying && lying))
return 1
/mob/living/incapacitated(ignore_restraints = FALSE, ignore_grab = FALSE, ignore_lying = FALSE)
if(stat || paralysis || stunned || weakened || (!ignore_restraints && restrained()) || (!ignore_lying && lying))
return TRUE
// wonderful proc names, I know - used to check whether the blur overlay
// should show or not
+2 -2
View File
@@ -43,8 +43,8 @@
/mob/proc/can_speak()
return 1
/mob/proc/incapacitated(ignore_restraints, ignore_grab)
return 0
/mob/proc/incapacitated(ignore_restraints = FALSE, ignore_grab = FALSE, ignore_lying = FALSE)
return FALSE
/mob/proc/restrained(ignore_grab)
// All are created free