Skip to content

Commit

Permalink
Fix accidental early update_canmove removal
Browse files Browse the repository at this point in the history
  • Loading branch information
fira committed Nov 13, 2023
1 parent 66e9557 commit 9852f1f
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions code/modules/mob/living/living_health_procs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
/mob/living/proc/stun_callback()
stunned = 0
handle_regular_status_updates(FALSE)
update_canmove()
if(stun_timer != TIMER_ID_NULL)
deltimer(stun_timer)
stun_timer = TIMER_ID_NULL
Expand All @@ -110,19 +111,22 @@
stunned = max(max(stunned,amount),0) //can't go below 0, getting a low amount of stun doesn't lower your current stun
stun_clock_adjustment()
stun_callback_check()
update_canmove()
return

/mob/living/proc/SetStun(amount) //if you REALLY need to set stun to a set amount without the whole "can't go below current stunned"
if(status_flags & CANSTUN)
stunned = max(amount,0)
stun_clock_adjustment()
stun_callback_check()
update_canmove()
return

/mob/living/proc/AdjustStun(amount)
if(status_flags & CANSTUN)
stunned = max(stunned + amount,0)
stun_callback_check()
update_canmove()
return

/mob/living/proc/Daze(amount)
Expand Down Expand Up @@ -174,6 +178,7 @@
/mob/living/proc/knocked_down_callback()
knocked_down = 0
handle_regular_status_updates(FALSE)
update_canmove()
knocked_down_timer = null

/mob/living/proc/knocked_down_callback_check()
Expand All @@ -194,6 +199,7 @@
/mob/living/proc/knocked_out_callback()
knocked_out = 0
handle_regular_status_updates(FALSE)
update_canmove()
knocked_out_timer = null

/mob/living/proc/knocked_out_callback_check()
Expand All @@ -217,6 +223,7 @@
knocked_down = max(max(knocked_down,amount),0)
knockdown_clock_adjustment()
knocked_down_callback_check()
update_canmove()
return


Expand All @@ -225,12 +232,14 @@
knocked_down = max(amount,0)
knockdown_clock_adjustment()
knocked_down_callback_check()
update_canmove()
return

/mob/living/proc/AdjustKnockDown(amount)
if(status_flags & CANKNOCKDOWN)
knocked_down = max(knocked_down + amount,0)
knocked_down_callback_check()
update_canmove()
return

/mob/living/proc/knockout_clock_adjustment()
Expand All @@ -241,19 +250,22 @@
knocked_out = max(max(knocked_out,amount),0)
knockout_clock_adjustment()
knocked_out_callback_check()
update_canmove()
return

/mob/living/proc/SetKnockOut(amount)
if(status_flags & CANKNOCKOUT)
knocked_out = max(amount,0)
knockout_clock_adjustment()
knocked_out_callback_check()
update_canmove()
return

/mob/living/proc/AdjustKnockOut(amount)
if(status_flags & CANKNOCKOUT)
knocked_out = max(knocked_out + amount,0)
knocked_out_callback_check()
update_canmove()
return

/mob/living/proc/Sleeping(amount)
Expand Down

0 comments on commit 9852f1f

Please sign in to comment.