Immovable rods can now hit mobs.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@979 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
n3ophyt3@gmail.com
2011-02-07 06:49:07 +00:00
parent 9fab076d4b
commit 58606c1011
2 changed files with 6 additions and 3 deletions
+2 -2
View File
@@ -13,7 +13,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
icon = 'objects.dmi'
icon_state = "immrod"
throwforce = 100
density = 0
density = 1
anchored = 1
Bump(atom/clong)
@@ -29,7 +29,7 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
O.show_message("CLANG", 2)
if (istype(clong, /mob))
if(clong.density || prob(10))
src.throw_impact(clong)
clong.meteorhit(src)
if(clong && prob(25))
src.loc = clong.loc
@@ -884,7 +884,10 @@
var/dam_zone = pick("chest", "chest", "chest", "head", "groin")
if (istype(src.organs[dam_zone], /datum/organ/external))
var/datum/organ/external/temp = src.organs[dam_zone]
temp.take_damage((istype(O, /obj/meteor/small) ? 10 : 25), 30)
if (istype(O, /obj/immovablerod))
temp.take_damage(101, 0)
else
temp.take_damage((istype(O, /obj/meteor/small) ? 10 : 25), 30)
src.UpdateDamageIcon()
src.updatehealth()
return