From 924ceedeaf592ffb3094b8571db5ec9457398cd1 Mon Sep 17 00:00:00 2001 From: Comxy Date: Sun, 8 Oct 2023 01:57:04 +0200 Subject: [PATCH] Spider Type Check Fix (#78817) ## About The Pull Request Fixes bug, I am running out of gbp plz merge ## Why It's Good For The Game Fixes #78802 ## Changelog :cl: fix: Spider types get properly checked again. /:cl: --- code/__DEFINES/is_helpers.dm | 2 +- code/game/objects/effects/spiderwebs.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index b775b948c87..10b6a0baa31 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -181,7 +181,7 @@ GLOBAL_LIST_INIT(turfs_pass_meteor, typecacheof(list( #define isclown(A) (istype(A, /mob/living/basic/clown)) -#define isspider(A) (istype(A, /mob/living/basic/spider/giant)) +#define isspider(A) (istype(A, /mob/living/basic/spider)) //Misc mobs diff --git a/code/game/objects/effects/spiderwebs.dm b/code/game/objects/effects/spiderwebs.dm index 3bdac03396f..c27ff9b302a 100644 --- a/code/game/objects/effects/spiderwebs.dm +++ b/code/game/objects/effects/spiderwebs.dm @@ -174,11 +174,11 @@ /obj/structure/spider/sticky/CanAllowThrough(atom/movable/mover, border_dir) . = ..() - if(isspider(mover)) + if(HAS_TRAIT(mover, TRAIT_WEB_SURFER)) return TRUE if(!isliving(mover)) return - if(isspider(mover.pulledby)) + if(HAS_TRAIT(mover.pulledby, TRAIT_WEB_SURFER)) return TRUE loc.balloon_alert(mover, "stuck in web!") return FALSE