why didn't it do this before fuck oh my god

shields can now block impaling
This commit is contained in:
Joan Lung
2016-06-11 08:05:41 -04:00
parent cc1b0f5ffa
commit 1c19a6a2fb
7 changed files with 20 additions and 16 deletions

View File

@@ -132,7 +132,7 @@
myjob.apply_fingerprints(src)
/mob/living/carbon/human/interactive/attacked_by(obj/item/I, mob/living/user, def_zone)
..()
. = ..()
retal = 1
retal_target = user

View File

@@ -1161,7 +1161,7 @@
if(Iforce > 10 || Iforce >= 5 && prob(33))
H.forcesay(hit_appends) //forcesay checks stat already.
return
return 1
/datum/species/proc/apply_damage(damage, damagetype = BRUTE, def_zone = null, blocked, mob/living/carbon/human/H)
blocked = (100-(blocked+armor))/100

View File

@@ -624,7 +624,7 @@
/mob/living/silicon/robot/attacked_by(obj/item/I, mob/living/user, def_zone)
if(I.force && I.damtype != STAMINA && stat != DEAD) //only sparks if real damage is dealt.
spark_system.start()
..()
return ..()
/mob/living/silicon/robot/emag_act(mob/user)