diff --git a/code/modules/ninja/suit/suit.dm b/code/modules/ninja/suit/suit.dm
index 12492c8043..6110f2b0c0 100644
--- a/code/modules/ninja/suit/suit.dm
+++ b/code/modules/ninja/suit/suit.dm
@@ -101,7 +101,7 @@ Contents:
 		to_chat(H, "<span class='danger'><B>fÄTaL ÈÈRRoR</B>: 382200-*#00CÖDE <B>RED</B>\nUNAU†HORIZED USÈ DETÈC†††eD\nCoMMÈNCING SUB-R0U†IN3 13...\nTÈRMInATING U-U-USÈR...</span>")
 		H.gib()
 		return FALSE
-	if(!istype(H.head, /obj/item/clothing/head/helmet/space/space_ninja) || !istype(H.head, /obj/item/clothing/head/hattip))//Fermichem edit, so ninjas can still use their suit with a fancy hat.
+	if(!istype(H.head, /obj/item/clothing/head/helmet/space/space_ninja))
 		to_chat(H, "<span class='userdanger'>ERROR</span>: 100113 UNABLE TO LOCATE HEAD GEAR\nABORTING...")
 		return FALSE
 	if(!istype(H.shoes, /obj/item/clothing/shoes/space_ninja))
diff --git a/modular_citadel/code/modules/reagents/objects/clothes.dm b/modular_citadel/code/modules/reagents/objects/clothes.dm
index cab2e41947..5c9f814a94 100644
--- a/modular_citadel/code/modules/reagents/objects/clothes.dm
+++ b/modular_citadel/code/modules/reagents/objects/clothes.dm
@@ -10,6 +10,9 @@
 	//item_flags = NODROP //Tips their hat!
 
 /obj/item/clothing/head/hattip/attack_hand(mob/user)
+	if(is_ninja(user))
+		to_chat(user, "<span class='notice'>Using your superior ninja reflexes, you take the hat off before tipping.</span>")
+		return ..()
 	if(iscarbon(user))
 		var/mob/living/carbon/C = user
 		if(src == C.head)
@@ -20,6 +23,9 @@
 	return ..()
 
 /obj/item/clothing/head/hattip/MouseDrop(atom/over_object)
+	if(is_ninja(user))
+		to_chat(user, "<span class='notice'>Using your superior ninja reflexes, you take the hat off before tipping.</span>")
+		return ..()
 	//You sure do love tipping your hat.
 	if(usr)
 		var/mob/living/carbon/C = usr