From 2003244388e059d86cf39012b4dacca69212f487 Mon Sep 17 00:00:00 2001 From: "Kortgstation@gmail.com" Date: Tue, 1 Jan 2013 08:36:50 +0000 Subject: [PATCH] Fixed beartraps instant-killing simple animals (now does 20 damage, enough to kill mice/pets, but not enough to one hit kill an alien empress or something). Fixed beartraps working on "floating" simple animals (constructs, shades, viscerators) git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5444 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/weapon.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 4ab016f5b13..86e0bd32652 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -246,10 +246,10 @@ if(O == H) continue O.show_message("\red [H] steps on \the [src].", 1) - if(isanimal(AM) && !istype(AM, /mob/living/simple_animal/parrot)) + if(isanimal(AM) && !istype(AM, /mob/living/simple_animal/parrot) && !istype(AM, /mob/living/simple_animal/construct) && !istype(AM, /mob/living/simple_animal/shade) && !istype(AM, /mob/living/simple_animal/hostile/viscerator)) armed = 0 var/mob/living/simple_animal/SA = AM - SA.health = 0 + SA.health -= 20 ..()