Implementing pigeon return logic.

Author: MistakeNot4892

code/game/objects/items/devices/fadeout.dm

@@ -0,0 +1,16 @@
+/obj/effect/dummy/fadeout/Initialize(mapload, fade_dir = SOUTH, atom/donor)
+	. = ..()
+	set_dir(fade_dir)
+	appearance = donor // grab appearance before ghostizing in case they fall over etc
+	switch(dir)
+		if(NORTH)
+			animate(src, pixel_z =  32, alpha = 0, time = 1 SECOND)
+		if(SOUTH)
+			animate(src, pixel_z = -32, alpha = 0, time = 1 SECOND)
+		if(EAST)
+			animate(src, pixel_w =  32, alpha = 0, time = 1 SECOND)
+		if(WEST)
+			animate(src, pixel_w = -32, alpha = 0, time = 1 SECOND)
+		else
+			animate(src, alpha = 0, time = 1 SECOND)
+	QDEL_IN(src, 1 SECOND)

mods/content/fantasy/props/signpost.dm

@@ -35,21 +35,7 @@
 	var/choice = alert(user, "Are you sure you wish to depart? This will permanently remove your character from the round.", "Venture Forth?", "No", "Yes")
 	if(choice != "Yes" || QDELETED(user) || user.incapacitated() || QDELETED(src) || !user.Adjacent(src))
 		return TRUE
-	var/obj/effect/dummy/fadeout = new(get_turf(user))
-	fadeout.set_dir(dir)
-	fadeout.appearance = user // grab appearance before ghostizing in case they fall over etc
-	switch(dir)
-		if(NORTH)
-			animate(fadeout, pixel_z =  32, alpha = 0, time = 1 SECOND)
-		if(SOUTH)
-			animate(fadeout, pixel_z = -32, alpha = 0, time = 1 SECOND)
-		if(EAST)
-			animate(fadeout, pixel_w =  32, alpha = 0, time = 1 SECOND)
-		if(WEST)
-			animate(fadeout, pixel_w = -32, alpha = 0, time = 1 SECOND)
-		else
-			animate(fadeout, alpha = 0, time = 1 SECOND)
-	QDEL_IN(fadeout, 1 SECOND)
+	new /obj/effect/dummy/fadeout(get_turf(user), dir, user)
 	despawn_character(user)
 	return TRUE
 

mods/pyrelight/mobs/birds/hawk.dm

@@ -21,17 +21,15 @@
 	set_target(null)
 	if(!body)
 		return
-	if(body.get_scooped(friend, body, silent = TRUE))
+	if(body.scoop_check(friend) && body.get_scooped(friend, body))//, silent = TRUE))
 		body.visible_message(SPAN_NOTICE("\The [body] alights on \the [friend]."))
 	else
 		body.visible_message(SPAN_NOTICE("\The [body] lands beside \the [friend]."))
 
-	for(var/obj/item/thing in body)
+	for(var/obj/item/thing in body) //.get_equipped_items())
 		thing.dropInto(body.loc)
 		friend.put_in_hands(thing)
 
-	// drop any item into their hand or on the ground
-	// scoop_check(user) ? get_scooped(user, user)
 	return TRUE
 
 // Placeholder for husbandry check
@@ -51,7 +49,7 @@
 	// Maybe consider handling structures at some point?
 	if(isitem(target) && body.Adjacent(target))
 		var/obj/item/item = target
-		item.forceMove(body)
+		item.forceMove(body) //body.put_in_hands(item)
 	// Return to handler.
 	set_target(last_handler?.resolve())
 	return FALSE

mods/pyrelight/mobs/birds/pigeon.dm

@@ -1,7 +1,55 @@
 /mob/living/simple_animal/trained_bird/pigeon
-	name = "pigeon"
+	name = "messenger pigeon"
 	icon = 'mods/pyrelight/icons/mobs/pigeon.dmi'
 	ai   = /datum/mob_controller/passive/pigeon
+	holder_type = /obj/item/holder/bird/pigeon
+	var/weakref/home_hutch
+
+/mob/living/simple_animal/trained_bird/pigeon/Initialize()
+	. = ..()
+	update_hutch()
+
+/mob/living/simple_animal/trained_bird/pigeon/proc/go_home(mob/releaser)
+	dropInto(get_turf(src))
+	if(!is_outside())
+		return
+	var/obj/structure/hutch/hutch = home_hutch?.resolve()
+	if(!istype(hutch) || QDELETED(hutch))
+		return // todo: check if the hutch is accessible from the sky
+	if(releaser)
+		releaser.visible_message(SPAN_NOTICE("\The [releaser] releases \a [src], which flutters away into the sky."))
+	else
+		visible_message(SPAN_NOTICE("\The [src] flutters away into the sky."))
+	set_dir(SOUTH)
+	new /obj/effect/dummy/fadeout(loc, NORTH, src)
+	dropInto(hutch)
+	hutch.visible_message(SPAN_NOTICE("\A [src] alights on \the [hutch] in a flutter of wings."))
+
+/obj/item/holder/bird/pigeon/attack_self(mob/user)
+	var/mob/living/simple_animal/trained_bird/pigeon/pigeon = locate() in contents
+	if(!istype(pigeon))
+		return ..()
+	if(!is_outside())
+		to_chat(user, SPAN_WARNING("You need to be outdoors to release \the [pigeon]."))
+		return TRUE
+	if(isnull(pigeon.home_hutch))
+		var/decl/pronouns/pronouns = pigeon.get_pronouns()
+		to_chat(user, SPAN_WARNING("\The [pigeon] tilts [pronouns.his] head at you in confusion. [pronouns.He] must not have a hutch to return to."))
+	else
+		releaser.drop_from_inventory(src)
+		pigeon.go_home(user)
+		qdel(src)
+	return TRUE
+
+/mob/living/simple_animal/trained_bird/pigeon/proc/update_hutch()
+	var/obj/structure/hutch/hutch = home_hutch?.resolve()
+	if(!istype(hutch) || QDELETED(hutch))
+		hutch = get_recursive_loc_of_type(/obj/structure/hutch)
+	if(istype(hutch) && !QDELETED(hutch))
+		home_hutch = weakref(hutch)
+		events_repository.unregister(/decl/observ/moved, src, src)
+	else
+		events_repository.register(/decl/observ/moved, src, src, TYPE_PROC_REF(/mob/living/simple_animal/trained_bird/pigeon, update_hutch))
 
 /datum/mob_controller/passive/pigeon
 	emote_speech   = list("Oo-ooo.","Oo-ooo?","Oo-ooo...")

nebula.dme

@@ -1180,6 +1180,7 @@
 #include "code\game\objects\items\devices\cable_painter.dm"
 #include "code\game\objects\items\devices\chameleonproj.dm"
 #include "code\game\objects\items\devices\dociler.dm"
+#include "code\game\objects\items\devices\fadeout.dm"
 #include "code\game\objects\items\devices\flash.dm"
 #include "code\game\objects\items\devices\geiger.dm"
 #include "code\game\objects\items\devices\gps.dm"