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
This commit is contained in:
uporotiy
2011-10-10 16:07:08 +00:00
parent 90e0297389
commit 59180f83cf
2 changed files with 17 additions and 2 deletions
+15
View File
@@ -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