From 1ffc19c7b06f95f14db1fd33388f877112f24d88 Mon Sep 17 00:00:00 2001 From: RandomGamer123 <31096837+RandomGamer123@users.noreply.github.com> Date: Tue, 8 Jun 2021 17:28:07 -0400 Subject: [PATCH] Fixes heroine bud being able to be removed by drag-dropping (#59405) Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com> --- .../xenobiology/crossbreeding/_clothing.dm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/code/modules/research/xenobiology/crossbreeding/_clothing.dm b/code/modules/research/xenobiology/crossbreeding/_clothing.dm index af25691029a..4f58cb222c4 100644 --- a/code/modules/research/xenobiology/crossbreeding/_clothing.dm +++ b/code/modules/research/xenobiology/crossbreeding/_clothing.dm @@ -108,13 +108,22 @@ Slimecrossing Armor w_class = WEIGHT_CLASS_TINY throw_speed = 1 throw_range = 3 +/obj/item/clothing/head/peaceflower/proc/at_peace_check(mob/user) + if(iscarbon(user)) + var/mob/living/carbon/carbon_user = user + if(src == carbon_user.head) + to_chat(user, "You feel at peace. Why would you want anything else?") + return TRUE + return FALSE /obj/item/clothing/head/peaceflower/attack_hand(mob/user, list/modifiers) - if(iscarbon(user)) - var/mob/living/carbon/C = user - if(src == C.head) - to_chat(user, "You feel at peace. Why would you want anything else?") - return + if(at_peace_check(user)) + return + return ..() + +/obj/item/clothing/head/peaceflower/MouseDrop(atom/over, src_location, over_location, src_control, over_control, params) + if(at_peace_check(usr)) + return return ..() /obj/item/clothing/suit/armor/heavy/adamantine