Crit people now count as dead for escape alone.

You can now put pocketable items in sliceable food.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2339 316c924e-a436-60f5-8080-3fe189b3f50e

code/game/gamemodes/objective.dm

@@ -166,14 +166,14 @@ datum/objective/hijack
 			return 0
 		if(emergency_shuttle.location<2)
 			return 0
-		if(!owner.current || owner.current.stat ==2)
+		if(!owner.current || owner.current.stat)
 			return 0
 		var/area/shuttle = locate(/area/shuttle/escape/centcom)
 		var/protected_mobs[] = list(/mob/living/silicon/ai, /mob/living/silicon/pai)
 		for(var/mob/living/player in world)
 			if(player.type in protected_mobs)	continue
 			if (player.mind && (player.mind != owner))
-				if (player.stat != 2) //they're not dead
+				if (!player.stat) //they're not dead or in crit
 					if (get_turf(player) in shuttle)
 						return 0
 		return 1

code/modules/chemical/Chemistry-Tools.dm

@@ -1304,6 +1304,7 @@
 /obj/item/weapon/reagent_containers/food/snacks
 	var/slice_path
 	var/slices_num
+
 	attackby(obj/item/weapon/W as obj, mob/user as mob)
 
 		if((slices_num <= 0 || !slices_num) || !slice_path)
@@ -1322,6 +1323,14 @@
 				istype(W, /obj/item/weapon/shovel) \
 			)
 			inaccurate = 1
+		else if(W.w_class <= 2 && istype(src,/obj/item/weapon/reagent_containers/food/snacks/sliceable))
+			user << "\red You slip [W] inside [src]."
+			user.u_equip(W)
+			if ((user.client && user.s_active != src))
+				user.client.screen -= W
+			W.dropped(user)
+			add_fingerprint(user)
+			contents += W
 			return
 		else
 			return 1
@@ -1352,6 +1361,12 @@
 		del(src)
 		return
 
+	Del()
+		if(contents)
+			for(var/atom/movable/something in contents)
+				something.loc = get_turf(src)
+		..()
+
 
 ////////////////////////////////////////////////////////////////////////////////
 /// FOOD END