mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-21 20:20:33 +01:00
[MIRROR] Basic Mob Spiders III: Sgt. Araneus is no longer a bat [MDB IGNORE] (#19315)
* Basic Mob Spiders III: Sgt. Araneus is no longer a bat * spooky scary spider * Revert "spooky scary spider" This reverts commit 7bcca7750390c7ba6aaa08760886eda524f600f8. * resolve conflicts * resolve conflicts * https://github.com/tgstation/tgstation/pull/73724 https://github.com/tgstation/tgstation/pull/73724 * https://github.com/Skyrat-SS13/Skyrat-tg/pull/19561 * fixes * wew --------- Co-authored-by: Jacquerel <hnevard@gmail.com> Co-authored-by: lessthnthree <three@lessthanthree.dk> Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
This commit is contained in:
SkyratBot
co-authored by
Jacquerel
lessthnthree
Gandalf
Jacquerel
lessthnthree
Gandalf
parent
79a99ba516
commit
480745ce05
@@ -1,6 +1,6 @@
|
||||
/obj/structure/spider/eggcluster
|
||||
name = "egg cluster"
|
||||
desc = "They seem to pulse slightly with an inner life."
|
||||
desc = "There's something alive in there, and sooner or later it's going to find its way out."
|
||||
icon_state = "eggs"
|
||||
/// Mob spawner handling the actual spawn of the spider
|
||||
var/obj/effect/mob_spawn/ghost_role/spider/spawner
|
||||
@@ -20,6 +20,22 @@
|
||||
spawner.attack_ghost(user)
|
||||
return ..()
|
||||
|
||||
/obj/structure/spider/eggcluster/examine_more(mob/user)
|
||||
. = ..()
|
||||
|
||||
if(istype(user, /mob/living/basic/giant_spider/midwife))
|
||||
switch(spawner.amount_grown)
|
||||
if(0 to 24)
|
||||
. += span_info("These eggs look shrunken and dormant.")
|
||||
if(25 to 49)
|
||||
. += span_info("These eggs have begun to move, pulsating, gestating...")
|
||||
if(50 to 74)
|
||||
. += span_info("These eggs are rippling, unseen life stirring beneath its skin.")
|
||||
if(75 to 99)
|
||||
. += span_info("These eggs swell with unseen life. They are almost ready to burst.")
|
||||
if(100 to INFINITY)
|
||||
. += span_info("These eggs are plump, teeming with life. Any moment now...")
|
||||
|
||||
/obj/structure/spider/eggcluster/enriched
|
||||
name = "enriched egg cluster"
|
||||
color = rgb(148, 0, 211)
|
||||
@@ -43,7 +59,7 @@
|
||||
you_are_text = "You are a spider."
|
||||
flavour_text = "For the hive! Choose a spider and fulfill your role to take over the station... if that is within your directives, of course."
|
||||
important_text = "Follow your directives at all costs."
|
||||
faction = list("spiders")
|
||||
faction = list("spider")
|
||||
spawner_job_path = /datum/job/spider
|
||||
role_ban = ROLE_ALIEN
|
||||
prompt_ghost = FALSE
|
||||
@@ -59,9 +75,9 @@
|
||||
var/obj/structure/spider/eggcluster/egg
|
||||
/// The types of spiders that the spawner can produce
|
||||
var/list/potentialspawns = list(
|
||||
/mob/living/simple_animal/hostile/giant_spider,
|
||||
/mob/living/simple_animal/hostile/giant_spider/hunter,
|
||||
/mob/living/simple_animal/hostile/giant_spider/nurse,
|
||||
/mob/living/basic/giant_spider,
|
||||
/mob/living/basic/giant_spider/hunter,
|
||||
/mob/living/basic/giant_spider/nurse,
|
||||
)
|
||||
|
||||
/obj/effect/mob_spawn/ghost_role/spider/Initialize(mapload)
|
||||
@@ -102,7 +118,7 @@
|
||||
to_chat(user, span_warning("\The [src] is not ready to hatch yet!"))
|
||||
return FALSE
|
||||
|
||||
/obj/effect/mob_spawn/ghost_role/spider/special(mob/living/simple_animal/hostile/giant_spider/spawned_mob, mob/mob_possessor)
|
||||
/obj/effect/mob_spawn/ghost_role/spider/special(mob/living/basic/giant_spider/spawned_mob, mob/mob_possessor)
|
||||
spawned_mob.directive = directive
|
||||
egg.spawner = null
|
||||
QDEL_NULL(egg)
|
||||
@@ -114,9 +130,9 @@
|
||||
you_are_text = "You are an enriched spider."
|
||||
cluster_type = /obj/structure/spider/eggcluster/enriched
|
||||
potentialspawns = list(
|
||||
/mob/living/simple_animal/hostile/giant_spider/tarantula,
|
||||
/mob/living/simple_animal/hostile/giant_spider/viper,
|
||||
/mob/living/simple_animal/hostile/giant_spider/midwife,
|
||||
/mob/living/basic/giant_spider/tarantula,
|
||||
/mob/living/basic/giant_spider/viper,
|
||||
/mob/living/basic/giant_spider/midwife,
|
||||
)
|
||||
|
||||
/obj/effect/mob_spawn/ghost_role/spider/bloody
|
||||
@@ -127,7 +143,7 @@
|
||||
directive = "You are the spawn of a vicious changeling. You have no ambitions except to wreak havoc and ensure your own survival. You are aggressive to all living beings outside of your species, including changelings."
|
||||
cluster_type = /obj/structure/spider/eggcluster/bloody
|
||||
potentialspawns = list(
|
||||
/mob/living/simple_animal/hostile/giant_spider/hunter/flesh,
|
||||
/mob/living/basic/giant_spider/hunter/flesh,
|
||||
)
|
||||
|
||||
/obj/effect/mob_spawn/ghost_role/spider/midwife
|
||||
@@ -137,7 +153,7 @@
|
||||
directive = "Ensure the survival of the spider species and overtake whatever structure you find yourself in."
|
||||
cluster_type = /obj/structure/spider/eggcluster/midwife
|
||||
potentialspawns = list(
|
||||
/mob/living/simple_animal/hostile/giant_spider/midwife,
|
||||
/mob/living/basic/giant_spider/midwife,
|
||||
)
|
||||
|
||||
/**
|
||||
@@ -153,7 +169,7 @@
|
||||
var/list/spider_list = list()
|
||||
var/list/display_spiders = list()
|
||||
for(var/choice in potentialspawns)
|
||||
var/mob/living/simple_animal/hostile/giant_spider/spider = choice
|
||||
var/mob/living/basic/giant_spider/spider = choice
|
||||
spider_list[initial(spider.name)] = choice
|
||||
|
||||
var/datum/radial_menu_choice/option = new
|
||||
|
||||
Reference in New Issue
Block a user