cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 13:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Porting Zuhayr's Fixes For Forensics

Browse Source
This commit is contained in:
skull132
2016-02-01 17:31:29 +02:00
parent fe48f26d71
commit 0b85a4321f
6 changed files with 47 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/detectivework/microscope/microscope.dm
+14 -6
View File
@@ -89,18 +89,26 @@
user << report.info
return
/obj/machinery/microscope/AltClick()
if(usr.lying || !Adjacent(usr) || !ishuman(usr))
/obj/machinery/microscope/proc/remove_sample(var/mob/living/remover)
if(!istype(remover) || remover.stat || !Adjacent(remover))
return ..()
if(!sample)
usr << "<span class='warning'>\The [src] does not have a sample in it.</span>"
remover << "<span class='warning'>\The [src] does not have a sample in it.</span>"
return
usr << "<span class='notice'>You remove \the [sample] from \the [src].</span>"
remover << "<span class='notice'>You remove \the [sample] from \the [src].</span>"
sample.forceMove(get_turf(src))
usr.put_in_hands(sample)
remover.put_in_hands(sample)
sample = null
update_icon()
return
/obj/machinery/microscope/AltClick()
remove_sample(usr)
/obj/machinery/microscope/MouseDrop(var/atom/other)
if(usr == other)
remove_sample(usr)
else
return ..()
/obj/machinery/microscope/update_icon()
icon_state = "microscope"