From c35e308491abcaaecdab96152672a183ecce23d8 Mon Sep 17 00:00:00 2001 From: Fluff Date: Sat, 8 Apr 2023 21:37:49 -0400 Subject: [PATCH] Eclipsed Nerf Nerfed the eclipse --- .../valley/eclipsedigsight.dmm | 90 +++++++++---------- .../subtypes/humanoid/eclipse/eclipse.dm | 24 ++--- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/maps/submaps/surface_submaps/valley/eclipsedigsight.dmm b/maps/submaps/surface_submaps/valley/eclipsedigsight.dmm index 004a7dece5..2a23a435ff 100644 --- a/maps/submaps/surface_submaps/valley/eclipsedigsight.dmm +++ b/maps/submaps/surface_submaps/valley/eclipsedigsight.dmm @@ -892,20 +892,20 @@ pW pW pW pW +mm +mm +mm +mm +mm +mm +mm +mm +mm +mm +mm +mm +mm pW -mm -mm -mm -mm -mm -mm -mm -mm -mm -mm -mm -mm -mm fF hU hU @@ -934,7 +934,6 @@ pW pW pW PW -pW mm Oy sH @@ -948,6 +947,7 @@ Zv IA sE mm +pW fF hU hU @@ -976,7 +976,6 @@ pW pW pW pW -pW es sH sH @@ -990,6 +989,7 @@ sH sH ZT mm +pW fF hU hU @@ -1018,7 +1018,6 @@ pW Dp pW pW -pW es sH sH @@ -1032,6 +1031,7 @@ sH sH sH mm +pW fF hU hU @@ -1060,7 +1060,6 @@ pW pW pW pW -pW mm Wc sH @@ -1074,6 +1073,7 @@ sH sH sH mm +pW fF hU hU @@ -1102,20 +1102,20 @@ pW pW pW Un +mm +mm +mm +mm +mm +mm +mm +mm +mm +sH +sH +sH +mm pW -mm -mm -mm -mm -mm -mm -mm -mm -mm -sH -sH -sH -mm fF hU hU @@ -1152,12 +1152,12 @@ pW pW pW pW -pW mm ly xF lk mm +pW fF hU hU @@ -1194,12 +1194,12 @@ pW pW pW pW +mm +sH +sH +sH +mm pW -mm -sH -sH -sH -mm fF hU hU @@ -1236,12 +1236,12 @@ pW pW pW pW -pW mm uQ JI eW mm +pW fF hU hU @@ -1278,12 +1278,12 @@ pW pW pW pW -pW mm Vh DV FQ mm +pW fF hU hU @@ -1320,12 +1320,12 @@ XC pW pW pW -pW mm Ma gt FE mm +pW fF hU hU @@ -1362,12 +1362,12 @@ pW pW pW pW -pW mm Td Vl bc mm +pW fF hU hU @@ -1404,12 +1404,12 @@ pW pW pW pW +mm +mm +mm +mm +mm pW -mm -mm -mm -mm -mm fF hU hU diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm index a0754db8b4..2ebb2cf9f4 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm @@ -123,9 +123,9 @@ //The solar part of the faction, highly resistant to burns and stuff /mob/living/simple_mob/humanoid/eclipse/solar name = "Solar Eclipse Initiate" - desc = "A silver cladded, dangerous looking indivual." + desc = "A dangerous indivual, a gleaming orange shield surronding them." - armor = list(melee = 30, bullet = 30, laser = 95, energy = 95, bomb = 50, bio = 100, rad = 100) //Solar members are nigh immune to burns. + armor = list(melee = 20, bullet = 20, laser = 95, energy = 95, bomb = 50, bio = 100, rad = 100) //Solar members are nigh immune to burns. armor_soak = list(melee = 0, bullet = 0, laser = 5, energy = 5, bomb = 0, bio = 0, rad = 0) /mob/living/simple_mob/humanoid/eclipse/solar/teslanoodle @@ -278,9 +278,9 @@ //The lunar mobs, highly resistant to brute based damage. /mob/living/simple_mob/humanoid/eclipse/lunar name = "Lunar Eclipse Initiate" - desc = "A silver cladded, dangerous looking indivual." + desc = "A dangerous indivual, a gleaming red shield surronding them." - armor = list(melee = 95, bullet = 95, laser = 30, energy = 30, bomb = 50, bio = 100, rad = 100) //Lunar members are nigh immune to burns. + armor = list(melee = 95, bullet = 95, laser = 20, energy = 20, bomb = 50, bio = 100, rad = 100) //Lunar members are nigh immune to burns. armor_soak = list(melee = 5, bullet = 5, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) //15 because every melee weapon has dumb amount of AP /mob/living/simple_mob/humanoid/eclipse/lunar/silvernoodle //Bouncing bullet extreme @@ -422,12 +422,12 @@ icon_living = "eclipse_hound" size_multiplier = 1.25 var/poison_chance = 100 - var/poison_per_bite = 8 + var/poison_per_bite = 4 var/poison_type = "stoxin" /mob/living/simple_mob/humanoid/eclipse/lunar/wheel - name = "Lunar Eclipse Wheel" + name = "Lunar Eclipse Armadillo" health = 150 maxHealth = 150 melee_damage_lower = 15 @@ -440,7 +440,7 @@ projectiletype = /obj/item/projectile/beam/energy_net movement_cooldown = -0.5 - var/cloaked_alpha = 50 // Lower = Harder to see. + var/cloaked_alpha = 60 // Lower = Harder to see. var/cloak_cooldown = 5 SECONDS // Amount of time needed to re-cloak after losing it. var/last_uncloak = 0 // world.time @@ -546,18 +546,18 @@ name = "Lunar Eclipse Pummeler" projectiletype = /obj/item/projectile/bullet/shotgun/ion/eclipse ai_holder_type = /datum/ai_holder/simple_mob/intentional/adv_dark_gygax - melee_damage_lower = 20 - melee_damage_upper = 40 + melee_damage_lower = 10 + melee_damage_upper = 30 attack_armor_pen = 30 - movement_cooldown = -0.5 + movement_cooldown = 0 icon_state = "eclipse_pummler" icon_living = "eclipse_pummler" reload_max = 5 size_multiplier = 1.5 var/poison_per_bite = 5 var/poison_type = "shredding_nanites" - var/poison_chance = 50 - var/shock_chance = 30 + var/poison_chance = 10 + var/shock_chance = 60 base_attack_cooldown = 6 /mob/living/simple_mob/humanoid/eclipse/lunar/pummler/apply_melee_effects(var/atom/A)