From 23f6567872e198fa380a77f5a55a9e29cde73caa 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 47d7b1e525..08357215d8 100644
--- a/code/game/objects/items/defib.dm
+++ b/code/game/objects/items/defib.dm
@@ -170,7 +170,6 @@
to_chat(user, "You need a free hand to hold the paddles!")
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 5c7df452f0..2a5e92d375 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, "You need a free hand to hold the mister!")
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 cc719f98ee..af44f998e1 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, "You need a free hand to hold the gun!")
return
update_icon()
- gun.forceMove(user)
user.update_inv_back()
else
to_chat(user, "You are already holding the gun!")