diff --git a/code/__HELPERS/matrices.dm b/code/__HELPERS/matrices.dm index 99b3df1d21d..414a16636ec 100644 --- a/code/__HELPERS/matrices.dm +++ b/code/__HELPERS/matrices.dm @@ -3,7 +3,7 @@ Turn(.) //BYOND handles cases such as -270, 360, 540 etc. DOES NOT HANDLE 180 TURNS WELL, THEY TWEEN AND LOOK LIKE SHIT -/atom/proc/SpinAnimation(speed = 10, loops = -1, clockwise = 1, segments = 3, parallel = FALSE) +/atom/proc/SpinAnimation(speed = 10, loops = -1, clockwise = 1, segments = 3, parallel = TRUE) if(!segments) return var/segment = 360/segments diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 490ac08e1c3..1e2c6dd05e1 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -1539,7 +1539,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) shift.Translate(0,radius) transform = shift - SpinAnimation(rotation_speed, -1, clockwise, rotation_segments) + SpinAnimation(rotation_speed, -1, clockwise, rotation_segments, parallel = FALSE) while(orbiting && orbiting == A && A.loc) var/targetloc = get_turf(A) @@ -1554,7 +1554,7 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) if(orbiting == A) //make sure we haven't started orbiting something else. orbiting = null - SpinAnimation(0, 0) + SpinAnimation(0, 0, parallel = FALSE) transform = cached_transform diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 52245fa05e6..bac3f4c3349 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -418,7 +418,7 @@ throwing = TT if(spin && !no_spin && !no_spin_thrown) - SpinAnimation(5, 1, parallel = TRUE) + SpinAnimation(5, 1) SEND_SIGNAL(src, COMSIG_MOVABLE_POST_THROW, TT, spin) SSthrowing.processing[src] = TT diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm index 5be97564787..352eae47ead 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -69,7 +69,7 @@ Difficulty: Medium ranged_cooldown = world.time + ranged_cooldown_time else visible_message("[src] charges!") - SpinAnimation(speed = 20, loops = 5) + SpinAnimation(speed = 20, loops = 5, parallel = FALSE) ranged = 0 retreat_distance = 0 minimum_distance = 0 diff --git a/code/modules/reagents/chemistry/reagents/drugs.dm b/code/modules/reagents/chemistry/reagents/drugs.dm index 89362dc9166..760b2a7bc01 100644 --- a/code/modules/reagents/chemistry/reagents/drugs.dm +++ b/code/modules/reagents/chemistry/reagents/drugs.dm @@ -568,21 +568,21 @@ /datum/reagent/fliptonium/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE if(current_cycle == 5) - M.SpinAnimation(speed = 11, loops = -1) + M.SpinAnimation(speed = 11, loops = -1, parallel = FALSE) if(current_cycle == 10) - M.SpinAnimation(speed = 10, loops = -1) + M.SpinAnimation(speed = 10, loops = -1, parallel = FALSE) if(current_cycle == 15) - M.SpinAnimation(speed = 9, loops = -1) + M.SpinAnimation(speed = 9, loops = -1, parallel = FALSE) if(current_cycle == 20) - M.SpinAnimation(speed = 8, loops = -1) + M.SpinAnimation(speed = 8, loops = -1, parallel = FALSE) if(current_cycle == 25) - M.SpinAnimation(speed = 7, loops = -1) + M.SpinAnimation(speed = 7, loops = -1, parallel = FALSE) if(current_cycle == 30) - M.SpinAnimation(speed = 6, loops = -1) + M.SpinAnimation(speed = 6, loops = -1, parallel = FALSE) if(current_cycle == 40) - M.SpinAnimation(speed = 5, loops = -1) + M.SpinAnimation(speed = 5, loops = -1, parallel = FALSE) if(current_cycle == 50) - M.SpinAnimation(speed = 4, loops = -1) + M.SpinAnimation(speed = 4, loops = -1, parallel = FALSE) M.AdjustDrowsy(-6) update_flags |= M.AdjustParalysis(-1.5, FALSE) @@ -594,11 +594,11 @@ /datum/reagent/fliptonium/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume) if(method == REAGENT_INGEST || method == REAGENT_TOUCH) - M.SpinAnimation(speed = 12, loops = -1) + M.SpinAnimation(speed = 12, loops = -1, parallel = FALSE) ..() /datum/reagent/fliptonium/on_mob_delete(mob/living/M) - M.SpinAnimation(speed = 12, loops = -1) + M.SpinAnimation(speed = 12, loops = -1, parallel = FALSE) /datum/reagent/fliptonium/overdose_process(mob/living/M, severity) var/list/overdose_info = ..()