diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm
index 74b7eb545b5..13161be87c7 100644
--- a/code/game/objects/structures/crates_lockers/closets/statue.dm
+++ b/code/game/objects/structures/crates_lockers/closets/statue.dm
@@ -13,8 +13,8 @@
 	desc = "An incredibly lifelike marble carving."
 	icon = 'icons/obj/statue.dmi'
 	icon_state = "human_male"
-	density = 1
-	anchored = 1
+	density = TRUE
+	anchored = TRUE
 	health = 0 //destroying the statue kills the mob within
 	var/timer = 90 //eventually the person will be freed
 	var/mob/statue_mob/imprisoned = null //the temporary mob that is created when someone is put inside a statue
@@ -28,7 +28,6 @@
 	return ..()
 
 /obj/structure/closet/statue/Initialize(mapload, mob/living/L)
-
 	if(isliving(L))
 		if(L.buckled)
 			L.buckled = 0
@@ -83,6 +82,9 @@
 		STOP_PROCESSING(SSprocessing, src)
 		qdel(src)
 
+/obj/structure/closet/statue/content_info()
+	return
+
 /obj/structure/closet/statue/dump_contents()
 
 	for(var/obj/O in src)
diff --git a/code/modules/spell_system/spells/spell_list/others/generic/flesh_to_stone.dm b/code/modules/spell_system/spells/spell_list/others/generic/flesh_to_stone.dm
index 0bb96d7ea42..d8ad6d0dccf 100644
--- a/code/modules/spell_system/spells/spell_list/others/generic/flesh_to_stone.dm
+++ b/code/modules/spell_system/spells/spell_list/others/generic/flesh_to_stone.dm
@@ -5,6 +5,7 @@
 	school = "transmutation"
 	charge_max = 200
 	spell_flags = NEEDSCLOTHES | SELECTABLE
+	blacklisted_mob_types = list(/mob/living/heavy_vehicle)
 	range = 5
 	max_targets = 1
 	invocation = "STAUN EI"
diff --git a/code/modules/spell_system/spells/spell_list/targeted_spells.dm b/code/modules/spell_system/spells/spell_list/targeted_spells.dm
index 004d24280cc..8df5b505ba7 100644
--- a/code/modules/spell_system/spells/spell_list/targeted_spells.dm
+++ b/code/modules/spell_system/spells/spell_list/targeted_spells.dm
@@ -29,6 +29,7 @@ Targeted spells have two useful flags: INCLUDEUSER and SELECTABLE. These are exp
 	var/amt_eye_blurry = 0
 
 	var/list/compatible_mobs = list()
+	var/list/blacklisted_mob_types
 
 
 /spell/targeted/choose_targets(mob/user = usr)
@@ -55,6 +56,8 @@ Targeted spells have two useful flags: INCLUDEUSER and SELECTABLE. These are exp
 			for(var/mob/living/M in starting_targets)
 				if(!(spell_flags & INCLUDEUSER) && M == user)
 					continue
+				if(length(blacklisted_mob_types) && is_type_in_list(M, blacklisted_mob_types))
+					continue
 				if(length(compatible_mobs) && !is_type_in_list(M, compatible_mobs))
 					continue
 				possible_targets += M
@@ -81,6 +84,8 @@ Targeted spells have two useful flags: INCLUDEUSER and SELECTABLE. These are exp
 		for(var/mob/living/target in starting_targets)
 			if(!(spell_flags & INCLUDEUSER) && target == user)
 				continue
+			if(length(blacklisted_mob_types) && is_type_in_list(target, blacklisted_mob_types))
+				continue
 			if(length(compatible_mobs) && !is_type_in_list(target, compatible_mobs))
 				continue
 			possible_targets += target
diff --git a/html/changelogs/geeves-no_mech_statues.yml b/html/changelogs/geeves-no_mech_statues.yml
new file mode 100644
index 00000000000..741651a802c
--- /dev/null
+++ b/html/changelogs/geeves-no_mech_statues.yml
@@ -0,0 +1,7 @@
+author: Geeves
+
+delete-after: True
+
+changes: 
+  - bugfix: "Flesh to stone can no longer target mechs."
+  - bugfix: "Statues no longer report being empty."
\ No newline at end of file