diff --git a/maps/submaps/surface_submaps/valley/hydroxeno.dmm b/maps/submaps/surface_submaps/valley/hydroxeno.dmm index 4087442636..e49ee6f81c 100644 --- a/maps/submaps/surface_submaps/valley/hydroxeno.dmm +++ b/maps/submaps/surface_submaps/valley/hydroxeno.dmm @@ -8,10 +8,6 @@ }, /turf/simulated/floor/outdoors/rocks/caves, /area/submap/hydroxeno) -"c" = ( -/obj/effect/alien/weeds/node, -/turf/simulated/floor/outdoors/rocks/caves, -/area/submap/hydroxeno) "d" = ( /obj/effect/alien/weeds, /obj/structure/bed/nest, @@ -71,7 +67,7 @@ }, /area/submap/hydroxeno) "n" = ( -/obj/effect/alien/weeds/node, +/obj/effect/alien/weeds, /obj/structure/closet/secure_closet/egg/xenomorph, /obj/item/organ/internal/lungs/replicant/mending, /obj/item/stolenpackage, @@ -350,7 +346,7 @@ a a a a -c +J J J u @@ -1293,7 +1289,7 @@ I I j J -c +J a a a diff --git a/maps/submaps/surface_submaps/valley/mouseattack.dmm b/maps/submaps/surface_submaps/valley/mouseattack.dmm index 05a5775bfb..550e13b4a3 100644 --- a/maps/submaps/surface_submaps/valley/mouseattack.dmm +++ b/maps/submaps/surface_submaps/valley/mouseattack.dmm @@ -27,10 +27,6 @@ /mob/living/simple_mob/mechanical/mecha/mouse_tank/livewire/manned, /turf/simulated/floor/tiled/dark, /area/submap/mouseattack) -"m" = ( -/mob/living/simple_mob/animal/space/mouse_army/stealth, -/turf/simulated/floor/tiled/yellow, -/area/submap/mouseattack) "o" = ( /obj/structure/table/rack, /obj/item/weapon/archaeological_find, @@ -227,7 +223,7 @@ s j c c -m +H c c c @@ -668,7 +664,7 @@ j c c c -m +u c c t diff --git a/maps/submaps/surface_submaps/valley/mousehq.dmm b/maps/submaps/surface_submaps/valley/mousehq.dmm index e606cdca30..52994f0d2a 100644 --- a/maps/submaps/surface_submaps/valley/mousehq.dmm +++ b/maps/submaps/surface_submaps/valley/mousehq.dmm @@ -339,11 +339,11 @@ V O O j -L +f p y p -L +f z O O @@ -466,7 +466,7 @@ V V O O -S +Y O x y @@ -544,7 +544,7 @@ p y p y -S +Y O u y @@ -650,7 +650,7 @@ p y p y -S +H O O V @@ -749,7 +749,7 @@ y p y D -L +f W O V @@ -848,7 +848,7 @@ u y p M -S +H O O V @@ -968,7 +968,7 @@ K K O y -S +H y p y @@ -1001,7 +1001,7 @@ K K O p -L +w p y p @@ -1071,7 +1071,7 @@ m Y y p -L +m x O O @@ -1135,7 +1135,7 @@ O p w H -L +m x O O 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 6d2082e5bf..2add800905 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 @@ -104,17 +104,17 @@ //////////////////////////////// /datum/ai_holder/simple_mob/merc/eclipse threaten = FALSE - vision_range = 8 + vision_range = 7 /datum/ai_holder/simple_mob/merc/eclipse/hunter - vision_range = 10 + vision_range = 7 /datum/ai_holder/simple_mob/merc/eclipse/ranged pointblank = TRUE // They get close? Just shoot 'em! firing_lanes = TRUE // But not your buddies! /datum/ai_holder/simple_mob/merc/eclipse/ranged/sniper - vision_range = 15 // We're a person with a long-ranged gun. + vision_range = 12 // We're a person with a long-ranged gun. /datum/ai_holder/simple_mob/merc/eclipse/ranged/sniper/max_range(atom/movable/AM) return holder.ICheckRangedAttack(AM) ? 16 : 1 @@ -125,13 +125,13 @@ name = "Solar Eclipse Initiate" desc = "A silver cladded, dangerous looking indivual." - armor = list(melee = 50, bullet = 50, laser = 95, energy = 95, bomb = 50, bio = 100, rad = 100) //Solar members are nigh immune to burns. + armor = list(melee = 30, bullet = 30, 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 name = "Solar Eclipse Tesla Serpent" - health = 125 - maxHealth = 125 + health = 100 + maxHealth = 100 icon_state = "eclipse_tesla" icon_living = "eclipse_tesla" reload_max = 5 @@ -140,8 +140,8 @@ /mob/living/simple_mob/humanoid/eclipse/solar/firemoff name = "Solar Eclipse Inferno Moth" - health = 90 - maxHealth = 90 + health = 75 + maxHealth = 75 icon_state = "eclipse_moth" icon_living = "eclipse_moth" reload_max = 10 @@ -197,8 +197,8 @@ /mob/living/simple_mob/humanoid/eclipse/solar/snipertesh name = "Solar Eclipse Sniper" - health = 75 - maxHealth = 75 + health = 50 + maxHealth = 50 movement_cooldown = 1 icon_state = "eclipse_snipertesh" @@ -208,12 +208,12 @@ projectile_accuracy = 75 - reload_max = 5 - reload_time = 2.0 SECONDS + reload_max = 1 + reload_time = 1.5 SECONDS ai_holder_type = /datum/ai_holder/simple_mob/merc/eclipse/ranged/sniper - ranged_attack_delay = 0.5 SECONDS + ranged_attack_delay = 1.5 SECONDS /mob/living/simple_mob/humanoid/eclipse/solar/snipertesh/ranged_pre_animation(atom/A) Beam(get_turf(A), icon_state = "sniper_beam", time = 1 SECONDS, maxdistance = 15) @@ -279,14 +279,14 @@ name = "Lunar Eclipse Initiate" desc = "A silver cladded, dangerous looking indivual." - armor = list(melee = 95, bullet = 95, laser = 50, energy = 50, bomb = 50, bio = 100, rad = 100) //Lunar members are nigh immune to burns. - armor_soak = list(melee = 15, bullet = 5, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0) //15 because every melee weapon has dumb amount of AP + armor = list(melee = 95, bullet = 95, laser = 30, energy = 30, 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 name = "Lunar Eclipse Silver Serpent" - health = 125 - maxHealth = 125 - reload_max = 15 + health = 100 + maxHealth = 100 + reload_max = 6 icon_state = "eclipse_silver" icon_living = "eclipse_silver" @@ -318,8 +318,8 @@ /mob/living/simple_mob/humanoid/eclipse/lunar/shotgunner //wuff with shotgun name = "Lunar Eclipse Shotgunner" - health = 90 - maxHealth = 90 + health = 75 + maxHealth = 75 reload_max = 2 icon_state = "eclipse_shotwuff" @@ -331,8 +331,8 @@ /mob/living/simple_mob/humanoid/eclipse/lunar/bulletstorm //tesh got a gun name = "Lunar Eclipse Judge" - health = 75 - maxHealth = 75 + health = 50 + maxHealth = 50 icon_state = "eclipse_shottesh" icon_living = "eclipse_shottesh" @@ -346,8 +346,8 @@ /mob/living/simple_mob/humanoid/eclipse/lunar/ravanger //Tanky boi. Very deadly melee name = "Lunar Eclipse Ravanger" - health = 150 - maxHealth = 150 + health = 125 + maxHealth = 125 icon_state = "eclipse_ravanger" icon_living = "eclipse_ravanger" @@ -366,7 +366,6 @@ /obj/item/projectile/energy/blob/moth - splatter = TRUE damage = 20 armor_penetration = 25 my_chems = list("fuel") @@ -392,6 +391,7 @@ /obj/item/projectile/beam/sniper/eclipse armor_penetration = 50 + damage = 30 /obj/item/projectile/energy/declone/burn damage = 20 @@ -405,8 +405,8 @@ /mob/living/simple_mob/humanoid/eclipse/solar/hellhound name = "Solar Eclipse Hound" - health = 200 - maxHealth = 200 + health = 150 + maxHealth = 150 ai_holder_type = /datum/ai_holder/simple_mob/intentional/adv_dark_gygax projectiletype = /obj/item/projectile/energy/flash movement_cooldown = 1 @@ -424,12 +424,12 @@ /mob/living/simple_mob/humanoid/eclipse/lunar/wheel name = "Lunar Eclipse Wheel" - health = 200 - maxHealth = 200 + health = 150 + maxHealth = 150 melee_damage_lower = 15 melee_damage_upper = 25 attack_armor_pen = 50 - reload_max = 3 + reload_max = 1 icon_state = "eclipse_wheel" icon_living = "eclipse_wheel" ai_holder_type = /datum/ai_holder/simple_mob/intentional/adv_dark_gygax