{"action":"opened","number":1,"pull_request":{"url":"https://api.github.com/repos/Gyaviste/tgstation/pulls/1","id":123868206,"html_url":"https://github.com/Gyaviste/tgstation/pull/1","diff_url":"https://github.com/Gyaviste/tgstation/pull/1.diff","patch_url":"https://github.com/Gyaviste/tgstation/pull/1.patch","issue_url":"https://api.github.com/repos/Gyaviste/tgstation/issues/1","number":1,"state":"open","locked":false,"title":"merge upstream","user":{"login":"Gyaviste","id":5979121,"avatar_url":"https://avatars1.githubusercontent.com/u/5979121?v=3","gravatar_id":"","url":"https://api.github.com/users/Gyaviste","html_url":"https://github.com/Gyaviste","followers_url":"https://api.github.com/users/Gyaviste/followers","following_url":"https://api.github.com/users/Gyaviste/following{/other_user}","gists_url":"https://api.github.com/users/Gyaviste/gists{/gist_id}","starred_url":"https://api.github.com/users/Gyaviste/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Gyaviste/subscriptions","organizations_url":"https://api.github.com/users/Gyaviste/orgs","repos_url":"https://api.github.com/users/Gyaviste/repos","events_url":"https://api.github.com/users/Gyaviste/events{/privacy}","received_events_url":"https://api.github.com/users/Gyaviste/received_events","type":"User","site_admin":false},"body":"[Changelogs]: # (Please make a changelog if you're adding, removing or changing content that'll affect players. This includes, but is not limited to, new features, sprites, sounds; balance changes; map edits and important fixes)\r\n[]: # (See here for how to easily make a changelog: https://github.com/tgstation/tgstation/wiki/Changelogs. An example changelog has been provided below. Please edit or remove)\r\n\r\n\r\n:cl: optional name here\r\nadd: Added new things\r\nadd: Added more things\r\ndel: Removed old things\r\ntweak: tweaked a few things\r\nbalance: rebalanced something\r\nfix: fixed a few things\r\nwip: added a few works in progress\r\nsoundadd: added a new sound thingy\r\nsounddel: removed an old sound thingy\r\nimageadd: added some icons and images\r\nimagedel: deleted some icons and images\r\nspellcheck: fixed a few typos\r\nexperiment: added an experimental thingy\r\n/:cl:\r\n\r\n[why]: # (Please add a short description [on the next line] of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding:) \r\n","created_at":"2017-06-04T07:17:16Z","updated_at":"2017-06-04T07:17:16Z","closed_at":null,"merged_at":null,"merge_commit_sha":null,"assignee":null,"assignees":[],"requested_reviewers":[],"milestone":null,"commits_url":"https://api.github.com/repos/Gyaviste/tgstation/pulls/1/commits","review_comments_url":"https://api.github.com/repos/Gyaviste/tgstation/pulls/1/comments","review_comment_url":"https://api.github.com/repos/Gyaviste/tgstation/pulls/comments{/number}","comments_url":"https://api.github.com/repos/Gyaviste/tgstation/issues/1/comments","statuses_url":"https://api.github.com/repos/Gyaviste/tgstation/statuses/ca4efb04e93b810215434e1065b236900d89224a","head":{"label":"tgstation:master","ref":"master","sha":"ca4efb04e93b810215434e1065b236900d89224a","user":{"login":"tgstation","id":1363778,"avatar_url":"https://avatars1.githubusercontent.com/u/1363778?v=3","gravatar_id":"","url":"https://api.github.com/users/tgstation","html_url":"https://github.com/tgstation","followers_url":"https://api.github.com/users/tgstation/followers","following_url":"https://api.github.com/users/tgstation/following{/other_user}","gists_url":"https://api.github.com/users/tgstation/gists{/gist_id}","starred_url":"https://api.github.com/users/tgstation/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tgstation/subscriptions","organizations_url":"https://api.github.com/users/tgstation/orgs","repos_url":"https://api.github.com/users/tgstation/repos","events_url":"https://api.github.com/users/tgstation/events{/privacy}","received_events_url":"https://api.github.com/users/tgstation/received_events","type":"Organization","site_admin":false},"repo":{"id":3234987,"name":"tgstation","full_name":"tgstation/tgstation","owner":{"login":"tgstation","id":1363778,"avatar_url":"https://avatars1.githubusercontent.com/u/1363778?v=3","gravatar_id":"","url":"https://api.github.com/users/tgstation","html_url":"https://github.com/tgstation","followers_url":"https://api.github.com/users/tgstation/followers","following_url":"https://api.github.com/users/tgstation/following{/other_user}","gists_url":"https://api.github.com/users/tgstation/gists{/gist_id}","starred_url":"https://api.github.com/users/tgstation/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/tgstation/subscriptions","organizations_url":"https://api.github.com/users/tgstation/orgs","repos_url":"https://api.github.com/users/tgstation/repos","events_url":"https://api.github.com/users/tgstation/events{/privacy}","received_events_url":"https://api.github.com/users/tgstation/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/tgstation/tgstation","description":"the /tg/station branch of SS13","fork":false,"url":"https://api.github.com/repos/tgstation/tgstation","forks_url":"https://api.github.com/repos/tgstation/tgstation/forks","keys_url":"https://api.github.com/repos/tgstation/tgstation/keys{/key_id}","collaborators_url":"https://api.github.com/repos/tgstation/tgstation/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/tgstation/tgstation/teams","hooks_url":"https://api.github.com/repos/tgstation/tgstation/hooks","issue_events_url":"https://api.github.com/repos/tgstation/tgstation/issues/events{/number}","events_url":"https://api.github.com/repos/tgstation/tgstation/events","assignees_url":"https://api.github.com/repos/tgstation/tgstation/assignees{/user}","branches_url":"https://api.github.com/repos/tgstation/tgstation/branches{/branch}","tags_url":"https://api.github.com/repos/tgstation/tgstation/tags","blobs_url":"https://api.github.com/repos/tgstation/tgstation/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/tgstation/tgstation/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/tgstation/tgstation/git/refs{/sha}","trees_url":"https://api.github.com/repos/tgstation/tgstation/git/trees{/sha}","statuses_url":"https://api.github.com/repos/tgstation/tgstation/statuses/{sha}","languages_url":"https://api.github.com/repos/tgstation/tgstation/languages","stargazers_url":"https://api.github.com/repos/tgstation/tgstation/stargazers","contributors_url":"https://api.github.com/repos/tgstation/tgstation/contributors","subscribers_url":"https://api.github.com/repos/tgstation/tgstation/subscribers","subscription_url":"https://api.github.com/repos/tgstation/tgstation/subscription","commits_url":"https://api.github.com/repos/tgstation/tgstation/commits{/sha}","git_commits_url":"https://api.github.com/repos/tgstation/tgstation/git/commits{/sha}","comments_url":"https://api.github.com/repos/tgstation/tgstation/comments{/number}","issue_comment_url":"https://api.github.com/repos/tgstation/tgstation/issues/comments{/number}","contents_url":"https://api.github.com/repos/tgstation/tgstation/contents/{+path}","compare_url":"https://api.github.com/repos/tgstation/tgstation/compare/{base}...{head}","merges_url":"https://api.github.com/repos/tgstation/tgstation/merges","archive_url":"https://api.github.com/repos/tgstation/tgstation/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/tgstation/tgstation/downloads","issues_url":"https://api.github.com/repos/tgstation/tgstation/issues{/number}","pulls_url":"https://api.github.com/repos/tgstation/tgstation/pulls{/number}","milestones_url":"https://api.github.com/repos/tgstation/tgstation/milestones{/number}","notifications_url":"https://api.github.com/repos/tgstation/tgstation/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/tgstation/tgstation/labels{/name}","releases_url":"https://api.github.com/repos/tgstation/tgstation/releases{/id}","deployments_url":"https://api.github.com/repos/tgstation/tgstation/deployments","created_at":"2012-01-21T17:32:47Z","updated_at":"2017-06-03T08:33:55Z","pushed_at":"2017-06-04T06:40:35Z","git_url":"git://github.com/tgstation/tgstation.git","ssh_url":"git@github.com:tgstation/tgstation.git","clone_url":"https://github.com/tgstation/tgstation.git","svn_url":"https://github.com/tgstation/tgstation","homepage":"http://www.tgstation13.org/","size":864525,"stargazers_count":384,"watchers_count":384,"language":"DM","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1409,"mirror_url":null,"open_issues_count":963,"forks":1409,"open_issues":963,"watchers":384,"default_branch":"master"}},"base":{"label":"Gyaviste:master","ref":"master","sha":"85d369020b16b3f4dffeb3ec3a180f0b5461b5f5","user":{"login":"Gyaviste","id":5979121,"avatar_url":"https://avatars1.githubusercontent.com/u/5979121?v=3","gravatar_id":"","url":"https://api.github.com/users/Gyaviste","html_url":"https://github.com/Gyaviste","followers_url":"https://api.github.com/users/Gyaviste/followers","following_url":"https://api.github.com/users/Gyaviste/following{/other_user}","gists_url":"https://api.github.com/users/Gyaviste/gists{/gist_id}","starred_url":"https://api.github.com/users/Gyaviste/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Gyaviste/subscriptions","organizations_url":"https://api.github.com/users/Gyaviste/orgs","repos_url":"https://api.github.com/users/Gyaviste/repos","events_url":"https://api.github.com/users/Gyaviste/events{/privacy}","received_events_url":"https://api.github.com/users/Gyaviste/received_events","type":"User","site_admin":false},"repo":{"id":93225152,"name":"tgstation","full_name":"Gyaviste/tgstation","owner":{"login":"Gyaviste","id":5979121,"avatar_url":"https://avatars1.githubusercontent.com/u/5979121?v=3","gravatar_id":"","url":"https://api.github.com/users/Gyaviste","html_url":"https://github.com/Gyaviste","followers_url":"https://api.github.com/users/Gyaviste/followers","following_url":"https://api.github.com/users/Gyaviste/following{/other_user}","gists_url":"https://api.github.com/users/Gyaviste/gists{/gist_id}","starred_url":"https://api.github.com/users/Gyaviste/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Gyaviste/subscriptions","organizations_url":"https://api.github.com/users/Gyaviste/orgs","repos_url":"https://api.github.com/users/Gyaviste/repos","events_url":"https://api.github.com/users/Gyaviste/events{/privacy}","received_events_url":"https://api.github.com/users/Gyaviste/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/Gyaviste/tgstation","description":"the /tg/station branch of SS13","fork":true,"url":"https://api.github.com/repos/Gyaviste/tgstation","forks_url":"https://api.github.com/repos/Gyaviste/tgstation/forks","keys_url":"https://api.github.com/repos/Gyaviste/tgstation/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Gyaviste/tgstation/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Gyaviste/tgstation/teams","hooks_url":"https://api.github.com/repos/Gyaviste/tgstation/hooks","issue_events_url":"https://api.github.com/repos/Gyaviste/tgstation/issues/events{/number}","events_url":"https://api.github.com/repos/Gyaviste/tgstation/events","assignees_url":"https://api.github.com/repos/Gyaviste/tgstation/assignees{/user}","branches_url":"https://api.github.com/repos/Gyaviste/tgstation/branches{/branch}","tags_url":"https://api.github.com/repos/Gyaviste/tgstation/tags","blobs_url":"https://api.github.com/repos/Gyaviste/tgstation/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Gyaviste/tgstation/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Gyaviste/tgstation/git/refs{/sha}","trees_url":"https://api.github.com/repos/Gyaviste/tgstation/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Gyaviste/tgstation/statuses/{sha}","languages_url":"https://api.github.com/repos/Gyaviste/tgstation/languages","stargazers_url":"https://api.github.com/repos/Gyaviste/tgstation/stargazers","contributors_url":"https://api.github.com/repos/Gyaviste/tgstation/contributors","subscribers_url":"https://api.github.com/repos/Gyaviste/tgstation/subscribers","subscription_url":"https://api.github.com/repos/Gyaviste/tgstation/subscription","commits_url":"https://api.github.com/repos/Gyaviste/tgstation/commits{/sha}","git_commits_url":"https://api.github.com/repos/Gyaviste/tgstation/git/commits{/sha}","comments_url":"https://api.github.com/repos/Gyaviste/tgstation/comments{/number}","issue_comment_url":"https://api.github.com/repos/Gyaviste/tgstation/issues/comments{/number}","contents_url":"https://api.github.com/repos/Gyaviste/tgstation/contents/{+path}","compare_url":"https://api.github.com/repos/Gyaviste/tgstation/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Gyaviste/tgstation/merges","archive_url":"https://api.github.com/repos/Gyaviste/tgstation/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Gyaviste/tgstation/downloads","issues_url":"https://api.github.com/repos/Gyaviste/tgstation/issues{/number}","pulls_url":"https://api.github.com/repos/Gyaviste/tgstation/pulls{/number}","milestones_url":"https://api.github.com/repos/Gyaviste/tgstation/milestones{/number}","notifications_url":"https://api.github.com/repos/Gyaviste/tgstation/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Gyaviste/tgstation/labels{/name}","releases_url":"https://api.github.com/repos/Gyaviste/tgstation/releases{/id}","deployments_url":"https://api.github.com/repos/Gyaviste/tgstation/deployments","created_at":"2017-06-03T05:13:40Z","updated_at":"2017-06-03T05:13:52Z","pushed_at":"2017-06-03T21:35:55Z","git_url":"git://github.com/Gyaviste/tgstation.git","ssh_url":"git@github.com:Gyaviste/tgstation.git","clone_url":"https://github.com/Gyaviste/tgstation.git","svn_url":"https://github.com/Gyaviste/tgstation","homepage":"http://www.tgstation13.org/","size":864205,"stargazers_count":0,"watchers_count":0,"language":"DM","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":1,"forks":0,"open_issues":1,"watchers":0,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/Gyaviste/tgstation/pulls/1"},"html":{"href":"https://github.com/Gyaviste/tgstation/pull/1"},"issue":{"href":"https://api.github.com/repos/Gyaviste/tgstation/issues/1"},"comments":{"href":"https://api.github.com/repos/Gyaviste/tgstation/issues/1/comments"},"review_comments":{"href":"https://api.github.com/repos/Gyaviste/tgstation/pulls/1/comments"},"review_comment":{"href":"https://api.github.com/repos/Gyaviste/tgstation/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/Gyaviste/tgstation/pulls/1/commits"},"statuses":{"href":"https://api.github.com/repos/Gyaviste/tgstation/statuses/ca4efb04e93b810215434e1065b236900d89224a"}},"merged":false,"mergeable":null,"rebaseable":null,"mergeable_state":"unknown","merged_by":null,"comments":0,"review_comments":0,"maintainer_can_modify":false,"commits":31,"additions":157,"deletions":47,"changed_files":37}}
{"actor":{"display_login":"Gyaviste"}}