From 9888120b054072a86f7d8cd21d9c526a7d534e34 Mon Sep 17 00:00:00 2001
From: GinjaNinja32 <ginjaninja32@gmail.com>
Date: Sun, 8 Mar 2015 11:21:38 +0000
Subject: [PATCH 1/2] Fix simple-animal grabbing

---
 code/modules/mob/living/simple_animal/simple_animal.dm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 74f6c85eb9..26a9d062ff 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -239,7 +239,7 @@
 			if (!(status_flags & CANPUSH))
 				return
 
-			var/obj/item/weapon/grab/G = new /obj/item/weapon/grab( M, M, src )
+			var/obj/item/weapon/grab/G = new /obj/item/weapon/grab(M, src)
 
 			M.put_in_active_hand(G)
 
@@ -375,4 +375,4 @@
 
 /mob/living/simple_animal/put_in_hands(var/obj/item/W) // No hands.
 	W.loc = get_turf(src)
-	return 1
\ No newline at end of file
+	return 1

From d290ee4c6892a2d008bc6f2b74df9639d34d094e Mon Sep 17 00:00:00 2001
From: PsiOmega <git@psiomega.se>
Date: Sun, 8 Mar 2015 13:22:45 +0100
Subject: [PATCH 2/2] Fixes #8398.

Cryopods/cells that contains mobs will now drop them to the ground on deletion.
---
 code/game/machinery/cryo.dm    | 5 +++++
 code/game/machinery/cryopod.dm | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm
index 32543822b9..ecf868f260 100644
--- a/code/game/machinery/cryo.dm
+++ b/code/game/machinery/cryo.dm
@@ -24,6 +24,11 @@
 	..()
 	initialize_directions = dir
 
+/obj/machinery/atmospherics/unary/cryo_cell/Del()
+	if(occupant)
+		occupant.loc = loc
+	..()
+
 /obj/machinery/atmospherics/unary/cryo_cell/initialize()
 	if(node) return
 	var/node_connect = dir
diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm
index 381a9790fb..5915aef5ac 100644
--- a/code/game/machinery/cryopod.dm
+++ b/code/game/machinery/cryopod.dm
@@ -234,6 +234,12 @@
 
 	..()
 
+/obj/machinery/cryopod/Del()
+	if(occupant)
+		occupant.loc = loc
+		occupant.resting = 1
+	..()
+
 /obj/machinery/cryopod/initialize()
 	..()