diff --git a/code/modules/events/event_container.dm b/code/modules/events/event_container.dm index 96a271db644..45bf962178b 100644 --- a/code/modules/events/event_container.dm +++ b/code/modules/events/event_container.dm @@ -140,7 +140,7 @@ var/list/event_last_fired = list() new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Sentience", /datum/event/sentience, 50), new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Wallrot", /datum/event/wallrot, 0, list(ASSIGNMENT_ENGINEER = 30, ASSIGNMENT_GARDENER = 50)), new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Aurora Caelus", /datum/event/aurora_caelus, 15, is_one_shot = TRUE), - new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Koi School", /datum/event/koi_migration, 200,) + new /datum/event_meta(EVENT_LEVEL_MUNDANE, "Koi School", /datum/event/koi_migration, 80,) ) /datum/event_container/moderate diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm index 4422c695196..28a8826362f 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm @@ -32,18 +32,15 @@ /mob/living/simple_animal/hostile/retaliate/carp/koi name = "space koi" - desc = "a gentle space faring koi." + desc = "A gentle space-faring koi." icon = 'icons/obj/fish_items.dmi' icon_state = "koi1" icon_living = "koi1" icon_dead = "koi1-dead" - icon_gib = "carp_gib" harm_intent_damage = 1 melee_damage_lower = 2 melee_damage_upper = 2 - attacktext = "bites" - attack_sound = 'sound/weapons/bite.ogg' speak_emote = list("blurps") butcher_results = null @@ -51,19 +48,17 @@ minbodytemp = 0 maxbodytemp = 1500 - faction = list("carp") - flying = 1 - gold_core_spawnable = CHEM_MOB_SPAWN_FRIENDLY + gold_core_spawnable = CHEM_MOB_SPAWN_HOSTILE /mob/living/simple_animal/hostile/retaliate/carp/koi/New() ..() - var/koinum = rand(1,4) + var/koinum = rand(1, 4) + if(prob(1)) + koinum = 5 icon_state = "koi[koinum]" icon_living = "koi[koinum]" icon_dead = "koi[koinum]-dead" - if(prob(1)) - icon_state = "koi5" -/mob/living/simple_animal/hostile/retaliate/carp/koi/Process_Spacemove(var/movement_dir = 0) - return 1 \ No newline at end of file +/mob/living/simple_animal/hostile/retaliate/carp/koi/Process_Spacemove(var/movement_dir) + return TRUE \ No newline at end of file