From e9988df9fb5ffbce5a180501349fa6e032a0c5ff Mon Sep 17 00:00:00 2001 From: Luc <89928798+lewcc@users.noreply.github.com> Date: Thu, 27 Jan 2022 14:33:25 -0500 Subject: [PATCH] Do away with old last_special checks (#17357) --- code/_onclick/hud/alert.dm | 3 +-- code/modules/mob/living/living.dm | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm index caf34917cb5..d30f388df39 100644 --- a/code/_onclick/hud/alert.dm +++ b/code/_onclick/hud/alert.dm @@ -656,8 +656,7 @@ so as to remain in compliance with the most up-to-date laws." if(!istype(L) || !L.can_resist()) return L.changeNext_move(CLICK_CD_RESIST) - if(L.last_special <= world.time) - return L.resist_buckle() + return L.resist_buckle() // PRIVATE = only edit, use, or override these if you're editing the system as a whole diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index b402e54ac8d..6af1c3f1a5e 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -663,7 +663,7 @@ return //unbuckling yourself - if(buckled && last_special <= world.time) + if(buckled) resist_buckle() //Breaking out of a container (Locker, sleeper, cryo...) @@ -674,7 +674,7 @@ else if(canmove) if(on_fire) resist_fire() //stop, drop, and roll - else if(last_special <= world.time) + else resist_restraints() //trying to remove cuffs. /*////////////////////