From 3bda7fd30db159fc074966ecd645787897b005f8 Mon Sep 17 00:00:00 2001 From: "uhangi@gmail.com" Date: Tue, 28 Sep 2010 01:19:35 +0000 Subject: [PATCH] shotgun fix goddamn I am stupid as fuck git-svn-id: http://tgstation13.googlecode.com/svn/trunk@200 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/objects/items/weapons/guns_ammo.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/guns_ammo.dm b/code/game/objects/items/weapons/guns_ammo.dm index 4af1a7b5b3e..2d435ef2152 100644 --- a/code/game/objects/items/weapons/guns_ammo.dm +++ b/code/game/objects/items/weapons/guns_ammo.dm @@ -265,7 +265,7 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us if (istype(A, /obj/item/weapon/ammo/bshell)) //var/obj/item/weapon/ammo/bshell/A = B - if ((src.s1 + src.s2) >= 2) + if ((src.s1 > 0 && src.s2 > 0)) user << "\blue It's already fully loaded!" return 1 else @@ -283,7 +283,7 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us else if (istype(A, /obj/item/weapon/ammo/gshell)) //var/obj/item/weapon/ammo/gshell/A = B - if ((src.s1 + src.s2) >= 2) + if ((src.s1 > 0 && src.s2 > 0)) user << "\blue It's already fully loaded!" return 1 else