From 0772d6687f451dfe531d0c50eb8b5f5155b88b63 Mon Sep 17 00:00:00 2001 From: Seris02 Date: Thu, 30 Jul 2020 08:01:25 +0800 Subject: [PATCH 1/2] ghost chilis fixed --- code/modules/hydroponics/grown/chili.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm index 1f60afe655..54481f7d37 100644 --- a/code/modules/hydroponics/grown/chili.dm +++ b/code/modules/hydroponics/grown/chili.dm @@ -81,8 +81,9 @@ wine_power = 50 /obj/item/reagent_containers/food/snacks/grown/ghost_chili/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags) - if( ismob(loc) ) - held_mob = loc + . = ..() + held_mob = loc + if(istype(held_mob)) START_PROCESSING(SSobj, src) /obj/item/reagent_containers/food/snacks/grown/ghost_chili/process() From 9b02b6619d8e66afb5dc0ca68fbe96c26c97eca4 Mon Sep 17 00:00:00 2001 From: Seris02 <49109742+Seris02@users.noreply.github.com> Date: Thu, 6 Aug 2020 06:44:17 +0800 Subject: [PATCH 2/2] Update code/modules/hydroponics/grown/chili.dm Co-authored-by: silicons <2003111+silicons@users.noreply.github.com> --- code/modules/hydroponics/grown/chili.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm index 54481f7d37..001a90b441 100644 --- a/code/modules/hydroponics/grown/chili.dm +++ b/code/modules/hydroponics/grown/chili.dm @@ -82,8 +82,8 @@ /obj/item/reagent_containers/food/snacks/grown/ghost_chili/on_attack_hand(mob/user, act_intent = user.a_intent, unarmed_attack_flags) . = ..() - held_mob = loc - if(istype(held_mob)) + if(ishuman(loc)) + held_mob = loc START_PROCESSING(SSobj, src) /obj/item/reagent_containers/food/snacks/grown/ghost_chili/process()