diff --git a/code/modules/mob/living/simple_animal/hostile/cavern_geist.dm b/code/modules/mob/living/simple_animal/hostile/cavern_geist.dm index 022a0d41b94..9a40c34199c 100644 --- a/code/modules/mob/living/simple_animal/hostile/cavern_geist.dm +++ b/code/modules/mob/living/simple_animal/hostile/cavern_geist.dm @@ -22,9 +22,10 @@ maxHealth = 500 health = 500 harm_intent_damage = 0 - melee_damage_lower = 35 - melee_damage_upper = 35 - resist_mod = 3 + melee_damage_lower = 40 + melee_damage_upper = 40 + armor_penetration = 20 + resist_mod = 15 mob_size = 25 environment_smash = 2 attacktext = "mangled" @@ -41,6 +42,10 @@ ..() anchored = TRUE +/mob/living/simple_animal/hostile/cavern_geist/Life() + ..() + adjustBruteLoss(-5) + /mob/living/simple_animal/hostile/cavern_geist/verb/devour(mob/living/target as mob in oview()) set category = "Cavern Geist" set name = "Devour" @@ -90,4 +95,18 @@ updatehealth() last_special = world.time + 100 is_devouring = FALSE - return \ No newline at end of file + return + +/mob/living/simple_animal/hostile/cavern_geist/augmented + name = "cybernetic cavern geist" + desc = "A cavern geist augmented with Hadiist technology. A Tajara-made horror beyond one's comprehension." + icon_state = "cybergeist" + icon_living = "cybergeist" + icon_dead = "cybergeist_dead" + maxHealth = 700 + health = 700 + speed = -2 + + melee_damage_lower = 50 + melee_damage_upper = 50 + armor_penetration = 40 \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index f95f9bb1192..e6f49cba167 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1181,7 +1181,10 @@ /mob/living/simple_animal/hostile/republicon/ranged, /mob/living/simple_animal/hostile/spider_queen, /mob/living/simple_animal/hostile/tree, - /mob/living/simple_animal/hostile/mimic + /mob/living/simple_animal/hostile/mimic, + /mob/living/simple_animal/hostile/cavern_geist, + /mob/living/simple_animal/hostile/cavern_geist/augmented, + /mob/living/simple_animal/hostile/retaliate/pra_exploration_drone ) //exclusion list for things you don't want the reaction to create. var/list/critters = typesof(/mob/living/simple_animal/hostile) - blocked // list of possible hostile mobs diff --git a/html/changelogs/alberyk-geist.yml b/html/changelogs/alberyk-geist.yml new file mode 100644 index 00000000000..7074fbd82d6 --- /dev/null +++ b/html/changelogs/alberyk-geist.yml @@ -0,0 +1,8 @@ +author: Alberyk, Happy_Fox + +delete-after: True + +changes: + - tweak: "Buffed the cavern geist with some minor damage regeneration, health and damage." + - rscadd: "Added a stronger version of the cavern geist." + - tweak: "Removed the geist and the pra exploration drone from the gold slime spawning list." diff --git a/icons/mob/npc/cavern_geist.dmi b/icons/mob/npc/cavern_geist.dmi index 6b0e079d2dd..a69c8abae69 100644 Binary files a/icons/mob/npc/cavern_geist.dmi and b/icons/mob/npc/cavern_geist.dmi differ