Revert "Merge branch 'master' into trash-eat-Mk2"

This reverts commit c82be8287a, reversing
changes made to 8cb3330fef.
This commit is contained in:
MrSky12
2024-05-15 23:03:29 +02:00
parent acf1d99ad2
commit d638582401
82 changed files with 220 additions and 1092 deletions
+1 -4
View File
@@ -36,14 +36,11 @@
. = ..()
/obj/structure/spider/stickyweb/CanPass(atom/movable/mover, turf/target)
if(istype(mover, /mob/living/simple_animal/hostile/poison/giant_spider) || HAS_TRAIT(mover, TRAIT_WEB_WEAVER))
if(istype(mover, /mob/living/simple_animal/hostile/poison/giant_spider))
return TRUE
else if(isliving(mover))
if(istype(mover.pulledby, /mob/living/simple_animal/hostile/poison/giant_spider))
return TRUE
if(mover.pulledby)
if(HAS_TRAIT(mover.pulledby, TRAIT_WEB_WEAVER))
return TRUE
if(prob(50))
to_chat(mover, "<span class='danger'>You get stuck in \the [src] for a moment.</span>")
return FALSE