diff --git a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm b/code/modules/mob/living/simple_animal/guardian/types/ranged.dm index 3e5756baa6a..a1d618a632b 100644 --- a/code/modules/mob/living/simple_animal/guardian/types/ranged.dm +++ b/code/modules/mob/living/simple_animal/guardian/types/ranged.dm @@ -73,7 +73,7 @@ set desc = "Set an invisible snare that will alert you when living creatures walk over it. Max of 5" if(src.snares.len <6) var/turf/snare_loc = get_turf(src.loc) - var/obj/item/effect/snare/S = new /obj/item/effect/snare(snare_loc) + var/obj/effect/snare/S = new /obj/effect/snare(snare_loc) S.spawner = src S.name = "[get_area(snare_loc)] snare ([rand(1, 1000)])" src.snares |= S @@ -91,14 +91,14 @@ qdel(picked_snare) src << "Snare disarmed." -/obj/item/effect/snare +/obj/effect/snare name = "snare" desc = "You shouldn't be seeing this!" var/mob/living/simple_animal/hostile/guardian/spawner invisibility = INVISIBILITY_ABSTRACT -/obj/item/effect/snare/Crossed(AM as mob|obj) +/obj/effect/snare/Crossed(AM as mob|obj) if(isliving(AM) && spawner && spawner.summoner && AM != spawner && !spawner.hasmatchingsummoner(AM)) spawner.summoner << "[AM] has crossed surveillance snare, [name]." var/list/guardians = spawner.summoner.hasparasites() diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm index 1c02ede80f9..1626ece8278 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm @@ -998,7 +998,7 @@ visible_message("The tendril writhes in pain and anger and the earth around it begins to split! Get back!") visible_message("A chest falls clear of the tendril!") playsound(get_turf(src),'sound/effects/tendril_destroyed.ogg', 200, 0, 50, 1, 1) - spawn(50) + spawn(75) for(var/mob/M in range(7,src)) shake_camera(M, 15, 1) playsound(get_turf(src),'sound/effects/explosionfar.ogg', 200, 1) diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 37e3ed8c891..0002f3dbeca 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -141,7 +141,7 @@ ..() /obj/item/projectile/kinetic/on_range() - new /obj/item/effect/kinetic_blast(src.loc) + new /obj/effect/kinetic_blast(src.loc) ..() /obj/item/projectile/kinetic/on_hit(atom/target) @@ -150,7 +150,7 @@ if(istype(target_turf, /turf/closed/mineral)) var/turf/closed/mineral/M = target_turf M.gets_drilled(firer) - new /obj/item/effect/kinetic_blast(target_turf) + new /obj/effect/kinetic_blast(target_turf) if(src.splash) for(var/turf/T in range(splash, target_turf)) if(istype(T, /turf/closed/mineral)) @@ -158,13 +158,13 @@ M.gets_drilled(firer) -/obj/item/effect/kinetic_blast +/obj/effect/kinetic_blast name = "kinetic explosion" icon = 'icons/obj/projectiles.dmi' icon_state = "kinetic_blast" layer = 4.1 -/obj/item/effect/kinetic_blast/New() +/obj/effect/kinetic_blast/New() spawn(4) qdel(src)