{"action":"created","comment":{"url":"https://api.github.com/repos/d3athrow/vgstation13/pulls/comments/42946260","id":42946260,"diff_hunk":"@@ -86,4 +92,69 @@\n \t\t\t\tdish = null\n \t\t\t\talert_noise(\"buzz\")\n \t\t\t\tpause = 0\n+\treturn\n+\n+/obj/machinery/disease2/diseaseanalyser/Topic(href, href_list)\n+\tif(..())\n+\t\treturn 1\n+\t//if (!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))\n+\t//usr.unset_machine()\n+\t//usr << browse(null, \"window=computer\")\n+\t//return\n+\tif(usr) usr.set_machine(src)\n+\n+\tif(href_list[\"eject\"])\n+\t\tfor(var/obj/item/weapon/virusdish/O in src.contents)\n+\t\t\tif(\"[O.virus2.uniqueID]\" == href_list[\"name\"])\n+\t\t\t\tO.loc = src.loc\n+\t\t\t\tif(toscan[\"O\"])\n+\t\t\t\t\ttoscan -= O\n+\t\tsrc.updateUsrDialog()\n+\telse if(href_list[\"scan\"])\n+\t\tfor(var/obj/item/weapon/virusdish/O in src.contents)\n+\t\t\tif(\"[O.virus2.uniqueID]\" == href_list[\"name\"])\n+\t\t\t\tif(!toscan[\"O\"])\n+\t\t\t\t\ttoscan += O\n+\telse if(href_list[\"print\"])\n+\t\tfor(var/obj/item/weapon/virusdish/O in src.contents)\n+\t\t\tif(\"[O.virus2.uniqueID]\" == href_list[\"name\"])\n+\t\t\t\tPrintPaper(O)\n+\telse if(href_list[\"close\"])\n+\t\tusr << browse(null, \"window=computer\")\n+\treturn\n+\n+/obj/machinery/disease2/diseaseanalyser/attack_hand(var/mob/user as mob)\n+\tuser.set_machine(src)\n+\tvar/dat\n+\tdat = \" Viral Storage & Analysis Unit V1.3\"\n+\tdat += \"<BR>Currently stored samples: [src.contents.len]\"\n+\tif (src.contents.len > 0)\n+\t\tdat += \"<table cellpadding='2' style='width: 100%;text-align:center;'><td>Name</td><td>Symptoms</td><td>Antibodies</td><td>Transmission</td><td>Options</td>\"\n+\t\tfor(var/obj/item/weapon/virusdish/B in src.contents)\n+\t\t\t//if(B == toscan[B])\n+\t\t\tvar/ID = B.virus2.uniqueID\n+\t\t\tif(\"[ID]\" in virusDB)\n+\t\t\t\tvar/datum/data/record/v = virusDB[\"[ID]\"]\n+\t\t\t\tdat += \"<BR><tr><td>[v.fields[\"name\"]]</td>\"\n+\t\t\t\tdat+=\"<td>\"\n+\t\t\t\tfor(var/datum/disease2/effectholder/e in B.virus2.effects)\n+\t\t\t\t\tdat += \"<br>[e.effect.name]\"\n+\t\t\t\tdat+=\"</td>\"\n+\t\t\t\tdat += \"<td>[v.fields[\"antigen\"]]</td>\"\n+\t\t\t\tdat += \"<td>[v.fields[\"spread type\"]]</td>\"\n+\t\t\telse\n+\t\t\t\tif(B == dish) //Analysing\n+\t\t\t\t\tdat += \"<br><tr><td>Analysing Sample.</td><td></td><td></td><td></td>\"\n+\t\t\t\telse\n+\t\t\t\t\tdat += \"<br><tr><td>Sample not in database.</td><td></td><td></td><td></td>\"\n+\t\t\tdat += \"<td>\"\n+\t\t\tif(B == dish)\n+\t\t\t\tdat += \"</td></tr>\"\n+\t\t\telse\n+\t\t\t\tdat += \"<A href='?src=\\ref[src];eject=1;name=[\"[ID]\"];'>Eject</a>\" //Disallow ejection if the sample is being analysed\n+\t\t\t\tdat += \"[B.analysed ? \"<br><A href='?src=\\ref[src];print=1;name=[\"[ID]\"];'>Print</a></td>\" : \"<br><A href='?src=\\ref[src];scan=1;name=[\"[ID]\"];'>Analyse</a></td>\"]</tr>\"\n+\t\tdat += \"</table>\"\n+\tdat += \"<BR><A href='?src=\\ref[src];close=1'>Close</a>\"","path":"code/modules/virus2/analyser.dm","position":161,"original_position":161,"commit_id":"1eb21d5c14f07616e22a38eff353e1955c533980","original_commit_id":"1eb21d5c14f07616e22a38eff353e1955c533980","user":{"login":"PJB3005","id":8107459,"avatar_url":"https://avatars.githubusercontent.com/u/8107459?v=3","gravatar_id":"","url":"https://api.github.com/users/PJB3005","html_url":"https://github.com/PJB3005","followers_url":"https://api.github.com/users/PJB3005/followers","following_url":"https://api.github.com/users/PJB3005/following{/other_user}","gists_url":"https://api.github.com/users/PJB3005/gists{/gist_id}","starred_url":"https://api.github.com/users/PJB3005/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/PJB3005/subscriptions","organizations_url":"https://api.github.com/users/PJB3005/orgs","repos_url":"https://api.github.com/users/PJB3005/repos","events_url":"https://api.github.com/users/PJB3005/events{/privacy}","received_events_url":"https://api.github.com/users/PJB3005/received_events","type":"User","site_admin":false},"body":"Don't need a close button.","created_at":"2015-10-25T15:51:31Z","updated_at":"2015-10-25T15:51:31Z","html_url":"https://github.com/d3athrow/vgstation13/pull/6304#discussion_r42946260","pull_request_url":"https://api.github.com/repos/d3athrow/vgstation13/pulls/6304","_links":{"self":{"href":"https://api.github.com/repos/d3athrow/vgstation13/pulls/comments/42946260"},"html":{"href":"https://github.com/d3athrow/vgstation13/pull/6304#discussion_r42946260"},"pull_request":{"href":"https://api.github.com/repos/d3athrow/vgstation13/pulls/6304"}}},"pull_request":{"url":"https://api.github.com/repos/d3athrow/vgstation13/pulls/6304","id":48663980,"html_url":"https://github.com/d3athrow/vgstation13/pull/6304","diff_url":"https://github.com/d3athrow/vgstation13/pull/6304.diff","patch_url":"https://github.com/d3athrow/vgstation13/pull/6304.patch","issue_url":"https://api.github.com/repos/d3athrow/vgstation13/issues/6304","number":6304,"state":"open","locked":false,"title":"Viral storage","user":{"login":"Faptastic","id":14299601,"avatar_url":"https://avatars.githubusercontent.com/u/14299601?v=3","gravatar_id":"","url":"https://api.github.com/users/Faptastic","html_url":"https://github.com/Faptastic","followers_url":"https://api.github.com/users/Faptastic/followers","following_url":"https://api.github.com/users/Faptastic/following{/other_user}","gists_url":"https://api.github.com/users/Faptastic/gists{/gist_id}","starred_url":"https://api.github.com/users/Faptastic/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Faptastic/subscriptions","organizations_url":"https://api.github.com/users/Faptastic/orgs","repos_url":"https://api.github.com/users/Faptastic/repos","events_url":"https://api.github.com/users/Faptastic/events{/privacy}","received_events_url":"https://api.github.com/users/Faptastic/received_events","type":"User","site_admin":false},"body":"You can now store analysed virus samples inside the disease analyser, the original features have been retained so it will still automatically output the analysed sample and paper but reinserting it will allow details such as symptoms and antibodies to be examined at a glance from an interface which will also be used to eject the samples or print another sheet of paper for the sample.\r\n\r\nI've done multiple tests on a local server and behavior is as expected.\r\n![ViralStorage](http://s18.postimg.org/9ozo1iz09/Viral_Storage.jpg)\r\n","created_at":"2015-10-24T20:02:36Z","updated_at":"2015-10-25T15:51:31Z","closed_at":null,"merged_at":null,"merge_commit_sha":"4592a60bf246db57557d552341aade70d425b2f3","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/d3athrow/vgstation13/pulls/6304/commits","review_comments_url":"https://api.github.com/repos/d3athrow/vgstation13/pulls/6304/comments","review_comment_url":"https://api.github.com/repos/d3athrow/vgstation13/pulls/comments{/number}","comments_url":"https://api.github.com/repos/d3athrow/vgstation13/issues/6304/comments","statuses_url":"https://api.github.com/repos/d3athrow/vgstation13/statuses/1eb21d5c14f07616e22a38eff353e1955c533980","head":{"label":"Faptastic:ViralStorage","ref":"ViralStorage","sha":"1eb21d5c14f07616e22a38eff353e1955c533980","user":{"login":"Faptastic","id":14299601,"avatar_url":"https://avatars.githubusercontent.com/u/14299601?v=3","gravatar_id":"","url":"https://api.github.com/users/Faptastic","html_url":"https://github.com/Faptastic","followers_url":"https://api.github.com/users/Faptastic/followers","following_url":"https://api.github.com/users/Faptastic/following{/other_user}","gists_url":"https://api.github.com/users/Faptastic/gists{/gist_id}","starred_url":"https://api.github.com/users/Faptastic/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Faptastic/subscriptions","organizations_url":"https://api.github.com/users/Faptastic/orgs","repos_url":"https://api.github.com/users/Faptastic/repos","events_url":"https://api.github.com/users/Faptastic/events{/privacy}","received_events_url":"https://api.github.com/users/Faptastic/received_events","type":"User","site_admin":false},"repo":{"id":42541069,"name":"vgstation13","full_name":"Faptastic/vgstation13","owner":{"login":"Faptastic","id":14299601,"avatar_url":"https://avatars.githubusercontent.com/u/14299601?v=3","gravatar_id":"","url":"https://api.github.com/users/Faptastic","html_url":"https://github.com/Faptastic","followers_url":"https://api.github.com/users/Faptastic/followers","following_url":"https://api.github.com/users/Faptastic/following{/other_user}","gists_url":"https://api.github.com/users/Faptastic/gists{/gist_id}","starred_url":"https://api.github.com/users/Faptastic/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Faptastic/subscriptions","organizations_url":"https://api.github.com/users/Faptastic/orgs","repos_url":"https://api.github.com/users/Faptastic/repos","events_url":"https://api.github.com/users/Faptastic/events{/privacy}","received_events_url":"https://api.github.com/users/Faptastic/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/Faptastic/vgstation13","description":"HONK","fork":true,"url":"https://api.github.com/repos/Faptastic/vgstation13","forks_url":"https://api.github.com/repos/Faptastic/vgstation13/forks","keys_url":"https://api.github.com/repos/Faptastic/vgstation13/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Faptastic/vgstation13/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Faptastic/vgstation13/teams","hooks_url":"https://api.github.com/repos/Faptastic/vgstation13/hooks","issue_events_url":"https://api.github.com/repos/Faptastic/vgstation13/issues/events{/number}","events_url":"https://api.github.com/repos/Faptastic/vgstation13/events","assignees_url":"https://api.github.com/repos/Faptastic/vgstation13/assignees{/user}","branches_url":"https://api.github.com/repos/Faptastic/vgstation13/branches{/branch}","tags_url":"https://api.github.com/repos/Faptastic/vgstation13/tags","blobs_url":"https://api.github.com/repos/Faptastic/vgstation13/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Faptastic/vgstation13/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Faptastic/vgstation13/git/refs{/sha}","trees_url":"https://api.github.com/repos/Faptastic/vgstation13/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Faptastic/vgstation13/statuses/{sha}","languages_url":"https://api.github.com/repos/Faptastic/vgstation13/languages","stargazers_url":"https://api.github.com/repos/Faptastic/vgstation13/stargazers","contributors_url":"https://api.github.com/repos/Faptastic/vgstation13/contributors","subscribers_url":"https://api.github.com/repos/Faptastic/vgstation13/subscribers","subscription_url":"https://api.github.com/repos/Faptastic/vgstation13/subscription","commits_url":"https://api.github.com/repos/Faptastic/vgstation13/commits{/sha}","git_commits_url":"https://api.github.com/repos/Faptastic/vgstation13/git/commits{/sha}","comments_url":"https://api.github.com/repos/Faptastic/vgstation13/comments{/number}","issue_comment_url":"https://api.github.com/repos/Faptastic/vgstation13/issues/comments{/number}","contents_url":"https://api.github.com/repos/Faptastic/vgstation13/contents/{+path}","compare_url":"https://api.github.com/repos/Faptastic/vgstation13/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Faptastic/vgstation13/merges","archive_url":"https://api.github.com/repos/Faptastic/vgstation13/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Faptastic/vgstation13/downloads","issues_url":"https://api.github.com/repos/Faptastic/vgstation13/issues{/number}","pulls_url":"https://api.github.com/repos/Faptastic/vgstation13/pulls{/number}","milestones_url":"https://api.github.com/repos/Faptastic/vgstation13/milestones{/number}","notifications_url":"https://api.github.com/repos/Faptastic/vgstation13/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Faptastic/vgstation13/labels{/name}","releases_url":"https://api.github.com/repos/Faptastic/vgstation13/releases{/id}","created_at":"2015-09-15T19:18:00Z","updated_at":"2015-09-15T19:33:34Z","pushed_at":"2015-10-25T00:30:31Z","git_url":"git://github.com/Faptastic/vgstation13.git","ssh_url":"git@github.com:Faptastic/vgstation13.git","clone_url":"https://github.com/Faptastic/vgstation13.git","svn_url":"https://github.com/Faptastic/vgstation13","homepage":"","size":875937,"stargazers_count":0,"watchers_count":0,"language":"DM","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"Bleeding-Edge"}},"base":{"label":"d3athrow:Bleeding-Edge","ref":"Bleeding-Edge","sha":"0a65da02d0238543c2bdf9752a8fbece8cf12df3","user":{"login":"d3athrow","id":706947,"avatar_url":"https://avatars.githubusercontent.com/u/706947?v=3","gravatar_id":"","url":"https://api.github.com/users/d3athrow","html_url":"https://github.com/d3athrow","followers_url":"https://api.github.com/users/d3athrow/followers","following_url":"https://api.github.com/users/d3athrow/following{/other_user}","gists_url":"https://api.github.com/users/d3athrow/gists{/gist_id}","starred_url":"https://api.github.com/users/d3athrow/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/d3athrow/subscriptions","organizations_url":"https://api.github.com/users/d3athrow/orgs","repos_url":"https://api.github.com/users/d3athrow/repos","events_url":"https://api.github.com/users/d3athrow/events{/privacy}","received_events_url":"https://api.github.com/users/d3athrow/received_events","type":"User","site_admin":false},"repo":{"id":10441188,"name":"vgstation13","full_name":"d3athrow/vgstation13","owner":{"login":"d3athrow","id":706947,"avatar_url":"https://avatars.githubusercontent.com/u/706947?v=3","gravatar_id":"","url":"https://api.github.com/users/d3athrow","html_url":"https://github.com/d3athrow","followers_url":"https://api.github.com/users/d3athrow/followers","following_url":"https://api.github.com/users/d3athrow/following{/other_user}","gists_url":"https://api.github.com/users/d3athrow/gists{/gist_id}","starred_url":"https://api.github.com/users/d3athrow/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/d3athrow/subscriptions","organizations_url":"https://api.github.com/users/d3athrow/orgs","repos_url":"https://api.github.com/users/d3athrow/repos","events_url":"https://api.github.com/users/d3athrow/events{/privacy}","received_events_url":"https://api.github.com/users/d3athrow/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/d3athrow/vgstation13","description":"Butts","fork":true,"url":"https://api.github.com/repos/d3athrow/vgstation13","forks_url":"https://api.github.com/repos/d3athrow/vgstation13/forks","keys_url":"https://api.github.com/repos/d3athrow/vgstation13/keys{/key_id}","collaborators_url":"https://api.github.com/repos/d3athrow/vgstation13/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/d3athrow/vgstation13/teams","hooks_url":"https://api.github.com/repos/d3athrow/vgstation13/hooks","issue_events_url":"https://api.github.com/repos/d3athrow/vgstation13/issues/events{/number}","events_url":"https://api.github.com/repos/d3athrow/vgstation13/events","assignees_url":"https://api.github.com/repos/d3athrow/vgstation13/assignees{/user}","branches_url":"https://api.github.com/repos/d3athrow/vgstation13/branches{/branch}","tags_url":"https://api.github.com/repos/d3athrow/vgstation13/tags","blobs_url":"https://api.github.com/repos/d3athrow/vgstation13/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/d3athrow/vgstation13/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/d3athrow/vgstation13/git/refs{/sha}","trees_url":"https://api.github.com/repos/d3athrow/vgstation13/git/trees{/sha}","statuses_url":"https://api.github.com/repos/d3athrow/vgstation13/statuses/{sha}","languages_url":"https://api.github.com/repos/d3athrow/vgstation13/languages","stargazers_url":"https://api.github.com/repos/d3athrow/vgstation13/stargazers","contributors_url":"https://api.github.com/repos/d3athrow/vgstation13/contributors","subscribers_url":"https://api.github.com/repos/d3athrow/vgstation13/subscribers","subscription_url":"https://api.github.com/repos/d3athrow/vgstation13/subscription","commits_url":"https://api.github.com/repos/d3athrow/vgstation13/commits{/sha}","git_commits_url":"https://api.github.com/repos/d3athrow/vgstation13/git/commits{/sha}","comments_url":"https://api.github.com/repos/d3athrow/vgstation13/comments{/number}","issue_comment_url":"https://api.github.com/repos/d3athrow/vgstation13/issues/comments{/number}","contents_url":"https://api.github.com/repos/d3athrow/vgstation13/contents/{+path}","compare_url":"https://api.github.com/repos/d3athrow/vgstation13/compare/{base}...{head}","merges_url":"https://api.github.com/repos/d3athrow/vgstation13/merges","archive_url":"https://api.github.com/repos/d3athrow/vgstation13/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/d3athrow/vgstation13/downloads","issues_url":"https://api.github.com/repos/d3athrow/vgstation13/issues{/number}","pulls_url":"https://api.github.com/repos/d3athrow/vgstation13/pulls{/number}","milestones_url":"https://api.github.com/repos/d3athrow/vgstation13/milestones{/number}","notifications_url":"https://api.github.com/repos/d3athrow/vgstation13/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/d3athrow/vgstation13/labels{/name}","releases_url":"https://api.github.com/repos/d3athrow/vgstation13/releases{/id}","created_at":"2013-06-02T19:39:54Z","updated_at":"2015-10-22T21:13:31Z","pushed_at":"2015-10-25T03:51:52Z","git_url":"git://github.com/d3athrow/vgstation13.git","ssh_url":"git@github.com:d3athrow/vgstation13.git","clone_url":"https://github.com/d3athrow/vgstation13.git","svn_url":"https://github.com/d3athrow/vgstation13","homepage":"","size":1093021,"stargazers_count":70,"watchers_count":70,"language":"DM","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":194,"mirror_url":null,"open_issues_count":786,"forks":194,"open_issues":786,"watchers":70,"default_branch":"Bleeding-Edge"}},"_links":{"self":{"href":"https://api.github.com/repos/d3athrow/vgstation13/pulls/6304"},"html":{"href":"https://github.com/d3athrow/vgstation13/pull/6304"},"issue":{"href":"https://api.github.com/repos/d3athrow/vgstation13/issues/6304"},"comments":{"href":"https://api.github.com/repos/d3athrow/vgstation13/issues/6304/comments"},"review_comments":{"href":"https://api.github.com/repos/d3athrow/vgstation13/pulls/6304/comments"},"review_comment":{"href":"https://api.github.com/repos/d3athrow/vgstation13/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/d3athrow/vgstation13/pulls/6304/commits"},"statuses":{"href":"https://api.github.com/repos/d3athrow/vgstation13/statuses/1eb21d5c14f07616e22a38eff353e1955c533980"}}}}