Merge branch 'master' into development

This commit is contained in:
skull132
2016-10-30 13:18:37 -04:00
12 changed files with 106 additions and 26 deletions
+2 -1
View File
@@ -342,7 +342,8 @@ var/global/list/obj/item/device/pda/PDAs = list()
return id
/obj/item/device/pda/AltClick(var/mob/user)
verb_remove_id()
if (ismob(src.loc))
verb_remove_id()
/obj/item/device/pda/MouseDrop(obj/over_object as obj, src_location, over_location)
var/mob/M = usr