From fdffebb3b8dced76097c9170825812ddebb2a527 Mon Sep 17 00:00:00 2001 From: MoreRobustThanYou Date: Fri, 13 Oct 2017 17:27:35 -0400 Subject: [PATCH] You can now drag-drop people into open DNA scanners (#31646) --- code/game/machinery/dna_scanner.dm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm index 034a260925..889fe42cf7 100644 --- a/code/game/machinery/dna_scanner.dm +++ b/code/game/machinery/dna_scanner.dm @@ -90,11 +90,11 @@ return C return null -/obj/machinery/dna_scannernew/close_machine() +/obj/machinery/dna_scannernew/close_machine(mob/living/carbon/user) if(!state_open) - return 0 + return FALSE - ..() + ..(user) // search for ghosts, if the corpse is empty and the scanner is connected to a cloner var/mob/living/mob_occupant = get_mob_or_brainmob(occupant) @@ -113,11 +113,11 @@ /obj/machinery/dna_scannernew/open_machine() if(state_open) - return 0 + return FALSE ..() - return 1 + return TRUE /obj/machinery/dna_scannernew/relaymove(mob/user as mob) if(user.stat || locked) @@ -149,3 +149,8 @@ return toggle_open(user) + +/obj/machinery/dna_scannernew/MouseDrop_T(mob/target, mob/user) + if(user.stat || user.lying || !Adjacent(user) || !user.Adjacent(target) || !iscarbon(target) || !user.IsAdvancedToolUser()) + return + close_machine(target)