From 0954f0f50c9b099e1ee14844afad545c7e44a832 Mon Sep 17 00:00:00 2001 From: Fermi Date: Wed, 26 Jun 2019 12:07:21 +0100 Subject: [PATCH] This is why you always compile test before merging. --- .../code/modules/reagents/objects/clothes.dm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/modular_citadel/code/modules/reagents/objects/clothes.dm b/modular_citadel/code/modules/reagents/objects/clothes.dm index 5c9f814a94..73bd7f84d5 100644 --- a/modular_citadel/code/modules/reagents/objects/clothes.dm +++ b/modular_citadel/code/modules/reagents/objects/clothes.dm @@ -10,11 +10,12 @@ //item_flags = NODROP //Tips their hat! /obj/item/clothing/head/hattip/attack_hand(mob/user) - if(is_ninja(user)) - to_chat(user, "Using your superior ninja reflexes, you take the hat off before tipping.") - return ..() if(iscarbon(user)) var/mob/living/carbon/C = user + if(is_ninja(C)) + to_chat(C, "Using your superior ninja reflexes, you take the hat off before tipping.") + return ..() + if(src == C.head) C.emote("me",1,"tips their hat.",TRUE) return @@ -23,12 +24,13 @@ return ..() /obj/item/clothing/head/hattip/MouseDrop(atom/over_object) - if(is_ninja(user)) - to_chat(user, "Using your superior ninja reflexes, you take the hat off before tipping.") - return ..() //You sure do love tipping your hat. if(usr) var/mob/living/carbon/C = usr + if(is_ninja(C)) + to_chat(C, "Using your superior ninja reflexes, you take the hat off before tipping.") + return ..() + if(src == C.head) C.emote("me",1,"tips their hat.",TRUE) return