Merge pull request #4006 from FlattestGuitar/martial

Fixes martial arts going away after boxing and booze

code/datums/martial.dm

@@ -66,12 +66,11 @@
 		H.verbs += help_verb
 	if(make_temporary)
 		temporary = 1
-	if(H.martial_art && H.martial_art.temporary)
-		if(temporary)
+	if(temporary)
+		if(H.martial_art)
 			base = H.martial_art.base
-		else
-			H.martial_art.base = src //temporary styles have priority
-			return
+	else
+		base = src
 	H.martial_art = src
 
 /datum/martial_art/proc/remove(var/mob/living/carbon/human/H)
@@ -637,4 +636,4 @@
 	if(wielded)
 		return 1
 	else
-		return 0
+		return 0