cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-16 05:02:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resist tweaks.

Browse Source 
Can now resist out of handcuffs and buckle restraints. Fixes #12359.
No longer resist out of every possible type of restraint at the same time.

# Conflicts:
#	code/modules/mob/living/carbon/resist.dm
This commit is contained in:
PsiOmegaDelta
2016-03-08 14:58:24 +01:00
committed by Jon
parent a88dd1f961
commit 4286cd959e
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/_helpers/mobs.dm
View File

@@ -212,7 +212,7 @@ Proc for attack log creation, because really why not
if (progbar)
qdel(progbar)
/proc/do_after(mob/user, delay, atom/target = null, needhand = 1, progress = 1)
/proc/do_after(mob/user, delay, atom/target = null, needhand = 1, progress = 1, var/incapacitation_flags = INCAPACITATION_DEFAULT)
if(!user)
return 0
var/atom/target_loc = null
@@ -235,7 +235,7 @@ Proc for attack log creation, because really why not
if (progress)
progbar.update(world.time - starttime)
if(!user || user.incapacitated() || user.loc != original_loc)
if(!user || user.incapacitated(incapacitation_flags) || user.loc != original_loc)
. = 0
break