shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

You can now drag-drop people into open DNA scanners (#31646)

Browse Source
This commit is contained in:
MoreRobustThanYou
2017-10-13 16:28:24 -05:00
committed by CitadelStationBot
parent b9c07e7f66
commit fdffebb3b8
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/dna_scanner.dm
+10 -5
View File
@@ -90,11 +90,11 @@
return C return C
return null return null
/obj/machinery/dna_scannernew/close_machine() /obj/machinery/dna_scannernew/close_machine(mob/living/carbon/user)
if(!state_open) if(!state_open)
return 0 return FALSE
..() ..(user)
// search for ghosts, if the corpse is empty and the scanner is connected to a cloner // 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) var/mob/living/mob_occupant = get_mob_or_brainmob(occupant)
@@ -113,11 +113,11 @@
/obj/machinery/dna_scannernew/open_machine() /obj/machinery/dna_scannernew/open_machine()
if(state_open) if(state_open)
return 0 return FALSE
..() ..()
return 1 return TRUE
/obj/machinery/dna_scannernew/relaymove(mob/user as mob) /obj/machinery/dna_scannernew/relaymove(mob/user as mob)
if(user.stat || locked) if(user.stat || locked)
@@ -149,3 +149,8 @@
return return
toggle_open(user) 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)