shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

please fix it

Browse Source
This commit is contained in:
Timothy Teakettle
2020-07-14 17:08:57 +01:00
parent 98f63772b3
commit 657810bb13
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/martial/wrestling.dm
+14 -2
View File
@@ -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)