{"action":"created","comment":{"url":"https://api.github.com/repos/Baystation12/Baystation12/pulls/comments/30772562","id":30772562,"diff_hunk":"@@ -2,42 +2,73 @@\n \tannounceWhen\t= 50\r\n \r\n \tvar/releaseWhen = 25\r\n-\tvar/list/area/prisonAreas = list()\r\n+\tvar/list/area/lightAreas = list()\t//Flickers and overloads lights in area\r\n+\tvar/list/area/generalAreas = list()\t//Opens all doors and windoors in area\r\n+\tvar/list/area/prisonAreas = list()\t//Opens security doors and lockers in area\r\n+\tvar/eventType = \"Security\"\r\n \r\n+/datum/event/prison_break/virology\r\n+\teventType = \"Medical\"\r\n+\r\n+/datum/event/prison_break/xenobiology\r\n+\teventType = \"Science\"\r\n+\r\n+/datum/event/prison_break/station\r\n+\teventType = \"Station\"\r\n \r\n /datum/event/prison_break/setup()\r\n \tannounceWhen = rand(50, 60)\r\n \treleaseWhen = rand(20, 30)\r\n-\r\n+\t\r\n \tsrc.startWhen = src.releaseWhen-1\r\n \tsrc.endWhen = src.releaseWhen+1\r\n \r\n \r\n /datum/event/prison_break/announce()\r\n-\tif(prisonAreas && prisonAreas.len > 0)\r\n-\t\tcommand_announcement.Announce(\"[pick(\"Gr3y.T1d3 virus\",\"Malignant trojan\")] detected in [station_name()] imprisonment subroutines. Recommend station AI involvement.\", \"Security Alert\")\r\n-\telse\r\n-\t\tworld.log << \"ERROR: Could not initate grey-tide. Unable find prison or brig area.\"\r\n-\t\tkill()\r\n+\tif(lightAreas && lightAreas.len > 0)\r\n+\t\tcommand_announcement.Announce(\"[pick(\"Gr3y.T1d3 virus\",\"Malignant trojan\")] detected in [station_name()] [(eventType == \"Security\")? \"imprisonment\":\"containment\"] subroutines. Recommend station AI involvement.\", \"[eventType] Alert\")\r\n \r\n \r\n /datum/event/prison_break/start()\r\n \tfor(var/area/A in world)\r\n-\t\tif(istype(A, /area/security/prison) || istype(A, /area/security/brig))\r\n-\t\t\tprisonAreas += A\r\n+\t\tif (eventType == \"Security\" || eventType == \"Station\")\r\n+\t\t\tif(istype(A, /area/security/prison) || istype(A, /area/security/brig))\r\n+\t\t\t\tprisonAreas += A\r\n+\t\t\t\tlightAreas += A\r\n+\t\tif (eventType == \"Medical\" || eventType == \"Station\")\r\n+\t\t\tif(istype(A, /area/medical/virology) || istype(A, /area/medical/virologyaccess))\r","path":"code/modules/events/prison_break.dm","position":47,"original_position":47,"commit_id":"e7801cd92df4c0f4420dd21c8748ba2b84733059","original_commit_id":"e7801cd92df4c0f4420dd21c8748ba2b84733059","user":{"login":"PsiOmegaDelta","id":496895,"avatar_url":"https://avatars.githubusercontent.com/u/496895?v=3","gravatar_id":"","url":"https://api.github.com/users/PsiOmegaDelta","html_url":"https://github.com/PsiOmegaDelta","followers_url":"https://api.github.com/users/PsiOmegaDelta/followers","following_url":"https://api.github.com/users/PsiOmegaDelta/following{/other_user}","gists_url":"https://api.github.com/users/PsiOmegaDelta/gists{/gist_id}","starred_url":"https://api.github.com/users/PsiOmegaDelta/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/PsiOmegaDelta/subscriptions","organizations_url":"https://api.github.com/users/PsiOmegaDelta/orgs","repos_url":"https://api.github.com/users/PsiOmegaDelta/repos","events_url":"https://api.github.com/users/PsiOmegaDelta/events{/privacy}","received_events_url":"https://api.github.com/users/PsiOmegaDelta/received_events","type":"User","site_admin":false},"body":"Just.. no. Define a list or common proc that each subtype overrides to acquire relevant areas.\r\nDo not have switches, if-statements, or type checks that are brittle and difficult to expand if one would like to add more subtypes.","created_at":"2015-05-21T04:43:35Z","updated_at":"2015-05-21T04:43:35Z","html_url":"https://github.com/Baystation12/Baystation12/pull/9388#discussion_r30772562","pull_request_url":"https://api.github.com/repos/Baystation12/Baystation12/pulls/9388","_links":{"self":{"href":"https://api.github.com/repos/Baystation12/Baystation12/pulls/comments/30772562"},"html":{"href":"https://github.com/Baystation12/Baystation12/pull/9388#discussion_r30772562"},"pull_request":{"href":"https://api.github.com/repos/Baystation12/Baystation12/pulls/9388"}}},"pull_request":{"url":"https://api.github.com/repos/Baystation12/Baystation12/pulls/9388","id":35878434,"html_url":"https://github.com/Baystation12/Baystation12/pull/9388","diff_url":"https://github.com/Baystation12/Baystation12/pull/9388.diff","patch_url":"https://github.com/Baystation12/Baystation12/pull/9388.patch","issue_url":"https://api.github.com/repos/Baystation12/Baystation12/issues/9388","number":9388,"state":"open","locked":false,"title":"[DNM] Expands the Prison Break event to Virology and Xenobiology.","user":{"login":"Techhead0","id":7104731,"avatar_url":"https://avatars.githubusercontent.com/u/7104731?v=3","gravatar_id":"","url":"https://api.github.com/users/Techhead0","html_url":"https://github.com/Techhead0","followers_url":"https://api.github.com/users/Techhead0/followers","following_url":"https://api.github.com/users/Techhead0/following{/other_user}","gists_url":"https://api.github.com/users/Techhead0/gists{/gist_id}","starred_url":"https://api.github.com/users/Techhead0/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Techhead0/subscriptions","organizations_url":"https://api.github.com/users/Techhead0/orgs","repos_url":"https://api.github.com/users/Techhead0/repos","events_url":"https://api.github.com/users/Techhead0/events{/privacy}","received_events_url":"https://api.github.com/users/Techhead0/received_events","type":"User","site_admin":false},"body":"The prison break random event has been renamed 'Containment Breach'.\r\nIt randomly affects either the Brig, Virology, or Xenobiology.\r\nAdditionally, a major event variant has been added that affects all three.","created_at":"2015-05-20T21:31:40Z","updated_at":"2015-05-21T04:43:35Z","closed_at":null,"merged_at":null,"merge_commit_sha":"c8c4f616e64f8635047ecbba31ca91ef54019636","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/Baystation12/Baystation12/pulls/9388/commits","review_comments_url":"https://api.github.com/repos/Baystation12/Baystation12/pulls/9388/comments","review_comment_url":"https://api.github.com/repos/Baystation12/Baystation12/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Baystation12/Baystation12/issues/9388/comments","statuses_url":"https://api.github.com/repos/Baystation12/Baystation12/statuses/e7801cd92df4c0f4420dd21c8748ba2b84733059","head":{"label":"Techhead0:prisonBreak2.0","ref":"prisonBreak2.0","sha":"e7801cd92df4c0f4420dd21c8748ba2b84733059","user":{"login":"Techhead0","id":7104731,"avatar_url":"https://avatars.githubusercontent.com/u/7104731?v=3","gravatar_id":"","url":"https://api.github.com/users/Techhead0","html_url":"https://github.com/Techhead0","followers_url":"https://api.github.com/users/Techhead0/followers","following_url":"https://api.github.com/users/Techhead0/following{/other_user}","gists_url":"https://api.github.com/users/Techhead0/gists{/gist_id}","starred_url":"https://api.github.com/users/Techhead0/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Techhead0/subscriptions","organizations_url":"https://api.github.com/users/Techhead0/orgs","repos_url":"https://api.github.com/users/Techhead0/repos","events_url":"https://api.github.com/users/Techhead0/events{/privacy}","received_events_url":"https://api.github.com/users/Techhead0/received_events","type":"User","site_admin":false},"repo":{"id":32213688,"name":"Baystation12","full_name":"Techhead0/Baystation12","owner":{"login":"Techhead0","id":7104731,"avatar_url":"https://avatars.githubusercontent.com/u/7104731?v=3","gravatar_id":"","url":"https://api.github.com/users/Techhead0","html_url":"https://github.com/Techhead0","followers_url":"https://api.github.com/users/Techhead0/followers","following_url":"https://api.github.com/users/Techhead0/following{/other_user}","gists_url":"https://api.github.com/users/Techhead0/gists{/gist_id}","starred_url":"https://api.github.com/users/Techhead0/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Techhead0/subscriptions","organizations_url":"https://api.github.com/users/Techhead0/orgs","repos_url":"https://api.github.com/users/Techhead0/repos","events_url":"https://api.github.com/users/Techhead0/events{/privacy}","received_events_url":"https://api.github.com/users/Techhead0/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/Techhead0/Baystation12","description":"The code for Baystation12's branch of SS13","fork":true,"url":"https://api.github.com/repos/Techhead0/Baystation12","forks_url":"https://api.github.com/repos/Techhead0/Baystation12/forks","keys_url":"https://api.github.com/repos/Techhead0/Baystation12/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Techhead0/Baystation12/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Techhead0/Baystation12/teams","hooks_url":"https://api.github.com/repos/Techhead0/Baystation12/hooks","issue_events_url":"https://api.github.com/repos/Techhead0/Baystation12/issues/events{/number}","events_url":"https://api.github.com/repos/Techhead0/Baystation12/events","assignees_url":"https://api.github.com/repos/Techhead0/Baystation12/assignees{/user}","branches_url":"https://api.github.com/repos/Techhead0/Baystation12/branches{/branch}","tags_url":"https://api.github.com/repos/Techhead0/Baystation12/tags","blobs_url":"https://api.github.com/repos/Techhead0/Baystation12/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Techhead0/Baystation12/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Techhead0/Baystation12/git/refs{/sha}","trees_url":"https://api.github.com/repos/Techhead0/Baystation12/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Techhead0/Baystation12/statuses/{sha}","languages_url":"https://api.github.com/repos/Techhead0/Baystation12/languages","stargazers_url":"https://api.github.com/repos/Techhead0/Baystation12/stargazers","contributors_url":"https://api.github.com/repos/Techhead0/Baystation12/contributors","subscribers_url":"https://api.github.com/repos/Techhead0/Baystation12/subscribers","subscription_url":"https://api.github.com/repos/Techhead0/Baystation12/subscription","commits_url":"https://api.github.com/repos/Techhead0/Baystation12/commits{/sha}","git_commits_url":"https://api.github.com/repos/Techhead0/Baystation12/git/commits{/sha}","comments_url":"https://api.github.com/repos/Techhead0/Baystation12/comments{/number}","issue_comment_url":"https://api.github.com/repos/Techhead0/Baystation12/issues/comments{/number}","contents_url":"https://api.github.com/repos/Techhead0/Baystation12/contents/{+path}","compare_url":"https://api.github.com/repos/Techhead0/Baystation12/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Techhead0/Baystation12/merges","archive_url":"https://api.github.com/repos/Techhead0/Baystation12/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Techhead0/Baystation12/downloads","issues_url":"https://api.github.com/repos/Techhead0/Baystation12/issues{/number}","pulls_url":"https://api.github.com/repos/Techhead0/Baystation12/pulls{/number}","milestones_url":"https://api.github.com/repos/Techhead0/Baystation12/milestones{/number}","notifications_url":"https://api.github.com/repos/Techhead0/Baystation12/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Techhead0/Baystation12/labels{/name}","releases_url":"https://api.github.com/repos/Techhead0/Baystation12/releases{/id}","created_at":"2015-03-14T13:39:40Z","updated_at":"2015-03-14T13:39:55Z","pushed_at":"2015-05-21T00:41:57Z","git_url":"git://github.com/Techhead0/Baystation12.git","ssh_url":"git@github.com:Techhead0/Baystation12.git","clone_url":"https://github.com/Techhead0/Baystation12.git","svn_url":"https://github.com/Techhead0/Baystation12","homepage":"http://baystation12.net/","size":591521,"stargazers_count":0,"watchers_count":0,"language":"DM","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"Baystation12:dev","ref":"dev","sha":"a7e346cb8135c6220fd8eb5c1cfce038748c1223","user":{"login":"Baystation12","id":1174322,"avatar_url":"https://avatars.githubusercontent.com/u/1174322?v=3","gravatar_id":"","url":"https://api.github.com/users/Baystation12","html_url":"https://github.com/Baystation12","followers_url":"https://api.github.com/users/Baystation12/followers","following_url":"https://api.github.com/users/Baystation12/following{/other_user}","gists_url":"https://api.github.com/users/Baystation12/gists{/gist_id}","starred_url":"https://api.github.com/users/Baystation12/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Baystation12/subscriptions","organizations_url":"https://api.github.com/users/Baystation12/orgs","repos_url":"https://api.github.com/users/Baystation12/repos","events_url":"https://api.github.com/users/Baystation12/events{/privacy}","received_events_url":"https://api.github.com/users/Baystation12/received_events","type":"Organization","site_admin":false},"repo":{"id":2715933,"name":"Baystation12","full_name":"Baystation12/Baystation12","owner":{"login":"Baystation12","id":1174322,"avatar_url":"https://avatars.githubusercontent.com/u/1174322?v=3","gravatar_id":"","url":"https://api.github.com/users/Baystation12","html_url":"https://github.com/Baystation12","followers_url":"https://api.github.com/users/Baystation12/followers","following_url":"https://api.github.com/users/Baystation12/following{/other_user}","gists_url":"https://api.github.com/users/Baystation12/gists{/gist_id}","starred_url":"https://api.github.com/users/Baystation12/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Baystation12/subscriptions","organizations_url":"https://api.github.com/users/Baystation12/orgs","repos_url":"https://api.github.com/users/Baystation12/repos","events_url":"https://api.github.com/users/Baystation12/events{/privacy}","received_events_url":"https://api.github.com/users/Baystation12/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/Baystation12/Baystation12","description":"The code for Baystation12's branch of SS13","fork":false,"url":"https://api.github.com/repos/Baystation12/Baystation12","forks_url":"https://api.github.com/repos/Baystation12/Baystation12/forks","keys_url":"https://api.github.com/repos/Baystation12/Baystation12/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Baystation12/Baystation12/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Baystation12/Baystation12/teams","hooks_url":"https://api.github.com/repos/Baystation12/Baystation12/hooks","issue_events_url":"https://api.github.com/repos/Baystation12/Baystation12/issues/events{/number}","events_url":"https://api.github.com/repos/Baystation12/Baystation12/events","assignees_url":"https://api.github.com/repos/Baystation12/Baystation12/assignees{/user}","branches_url":"https://api.github.com/repos/Baystation12/Baystation12/branches{/branch}","tags_url":"https://api.github.com/repos/Baystation12/Baystation12/tags","blobs_url":"https://api.github.com/repos/Baystation12/Baystation12/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Baystation12/Baystation12/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Baystation12/Baystation12/git/refs{/sha}","trees_url":"https://api.github.com/repos/Baystation12/Baystation12/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Baystation12/Baystation12/statuses/{sha}","languages_url":"https://api.github.com/repos/Baystation12/Baystation12/languages","stargazers_url":"https://api.github.com/repos/Baystation12/Baystation12/stargazers","contributors_url":"https://api.github.com/repos/Baystation12/Baystation12/contributors","subscribers_url":"https://api.github.com/repos/Baystation12/Baystation12/subscribers","subscription_url":"https://api.github.com/repos/Baystation12/Baystation12/subscription","commits_url":"https://api.github.com/repos/Baystation12/Baystation12/commits{/sha}","git_commits_url":"https://api.github.com/repos/Baystation12/Baystation12/git/commits{/sha}","comments_url":"https://api.github.com/repos/Baystation12/Baystation12/comments{/number}","issue_comment_url":"https://api.github.com/repos/Baystation12/Baystation12/issues/comments{/number}","contents_url":"https://api.github.com/repos/Baystation12/Baystation12/contents/{+path}","compare_url":"https://api.github.com/repos/Baystation12/Baystation12/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Baystation12/Baystation12/merges","archive_url":"https://api.github.com/repos/Baystation12/Baystation12/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Baystation12/Baystation12/downloads","issues_url":"https://api.github.com/repos/Baystation12/Baystation12/issues{/number}","pulls_url":"https://api.github.com/repos/Baystation12/Baystation12/pulls{/number}","milestones_url":"https://api.github.com/repos/Baystation12/Baystation12/milestones{/number}","notifications_url":"https://api.github.com/repos/Baystation12/Baystation12/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Baystation12/Baystation12/labels{/name}","releases_url":"https://api.github.com/repos/Baystation12/Baystation12/releases{/id}","created_at":"2011-11-05T16:12:41Z","updated_at":"2015-05-16T16:00:17Z","pushed_at":"2015-05-21T03:21:27Z","git_url":"git://github.com/Baystation12/Baystation12.git","ssh_url":"git@github.com:Baystation12/Baystation12.git","clone_url":"https://github.com/Baystation12/Baystation12.git","svn_url":"https://github.com/Baystation12/Baystation12","homepage":"http://baystation12.net/","size":1455662,"stargazers_count":189,"watchers_count":189,"language":"DM","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":743,"mirror_url":null,"open_issues_count":257,"forks":743,"open_issues":257,"watchers":189,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/Baystation12/Baystation12/pulls/9388"},"html":{"href":"https://github.com/Baystation12/Baystation12/pull/9388"},"issue":{"href":"https://api.github.com/repos/Baystation12/Baystation12/issues/9388"},"comments":{"href":"https://api.github.com/repos/Baystation12/Baystation12/issues/9388/comments"},"review_comments":{"href":"https://api.github.com/repos/Baystation12/Baystation12/pulls/9388/comments"},"review_comment":{"href":"https://api.github.com/repos/Baystation12/Baystation12/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Baystation12/Baystation12/pulls/9388/commits"},"statuses":{"href":"https://api.github.com/repos/Baystation12/Baystation12/statuses/e7801cd92df4c0f4420dd21c8748ba2b84733059"}}}}