diff --git a/code/modules/events/alien_infestation.dm b/code/modules/events/alien_infestation.dm index 49fc5a97d86..b230ecff627 100644 --- a/code/modules/events/alien_infestation.dm +++ b/code/modules/events/alien_infestation.dm @@ -34,6 +34,8 @@ var/mob/living/carbon/alien/larva/new_xeno = new(vent.loc) new_xeno.amount_grown += (0.75 * new_xeno.max_grown) //event spawned larva start off almost ready to evolve. new_xeno.key = C.key + new_xeno.forceMove(vent) + new_xeno.add_ventcrawl(vent) if(SSticker && SSticker.mode) SSticker.mode.xenos += new_xeno.mind diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm index edd563fbfe9..4856d532740 100644 --- a/code/modules/events/blob.dm +++ b/code/modules/events/blob.dm @@ -27,6 +27,8 @@ B.key = M.key B.mind.special_role = SPECIAL_ROLE_BLOB SSticker.mode.update_blob_icons_added(B.mind) + B.forceMove(vent) + B.add_ventcrawl(vent) to_chat(B, "You are now a mouse, infected with blob spores. Find somewhere isolated... before you burst and become the blob! Use ventcrawl (alt-click on vents) to move around.") to_chat(B, "For more information, check the wiki page: ([GLOB.configuration.url.wiki_url]/index.php/Blob)") diff --git a/code/modules/events/spider_terror.dm b/code/modules/events/spider_terror.dm index 0ee1a3ef52c..09e4783ecc0 100644 --- a/code/modules/events/spider_terror.dm +++ b/code/modules/events/spider_terror.dm @@ -1,4 +1,9 @@ #define TS_HIGHPOP_TRIGGER 80 +#define GREEN_SPIDER 1 +#define PRINCE_SPIDER 2 +#define WHITE_SPIDER 3 +#define PRINCESS_SPIDER 4 +#define QUEEN_SPIDER 5 /datum/event/spider_terror announceWhen = 240 @@ -23,27 +28,27 @@ var/spider_type var/infestation_type if((length(GLOB.clients)) < TS_HIGHPOP_TRIGGER) - infestation_type = pick(1, 2, 3, 4) + infestation_type = pick(GREEN_SPIDER, PRINCE_SPIDER, WHITE_SPIDER, PRINCESS_SPIDER) else - infestation_type = pick(2, 3, 4, 5) + infestation_type = pick(PRINCE_SPIDER, WHITE_SPIDER, PRINCESS_SPIDER, QUEEN_SPIDER) switch(infestation_type) - if(1) + if(GREEN_SPIDER) // Weakest, only used during lowpop. spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/green spawncount = 5 - if(2) + if(PRINCE_SPIDER) // Fairly weak. Dangerous in single combat but has little staying power. Always gets whittled down. spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/prince spawncount = 1 - if(3) + if(WHITE_SPIDER) // Variable. Depends how many they infect. spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/white spawncount = 2 - if(4) + if(PRINCESS_SPIDER) // Pretty strong. spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/queen/princess spawncount = 3 - if(5) + if(QUEEN_SPIDER) // Strongest, only used during highpop. spider_type = /mob/living/simple_animal/hostile/poison/terror_spider/queen spawncount = 1 @@ -59,9 +64,17 @@ var/mob/living/simple_animal/hostile/poison/terror_spider/S = new spider_type(vent.loc) var/mob/M = pick_n_take(candidates) S.key = M.key + if(infestation_type != PRINCE_SPIDER) + S.forceMove(vent) + S.add_ventcrawl(vent) SEND_SOUND(S, sound('sound/ambience/antag/terrorspider.ogg')) to_chat(S, "For more information, check the wiki page: ([GLOB.configuration.url.wiki_url]/index.php/Terror_Spider)") spawncount-- successSpawn = TRUE #undef TS_HIGHPOP_TRIGGER +#undef GREEN_SPIDER +#undef PRINCE_SPIDER +#undef WHITE_SPIDER +#undef PRINCESS_SPIDER +#undef QUEEN_SPIDER