Merge pull request #4385 from FlattestGuitar/tapegag

Tape gags for all

code/modules/mob/inventory.dm

@@ -124,7 +124,6 @@
 		I.dropped(src)
 		if(I)
 			I.layer = initial(I.layer)
-
 	return 1
 
 
@@ -173,4 +172,4 @@
 			return l_hand
 		if(slot_r_hand)
 			return r_hand
-	return null
+	return null

code/modules/mob/living/carbon/carbon.dm

@@ -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
@@ -786,6 +790,21 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
 		last_special = world.time + CLICK_CD_BREAKOUT
 		cuff_resist(I)
 
+/mob/living/carbon/resist_muzzle()
+	if(!istype(wear_mask, /obj/item/clothing/mask/muzzle))
+		return
+	var/obj/item/clothing/mask/muzzle/I = wear_mask
+	var/time = I.resist_time
+	if(I.resist_time == 0)//if it's 0, you can't get out of it
+		to_chat(src, "[I] is too well made, you'll need hands for this one!")
+	else
+		visible_message("<span class='warning'>[src] gnaws on [I], trying to remove it!</span>")
+		to_chat(src, "<span class='notice'>You attempt to remove [I]... (This will take around [time/10] seconds and you need to stand still.)</span>")
+		if(do_after(src, time, 0, target = src))
+			visible_message("<span class='warning'>[src] removes [I]!</span>")
+			to_chat(src, "<span class='notice'>You get rid of [I]!</span>")
+			unEquip(I)
+
 
 /mob/living/carbon/proc/cuff_resist(obj/item/I, breakouttime = 600, cuff_break = 0)
 	breakouttime = I.breakouttime

code/modules/mob/living/carbon/human/inventory.dm

@@ -607,4 +607,4 @@
 				return 0
 			return 1
 
-	return 0 //Unsupported slot
+	return 0 //Unsupported slot

code/modules/mob/living/carbon/human/species/station.dm

@@ -104,7 +104,7 @@
 
 	flags = HAS_LIPS | CAN_BE_FAT
 	clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
-	bodyflags = FEET_PADDED | HAS_TAIL | HAS_HEAD_ACCESSORY | HAS_MARKINGS | HAS_SKIN_COLOR | TAIL_WAGGING
+	bodyflags = FEET_PADDED | HAS_TAIL | HAS_HEAD_ACCESSORY | HAS_MARKINGS | HAS_SKIN_COLOR | TAIL_WAGGING | HAS_FUR
 	dietflags = DIET_OMNI
 	reagent_tag = PROCESS_ORG
 	flesh_color = "#AFA59E"
@@ -148,7 +148,7 @@
 
 	flags = HAS_LIPS
 	clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
-	bodyflags = FEET_PADDED | HAS_TAIL | HAS_HEAD_ACCESSORY | HAS_MARKINGS | HAS_SKIN_COLOR | TAIL_WAGGING
+	bodyflags = FEET_PADDED | HAS_TAIL | HAS_HEAD_ACCESSORY | HAS_MARKINGS | HAS_SKIN_COLOR | TAIL_WAGGING | HAS_FUR
 	dietflags = DIET_OMNI
 	reagent_tag = PROCESS_ORG
 	flesh_color = "#966464"
@@ -793,4 +793,4 @@
 /datum/species/machine/handle_death(var/mob/living/carbon/human/H)
 	H.h_style = ""
 	spawn(100)
-		if(H) H.update_hair()
+		if(H) H.update_hair()

code/modules/mob/living/living.dm

@@ -580,12 +580,19 @@
 	return
 
 /mob/living/proc/resist_buckle()
+	spawn(0)
+		resist_muzzle()
 	buckled.user_unbuckle_mob(src,src)
 
+/mob/living/proc/resist_muzzle()
+	return
+
 /mob/living/proc/resist_fire()
 	return
 
 /mob/living/proc/resist_restraints()
+	spawn(0)
+		resist_muzzle()
 	return
 
 /*//////////////////////
@@ -835,4 +842,4 @@
 	if(slowed)
 		tally += 10
 
-	return tally
+	return tally

code/modules/mob/living/say.dm

@@ -166,8 +166,13 @@ proc/get_radio_key_from_channel(var/channel)
 	verb = say_quote(message, speaking)
 
 	if(is_muzzled())
-		to_chat(src, "<span class='danger'>You're muzzled and cannot speak!</span>")
-		return
+		var/obj/item/clothing/mask/muzzle/G = wear_mask
+		if(G.mute) //if the mask is supposed to mute you completely or just muffle you
+			to_chat(src, "<span class='danger'>You're muzzled and cannot speak!</span>")
+			return
+		else
+			message = muffledspeech(message)
+			verb = "mumbles"
 
 	message = trim_left(message)
 
@@ -356,7 +361,10 @@ proc/get_radio_key_from_channel(var/channel)
 		return
 
 	if(is_muzzled())
-		to_chat(src, "<span class='danger'>You're muzzled and cannot speak!</span>")
+		if(istype(wear_mask, /obj/item/clothing/mask/muzzle/tapegag)) //just for tape
+			to_chat(src, "<span class='danger'>Your mouth is taped and you cannot speak!</span>")
+		else
+			to_chat(src, "<span class='danger'>You're muzzled and cannot speak!</span>")
 		return
 
 	var/message_range = 1

code/modules/mob/mob_helpers.dm

@@ -233,6 +233,24 @@ proc/Gibberish(t, p)//t is the inputted message, and any value higher than 70 fo
 
 	return returntext
 
+proc/muffledspeech(phrase)
+	phrase = html_decode(phrase)
+	var/leng=lentext(phrase)
+	var/counter=lentext(phrase)
+	var/newphrase=""
+	var/newletter=""
+	while(counter>=1)
+		newletter=copytext(phrase,(leng-counter)+1,(leng-counter)+2)
+		if(newletter in list(" ", "!", "?", ".", ","))
+			//do nothing
+		else if(lowertext(newletter) in list("a", "e", "i", "o", "u", "y"))
+			newletter = "ph"
+		else
+			newletter = "m"
+		newphrase+="[newletter]"
+		counter-=1
+	return newphrase
+
 
 /proc/shake_camera(mob/M, duration, strength=1)
 	if(!M || !M.client || M.shakecamera)