From 568a8b17cee8fa167f823b95af612a83a144f1aa Mon Sep 17 00:00:00 2001 From: SabreML <57483089+SabreML@users.noreply.github.com> Date: Fri, 9 Jul 2021 15:05:48 +0100 Subject: [PATCH] Makes all Terror spiders immune to dragging (#16325) * Update white.dm * Makes ALL spiders heavy --- .../mob/living/simple_animal/hostile/terror_spiders/empress.dm | 1 - .../mob/living/simple_animal/hostile/terror_spiders/prince.dm | 1 - .../mob/living/simple_animal/hostile/terror_spiders/princess.dm | 1 - .../mob/living/simple_animal/hostile/terror_spiders/purple.dm | 1 - .../mob/living/simple_animal/hostile/terror_spiders/queen.dm | 1 - .../mob/living/simple_animal/hostile/terror_spiders/red.dm | 1 - .../simple_animal/hostile/terror_spiders/terror_spiders.dm | 1 + 7 files changed, 1 insertion(+), 6 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/empress.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/empress.dm index eb449c44417..ecfa1332630 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/empress.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/empress.dm @@ -24,7 +24,6 @@ projectiletype = /obj/item/projectile/terrorqueenspit/empress icon = 'icons/mob/terrorspider64.dmi' pixel_x = -16 - move_resist = MOVE_FORCE_STRONG // no more pushing a several hundred if not thousand pound spider mob_size = MOB_SIZE_LARGE icon_state = "terror_empress" icon_living = "terror_empress" diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm index a7b99aafc67..7b900d8a881 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm @@ -30,7 +30,6 @@ web_type = /obj/structure/spider/terrorweb/purple ai_spins_webs = FALSE gender = MALE - move_resist = MOVE_FORCE_STRONG // no more pushing a several hundred if not thousand pound spider /mob/living/simple_animal/hostile/poison/terror_spider/prince/death(gibbed) if(can_die() && !hasdied && spider_uo71) diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/princess.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/princess.dm index 3e7e5c5194e..787d89b722f 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/princess.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/princess.dm @@ -19,7 +19,6 @@ maxHealth = 150 health = 150 spider_tier = TS_TIER_3 - move_resist = MOVE_FORCE_STRONG // no more pushing a several hundred if not thousand pound spider // Unlike queens, no ranged attack. ranged = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/purple.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/purple.dm index 63541db1e9b..eb55ff2a9b3 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/purple.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/purple.dm @@ -25,7 +25,6 @@ speed = 0 // '0' (also the default for human mobs) converts to 2.5 total delay, or 4 tiles/sec. spider_opens_doors = 2 ventcrawler = 0 - move_resist = MOVE_FORCE_STRONG // no more pushing a several hundred if not thousand pound spider ai_ventcrawls = FALSE environment_smash = ENVIRONMENT_SMASH_RWALLS idle_ventcrawl_chance = 0 // stick to the queen! diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm index 06db565cad4..cd87f2dd577 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen.dm @@ -26,7 +26,6 @@ ai_spins_webs = FALSE ai_ventcrawls = FALSE idle_ventcrawl_chance = 0 - move_resist = MOVE_FORCE_STRONG // no more pushing a several hundred if not thousand pound spider force_threshold = 18 // outright immune to anything of force under 18, this means welders can't hurt it, only guns can ranged = 1 retreat_distance = 5 diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/red.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/red.dm index 1e92b5d65e5..a96486e473e 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/red.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/red.dm @@ -24,7 +24,6 @@ move_to_delay = 10 // at 20ticks/sec, this is 2 tile/sec movespeed speed = 2 // movement_delay() gives 4.5, or 0.45s between steps, which = about 2.2 tiles/second. Player is slightly faster than AI, but cannot move on diagonals. spider_opens_doors = 2 - move_resist = MOVE_FORCE_STRONG // no more pushing a several hundred if not thousand pound spider web_type = /obj/structure/spider/terrorweb/red var/enrage = 0 var/melee_damage_lower_rage0 = 15 diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm index 9f93bcab1ef..eed323d9ebe 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm @@ -40,6 +40,7 @@ GLOBAL_LIST_EMPTY(ts_spiderling_list) // Movement pass_flags = PASSTABLE + move_resist = MOVE_FORCE_STRONG // no more pushing a several hundred if not thousand pound spider turns_per_move = 3 // number of turns before AI-controlled spiders wander around. No effect on actual player or AI movement speed! move_to_delay = 6 // AI spider speed at chasing down targets. Higher numbers mean slower speed. Divide 20 (server tick rate / second) by this to get tiles/sec.