From 7770b355dd107f350c47336afca3ef02cc0faa0d Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 13 Dec 2014 22:15:13 +1030 Subject: [PATCH] Fixes #7404 --- code/_onclick/click.dm | 4 ++++ code/game/objects/structures/tables_racks.dm | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index cfa6e0cc2c2..24e729a2aad 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -338,6 +338,10 @@ is_buckled = 1 else is_buckled = 0 + + if(is_buckled) + return + if(!A || !x || !y || !A.x || !A.y) return var/dx = A.x - x var/dy = A.y - y diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 2dc9ae80572..924be309094 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -353,6 +353,9 @@ if(isrobot(user)) return + if(W.loc != user) // This should stop mounted modules ending up outside the module. + return + if(istype(W, /obj/item/weapon/melee/energy/blade)) var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread() spark_system.set_up(5, 0, src.loc) @@ -582,6 +585,8 @@ return if(isrobot(user)) return + if(W.loc != user) // This should stop mounted modules ending up outside the module. + return user.drop_item() if(W && W.loc) W.loc = src.loc return \ No newline at end of file