From cf818aaa37216dc38ca4e0d09db7c114cfac6f01 Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Tue, 2 Oct 2018 18:21:40 -0400 Subject: [PATCH] Fixes nanite chamber exploit (#40640) --- code/modules/research/nanites/nanite_chamber.dm | 2 +- code/modules/research/nanites/public_chamber.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/research/nanites/nanite_chamber.dm b/code/modules/research/nanites/nanite_chamber.dm index 6e07752b142..3e1ddb4c493 100644 --- a/code/modules/research/nanites/nanite_chamber.dm +++ b/code/modules/research/nanites/nanite_chamber.dm @@ -226,7 +226,7 @@ toggle_open(user) /obj/machinery/nanite_chamber/MouseDrop_T(mob/target, mob/user) - if(user.stat || user.lying || !Adjacent(user) || !user.Adjacent(target) || !iscarbon(target) || !user.IsAdvancedToolUser()) + if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK) || !Adjacent(target) || !user.Adjacent(target) || !iscarbon(target)) return if(close_machine(target)) log_combat(user, target, "inserted", null, "into [src].") diff --git a/code/modules/research/nanites/public_chamber.dm b/code/modules/research/nanites/public_chamber.dm index f55b3136893..4dd9e112c97 100644 --- a/code/modules/research/nanites/public_chamber.dm +++ b/code/modules/research/nanites/public_chamber.dm @@ -176,7 +176,7 @@ toggle_open(user) /obj/machinery/public_nanite_chamber/MouseDrop_T(mob/target, mob/user) - if(user.stat || user.lying || !Adjacent(user) || !user.Adjacent(target) || !iscarbon(target) || !user.IsAdvancedToolUser()) + if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK) || !Adjacent(target) || !user.Adjacent(target) || !iscarbon(target)) return if(close_machine(target, user)) log_combat(user, target, "inserted", null, "into [src].")