Fixes resisting, "Mphmmmph!"

This commit is contained in:
Mieszko Jędrzejczak
2016-05-08 14:15:29 +02:00
parent 805c81f3ab
commit 0dc4a3118a
3 changed files with 10 additions and 6 deletions
+4
View File
@@ -746,6 +746,8 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
spintime -= speed
/mob/living/carbon/resist_buckle()
spawn(0)
resist_muzzle()
if(restrained())
changeNext_move(CLICK_CD_BREAKOUT)
last_special = world.time + CLICK_CD_BREAKOUT
@@ -776,6 +778,8 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
/mob/living/carbon/resist_restraints()
spawn(0)
resist_muzzle()
var/obj/item/I = null
if(handcuffed)
I = handcuffed
+5 -5
View File
@@ -536,10 +536,6 @@
if(buckled && last_special <= world.time)
resist_buckle()
//unmuzzling yourself
if(is_muzzled())
resist_muzzle()
//Breaking out of a container (Locker, sleeper, cryo...)
else if(isobj(loc))
var/obj/C = loc
@@ -584,6 +580,8 @@
return
/mob/living/proc/resist_buckle()
spawn(0)
resist_muzzle()
buckled.user_unbuckle_mob(src,src)
/mob/living/proc/resist_muzzle()
@@ -593,6 +591,8 @@
return
/mob/living/proc/resist_restraints()
spawn(0)
resist_muzzle()
return
/*//////////////////////
@@ -842,4 +842,4 @@
if(slowed)
tally += 10
return tally
return tally
+1 -1
View File
@@ -423,7 +423,7 @@ proc/muffledspeech(phrase)
if(newletter in list(" ", "!", "?", ".", ","))
//do nothing
else if(lowertext(newletter) in list("a", "e", "i", "o", "u", "y"))
newletter = "h"
newletter = "ph"
else
newletter = "m"
newphrase+="[newletter]"