Merge pull request #16741 from SabreML/spin-fix

Fixes unstoppable spinning/orbiting
This commit is contained in:
Fox McCloud
2021-09-23 11:54:47 -04:00
committed by GitHub
2 changed files with 11 additions and 11 deletions
@@ -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 = ..()