From ee68e71b2a40e416f29861b413f30924fcf0d5a5 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 11 Mar 2020 08:01:34 -0700 Subject: [PATCH 1/4] Update bubblegum.dm --- .../mob/living/simple_animal/hostile/megafauna/bubblegum.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index 83abde2fca..88990eaba1 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -229,6 +229,7 @@ Difficulty: Hard attacktext = "pierces" color = "#C80000" density = FALSE + swarming = FALSE faction = list("mining", "boss") weather_immunities = list("lava","ash") From 2552a34c21533c56b595c22886ec652bd78c71a8 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 11 Mar 2020 08:02:33 -0700 Subject: [PATCH 2/4] Update hivelord.dm --- .../mob/living/simple_animal/hostile/mining_mobs/hivelord.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 56d112237e..248b5b9c82 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -84,10 +84,12 @@ pass_flags = PASSTABLE | PASSMOB //they shouldn't get stuck behind hivelords. density = FALSE del_on_death = 1 + var/swarming = TRUE /mob/living/simple_animal/hostile/asteroid/hivelordbrood/Initialize() . = ..() - AddComponent(/datum/component/swarming) //oh god not the bees + if(swarming) + AddComponent(/datum/component/swarming) //oh god not the bees addtimer(CALLBACK(src, .proc/death), 100) //Legion From bfeb2f0952bf790b8520b36d48dec5e3d3801bf6 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 11 Mar 2020 08:07:20 -0700 Subject: [PATCH 3/4] Update hivelord.dm --- .../mob/living/simple_animal/hostile/mining_mobs/hivelord.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index 248b5b9c82..d940305080 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -84,7 +84,7 @@ pass_flags = PASSTABLE | PASSMOB //they shouldn't get stuck behind hivelords. density = FALSE del_on_death = 1 - var/swarming = TRUE + var/swarming = FALSE /mob/living/simple_animal/hostile/asteroid/hivelordbrood/Initialize() . = ..() @@ -186,6 +186,7 @@ del_on_death = TRUE stat_attack = UNCONSCIOUS robust_searching = 1 + swarming = TRUE var/can_infest_dead = FALSE /mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion/Life() From 2bf892c4829725e264246feb539b652ef6babde1 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Wed, 11 Mar 2020 08:07:37 -0700 Subject: [PATCH 4/4] Update bubblegum.dm --- .../mob/living/simple_animal/hostile/megafauna/bubblegum.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm index 88990eaba1..83abde2fca 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm @@ -229,7 +229,6 @@ Difficulty: Hard attacktext = "pierces" color = "#C80000" density = FALSE - swarming = FALSE faction = list("mining", "boss") weather_immunities = list("lava","ash")