From 236f22096a02d85a00d4f3d291f78eadb50e76f7 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Wed, 20 Nov 2019 21:13:08 +0100
Subject: [PATCH] run
---
code/datums/martial/krav_maga.dm | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/code/datums/martial/krav_maga.dm b/code/datums/martial/krav_maga.dm
index 01b6167e8a..4e8dacaef9 100644
--- a/code/datums/martial/krav_maga.dm
+++ b/code/datums/martial/krav_maga.dm
@@ -19,8 +19,8 @@
owner.visible_message("[owner] assumes a neutral stance.", "Your next attack is cleared.")
H.mind.martial_art.streak = ""
else
- if(HAS_TRAIT(A, TRAIT_PACIFISM))
- to_chat(A, "You don't want to harm other people!")
+ if(HAS_TRAIT(H, TRAIT_PACIFISM))
+ to_chat(H, "You don't want to harm other people!")
return
owner.visible_message("[owner] assumes the Neck Chop stance!", "Your next attack will be a Neck Chop.")
H.mind.martial_art.streak = "neck_chop"
@@ -39,8 +39,8 @@
owner.visible_message("[owner] assumes a neutral stance.", "Your next attack is cleared.")
H.mind.martial_art.streak = ""
else
- if(HAS_TRAIT(A, TRAIT_PACIFISM))
- to_chat(A, "You don't want to harm other people!")
+ if(HAS_TRAIT(H, TRAIT_PACIFISM))
+ to_chat(H, "You don't want to harm other people!")
return
owner.visible_message("[owner] assumes the Leg Sweep stance!", "Your next attack will be a Leg Sweep.")
H.mind.martial_art.streak = "leg_sweep"
@@ -59,8 +59,8 @@
owner.visible_message("[owner] assumes a neutral stance.", "Your next attack is cleared.")
H.mind.martial_art.streak = ""
else
- if(HAS_TRAIT(A, TRAIT_PACIFISM))
- to_chat(A, "You don't want to harm other people!")
+ if(HAS_TRAIT(H, TRAIT_PACIFISM))
+ to_chat(H, "You don't want to harm other people!")
return
owner.visible_message("[owner] assumes the Lung Punch stance!", "Your next attack will be a Lung Punch.")
H.mind.martial_art.streak = "quick_choke"//internal name for lung punch