From 5969c43ca9b2e1183f4a13b33e3127a2b1e676a9 Mon Sep 17 00:00:00 2001
From: "vageyenaman@gmail.com"
 <vageyenaman@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Tue, 19 Jul 2011 17:30:50 +0000
Subject: [PATCH] Fixed a problem with pockets.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1891 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/game/objects/items/weapons/guns_new.dm   | 37 ++++++-------------
 code/modules/mob/living/carbon/human/human.dm |  4 +-
 2 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/code/game/objects/items/weapons/guns_new.dm b/code/game/objects/items/weapons/guns_new.dm
index 3a206923af4..a09574ad0a3 100644
--- a/code/game/objects/items/weapons/guns_new.dm
+++ b/code/game/objects/items/weapons/guns_new.dm
@@ -1,20 +1,3 @@
-/* NOPE NOPE SORRY NO DERPFLAGS
-
-var/const/PROJECTILE_TASER = 1
-var/const/PROJECTILE_LASER = 2
-var/const/PROJECTILE_BULLET = 3
-var/const/PROJECTILE_PULSE = 4
-var/const/PROJECTILE_BOLT = 5
-var/const/PROJECTILE_WEAKBULLET = 6
-var/const/PROJECTILE_TELEGUN = 7
-var/const/PROJECTILE_DART = 8
-var/const/PROJECTILE_SHOCK = 9
-var/const/PROJECTILE_BULLETBURST = 10
-var/const/PROJECTILE_WEAKBULLETBURST = 11
-var/const/PROJECTILE_WEAKERBULLETBURST = 12
-
-*/
-
 #define BRUTE "brute"
 #define BURN "burn"
 #define TOX "tox"
@@ -69,7 +52,6 @@ var/const/PROJECTILE_WEAKERBULLETBURST = 12
 
 	beam
 		name = "laser"
-		//damage_type = PROJECTILE_LASER
 		icon_state = "laser"
 		pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
 		damage = 20
@@ -82,14 +64,12 @@ var/const/PROJECTILE_WEAKERBULLETBURST = 12
 
 		pulse
 			name = "pulse"
-			//damage_type = PROJECTILE_PULSE
 			icon_state = "u_laser"
 			damage = 50
 			mobdamage = list(BRUTE = 10, BURN = 40, TOX = 0, OXY = 0, CLONE = 0)
 
 	fireball
 		name = "shock"
-		//damage_type = PROJECTILE_SHOCK
 		icon_state = "fireball"
 		pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
 		damage = 20
@@ -98,7 +78,6 @@ var/const/PROJECTILE_WEAKERBULLETBURST = 12
 
 	declone
 		name = "declown"
-		//damage_type = PROJECTILE_DECLONE
 		icon_state = "declone"
 		pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
 		damage = 20
@@ -107,7 +86,6 @@ var/const/PROJECTILE_WEAKERBULLETBURST = 12
 
 	dart
 		name = "dart"
-		//damage_type = PROJECTILE_DART
 		icon_state = "toxin"
 		flag = "bio"
 		damage = 0
@@ -119,7 +97,6 @@ var/const/PROJECTILE_WEAKERBULLETBURST = 12
 
 	electrode
 		name = "electrode"
-		//damage_type = PROJECTILE_TASER
 		icon_state = "spark"
 		flag = "taser"
 		damage = 0
@@ -133,7 +110,6 @@ var/const/PROJECTILE_WEAKERBULLETBURST = 12
 
 	bolt
 		name = "bolt"
-		//damage_type = PROJECTILE_BOLT
 		icon_state = "cbbolt"
 		flag = "rad"
 		damage = 0
@@ -173,12 +149,21 @@ var/const/PROJECTILE_WEAKERBULLETBURST = 12
 	Bump(atom/A as mob|obj|turf|area)
 		if(A == firer)
 			loc = A.loc
-			return // cannot shoot yourself! NO!
+			return // cannot shoot yourself
+
 		if(bumped) return
 
 		bumped = 1
 		if(firer && istype(A, /mob))
 			var/mob/M = A
+			if(!istype(A, /mob/living))
+				if(prob(98))
+					loc = A.loc
+					return // nope.avi
+				else
+					visible_message("\red [src] vanishes into thin air!")
+					del(src) // ssssshhhhh
+
 			if(!silenced)
 				/*
 				for(var/mob/O in viewers(M))
@@ -413,7 +398,7 @@ var/const/PROJECTILE_WEAKERBULLETBURST = 12
 	item_state = "gun"
 	flags =  FPRINT | TABLEPASS | CONDUCT | ONBELT | USEDELAY
 	m_amt = 2000
-	w_class = 2.0
+	w_class = 3.0
 	throw_speed = 4
 	throwforce = 5
 	throw_range = 10
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 444a7b463c0..75f110341e9 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -840,7 +840,7 @@
 				if (emptyHand)
 					l_store.DblClick()
 				return
-			if ((!( istype(W, /obj/item) ) || W.w_class >= 2 || !( w_uniform )))
+			if ((!( istype(W, /obj/item) ) || W.w_class > 2 || !( w_uniform )))
 				return
 			u_equip(W)
 			l_store = W
@@ -849,7 +849,7 @@
 				if (emptyHand)
 					r_store.DblClick()
 				return
-			if ((!( istype(W, /obj/item) ) || W.w_class >= 2 || !( w_uniform )))
+			if ((!( istype(W, /obj/item) ) || W.w_class > 2 || !( w_uniform )))
 				return
 			u_equip(W)
 			r_store = W