From de19e36a51a2eb632bfc6f5858935ea34ae13977 Mon Sep 17 00:00:00 2001 From: Shadowlight213 Date: Sun, 2 Oct 2016 17:35:56 -0700 Subject: [PATCH] Removes morphine from nurse spiders (#20773) Fixes spider web, cocoon, spiderling sprites Halves cocoon breakout time, fixes camera going to nullspace --- code/game/objects/effects/spiders.dm | 6 ++++-- .../mob/living/simple_animal/hostile/giant_spider.dm | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 550e8e4e690..09efd978b5e 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -1,6 +1,7 @@ //generic procs copied from obj/effect/alien /obj/structure/spider name = "web" + icon = 'icons/effects/effects.dmi' desc = "it's stringy and sticky" anchored = 1 density = 0 @@ -204,7 +205,7 @@ /obj/structure/spider/cocoon/container_resist() var/mob/living/user = usr - var/breakout_time = 2 + var/breakout_time = 1 user.changeNext_move(CLICK_CD_BREAKOUT) user.last_special = world.time + CLICK_CD_BREAKOUT user << "You struggle against the tight bonds... (This will take about [breakout_time] minutes.)" @@ -217,7 +218,8 @@ /obj/structure/spider/cocoon/Destroy() + var/turf/T = get_turf(src) src.visible_message("\The [src] splits open.") for(var/atom/movable/A in contents) - A.loc = src.loc + A.forceMove(T) return ..() diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index 2e79f072bf6..fa6d21456c9 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -84,9 +84,8 @@ health = 40 melee_damage_lower = 5 melee_damage_upper = 10 - poison_per_bite = 10 + poison_per_bite = 3 var/atom/cocoon_target - poison_type = "morphine" var/fed = 0 //hunters have the most poison and move the fastest, so they can find prey