From 635e9746b63c28b01ad050211d97e1030926c940 Mon Sep 17 00:00:00 2001 From: "bbusse@gmail.com" Date: Sun, 2 Oct 2011 03:08:19 +0000 Subject: [PATCH] Fix from Rolan7 to keep flashbangs from going off when you put them in a belt. Also, security belts can hold jelly donuts. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2309 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/items/weapons/grenades.dm | 2 ++ code/game/objects/storage/belt.dm | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/grenades.dm b/code/game/objects/items/weapons/grenades.dm index 3cab5ac648d..2b5b07a2835 100644 --- a/code/game/objects/items/weapons/grenades.dm +++ b/code/game/objects/items/weapons/grenades.dm @@ -25,6 +25,7 @@ FLASHBANG afterattack(atom/target as mob|obj|turf|area, mob/user as mob) + if (istype(target, /obj/item/weapon/storage)) return ..() // Trying to put it in a full container if((user.equipped() == src)&&(!active)&&(clown_check(user))) user << "\red You prime the emp grenade! [det_time/10] seconds!" src.active = 1 @@ -117,6 +118,7 @@ FLASHBANG afterattack(atom/target as mob|obj|turf|area, mob/user as mob) + if (istype(target, /obj/item/weapon/storage)) return ..() // Trying to put it in a full container if((user.equipped() == src)&&(!active)&&(clown_check(user))) user << "\red You prime the flashbang! [det_time/10] seconds!" src.active = 1 diff --git a/code/game/objects/storage/belt.dm b/code/game/objects/storage/belt.dm index fae60568b53..1a07a187309 100644 --- a/code/game/objects/storage/belt.dm +++ b/code/game/objects/storage/belt.dm @@ -112,5 +112,6 @@ "/obj/item/clothing/glasses", "/obj/item/ammo_casing/shotgun", "/obj/item/ammo_magazine", - "/obj/item/weapon/reagent_containers/food/snacks/donut" + "/obj/item/weapon/reagent_containers/food/snacks/donut", + "/obj/item/weapon/reagent_containers/food/snacks/jellydonut" ) \ No newline at end of file