Merge pull request #14500 from farie82/martial-arts-fix2

Fixes some issue with being cloned while having martial arts
2026-08-21 11:07:12 +01:00 · 2020-10-02 10:47:56 +01:00
parent ed9c94210d 84813f3fc5
commit b6acce8f89
2 changed files with 9 additions and 3 deletions
@@ -113,6 +113,11 @@
 		A.on_body_transfer(old_current, current)
 	transfer_antag_huds(hud_to_transfer)				//inherit the antag HUD
 	transfer_actions(new_character)
+	if(martial_art)
+		if(martial_art.temporary)
+			martial_art.remove(current)
+		else
+			martial_art.teach(current)

 	if(active)
 		new_character.key = key		//now transfer the key to link the client to our new body