Merge pull request #12783 from SteelSlayer/cyber-heart-admin-freeze-fix

Tweaks to admin freeze and sleeping
This commit is contained in:
Crazy Lemon
2019-12-16 21:07:42 -08:00
committed by GitHub
2 changed files with 11 additions and 6 deletions
+2
View File
@@ -344,6 +344,8 @@
return SetSleeping(max(sleeping, amount), updating, no_alert)
/mob/living/SetSleeping(amount, updating = 1, no_alert = FALSE)
if(frozen) // If the mob has been admin frozen, sleeping should not be changeable
return
. = STATUS_UPDATE_STAT
if((!!amount) == (!!sleeping)) // We're not changing from + to 0 or vice versa
updating = FALSE