From cf87aca7c381cecaefe44dd2c2186f0e3ddb5390 Mon Sep 17 00:00:00 2001
From: Lzimann <lzimann@users.noreply.github.com>
Date: Wed, 1 Jun 2016 18:45:23 -0300
Subject: [PATCH] Fix temporary martial arts not working properly

---
 code/datums/martial.dm | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/code/datums/martial.dm b/code/datums/martial.dm
index 6ce74720d43..210a2b35b94 100644
--- a/code/datums/martial.dm
+++ b/code/datums/martial.dm
@@ -66,12 +66,8 @@
 		H.verbs += help_verb
 	if(make_temporary)
 		temporary = 1
-	if(H.martial_art && H.martial_art.temporary)
-		if(temporary)
-			base = H.martial_art.base
-		else
-			H.martial_art.base = src //temporary styles have priority
-			return
+	if(H.martial_art && temporary)
+		base = H.martial_art
 	H.martial_art = src
 
 /datum/martial_art/proc/remove(mob/living/carbon/human/H)