diff --git a/aurorastation.dme b/aurorastation.dme
index 380d82e6dd4..f6743a08061 100644
--- a/aurorastation.dme
+++ b/aurorastation.dme
@@ -1897,6 +1897,7 @@
 #include "code\modules\mob\living\simple_animal\friendly\crab.dm"
 #include "code\modules\mob\living\simple_animal\friendly\farm_animals.dm"
 #include "code\modules\mob\living\simple_animal\friendly\fox.dm"
+#include "code\modules\mob\living\simple_animal\friendly\hakhma.dm"
 #include "code\modules\mob\living\simple_animal\friendly\lizard.dm"
 #include "code\modules\mob\living\simple_animal\friendly\mushroom.dm"
 #include "code\modules\mob\living\simple_animal\friendly\rat.dm"
diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm
index 8cbf32add50..c74f40c7d3c 100644
--- a/code/game/objects/random/random.dm
+++ b/code/game/objects/random/random.dm
@@ -1316,5 +1316,6 @@
 		/obj/structure/largecrate/animal/chick = 4,
 		/obj/structure/largecrate/animal/adhomai = 0.5,
 		/obj/structure/largecrate/animal/adhomai/fatshouter = 0.5,
-		/obj/structure/largecrate/animal/adhomai/rafama = 0.5
+		/obj/structure/largecrate/animal/adhomai/rafama = 0.5,
+		/obj/structure/largecrate/animal/hakhma = 0.5
 	)
diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm
index 3bb0c360722..f02e316ff85 100644
--- a/code/game/objects/structures/crates_lockers/largecrate.dm
+++ b/code/game/objects/structures/crates_lockers/largecrate.dm
@@ -96,4 +96,8 @@
 	held_type = /mob/living/simple_animal/fatshouter
 
 /obj/structure/largecrate/animal/adhomai/rafama
-	held_type = /mob/living/simple_animal/hostile/retaliate/rafama
\ No newline at end of file
+	held_type = /mob/living/simple_animal/hostile/retaliate/rafama
+
+/obj/structure/largecrate/animal/hakhma
+	name = "hakhma crate"
+	held_type = /mob/living/simple_animal/hakhma
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/friendly/adhomai.dm b/code/modules/mob/living/simple_animal/friendly/adhomai.dm
index ecad124770d..03b886aff25 100644
--- a/code/modules/mob/living/simple_animal/friendly/adhomai.dm
+++ b/code/modules/mob/living/simple_animal/friendly/adhomai.dm
@@ -10,6 +10,7 @@
 	emote_see = list("whistles")
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/adhomai
 	meat_amount = 2
+	hunger_enabled = FALSE
 	var/eggsleft = 0
 
 /mob/living/simple_animal/ice_tunneler/attackby(var/obj/item/O as obj, var/mob/user as mob)
@@ -52,7 +53,6 @@
 	speak_chance = 1
 	turns_per_move = 5
 	see_in_dark = 6
-	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/adhomai
 	meat_amount = 30
 	response_help  = "pets"
 	response_disarm = "gently pushes aside"
diff --git a/code/modules/mob/living/simple_animal/friendly/hakhma.dm b/code/modules/mob/living/simple_animal/friendly/hakhma.dm
new file mode 100644
index 00000000000..e423953d338
--- /dev/null
+++ b/code/modules/mob/living/simple_animal/friendly/hakhma.dm
@@ -0,0 +1,26 @@
+/mob/living/simple_animal/hakhma
+	name = "hakhma"
+	desc = "An oversized insect breed by Scarab colony ships, known for their milk."
+	icon_state = "hakhma"
+	icon_living = "hakhma"
+	icon_dead = "hakhma_dead"
+	icon_rest = "hakhma_rest"
+	speak_emote = list("chitters")
+	emote_hear = list("chitters")
+	emote_see = list("shakes its head")
+	speak_chance = 1
+	turns_per_move = 5
+	meat_amount = 35
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "kicks"
+	attacktext = "kicked"
+	health = 250
+	maxHealth = 250
+
+	autoseek_food = FALSE
+	beg_for_food = FALSE
+	mob_size = 15
+
+	has_udder = TRUE
+	milk_type = "beetle_milk"
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index 460a24240fe..f06bca66a27 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -205,6 +205,11 @@
 				to_chat(user, "<span class='warning'>\The [blocked] is in the way!</span>")
 				return
 
+		if(isanimal(target))
+			var/mob/living/simple_animal/C = target
+			if(C.has_udder)
+				return
+
 		other_feed_message_start(user, target)
 
 		user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
diff --git a/html/changelogs/alberyk-giantbug.yml b/html/changelogs/alberyk-giantbug.yml
new file mode 100644
index 00000000000..43d2e7f1778
--- /dev/null
+++ b/html/changelogs/alberyk-giantbug.yml
@@ -0,0 +1,6 @@
+author: Alberyk, Kyres1
+
+delete-after: True
+
+changes: 
+  - rscadd: "Added the hakhma as one of the animals that you can find in cargo random crates."
\ No newline at end of file
diff --git a/icons/mob/npc/animal.dmi b/icons/mob/npc/animal.dmi
index 2628e163e4f..37317984719 100644
Binary files a/icons/mob/npc/animal.dmi and b/icons/mob/npc/animal.dmi differ