From b093f0431038d692e356137c3d96e79c87706d84 Mon Sep 17 00:00:00 2001
From: GauHelldragon <kyle-jackson@sbcglobal.net>
Date: Mon, 14 Jan 2013 05:49:39 -0800
Subject: [PATCH] Feature: Bang kitchen trays with rolling pin just like riot
 shield + baton

The public demands it!!
---
 code/game/objects/items/weapons/kitchen.dm | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm
index 9029fdfc5fc..9f16def1c3b 100644
--- a/code/game/objects/items/weapons/kitchen.dm
+++ b/code/game/objects/items/weapons/kitchen.dm
@@ -210,6 +210,16 @@
 				return
 			return
 
+/obj/item/weapon/tray/var/cooldown = 0	//shield bash cooldown. based on world.time
+
+/obj/item/weapon/tray/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/kitchen/rollingpin))
+		if(cooldown < world.time - 25)
+			user.visible_message("<span class='warning'>[user] bashes [src] with [W]!</span>")
+			playsound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1)
+			cooldown = world.time
+	else
+		..()
 
 /*
 ===============~~~~~================================~~~~~====================