From b1728d872f451c9b4c4234d31e7bde667d78dad4 Mon Sep 17 00:00:00 2001
From: DGamerL <108773801+DGamerL@users.noreply.github.com>
Date: Wed, 4 Feb 2026 01:28:42 +0100
Subject: [PATCH] Minor `Animalize()` refactor (#31574)

* BEE TRANSFORMATION

* Contra review

* Aaaaaaaaaaaaaaaaaaaaa
---
 code/modules/mob/transform_procs.dm | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index d15743a2cfb..b1c40a85c18 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -200,12 +200,13 @@
 	new_corgi.update_pipe_vision()
 	qdel(src)
 
-/mob/living/carbon/human/Animalize()
-
-	var/list/mobtypes = typesof(/mob/living/simple_animal)
-	var/mobpath = tgui_input_list(usr, "Which type of mob should [src] turn into?", "Choose a Type", mobtypes)
-
+/mob/living/carbon/human/Animalize(mob/living/mob_type)
+	var/mobpath = mob_type
 	if(!mobpath)
+		var/list/mobtypes = typesof(/mob/living/simple_animal)
+		mobpath = tgui_input_list(usr, "Which type of mob should [src] turn into?", "Choose a Type", mobtypes)
+
+	if(!ispath(mobpath, /mob/living))
 		return
 
 	if(notransform)
@@ -221,7 +222,7 @@
 	for(var/t in bodyparts)
 		qdel(t)
 
-	var/mob/new_mob = new mobpath(src.loc)
+	var/mob/new_mob = new mobpath(loc)
 
 	new_mob.key = key
 	new_mob.a_intent = INTENT_HARM
@@ -229,16 +230,17 @@
 	new_mob.update_pipe_vision()
 	qdel(src)
 
-/mob/proc/Animalize()
-
-	var/list/mobtypes = typesof(/mob/living/simple_animal)
-	mobtypes |= subtypesof(/mob/living/basic)
-	var/mobpath = tgui_input_list(usr, "Which type of mob should [src] turn into?", "Choose a Type", mobtypes)
-
+/mob/proc/Animalize(mob/living/mob_type)
+	var/mobpath = mob_type
 	if(!mobpath)
+		var/list/mobtypes = typesof(/mob/living/simple_animal)
+		mobtypes |= subtypesof(/mob/living/basic)
+		mobpath = tgui_input_list(usr, "Which type of mob should [src] turn into?", "Choose a Type", mobtypes)
+
+	if(!ispath(mobpath, /mob/living))
 		return
 
-	var/mob/new_mob = new mobpath(src.loc)
+	var/mob/new_mob = new mobpath(loc)
 
 	new_mob.key = key
 	new_mob.a_intent = INTENT_HARM