Moving birds into their own modpack.

Author: MistakeNot4892

code/datums/ai/hunter.dm

@@ -32,6 +32,8 @@
 		prey.gib()
 	else
 		qdel(prey)
+	set_target(null)
+	resume_wandering()
 
 /datum/mob_controller/passive/hunter/get_target(atom/new_target)
 	if(isnull(hunt_target))
@@ -81,10 +83,8 @@
 	if(prey.stat != DEAD)
 		return
 	// Eat the mob.
-	set_target(null)
-	resume_wandering()
 	consume_prey(prey)
 
 // Stub for hawks to return to their handler and dock with the mothership.
-/datum/mob_controller/passive/hunter/proc/handle_friend_hunting(mob/friend)
+/datum/mob_controller/passive/hunter/proc/handle_friend_hunting(mob/user)
 	return FALSE

code/datums/storage/subtypes_backpack.dm

@@ -25,7 +25,3 @@
 	max_w_class = ITEM_SIZE_NORMAL
 	max_storage_space = 15
 	cant_hold = list(/obj/item/backpack/satchel/flat) //muh recursive backpacks
-
-/datum/storage/backpack/crow
-	storage_slots = 7
-	max_w_class = ITEM_SIZE_SMALL

code/modules/clothing/shirts/_shirts.dm

@@ -1,4 +1,5 @@
 /obj/item/clothing/shirt
+	name = "shirt"
 	abstract_type = /obj/item/clothing/shirt
 	body_parts_covered = SLOT_UPPER_BODY|SLOT_ARMS
 	permeability_coefficient = 0.90

code/modules/mob/living/simple_animal/crow/crow.dm

@@ -1,3 +1,7 @@
+/datum/storage/backpack/crow
+	storage_slots = 7
+	max_w_class = ITEM_SIZE_SMALL
+
 /obj/item/backpack/messenger/corvid_couriers
 	name = "corvid messenger bag"
 	desc = "A small green-grey messenger bag with a blue Corvid Couriers logo on it."
@@ -7,6 +11,7 @@
 	storage = /datum/storage/backpack/crow
 	material = /decl/material/solid/organic/cloth
 
+// TODO: Merge with /mob/living/simple_animal/passive/bird/crow
 /mob/living/simple_animal/crow
 	name = "crow"
 	desc = "A large crow. Caw caw."
@@ -15,7 +20,7 @@
 	mob_size = MOB_SIZE_SMALL
 	speak_emote  = list("caws")
 	ai = /datum/mob_controller/crow
-	natural_weapon = /obj/item/natural_weapon/crow_claws
+	natural_weapon = /obj/item/natural_weapon/bird_claws
 	universal_speak = TRUE
 
 /datum/mob_controller/crow
@@ -34,7 +39,7 @@
 /mob/living/simple_animal/crow/get_bodytype()
 	return GET_DECL(/decl/bodytype/animal/crow)
 
-/obj/item/natural_weapon/crow_claws
+/obj/item/natural_weapon/bird_claws
 	name = "claws"
 	gender = PLURAL
 	attack_verb = "clawed"

code/modules/mob/living/simple_animal/friendly/cat.dm

@@ -14,6 +14,8 @@
 
 /datum/mob_controller/passive/hunter/cat/consume_prey(mob/living/prey)
 	next_hunt = world.time + rand(1 SECONDS, 10 SECONDS)
+	set_target(null)
+	resume_wandering()
 
 /datum/mob_controller/passive/hunter/cat/can_hunt(mob/living/victim)
 	return istype(victim, /mob/living/simple_animal/passive/mouse) && !victim.stat

code/modules/mob_holder/_holder.dm

@@ -24,6 +24,11 @@
 		AM.vis_flags |= (VIS_INHERIT_ID|VIS_INHERIT_LAYER|VIS_INHERIT_PLANE)
 		add_vis_contents(AM)
 
+/obj/item/holder/examined_by(mob/user, distance, infix, suffix)
+	for(var/atom/thing in get_contained_external_atoms())
+		thing.examined_by(user, distance, infix, suffix)
+	return TRUE
+
 // No scooping mobs and handing them to people who can't scoop them.
 /obj/item/holder/equipped(mob/user, slot)
 	. = ..()

code/modules/mob_holder/holder_mobs.dm

@@ -22,7 +22,7 @@
 	var/obj/item/holder/H = new holder_type(get_turf(src))
 	H.w_class = get_object_size()
 	if(initiator == src)
-		if(!target.equip_to_slot_if_possible(H, slot_back_str, del_on_fail=0, disable_warning=1))
+		if(!target.equip_to_slot_if_possible(H, slot_back_str, del_on_fail=0, disable_warning=1) && !target.put_in_hands(H))
 			if(!silent)
 				to_chat(initiator, SPAN_WARNING("You can't climb onto [target]!"))
 			return FALSE

maps/karzerfeste/karzerfeste.dm

@@ -5,6 +5,7 @@
 	#include "../../mods/content/mouse_highlights/_mouse_highlight.dme"
 	#include "../../mods/content/scaling_descriptors.dm"
 	#include "../../mods/species/drakes/_drakes.dme" // include before _fantasy.dme so overrides work
+	#include "../../mods/content/birds/_birds.dme"
 	#include "../../mods/content/fantasy/_fantasy.dme"
 	#include "../../mods/pyrelight/_pyrelight.dme" // include after _fantasy.dme so overrides work
 

mods/content/birds/_birds.dm

@@ -0,0 +1,2 @@
+/decl/modpack/birds
+	name = "Birds"

mods/content/birds/_birds.dme

@@ -0,0 +1,11 @@
+#ifndef MODPACK_BIRDS
+#define MODPACK_BIRDS
+// BEGIN_INCLUDE
+#include "_birds.dm"
+#include "bird.dm"
+#include "bird_crow.dm"
+#include "bird_hawk.dm"
+#include "bird_pigeon.dm"
+#include "hutch.dm"
+// END_INCLUDE
+#endif