Extras and tg#45018

This commit is contained in:
Ghommie
2020-02-07 05:21:08 +01:00
parent 86c472eaf6
commit 83a08ee9f5
2 changed files with 6 additions and 5 deletions
+4 -3
View File
@@ -71,10 +71,11 @@ All foods are distributed among various categories. Use common sense.
if(!eater)
return
if(!reagents.total_volume)
var/obj/item/trash_item = generate_trash(eater)
var/mob/living/location = loc
var/obj/item/trash_item = generate_trash(location)
qdel(src)
eater.put_in_hands(trash_item)
if(istype(location))
location.put_in_hands(trash_item)
/obj/item/reagent_containers/food/snacks/attack_self(mob/user)
return
@@ -320,10 +320,10 @@
if(C.setting == counter_setting)
return BULLET_ACT_BLOCK
var/mob/living/L = target
if(!istype(target))
if(!isliving(target))
return BULLET_ACT_BLOCK
var/mob/living/L = target
switch(hugbox)
if(DUEL_HUGBOX_NONE)
var/obj/item/bodypart/B = L.get_bodypart(BODY_ZONE_HEAD)