From 4b069afb423c70af4005a7e7f322464183fa9875 Mon Sep 17 00:00:00 2001
From: Thalpy <48600475+ThalpySci@users.noreply.github.com>
Date: Tue, 15 Oct 2019 08:42:40 +0100
Subject: [PATCH] Scrub a dub dub

---
 code/modules/surgery/organs/organ_internal.dm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 9ab1f65928..593614372a 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -110,14 +110,18 @@
 
 	else if(istype(loc, /mob/) && !owner)
 		var/mob/M = loc
+		if(is_type_in_list(M.loc, freezing_objects))
+			if(!(organ_flags & ORGAN_FROZEN))
+				organ_flags |= ORGAN_FROZEN
+			return TRUE
 		var/turf/T = M.loc
 		var/datum/gas_mixture/enviro = T.return_air()
 		local_temp = enviro.temperature
 
 	if(owner)
 		//Don't interfere with bodies frozen by structures.
-		if(is_type_in_list(loc, freezing_objects))
-			if(!(organ_flags & ORGAN_FROZEN))//Incase someone puts them in when cold, but they warm up inside of the thing. (i.e. they have the flag, the thing turns it off, this rights it.)
+		if(is_type_in_list(owner.loc, freezing_objects))
+			if(!(organ_flags & ORGAN_FROZEN))
 				organ_flags |= ORGAN_FROZEN
 			return TRUE
 		local_temp = owner.bodytemperature