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

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source 
Conflicts:
	code/modules/mob/living/carbon/resist.dm
This commit is contained in:
PsiOmegaDelta
2015-06-20 20:24:05 +02:00
parent 33dc2e5811 45e0f1b233
commit 4a5da7221c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,13 +19,13 @@
ExtinguishMob() ExtinguishMob()
return return
..()
if(handcuffed) if(handcuffed)
spawn() escape_handcuffs() spawn() escape_handcuffs()
else if(legcuffed) else if(legcuffed)
spawn() escape_legcuffs() spawn() escape_legcuffs()
..()
/mob/living/carbon/proc/escape_handcuffs() /mob/living/carbon/proc/escape_handcuffs()
if(!(last_special <= world.time)) return if(!(last_special <= world.time)) return