Merge pull request #4385 from FlattestGuitar/tapegag

Tape gags for all

code/game/objects/items/trash.dm

@@ -7,62 +7,85 @@
 	w_class = 1.0
 	desc = "This is rubbish."
 
-	raisins
+/obj/item/trash/raisins
 		name = "4no raisins"
 		icon_state= "4no_raisins"
-	candy
+
+/obj/item/trash/candy
 		name = "Candy"
 		icon_state= "candy"
-	cheesie
+
+/obj/item/trash/cheesie
 		name = "Cheesie honkers"
 		icon_state = "cheesie_honkers"
-	chips
+
+/obj/item/trash/chips
 		name = "Chips"
 		icon_state = "chips"
-	popcorn
+
+/obj/item/trash/popcorn
 		name = "Popcorn"
 		icon_state = "popcorn"
-	sosjerky
+
+/obj/item/trash/sosjerky
 		name = "Scaredy's Private Reserve Beef Jerky"
 		icon_state = "sosjerky"
-	syndi_cakes
+
+/obj/item/trash/syndi_cakes
 		name = "Syndi cakes"
 		icon_state = "syndi_cakes"
-	waffles
+
+/obj/item/trash/waffles
 		name = "Waffles"
 		icon_state = "waffles"
-	plate
+
+/obj/item/trash/plate
 		name = "Plate"
 		icon_state = "plate"
-	snack_bowl
+
+/obj/item/trash/snack_bowl
 		name = "Snack bowl"
 		icon_state	= "snack_bowl"
-	pistachios
+
+/obj/item/trash/pistachios
 		name = "Pistachios pack"
 		icon_state = "pistachios_pack"
-	semki
+
+/obj/item/trash/semki
 		name = "Semki pack"
 		icon_state = "semki_pack"
-	tray
+
+/obj/item/trash/tray
 		name = "Tray"
 		icon_state = "tray"
-	candle
+
+/obj/item/trash/candle
 		name = "candle"
 		icon = 'icons/obj/candle.dmi'
 		icon_state = "candle4"
-	liquidfood
+
+/obj/item/trash/liquidfood
 		name = "\improper \"LiquidFood\" ration"
 		icon_state = "liquidfood"
-	can
+
+/obj/item/trash/can
 		name = "crushed can"
 		icon_state = "cola"
-	gum
+
+/obj/item/trash/gum
 		name = "chewed gum"
 		desc = "NOT free candy."
 		icon_state = "gum"
-	tastybread
+
+/obj/item/trash/tastybread
 		name = "bread tube"
 		icon_state = "tastybread"
 
+/obj/item/trash/tapetrash
+		name = "old duct tape"
+		icon_state = "tape"
+		desc = "Not sticky anymore."
+		throw_range = 1
+
 /obj/item/trash/attack(mob/M as mob, mob/living/user as mob)
 	return

code/game/objects/items/weapons/tape.dm

@@ -12,6 +12,35 @@
 
 	update_icon()
 
+/obj/item/stack/tape_roll/attack(mob/living/carbon/human/M as mob, mob/living/user as mob)
+	if(M.wear_mask)
+		to_chat(user, "Remove their mask first!")
+	else if(amount < 2)
+		to_chat(user, "You'll need more tape for this!")
+	else if(!M.check_has_mouth())
+		to_chat(user, "They have no mouth to tape over!")
+	else
+		if(M == user)
+			to_chat(user, "You try to tape your own mouth shut.")
+		else
+			to_chat(user, "You try to tape [M]'s mouth shut.")
+			M.visible_message("<span class='warning'>[user] tries to tape [M]'s mouth closed!</span>")
+		if(do_after(user, 50, target = M))
+			if(M == user)
+				to_chat(user, "You cover your own mouth with a piece of duct tape.")
+			else
+				to_chat(user, "You cover [M]'s mouth with a piece of duct tape. That will shut them up!")
+				M.visible_message("<span class='warning'>[user] tapes [M]'s mouth shut!</span>")
+			var/obj/item/clothing/mask/muzzle/G = new /obj/item/clothing/mask/muzzle/tapegag
+			M.equip_to_slot(G, slot_wear_mask)
+			G.add_fingerprint(user)
+			amount = amount - 2
+	if(amount <= 0)
+		user.unEquip(src, 1)
+		qdel(src)
+
+
+
 /* -- Disabled for now until it has a use --
 /obj/item/stack/tape_roll/attack_self(mob/user as mob)
 	to_chat(user, "You remove a length of tape from [src].")
@@ -110,4 +139,4 @@
 			if(dir_offset & NORTH)
 				pixel_y += 32
 			else if(dir_offset & SOUTH)
-				pixel_y -= 32
+				pixel_y -= 32