Merge pull request #13004 from Shadowlight213/mobbuffs

buffs syndicate simple mobs
This commit is contained in:
duncathan salt
2015-11-29 12:33:09 -06:00
@@ -11,6 +11,7 @@
response_disarm = "shoves"
response_harm = "hits"
speed = 0
stat_attack = 1
maxHealth = 100
health = 100
harm_intent_damage = 5
@@ -41,21 +42,22 @@
///////////////Sword and shield////////////
/mob/living/simple_animal/hostile/syndicate/melee
melee_damage_lower = 20
melee_damage_upper = 25
melee_damage_lower = 25
melee_damage_upper = 30
icon_state = "syndicatemelee"
icon_living = "syndicatemelee"
weapon1 = /obj/item/weapon/melee/energy/sword/saber/red
weapon2 = /obj/item/weapon/shield/energy
attacktext = "slashes"
attack_sound = 'sound/weapons/bladeslice.ogg'
armour_penetration = 28
status_flags = 0
maxHealth = 150
health = 150
maxHealth = 170
health = 170
/mob/living/simple_animal/hostile/syndicate/melee/bullet_act(obj/item/projectile/Proj)
if(!Proj) return
if(prob(65))
if(prob(50))
if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
src.health -= Proj.damage
else