diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm index c50a58e291..f4107ab4b4 100644 --- a/code/modules/ninja/energy_katana.dm +++ b/code/modules/ninja/energy_katana.dm @@ -45,8 +45,19 @@ /obj/item/energy_katana/afterattack(atom/target, mob/user, proximity_flag, click_parameters) . = ..() - if(dash_toggled && !Adjacent(target) && !target.density) - jaunt.Teleport(user, target) + if(!ishuman(user)) + return + var/mob/living/carbon/human/H = user + var/obj/item/clothing/suit/space/space_ninja/ninja_suit = H.wear_suit + if(!istype(ninja_suit)) + to_chat(user, "ERROR: garments incompatible with carbon material jaunt. Please suit up in compatible garments.") + return + if(!dash_toggled || Adjacent(target) || target.density) + return + if(!ninja_suit.s_coold == 0) + to_chat(user, "ERROR: suit is on cooldown.") + return + jaunt.Teleport(user, target) /obj/item/energy_katana/pickup(mob/living/user) . = ..()