From c32d33fad962cf9d49d557c10aa8841ac8224c28 Mon Sep 17 00:00:00 2001 From: VerySoft Date: Tue, 9 Jan 2024 14:59:42 -0500 Subject: [PATCH] Spider Makes it so that nurse spiders can't spawn from any random sources, such as spider egg clusters, spider spawners, and capture crystals. GMs and map makers can still put nurse spiders out if they want to, but this should stop any UNEXPECTED nurse spiders from appearing, and stop spiders from snowballing quite so hard when the conditions are right. --- code/_helpers/global_lists_vr.dm | 2 -- .../gamemodes/technomancer/spells/summon/summon_creature.dm | 3 +-- code/game/objects/effects/semirandom_mobs_vr.dm | 2 -- code/game/objects/effects/spiders.dm | 4 ++-- code/game/objects/items/weapons/capture_crystal.dm | 1 - code/game/objects/random/mob.dm | 3 +-- .../simple_mob/subtypes/animal/giant_spider/broodmother.dm | 3 +-- code/modules/xenoarcheaology/artifacts/autocloner.dm | 1 - 8 files changed, 5 insertions(+), 14 deletions(-) diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index 7ede8fc794e..76b1703fa90 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -664,9 +664,7 @@ var/global/list/xenobio_gold_mobs_hostile = list( /mob/living/simple_mob/animal/giant_spider/webslinger, /mob/living/simple_mob/animal/giant_spider/phorogenic, /mob/living/simple_mob/animal/giant_spider/carrier, - /mob/living/simple_mob/animal/giant_spider/nurse, /mob/living/simple_mob/animal/giant_spider/ion, - /mob/living/simple_mob/animal/giant_spider/nurse/queen, /mob/living/simple_mob/animal/sif/diyaab, /mob/living/simple_mob/animal/sif/duck, /mob/living/simple_mob/animal/sif/frostfly, diff --git a/code/game/gamemodes/technomancer/spells/summon/summon_creature.dm b/code/game/gamemodes/technomancer/spells/summon/summon_creature.dm index c29d9827ec2..7b2ab146a23 100644 --- a/code/game/gamemodes/technomancer/spells/summon/summon_creature.dm +++ b/code/game/gamemodes/technomancer/spells/summon/summon_creature.dm @@ -30,7 +30,6 @@ "BAT" = /mob/living/simple_mob/animal/space/bats, "SPIDER" = /mob/living/simple_mob/animal/giant_spider, "SPIDER HUNTER" = /mob/living/simple_mob/animal/giant_spider/hunter, - "SPIDER NURSE" = /mob/living/simple_mob/animal/giant_spider/nurse, "CARP" = /mob/living/simple_mob/animal/space/carp, "BEAR" = /mob/living/simple_mob/animal/space/bear ) @@ -57,4 +56,4 @@ // Now we hurt their new pal, because being forcefully abducted by teleportation can't be healthy. - summoned.adjustBruteLoss(summoned.getMaxHealth() * 0.3) // Lose 30% of max health on arrival (but could be healed back up). \ No newline at end of file + summoned.adjustBruteLoss(summoned.getMaxHealth() * 0.3) // Lose 30% of max health on arrival (but could be healed back up). diff --git a/code/game/objects/effects/semirandom_mobs_vr.dm b/code/game/objects/effects/semirandom_mobs_vr.dm index aaf14528373..9dc2c2e561a 100644 --- a/code/game/objects/effects/semirandom_mobs_vr.dm +++ b/code/game/objects/effects/semirandom_mobs_vr.dm @@ -104,7 +104,6 @@ var/global/list/semirandom_mob_spawner_decisions = list() list(/mob/living/simple_mob/animal/sif/siffet), list(/mob/living/simple_mob/animal/sif/tymisian), list( - /mob/living/simple_mob/animal/giant_spider/nurse = 10, /mob/living/simple_mob/animal/giant_spider/electric = 5, /mob/living/simple_mob/animal/giant_spider/frost = 5, /mob/living/simple_mob/animal/giant_spider/hunter = 10, @@ -448,7 +447,6 @@ var/global/list/semirandom_mob_spawner_decisions = list() possible_mob_types = list( list( - /mob/living/simple_mob/animal/giant_spider/nurse = 10, /mob/living/simple_mob/animal/giant_spider/electric = 5, /mob/living/simple_mob/animal/giant_spider/frost = 5, /mob/living/simple_mob/animal/giant_spider/hunter = 10, diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 74ef44f5b1e..0d9f6173bc2 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -154,7 +154,7 @@ var/amount_grown = 0 var/obj/machinery/atmospherics/unary/vent_pump/entry_vent var/travelling_in_vent = 0 - var/list/grow_as = list(/mob/living/simple_mob/animal/giant_spider, /mob/living/simple_mob/animal/giant_spider/nurse, /mob/living/simple_mob/animal/giant_spider/hunter) + var/list/grow_as = list(/mob/living/simple_mob/animal/giant_spider, /mob/living/simple_mob/animal/giant_spider/hunter) var/faction = "spiders" var/stunted = FALSE @@ -163,7 +163,7 @@ grow_as = list(/mob/living/simple_mob/animal/giant_spider/frost) /obj/effect/spider/spiderling/varied - grow_as = list(/mob/living/simple_mob/animal/giant_spider, /mob/living/simple_mob/animal/giant_spider/nurse, /mob/living/simple_mob/animal/giant_spider/hunter, + grow_as = list(/mob/living/simple_mob/animal/giant_spider, /mob/living/simple_mob/animal/giant_spider/hunter, /mob/living/simple_mob/animal/giant_spider/frost, /mob/living/simple_mob/animal/giant_spider/electric, /mob/living/simple_mob/animal/giant_spider/lurker, /mob/living/simple_mob/animal/giant_spider/pepper, /mob/living/simple_mob/animal/giant_spider/thermic, /mob/living/simple_mob/animal/giant_spider/tunneler, /mob/living/simple_mob/animal/giant_spider/webslinger, /mob/living/simple_mob/animal/giant_spider/phorogenic, /mob/living/simple_mob/animal/giant_spider/carrier, diff --git a/code/game/objects/items/weapons/capture_crystal.dm b/code/game/objects/items/weapons/capture_crystal.dm index 83dbec328a7..450a2c6e39e 100644 --- a/code/game/objects/items/weapons/capture_crystal.dm +++ b/code/game/objects/items/weapons/capture_crystal.dm @@ -635,7 +635,6 @@ list(/mob/living/simple_mob/animal/sif/siffet), list(/mob/living/simple_mob/animal/sif/tymisian), list( - /mob/living/simple_mob/animal/giant_spider/nurse = 10, /mob/living/simple_mob/animal/giant_spider/electric = 5, /mob/living/simple_mob/animal/giant_spider/frost = 5, /mob/living/simple_mob/animal/giant_spider/hunter = 10, diff --git a/code/game/objects/random/mob.dm b/code/game/objects/random/mob.dm index be1222aabef..82d828535ad 100644 --- a/code/game/objects/random/mob.dm +++ b/code/game/objects/random/mob.dm @@ -132,8 +132,7 @@ mob_wander_distance = 4 /obj/random/mob/spider/item_to_spawn() - return pick(prob(22);/mob/living/simple_mob/animal/giant_spider/nurse, - prob(33);/mob/living/simple_mob/animal/giant_spider/hunter, + return pick(prob(33);/mob/living/simple_mob/animal/giant_spider/hunter, prob(45);/mob/living/simple_mob/animal/giant_spider) /obj/random/mob/spider/nurse diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm index 345e315a166..13db1d25847 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/giant_spider/broodmother.dm @@ -31,7 +31,6 @@ /mob/living/simple_mob/animal/giant_spider/electric/broodling, /mob/living/simple_mob/animal/giant_spider/hunter/broodling, /mob/living/simple_mob/animal/giant_spider/lurker/broodling, - /mob/living/simple_mob/animal/giant_spider/nurse/broodling, /mob/living/simple_mob/animal/giant_spider/pepper/broodling, /mob/living/simple_mob/animal/giant_spider/thermic/broodling, /mob/living/simple_mob/animal/giant_spider/tunneler/broodling, @@ -185,4 +184,4 @@ qdel(src) else - to_chat(user, "You need more space to release the egg!") \ No newline at end of file + to_chat(user, "You need more space to release the egg!") diff --git a/code/modules/xenoarcheaology/artifacts/autocloner.dm b/code/modules/xenoarcheaology/artifacts/autocloner.dm index 03ece599dd8..0fdd3ef3f3e 100644 --- a/code/modules/xenoarcheaology/artifacts/autocloner.dm +++ b/code/modules/xenoarcheaology/artifacts/autocloner.dm @@ -22,7 +22,6 @@ //33% chance to spawn nasties if(prob(33)) spawn_type = pick( - /mob/living/simple_mob/animal/giant_spider/nurse, /mob/living/simple_mob/animal/space/alien, /mob/living/simple_mob/animal/space/bear, /mob/living/simple_mob/creature,