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

optimisaiton

Browse Source
This commit is contained in:
Timothy Teakettle
2020-07-14 18:51:46 +01:00
parent 1f8e47c0f5
commit 11148b0a26
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/martial/wrestling.dm
+2 -2
View File
@@ -223,9 +223,9 @@
animate(D, transform = matrix(180, MATRIX_ROTATE), time = 1, loop = 0)
sleep(15)
if (D)
animate(D, transform = null, time = 1, loop = 0)
if(transform_before && laying_before == D.lying) //animate calls sleep so this should be fine and stop a bug with transforms
D.transform = transform_before
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)
@@ -429,8 +429,8 @@
animate(A, transform = matrix(90, MATRIX_ROTATE), time = 1, loop = 0)
sleep(10)
if(A)
animate(A, transform = null, time = 1, loop = 0)
if(transform_before && laying_before == A.lying) //if they suddenly dropped to the floor between this period, don't revert their animation
animate(A, transform = null, time = 1, loop = 0)
A.transform = transform_before
A.forceMove(D.loc)