cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +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

20
code/modules/mob/living/carbon/resist.dm
View File

@@ -1,4 +1,3 @@
/mob/living/carbon/process_resist()
//drop && roll
@@ -17,9 +16,12 @@
"<span class='notice'>You extinguish yourself.</span>"
)
ExtinguishMob()
return
return TRUE
else if(handcuffed)
if(..())
return TRUE
if(handcuffed)
spawn() escape_handcuffs()
else if(legcuffed)
spawn() escape_legcuffs()
@@ -57,8 +59,8 @@
"<span class='warning'>You attempt to remove \the [HC]. (This will take around [displaytime] minutes and you need to stand still)</span>"
)
if(do_after(src, breakouttime))
if(!handcuffed)
if(do_after(src, breakouttime, incapacitation_flags = INCAPACITATION_DEFAULT & ~INCAPACITATION_RESTRAINED))
if(!handcuffed || buckled)
return
visible_message(
"<span class='danger'>\The [src] manages to remove \the [handcuffed]!</span>",
@@ -91,7 +93,7 @@
"<span class='warning'>You attempt to remove \the [HC]. (This will take around [displaytime] minutes and you need to stand still)</span>"
)
if(do_after(src, breakouttime))
if(do_after(src, breakouttime, incapacitation_flags = INCAPACITATION_DEFAULT & ~INCAPACITATION_RESTRAINED))
if(!legcuffed || buckled)
return
visible_message(
@@ -113,7 +115,7 @@
"<span class='warning'>You attempt to break your [handcuffed.name]. (This will take around 5 seconds and you need to stand still)</span>"
)
if(do_after(src, 50))
if(do_after(src, 5 SECONDS, incapacitation_flags = INCAPACITATION_DEFAULT & ~INCAPACITATION_RESTRAINED))
if(!handcuffed || buckled)
return
@@ -134,7 +136,7 @@
src << "<span class='warning'>You attempt to break your legcuffs. (This will take around 5 seconds and you need to stand still)</span>"
visible_message("<span class='danger'>[src] is trying to break the legcuffs!</span>")
if(do_after(src, 50))
if(do_after(src, 5 SECONDS, incapacitation_flags = INCAPACITATION_DEFAULT & ~INCAPACITATION_RESTRAINED))
if(!legcuffed || buckled)
return
@@ -166,7 +168,7 @@
"<span class='warning'>You attempt to unbuckle yourself. (This will take around 2 minutes and you need to stand still)</span>"
)
if(do_after(usr, 1200))
if(do_after(usr, 2 MINUTES, incapacitation_flags = INCAPACITATION_DEFAULT & ~(INCAPACITATION_RESTRAINED | INCAPACITATION_BUCKLED_FULLY)))
if(!buckled)
return
visible_message("<span class='danger'>[usr] manages to unbuckle themself!</span>",

2
code/modules/mob/living/living.dm
View File

@@ -581,11 +581,13 @@ default behaviour is:
//unbuckling yourself
if(buckled)
spawn() escape_buckle()
return TRUE
//Breaking out of a locker?
if( src.loc && (istype(src.loc, /obj/structure/closet)) )
var/obj/structure/closet/C = loc
spawn() C.mob_breakout(src)
return TRUE
/mob/living/proc/escape_inventory(obj/item/weapon/holder/H)
if(H != src.loc) return