Simple Mob Shields (#10242)

This commit is contained in:
Geeves
2020-10-16 21:06:45 +02:00
committed by GitHub
parent 5de4228a1a
commit ba42ec76f3
2 changed files with 11 additions and 3 deletions
@@ -463,14 +463,16 @@
return
/mob/living/carbon/human/attack_generic(var/mob/user, var/damage, var/attack_message)
if(!damage)
return
user.attack_log += text("\[[time_stamp()]\] <span class='warning'>attacked [src.name] ([src.ckey])</span>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'>was attacked by [user.name] ([user.ckey])</font>")
src.visible_message("<span class='danger'>[user] has [attack_message] [src]!</span>")
user.do_attack_animation(src)
if(damage < 15 && check_shields(damage, null, user, null, "\the [user]"))
return
visible_message(SPAN_DANGER("[user] has [attack_message] [src]!"))
var/dam_zone = user.zone_sel?.selecting
if(!dam_zone)
@@ -479,7 +481,7 @@
var/armor_block = run_armor_check(affecting, "melee")
apply_damage(damage, BRUTE, affecting, armor_block)
updatehealth()
return 1
return TRUE
//Used to attack a joint through grabbing
/mob/living/carbon/human/proc/grab_joint(var/mob/living/user, var/def_zone)