From 657810bb139d3bcf178f5bdce0336b5e4d0db43a Mon Sep 17 00:00:00 2001
From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com>
Date: Tue, 14 Jul 2020 17:08:57 +0100
Subject: [PATCH] please fix it

---
 code/datums/martial/wrestling.dm | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/code/datums/martial/wrestling.dm b/code/datums/martial/wrestling.dm
index 528032b0d9..c68423c790 100644
--- a/code/datums/martial/wrestling.dm
+++ b/code/datums/martial/wrestling.dm
@@ -215,11 +215,17 @@
 
 /datum/martial_art/wrestling/proc/FlipAnimation(mob/living/carbon/human/D)
 	set waitfor = FALSE
+	var/transform_before
 	if (D)
+		transform_before = D.transform
 		animate(D, transform = matrix(180, MATRIX_ROTATE), time = 1, loop = 0)
 	sleep(15)
 	if (D)
-		animate(D, transform = matrix(-180, MATRIX_ROTATE), time = 1, loop = 0)
+		if(transform_before)
+			sleep(10) //animate calls sleep apparently so this should be fine
+			D.transform = transform_before
+		else
+			animate(D, transform = null, time = 1, loop = 0)
 
 /datum/martial_art/wrestling/proc/slam(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	if(!D)
@@ -415,11 +421,17 @@
 			to_chat(A, "You can't drop onto [D] from here!")
 			return FALSE
 
+		var/transform_before
 		if(A)
+			transform_before = A.transform
 			animate(A, transform = matrix(90, MATRIX_ROTATE), time = 1, loop = 0)
 		sleep(10)
 		if(A)
-			animate(A, transform = matrix(-90, MATRIX_ROTATE), time = 1, loop = 0)
+			if(transform_before)
+				sleep(10)
+				A.transform = transform_before
+			else
+				animate(A, transform = null, time = 1, loop = 0)
 
 		A.forceMove(D.loc)