diff --git a/code/modules/martial_arts/krav_maga.dm b/code/modules/martial_arts/krav_maga.dm
index 7267eec0306..9b589878475 100644
--- a/code/modules/martial_arts/krav_maga.dm
+++ b/code/modules/martial_arts/krav_maga.dm
@@ -9,7 +9,10 @@
button_icon_state = "neckchop"
/datum/action/neck_chop/Trigger()
- owner << "Your next attack will be a Neck Chop."
+ if(owner.incapacitated())
+ to_chat(owner, "You can't use Krav Maga while you're incapacitated.")
+ return
+ to_chat(owner, "Your next attack will be a Neck Chop.")
owner.visible_message("[owner] assumes the Neck Chop stance!")
var/mob/living/carbon/human/H = owner
H.martial_art.streak = "neck_chop"
@@ -19,7 +22,10 @@
button_icon_state = "legsweep"
/datum/action/leg_sweep/Trigger()
- owner << "Your next attack will be a Leg Sweep."
+ if(owner.incapacitated())
+ to_chat(owner, "You can't use Krav Maga while you're incapacitated.")
+ return
+ to_chat(owner, "Your next attack will be a Leg Sweep.")
owner.visible_message("[owner] assumes the Leg Sweep stance!")
var/mob/living/carbon/human/H = owner
H.martial_art.streak = "leg_sweep"
@@ -29,22 +35,25 @@
button_icon_state = "lungpunch"
/datum/action/lung_punch/Trigger()
- owner << "Your next attack will be a Lung Punch."
+ if(owner.incapacitated())
+ to_chat(owner, "You can't use Krav Maga while you're incapacitated.")
+ return
+ to_chat(owner, "Your next attack will be a Lung Punch.")
owner.visible_message("[owner] assumes the Lung Punch stance!")
var/mob/living/carbon/human/H = owner
H.martial_art.streak = "quick_choke"//internal name for lung punch
/datum/martial_art/krav_maga/teach(var/mob/living/carbon/human/H,var/make_temporary=0)
..()
- H << "You know the arts of Krav Maga!"
- H << "Place your cursor over a move at the top of the screen to see what it does."
+ to_chat(H, "You know the arts of Krav Maga!")
+ to_chat(H, "Place your cursor over a move at the top of the screen to see what it does.")
neckchop.Grant(H)
legsweep.Grant(H)
lungpunch.Grant(H)
/datum/martial_art/krav_maga/remove(var/mob/living/carbon/human/H)
..()
- H << "You suddenly forget the arts of Krav Maga..."
+ to_chat(H, "You suddenly forget the arts of Krav Maga...")
neckchop.Remove(H)
legsweep.Remove(H)
lungpunch.Remove(H)