diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/tyr/ants.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/tyr/ants.dm index f718a4f7e9..36506b2deb 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/tyr/ants.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/tyr/ants.dm @@ -402,14 +402,14 @@ ANT STRUCTURES /mob/living/simple_mob/animal/tyr/mineral_ants/verdantium, /mob/living/simple_mob/animal/tyr/mineral_ants/tritium, /mob/living/simple_mob/animal/tyr/mineral_ants/uranium) - faction = FACTION_TYR + faction = FACTION_TYR_ANT /obj/effect/ant_structure/webbarrier name = "weblike barrier" icon_state = "web" /obj/effect/ant_structure/webbarrier/CanPass(atom/movable/mover, turf/target) - if(istype(mover, /mob/living/simple_mob/animal/giant_spider)) + if(istype(mover, /mob/living/simple_mob/animal/tyr/mineral_ants)) return TRUE else if(istype(mover, /mob/living)) if(prob(80)) diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/bhattacks.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/bhattacks.dm index 9550bb21b8..fe58352c21 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/bhattacks.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/bhattacks.dm @@ -645,6 +645,14 @@ bullet_heck(target, -2, 4) bullet_heck(target, -3, 4) bullet_heck(target, -4, 4) + bullet_heck(target, -4, 3) + bullet_heck(target, -4, 2) + bullet_heck(target, -4, 1) + bullet_heck(target, -4, 0) + bullet_heck(target, -4, -1) + bullet_heck(target, -4, -2) + bullet_heck(target, -4, -3) + bullet_heck(target, -4, -4) /mob/living/simple_mob/mechanical/mecha/eclipse/proc/checker_board(atom/target, var/next_cycle) bullet_heck(target, -1, 1) diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/heads.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/heads.dm index b29f85e650..bc10cc7bac 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/heads.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/heads.dm @@ -295,11 +295,11 @@ var/deathdir = rand(1,3) switch(deathdir) if(1) - new /mob/living/simple_mob/mechanical/mining_drone/scavenger/eclipse (src.loc) + new /mob/living/simple_mob/mechanical/mining_drone/scavenger/eclipse(src.loc) if(2) - new /mob/living/simple_mob/mechanical/hivebot/swarm/eclipse (src.loc) + new /mob/living/simple_mob/mechanical/hivebot/swarm/eclipse(src.loc) if(3) - new /mob/living/simple_mob/mechanical/combat_drone/artillery + new /mob/living/simple_mob/mechanical/combat_drone/artillery(src.loc) amount-- if(amount > 0) addtimer(CALLBACK(src, PROC_REF(summon_drones), target, amount, fire_delay), fire_delay, TIMER_DELETE_ME) diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/mechas.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/mechas.dm index 72897863eb..b6d1edb9d5 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/mechas.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/mechas.dm @@ -53,6 +53,8 @@ //This one however, is the simplest one, more meant as an intro /mob/living/simple_mob/mechanical/mecha/eclipse/antipersonal_unit //Melts folks with lasers name = "Eclipse Expirmental Anti-Infantary Unit" + health = 400 + maxHealth = 400 specialattackprojectile = /obj/item/projectile/energy/eclipse/lorge armor = list(melee = 60, bullet = 60, laser = 60, energy = 60, bomb = 90, bio = 100, rad = 100) icon_state = "orb" @@ -435,7 +437,6 @@ wreckage = /obj/item/melee/energy/sword/top_shield specialattackprojectile = /obj/item/projectile/energy/eclipse/chillingwind desc = "It appears to be spinning at rapid speeds; enough to deflect projectiles. The air around it feels frigid.." - artidrop = /obj/item/material/barbedwire/vopal/active /mob/living/simple_mob/mechanical/mecha/eclipse/battle_top/do_special_attack(atom/A) var/rng_cycle diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/orginalAlts.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/orginalAlts.dm index e04211f26a..4f52c3a213 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/orginalAlts.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/orginalAlts.dm @@ -70,7 +70,7 @@ /mob/living/simple_mob/mechanical/mecha/eclipse/hivebot/tyr/proc/summon_janitor(atom/target, var/amount, var/next_cycle) if(!target) return - new /mob/living/simple_mob/mechanical/hivebot/tyr + new /mob/living/simple_mob/mechanical/hivebot/tyr(src.loc) amount-- if(amount > 0) addtimer(CALLBACK(src, PROC_REF(summon_janitor), target, amount, next_cycle), 0.5 SECONDS, TIMER_DELETE_ME)