cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some spider attacks being improperly parried (#29062)

Browse Source 
* Fix black and white terror spider attacks being improperly parried

* Update green.dm
This commit is contained in:
Migratingcocofruit
2025-04-26 18:15:55 +00:00
committed by GitHub
parent d46da2da77
commit 1156dee51d
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/simple_animal/hostile/terror_spiders/black.dm
+3 -1
View File
@@ -34,8 +34,10 @@
if(L.reagents.has_reagent("terror_black_toxin", 100))
return ..()
var/inject_target = pick("chest", "head")
// Stop if we got blocked/parried
if(!L.attack_animal(src))
return
L.apply_damage(30, STAMINA)
L.attack_animal(src)
if(L.can_inject(null, FALSE, inject_target, FALSE) || (HAS_TRAIT(L, TRAIT_HANDS_BLOCKED) && HAS_TRAIT(L, TRAIT_IMMOBILIZED)))
L.reagents.add_reagent("terror_black_toxin", 30) // inject our special poison
visible_message("<span class='danger'>[src] buries its long fangs deep into the [inject_target] of [target]!</span>")
code/modules/mob/living/simple_animal/hostile/terror_spiders/green.dm
+2 -1
View File
@@ -89,13 +89,14 @@
..()
return
var/inject_target = pick("chest","head")
if(!L.attack_animal(src))
return
if(L.IsStunned() || L.can_inject(null, FALSE, inject_target, FALSE))
L.AdjustEyeBlurry(20 SECONDS, 0, 120 SECONDS)
// instead of having a venom that only lasts seconds, we just add the eyeblur directly.
visible_message("<span class='danger'>[src] buries its fangs deep into the [inject_target] of [target]!</span>")
else
visible_message("<span class='danger'>[src] bites [target], but cannot inject venom into [target.p_their()] [inject_target]!</span>")
L.attack_animal(src)
/obj/structure/spider/terrorweb/green
name = "slimy web"
code/modules/mob/living/simple_animal/hostile/terror_spiders/white.dm
+2 -1
View File
@@ -39,7 +39,8 @@
..()
return
var/inject_target = pick("chest","head")
L.attack_animal(src)
if(!L.attack_animal(src))
return
L.KnockDown(10 SECONDS)
L.apply_damage(30, STAMINA)
if(L.can_inject(null, FALSE, inject_target, FALSE) || (HAS_TRAIT(L, TRAIT_HANDS_BLOCKED) && HAS_TRAIT(L, TRAIT_IMMOBILIZED)))