Skip to content

Commit

Permalink
avoid conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Absolucy committed May 20, 2024
1 parent c3da06f commit 0d9cb42
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions code/modules/mob_spawn/ghost_roles/spider_roles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@
/mob/living/basic/spider/growing/spiderling/guard,
/mob/living/basic/spider/growing/spiderling/scout,
)
/// Do we flash the byond window when this particular egg type is available?
var/flash_window = FALSE

/obj/effect/mob_spawn/ghost_role/spider/Initialize(mapload)
. = ..()
Expand All @@ -100,7 +98,7 @@
amount_grown += rand(5, 15) * seconds_per_tick
if(amount_grown >= 100 && !ready)
ready = TRUE
notify_ghosts("[src] is ready to hatch!", null, enter_link = "<a href=?src=[REF(src)];activate=1>(Click to play)</a>", source = src, action = NOTIFY_ORBIT, ignore_key = POLL_IGNORE_SPIDER, flashwindow = flash_window)
notify_ghosts("[src] is ready to hatch!", null, enter_link = "<a href=?src=[REF(src)];activate=1>(Click to play)</a>", source = src, action = NOTIFY_ORBIT, ignore_key = POLL_IGNORE_SPIDER)
STOP_PROCESSING(SSobj, src)

/obj/effect/mob_spawn/ghost_role/spider/Topic(href, href_list)
Expand Down Expand Up @@ -140,7 +138,6 @@
/mob/living/basic/spider/growing/spiderling/viper,
/mob/living/basic/spider/growing/spiderling/midwife,
)
flash_window = TRUE

/obj/effect/mob_spawn/ghost_role/spider/bloody
name = "bloody egg cluster"
Expand All @@ -152,7 +149,6 @@
potentialspawns = list(
/mob/living/basic/spider/giant/hunter/flesh,
)
flash_window = TRUE

/obj/effect/mob_spawn/ghost_role/spider/midwife
name = "midwife egg cluster"
Expand All @@ -163,7 +159,6 @@
potentialspawns = list(
/mob/living/basic/spider/giant/midwife, // We don't want the event to end instantly because of a 2 hp spiderling dying
)
flash_window = TRUE

/**
* Makes a ghost into a spider based on the type of egg cluster.
Expand Down

0 comments on commit 0d9cb42

Please sign in to comment.