Merge remote-tracking branch 'upstream/master' into dev-freeze

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

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()
 	..()
 

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
+	return 1