cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

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).

Browse Source 
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
This commit is contained in:
Kortgstation@gmail.com
2013-01-01 08:36:50 +00:00
parent 69855bbcdc
commit 2003244388
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/weapon.dm
+2 -2
View File
@@ -246,10 +246,10 @@
if(O == H)
continue
O.show_message("\red <B>[H] steps on \the [src].</B>", 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
..()