From 03d99de80cc408009f4e1bed5bacfc0966276926 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sat, 28 Nov 2020 13:02:10 +0100 Subject: [PATCH] [MIRROR] Fixes Issues Regarding Finding Spider and Swarmer Spawns (#1905) * Fixes Issues Regarding Finding Spider and Swarmer Spawns (#55054) This PR fixes the issue where people couldn't teleport to spider egg clusters using the notification. It also adds both the swarmer beacon and spider egg clusters to the ghost orbit menu. This should make it easier to find instances of both in cases where a player might miss the initial notification. * Fixes Issues Regarding Finding Spider and Swarmer Spawns Co-authored-by: IndieanaJones <47086570+IndieanaJones@users.noreply.github.com> --- code/game/objects/effects/spiders.dm | 7 ++++++- code/modules/swarmers/swarmer_objs.dm | 8 ++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 3b678046b8e..932215a51d4 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -91,11 +91,16 @@ pixel_y = base_pixel_y + rand(3,-3) START_PROCESSING(SSobj, src) . = ..() + GLOB.poi_list |= src + +/obj/structure/spider/eggcluster/Destroy() + . = ..() + GLOB.poi_list.Remove(src) /obj/structure/spider/eggcluster/process(delta_time) amount_grown += rand(0,1) * delta_time if(amount_grown >= 100 && !ghost_ready) - notify_ghosts("[src] is ready to hatch!", null, enter_link="(Click to play)", source=src, action=NOTIFY_ATTACK, ignore_key = POLL_IGNORE_SPIDER) + notify_ghosts("[src] is ready to hatch!", null, enter_link="(Click to play)", source=src, action=NOTIFY_ORBIT, ignore_key = POLL_IGNORE_SPIDER) ghost_ready = TRUE /obj/structure/spider/eggcluster/attack_ghost(mob/user) diff --git a/code/modules/swarmers/swarmer_objs.dm b/code/modules/swarmers/swarmer_objs.dm index 12f4c17fa66..a41abcf681a 100644 --- a/code/modules/swarmers/swarmer_objs.dm +++ b/code/modules/swarmers/swarmer_objs.dm @@ -54,6 +54,14 @@ ///Whether or not a swarmer is currently being created by this beacon var/processing_swarmer = FALSE +/obj/structure/swarmer_beacon/Initialize() + . = ..() + GLOB.poi_list |= src + +/obj/structure/swarmer_beacon/Destroy() + . = ..() + GLOB.poi_list.Remove(src) + /obj/structure/swarmer_beacon/attack_ghost(mob/user) . = ..() if(processing_swarmer)