Sending a message should no longer work if you are incapacitated. Fixes issue 1120.

Moved some mob vars to carbon:
mob/var/handcuffed -> mob/living/carbon/var/handcuffed
mob/var/legcuffed -> mob/living/carbon/var/legcuffed

As a result, I've turned some procs into pure virtual procs and moved their code into carbon.dm.

mob/proc/restrained() -> mob/living/carbon/restrained()
mob/proc/can_use_hands() -> mob/living/carbon/can_use_hands()

The hand and legcuff portion of mob/proc/u_equip() was moved into mob/living/carbon/u_equip().

The handcuffed portion of mob/proc/show_inv() was moved into mob/living/carbon/show_inv().

Fixes issue 1114.

Made parrots immune to bear traps since parrots should be flying over them anyway.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5184 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
johnsonmt88@gmail.com
2012-11-25 00:28:47 +00:00
parent c6a4b991bc
commit 4ddf9100f5
14 changed files with 132 additions and 84 deletions
+4 -4
View File
@@ -739,16 +739,16 @@
var/mob/living/carbon/H = AM
if(H.m_intent == "run")
armed = 0
usr.legcuffed = src
src.loc = usr
usr.update_inv_legcuffed()
H.legcuffed = src
src.loc = H
H.update_inv_legcuffed()
H << "\red <B>You step on \the [src]!</B>"
feedback_add_details("handcuffs","B") //Yes, I know they're legcuffs. Don't change this, no need for an extra variable. The "B" is used to tell them apart.
for(var/mob/O in viewers(H, null))
if(O == H)
continue
O.show_message("\red <B>[H] steps on \the [src].</B>", 1)
if(isanimal(AM))
if(isanimal(AM) && !istype(AM, /mob/living/simple_animal/parrot))
armed = 0
var/mob/living/simple_animal/SA = AM
SA.health = 0