From ccfa495a276802a1a590c59083452c02612b1e8a Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Fri, 17 Aug 2018 16:02:01 -0700 Subject: [PATCH] Update pneumaticCannon.dm --- code/game/objects/items/pneumaticCannon.dm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm index 54fa046019..96d64bac45 100644 --- a/code/game/objects/items/pneumaticCannon.dm +++ b/code/game/objects/items/pneumaticCannon.dm @@ -34,7 +34,6 @@ var/selfcharge = FALSE trigger_guard = TRIGGER_GUARD_NORMAL - /obj/item/pneumatic_cannon/Initialize() . = ..() if(selfcharge) @@ -289,3 +288,12 @@ charge_type = /obj/item/reagent_containers/food/snacks/pie/cream/nostun maxWeightClass = 6 //2 pies charge_ticks = 2 //4 second/pie + +/obj/item/pneumatic_cannon/grenadelauncher + var/gtimer = 15 + +/obj/item/pneumatic_cannon/grenadelauncher/throw_item(turf/target, obj/item/I, mob/user) + . = ..() + if(istype(I, /obj/item/grenade)) + var/obj/item/grenade/G = I + G.preprime(null, gtimer)