diff --git a/modular_chomp/code/modules/exploration/bossloots.dm b/modular_chomp/code/modules/exploration/bossloots.dm index 0341465455..25d51ca5f7 100644 --- a/modular_chomp/code/modules/exploration/bossloots.dm +++ b/modular_chomp/code/modules/exploration/bossloots.dm @@ -48,8 +48,8 @@ defend_chance = 20 icon = 'modular_chomp/icons/mob/tribal_gear.dmi' - icon_state = "topshield" - item_state = "topshield" + icon_state = "sabre" + item_state = "sabre" item_icons = list( slot_l_hand_str = 'modular_chomp/icons/obj/guns/precursor/lefthand.dmi', 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 669f26866f..7a55b6477c 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 @@ -23,6 +23,12 @@ /mob/living/simple_mob/mechanical/mecha/eclipse/do_special_attack(atom/A) bullet_heck(A, 3, 3) +/mob/living/simple_mob/mechanical/mecha/eclipse/bullet_act(obj/item/projectile/P) //removal of E net cheese + if(P == /obj/item/projectile/beam/energy_net) + return + else + ..() + /datum/ai_holder/simple_mob/intentional/three_phases use_astar = TRUE wander = FALSE @@ -705,14 +711,14 @@ name = "experiment 7" desc = "A strange furball gaurded by a transparent barrier." specialattackprojectile = /obj/item/projectile/energy/eclipse/tyrjavelin - health = 400 - maxHealth = 400 //shield mechanic + health = 450 + maxHealth = 450 //shield mechanic icon_state = "UPshield_boss" icon_living = "UPshield_boss" projectiletype = /obj/item/projectile/energy/eclipse/tyrjavelin wreckage = /obj/item/prop/tyrlore/basicshield - var/fullshield = 300 - var/shieldrage = 3 + var/fullshield = 200 + var/shieldrage = 200 /mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/chamberc/load_default_bellies() . = ..() @@ -729,7 +735,7 @@ if(fullshield > 0) fullshield -= P.damage if(P == /obj/item/projectile/ion) - fullshield = 0 + fullshield -= 300 visible_message(span_boldwarning(span_orange("[P] breaks the shield!!."))) icon_state = "shield_boss" if(fullshield > 0) @@ -739,10 +745,10 @@ icon_state = "shield_boss" else ..() - shieldrage-- - if(shieldrage == 0) - shieldrage = 3 - fullshield = 300 + shieldrage -= P.damage + if(shieldrage > 0) + shieldrage = 200 + fullshield = 200 visible_message(span_boldwarning(span_orange("The shield reactivates!!."))) icon_state = "UPshield_boss" diff --git a/modular_chomp/code/modules/research/tg/designs/tyrstuff.dm b/modular_chomp/code/modules/research/tg/designs/tyrstuff.dm index 94b7adc202..a56070202f 100644 --- a/modular_chomp/code/modules/research/tg/designs/tyrstuff.dm +++ b/modular_chomp/code/modules/research/tg/designs/tyrstuff.dm @@ -36,7 +36,7 @@ name = "Magnet Belt" id = "magnet_belt" build_type = PROTOLATHE - materials = list(MAT_BRONZE = 12000,MAT_DIAMOND = 700,MAT_COPPER = 3000,MAT_METALHYDROGEN = 1000,MAT_QUARTZ = 5000,MAT_WEATHERED_AGATE = 8000) + materials = list(MAT_BRONZE = 12000,MAT_DIAMOND = 700,MAT_COPPER = 3000,MAT_METALHYDROGEN = 1000,MAT_QUARTZ = 5000,MAT_EAGATE = 8000) build_path = /obj/item/personal_shield_generator/belt/magnetbelt category = list( RND_CATEGORY_EQUIPMENT @@ -47,7 +47,7 @@ name = "Tyrian Energy Blade" id = "tyr_sabre" build_type = PROTOLATHE - materials = list(MAT_BRONZE = 10000,MAT_DIAMOND = 6000,MAT_COPPER = 8000,MAT_METALHYDROGEN = 2000,MAT_QUARTZ = 2000,MAT_WEATHERED_AGATE = 6000) + materials = list(MAT_BRONZE = 10000,MAT_DIAMOND = 6000,MAT_COPPER = 8000,MAT_METALHYDROGEN = 2000,MAT_QUARTZ = 2000,MAT_EAGATE = 6000) build_path = /obj/item/melee/energy/tyr_sabre category = list( RND_CATEGORY_EQUIPMENT @@ -58,7 +58,7 @@ name = "Tyrian Barrier Bubble" id = "tyr_barrier" build_type = PROTOLATHE - materials = list(MAT_BRONZE = 20000,MAT_DIAMOND = 15000,MAT_COPPER = 15000,MAT_METALHYDROGEN = 20000,MAT_QUARTZ = 50000,MAT_WEATHERED_AGATE = 60000) + materials = list(MAT_BRONZE = 20000,MAT_DIAMOND = 15000,MAT_COPPER = 15000,MAT_METALHYDROGEN = 20000,MAT_QUARTZ = 50000,MAT_EAGATE = 60000) build_path = /obj/item/shield_projector/rectangle/automatic/tyrbarrier category = list( RND_CATEGORY_EQUIPMENT