From e10f47d0ebcaff7352bdda42faa01ce2590bdc9f Mon Sep 17 00:00:00 2001 From: Kyep Date: Fri, 16 Feb 2018 05:41:37 -0800 Subject: [PATCH] gray loses silencing, gets bonus damage to humans on webs --- .../hostile/terror_spiders/gray.dm | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/gray.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/gray.dm index fdaa36257d2..06b28c6400e 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/gray.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/gray.dm @@ -29,19 +29,16 @@ /mob/living/simple_animal/hostile/poison/terror_spider/gray/spider_specialattack(mob/living/carbon/human/L, poisonable) - if(!poisonable) - ..() - return - if(L.silent >= 10) - L.attack_animal(src) + var/obj/structure/spider/terrorweb/W = locate() in get_turf(L) + if(W) + melee_damage_lower = initial(melee_damage_lower) * 2 + melee_damage_upper = initial(melee_damage_upper) * 2 + visible_message("[src] savagely mauls [target] while they are stuck in the web!") else - var/inject_target = pick("chest","head") - if(L.stunned || L.can_inject(null,0,inject_target,0)) - L.Silence(20) // instead of having a venom that only lasts seconds, we just add the silence directly. - visible_message("[src] buries grey fangs deep into the [inject_target] of [target]!") - else - visible_message("[src] bites [target], but cannot inject venom into their [inject_target]!") - L.attack_animal(src) + melee_damage_lower = initial(melee_damage_lower) + melee_damage_upper = initial(melee_damage_upper) + visible_message("[src] bites [target]!") + L.attack_animal(src) /mob/living/simple_animal/hostile/poison/terror_spider/gray/adjustBruteLoss(damage) ..(damage)