From ca48bb45bf221a2e6ad3b16c5b66bb21559aa82d Mon Sep 17 00:00:00 2001
From: YPOQ <30683121+YPOQ@users.noreply.github.com>
Date: Sat, 12 May 2018 23:05:35 -0600
Subject: [PATCH] Fixes defibs/watertanks/gatling lasers (#37792)

---
 code/game/objects/items/defib.dm                         | 1 -
 code/game/objects/items/tanks/watertank.dm               | 1 -
 code/modules/projectiles/guns/ballistic/laser_gatling.dm | 1 -
 3 files changed, 3 deletions(-)

diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm
index 5471f6aae06..72cbb7f1233 100644
--- a/code/game/objects/items/defib.dm
+++ b/code/game/objects/items/defib.dm
@@ -170,7 +170,6 @@
 			to_chat(user, "<span class='warning'>You need a free hand to hold the paddles!</span>")
 			update_icon()
 			return
-		paddles.forceMove(user)
 	else
 		//Remove from their hands and back onto the defib unit
 		paddles.unwield()
diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm
index 0b1c2fba5c8..b8eb2dcc00e 100644
--- a/code/game/objects/items/tanks/watertank.dm
+++ b/code/game/objects/items/tanks/watertank.dm
@@ -49,7 +49,6 @@
 			on = FALSE
 			to_chat(user, "<span class='warning'>You need a free hand to hold the mister!</span>")
 			return
-		noz.forceMove(user)
 	else
 		//Remove from their hands and put back "into" the tank
 		remove_noz()
diff --git a/code/modules/projectiles/guns/ballistic/laser_gatling.dm b/code/modules/projectiles/guns/ballistic/laser_gatling.dm
index 473a1c1604e..db5beb21ed6 100644
--- a/code/modules/projectiles/guns/ballistic/laser_gatling.dm
+++ b/code/modules/projectiles/guns/ballistic/laser_gatling.dm
@@ -40,7 +40,6 @@
 					to_chat(user, "<span class='warning'>You need a free hand to hold the gun!</span>")
 					return
 				update_icon()
-				gun.forceMove(user)
 				user.update_inv_back()
 		else
 			to_chat(user, "<span class='warning'>You are already holding the gun!</span>")