Merge pull request #14455 from Kyep/terror_web_spacemove

Fixes zero-G spiderweb weirdness
This commit is contained in:
AffectedArc07
2020-10-04 18:24:49 +01:00
committed by GitHub
2 changed files with 14 additions and 0 deletions
@@ -47,6 +47,13 @@
if(C.can_inject(null, FALSE, inject_target, FALSE))
C.reagents.add_reagent("spidertoxin", venom_per_bite)
/mob/living/simple_animal/hostile/poison/giant_spider/get_spacemove_backup()
. = ..()
// If we don't find any normal thing to use, attempt to use any nearby spider structure instead.
if(!.)
for(var/obj/structure/spider/S in range(1, get_turf(src)))
return S
//nursemaids - these create webs and eggs
/mob/living/simple_animal/hostile/poison/giant_spider/nurse
desc = "Furry and black, it makes you shudder to look at it. This one has brilliant green eyes."
@@ -391,6 +391,13 @@ GLOBAL_LIST_EMPTY(ts_spiderling_list)
return TRUE
/mob/living/simple_animal/hostile/poison/terror_spider/get_spacemove_backup()
. = ..()
// If we don't find any normal thing to use, attempt to use any nearby spider structure instead.
if(!.)
for(var/obj/structure/spider/S in range(1, get_turf(src)))
return S
/mob/living/simple_animal/hostile/poison/terror_spider/Stat()
..()
// Determines what shows in the "Status" tab for player-controlled spiders. Used to help players understand spider health regeneration mechanics.