diff --git a/modular_chomp/code/modules/blob2/agate_blob.dm b/modular_chomp/code/modules/blob2/agate_blob.dm index 8b78a5af43..6edfcc63c4 100644 --- a/modular_chomp/code/modules/blob2/agate_blob.dm +++ b/modular_chomp/code/modules/blob2/agate_blob.dm @@ -33,7 +33,7 @@ ranged_spores = TRUE spore_range = 7 - spore_projectile = /obj/item/projectile/energy/eclipse/tyrjavelin + spore_projectile = /obj/item/projectile/energy/eclipse_boss/tyrjavelin spore_type = /mob/living/simple_mob/blob/spore/infesting diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/hivebot.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/hivebot.dm index 199e9c77f7..1efdcb70e9 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/hivebot.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/hivebot.dm @@ -12,7 +12,7 @@ ai_holder_type = /datum/ai_holder/simple_mob/intentional/three_phases/no_movement anchored = 1 armor = list(melee = 40, bullet = 40, laser = 40, energy = 40, bomb = 50, bio = 100, rad = 100) - projectiletype = /obj/item/projectile/energy/eclipse/tyrjavelin + projectiletype = /obj/item/projectile/energy/eclipse_boss/tyrjavelin loot_list = list(/obj/item/tool/wirecutters/hybrid/alien = 10, /obj/item/tool/wrench/hybrid/alien = 10, /obj/item/tool/crowbar/hybrid/alien = 10, @@ -44,7 +44,7 @@ addtimer(CALLBACK(src, PROC_REF(dual_spin), A, 3, 7), 1 SECOND, TIMER_DELETE_ME) attackcycle = 0 if(3) - specialattackprojectile = /obj/item/projectile/energy/eclipse/tyrjavelin + specialattackprojectile = /obj/item/projectile/energy/eclipse_boss/tyrjavelin addtimer(CALLBACK(src, PROC_REF(quad_random_firing), A, 12, 1, 0.5 SECONDS), 1 SECOND, TIMER_DELETE_ME) attackcycle = 0 diff --git a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/tyrian.dm b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/tyrian.dm index cef996c8d8..1c73c0d5f9 100644 --- a/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/tyrian.dm +++ b/modular_chomp/code/modules/mob/living/simple_mob/subtypes/bullet_heck/tyrian.dm @@ -95,7 +95,7 @@ /mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/sonic_boss name = "experiment 10" desc = "A strange furball, the air vibrating around it." - specialattackprojectile = /obj/item/projectile/energy/eclipse/tyrjavelin + specialattackprojectile = /obj/item/projectile/energy/eclipse_boss/tyrjavelin icon_state = "sonic_boss" icon_living = "sonic_boss" projectiletype = /obj/item/projectile/knockback/slow @@ -134,12 +134,12 @@ /mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/shield_boss name = "experiment 15" desc = "A strange furball gaurded by a transparent barrier." - specialattackprojectile = /obj/item/projectile/energy/eclipse/tyrjavelin + specialattackprojectile = /obj/item/projectile/energy/eclipse_boss/tyrjavelin health = 700 maxHealth = 700 //shield mechanic icon_state = "UPshield_boss" icon_living = "UPshield_boss" - projectiletype = /obj/item/projectile/energy/eclipse/tyrjavelin + projectiletype = /obj/item/projectile/energy/eclipse_boss/tyrjavelin wreckage = /obj/item/prop/tyrlore/shield_boss var/fullshield = 300 var/shieldrage = 300 @@ -234,7 +234,7 @@ icon_state = "naga_boss" icon_living = "naga_boss" wreckage = /obj/item/prop/tyrlore/gravity_boss - specialattackprojectile = /obj/item/projectile/energy/eclipse/tyrjavelin + specialattackprojectile = /obj/item/projectile/energy/eclipse_boss/tyrjavelin /mob/living/simple_mob/mechanical/mecha/eclipse/tankyboss/naga_boss/do_special_attack(atom/A) rng_cycle = rand(1,3) diff --git a/modular_chomp/code/modules/projectiles/precursor/tyr.dm b/modular_chomp/code/modules/projectiles/precursor/tyr.dm index 8448ab85fb..11693bdf81 100644 --- a/modular_chomp/code/modules/projectiles/precursor/tyr.dm +++ b/modular_chomp/code/modules/projectiles/precursor/tyr.dm @@ -99,7 +99,7 @@ speed = 15 range = 20 -/obj/item/projectile/energy/eclipse/tyrjavelin //Five hits ought to end you +/obj/item/projectile/energy/eclipse_boss/tyrjavelin //Five hits ought to end you name = "energy javelin" icon_state = "javelin" damage_type = SEARING @@ -111,10 +111,10 @@ modifier_type_to_apply = /datum/modifier/deep_wounds //reduced healing modifier_duration = 1 MINUTE -/obj/item/projectile/energy/eclipse/tyrjavelin/speed +/obj/item/projectile/energy/eclipse_boss/tyrjavelin/speed speed = 7 -/obj/item/projectile/energy/eclipse/tyrjavelin/super_slow +/obj/item/projectile/energy/eclipse_boss/tyrjavelin/super_slow speed = 15 damage = 30