From 50b55e54e8d09375ea396ea4e47a45ec151cc941 Mon Sep 17 00:00:00 2001
From: kingofkosmos <monggi@gmail.com>
Date: Wed, 18 Nov 2015 06:24:23 +0200
Subject: [PATCH] Removes checks for seclite/hydrid taser + suppressor/gun to
 be in hands for combining them.

---
 code/modules/projectiles/gun.dm             | 6 ------
 code/modules/projectiles/guns/projectile.dm | 5 +----
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 423f7523d67..d64258b66af 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -260,9 +260,6 @@
 		var/obj/item/device/flashlight/seclite/S = A
 		if(can_flashlight)
 			if(!F)
-				if(user.l_hand != src && user.r_hand != src)
-					user << "<span class='warning'>You'll need [src] in your hands to do that!</span>"
-					return
 				if(!user.unEquip(A))
 					return
 				user << "<span class='notice'>You click [S] into place on [src].</span>"
@@ -276,9 +273,6 @@
 
 	if(istype(A, /obj/item/weapon/screwdriver))
 		if(F)
-			if(user.l_hand != src && user.r_hand != src)
-				user << "<span class='warning'>You'll need [src] in your hands to do that!</span>"
-				return
 			for(var/obj/item/device/flashlight/seclite/S in src)
 				user << "<span class='notice'>You unscrew the seclite from [src].</span>"
 				F = null
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index f3f93102e14..dcb69e3d0eb 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -65,9 +65,6 @@
 		var/obj/item/weapon/suppressor/S = A
 		if(can_suppress)
 			if(!suppressed)
-				if(user.l_hand != src && user.r_hand != src)
-					user << "<span class='notice'>You'll need [src] in your hands to do that.</span>"
-					return
 				if(!user.unEquip(A))
 					return
 				user << "<span class='notice'>You screw [S] onto [src].</span>"
@@ -157,4 +154,4 @@
 	icon_state = "suppressor"
 	w_class = 2
 	var/oldsound = null
-	var/initial_w_class = null
+	var/initial_w_class = null