From 70804d49fc99024f907b7ffdcc6935b3c86c7d5d Mon Sep 17 00:00:00 2001 From: FalseIncarnate Date: Thu, 28 Jan 2016 21:38:54 -0500 Subject: [PATCH] Fixes plants attempting to sting ghosts Fixes #3427 --- code/modules/hydroponics/seed.dm | 2 ++ code/modules/hydroponics/spreading/spreading_response.dm | 2 ++ 2 files changed, 4 insertions(+) diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm index 2dbedafa353..896eb886060 100644 --- a/code/modules/hydroponics/seed.dm +++ b/code/modules/hydroponics/seed.dm @@ -145,6 +145,8 @@ /datum/seed/proc/do_sting(var/mob/living/carbon/human/target, var/obj/item/fruit, var/target_limb) if(!get_trait(TRAIT_STINGS)) return + if(!istype(target)) + return if(!target_limb) //if we weren't given a target_limb, pick a random one to try stinging target_limb = pick("l_foot","r_foot","l_leg","r_leg","l_hand","r_hand","l_arm", "r_arm","head","chest","groin") if(chems && chems.len) diff --git a/code/modules/hydroponics/spreading/spreading_response.dm b/code/modules/hydroponics/spreading/spreading_response.dm index 0f991a56bfc..fbdc534c4e4 100644 --- a/code/modules/hydroponics/spreading/spreading_response.dm +++ b/code/modules/hydroponics/spreading/spreading_response.dm @@ -20,6 +20,8 @@ /obj/effect/plant/Crossed(var/mob/living/victim) if(!is_mature()) return + if(!istype(victim)) + return var/target_limb = pick("r_foot","l_foot","r_leg","l_leg") if(ishuman(victim)) var/mob/living/carbon/human/H = victim