diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index 0b0fda37d74..eac573135ff 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -199,13 +199,19 @@
 /obj/item/gun/energy/mousegun/emag_act(var/remaining_charges, var/mob/user)
 	if(!emagged)
 		to_chat(user, SPAN_WARNING("You overload \the [src]'s shock modulator."))
-		max_shots = 10
+		max_shots = initial(max_shots) + 4
 		projectile_type = /obj/item/projectile/beam/mousegun/emag
 		emagged = TRUE
 		QDEL_NULL(power_supply)
 		power_supply = new /obj/item/cell/device/variable(src, max_shots * charge_cost)
 		return TRUE
 
+/obj/item/gun/energy/mousegun/xenofauna
+	name = "xenofauna gun"
+	desc = "The NT \"Xenovermino\" Zap-Blast is a highly sophisticated and probably safe beamgun designed to deal with hostile xenofauna."
+	projectile_type = /obj/item/projectile/beam/mousegun/xenofauna
+	max_shots = 12
+
 /obj/item/gun/energy/net
 	name = "net gun"
 	desc = "A gun designed to deploy energy nets to capture animals or unruly crew members."
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index 780fd7b0696..d4fbc56be90 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -280,6 +280,16 @@
 			to_chat(M, 'sound/effects/basscannon.ogg')
 	return TRUE
 
+/obj/item/projectile/beam/mousegun/xenofauna
+	nodamage = FALSE
+	damage = 10
+
+/obj/item/projectile/beam/mousegun/xenofauna/mousepulse(atom/target, range, log)
+	if(is_type_in_list(target, list(/mob/living/simple_animal/hostile/retaliate/cavern_dweller, /mob/living/simple_animal/hostile/carp, /mob/living/simple_animal/carp, /mob/living/simple_animal/hostile/giant_spider)))
+		var/mob/living/simple_animal/SA = target
+		SA.take_organ_damage(0, 20)
+	return TRUE
+
 /obj/item/projectile/beam/shotgun
 	name = "diffuse laser"
 	icon_state = "laser"
diff --git a/html/changelogs/geeves-anti-pesto.yml b/html/changelogs/geeves-anti-pesto.yml
new file mode 100644
index 00000000000..3d59b741abb
--- /dev/null
+++ b/html/changelogs/geeves-anti-pesto.yml
@@ -0,0 +1,6 @@
+author: Geeves
+
+delete-after: True
+
+changes:
+  - rscadd: "Added two xenofauna guns to the surface level checkpoint. They only do damage to carp, cavern dwellers, and spiders, inflicting pain on any other targets."
\ No newline at end of file
diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm
index d41318c487a..a8f6b2d00e7 100644
--- a/maps/aurora/aurora-6_surface.dmm
+++ b/maps/aurora/aurora-6_surface.dmm
@@ -6472,6 +6472,7 @@
 	pixel_x = -24
 	},
 /obj/effect/floor_decal/corner/blue/full,
+/obj/item/gun/energy/mousegun/xenofauna,
 /turf/simulated/floor/tiled,
 /area/security/checkpoint2)
 "lW" = (
@@ -6518,6 +6519,7 @@
 	dir = 8;
 	pixel_x = 28
 	},
+/obj/item/gun/energy/mousegun/xenofauna,
 /turf/simulated/floor/tiled,
 /area/security/checkpoint2)
 "ma" = (