Eclipse Minor Stuff (#7199)

modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/imperion.dm

@@ -130,7 +130,7 @@
 
 /mob/living/simple_mob/mechanical/mecha/imperion/phase2 //Boss uses crowd control.
 	movement_cooldown = -1
-	projectiletype = /obj/item/projectile/bola
+	projectiletype = /obj/item/projectile/mobbola
 	melee_attack_delay = 4 SECOND
 	alpha = 215
 

modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm

@@ -145,6 +145,12 @@
 	armor = list(melee = -20, bullet = -20, laser = 85, energy = 85, bomb = 50, bio = 100, rad = 100) //Solar members are nigh immune to burns.
 	armor_soak = list(melee = 0, bullet = 0, laser = 15, energy = 15, bomb = 0, bio = 0, rad = 0)
 
+/mob/living/simple_mob/humanoid/eclipse/solar/bullet_act(obj/item/projectile/P)
+	if(istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam))
+		visible_message("<font color='orange'><B>[P] seems ineffective!.</B></font>")
+	else
+		..()
+
 /mob/living/simple_mob/humanoid/eclipse/solar/teslanoodle
 	name = "Solar Eclipse Tesla Serpent"
 	desc = "A naga cladded in strange orange armor, seemingly guarded from lasers and energy based weaponry."
@@ -255,7 +261,7 @@
 	icon_living = "eclipse_rad"
 
 	projectiletype = /obj/item/projectile/energy/declone/burn
-	var/rads = 25
+	var/rads = 5
 
 /mob/living/simple_mob/humanoid/eclipse/solar/radiation/handle_special()
 	if(stat != DEAD)
@@ -274,6 +280,15 @@
 	armor = list(melee = 85, bullet = 85, laser = -20, energy = -20, bomb = 50, bio = 100, rad = 100) //Lunar members are nigh immune to burns.
 	armor_soak = list(melee = 15, bullet = 15, 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/bullet_act(obj/item/projectile/P)
+	if(istype(P, /obj/item/projectile/bullet))
+		visible_message("<font color='orange'><B>[P] seems ineffective!.</B></font>")
+	else
+		..()
+
+/mob/living/simple_mob/humanoid/eclipse/lunar/attackby(var/obj/item/O as obj, var/mob/user as mob)
+	to_chat(user, "<span class='warning'>This weapon is ineffective, it does no damage.</span>")
+
 /mob/living/simple_mob/humanoid/eclipse/lunar/silvernoodle //Bouncing bullet extreme
 	name = "Lunar Eclipse Silver Serpent"
 	desc = "A hungry looking naga, their strange armor protecting them from ballistics and physical weaponry."
@@ -509,7 +524,7 @@
 /mob/living/simple_mob/humanoid/eclipse/lunar/pummler
 	name = "Lunar Eclipse Pummeler"
 	desc = "A strange creature moving at quick speed, bullets and melee sliding off it's hide."
-	projectiletype = /obj/item/projectile/bola
+	projectiletype = /obj/item/projectile/mobbola
 	ai_holder_type = /datum/ai_holder/simple_mob/intentional/adv_dark_gygax
 	melee_damage_lower = 10
 	melee_damage_upper = 10
@@ -519,12 +534,11 @@
 	icon_living = "eclipse_pummler"
 	reload_max = 5
 	size_multiplier = 1.5
-	var/poison_per_bite = 5
+	melee_attack_delay = 3 SECOND
-	var/poison_type = "shredding_nanites"
+	var/shock_chance = 40
-	var/poison_chance = 10
-	var/shock_chance = 60
 	base_attack_cooldown = 6
 	hovering = TRUE
+	ranged_cooldown_time = 1.5
 
 /mob/living/simple_mob/humanoid/eclipse/lunar/pummler/apply_melee_effects(var/atom/A)
 	if(isliving(A))
@@ -540,17 +554,7 @@
 			s.start()
 			visible_message("<span class='danger'>The pummler releases a powerful shock!</span>")
 		else
-			if(L.reagents)
+			return
-				var/target_zone = pick(BP_TORSO,BP_TORSO,BP_TORSO,BP_L_LEG,BP_R_LEG,BP_L_ARM,BP_R_ARM,BP_HEAD)
-				if(L.can_inject(src, null, target_zone))
-					inject_poison(L, target_zone)
-
-
-/mob/living/simple_mob/humanoid/eclipse/lunar/pummler/proc/inject_poison(mob/living/L, target_zone)
-	if(prob(poison_chance))
-		to_chat(L, "<span class='warning'>You feel a small shock rushing through your veins.</span>")
-		L.reagents.add_reagent(poison_type, poison_per_bite)
-
 
 //Freezing winds update
 
@@ -634,7 +638,7 @@
 	faction = "eclipse"
 
 /mob/living/simple_mob/humanoid/eclipse/solar/froststalker //teleporting stalker
-	name = "Lunar Eclipse Froststalker"
+	name = "Solar Eclipse Froststalker"
 	health = 50
 	maxHealth = 50
 	desc = "A somewhat see through being wearing a burn resistaint coat."
@@ -696,7 +700,7 @@
 	s2.start()
 
 /mob/living/simple_mob/humanoid/eclipse/solar/cryomancer //Freezing slowdown unit
-	name = "Lunar Eclipse Cryomancer"
+	name = "Solar Eclipse Cryomancer"
 	desc = "A being wearing ice and burn resistaint armor."
 	health = 100
 	maxHealth = 100

modular_chomp/code/modules/projectiles/guns/special.dm

@@ -0,0 +1,13 @@
+/obj/item/projectile/mobbola
+	name = "bola"
+	icon_state = "bola"
+	damage = 5
+	embed_chance = 0 //Nada.
+	damage_type = HALLOSS
+	muzzle_type = null
+	hud_state = "monkey"
+
+	combustion = FALSE
+
+	modifier_type_to_apply = /datum/modifier/entangled
+	modifier_duration = 0.5 MINUTE

vorestation.dme

@@ -4816,6 +4816,7 @@
 #include "modular_chomp\code\modules\projectiles\guns\energy.dm"
 #include "modular_chomp\code\modules\projectiles\guns\magnetic.dm"
 #include "modular_chomp\code\modules\projectiles\guns\phase.dm"
+#include "modular_chomp\code\modules\projectiles\guns\special.dm"
 #include "modular_chomp\code\modules\projectiles\guns\staffs.dm"
 #include "modular_chomp\code\modules\projectiles\guns\energy\laser.dm"
 #include "modular_chomp\code\modules\projectiles\guns\projectile\revolver.dm"