{"action":"created","comment":{"url":"https://api.github.com/repos/HippieStationCode/HippieStation13/pulls/comments/65414870","id":65414870,"diff_hunk":"@@ -782,14 +782,31 @@\n \t\t\t\tif(2)\tH.healths.icon_state = \"health7\"\n \t\t\t\tif(5)\tH.healths.icon_state = \"health0\"\n \t\t\t\telse\n-\t\t\t\t\tswitch(H.health - H.staminaloss)\n+\t\t\t\t\tswitch(H.health)\n \t\t\t\t\t\tif(100 to INFINITY)\t\tH.healths.icon_state = \"health0\"\n \t\t\t\t\t\tif(80 to 100)\t\t\tH.healths.icon_state = \"health1\"\n \t\t\t\t\t\tif(60 to 80)\t\t\tH.healths.icon_state = \"health2\"\n \t\t\t\t\t\tif(40 to 60)\t\t\tH.healths.icon_state = \"health3\"\n \t\t\t\t\t\tif(20 to 40)\t\t\tH.healths.icon_state = \"health4\"\n \t\t\t\t\t\tif(0 to 20)\t\t\t\tH.healths.icon_state = \"health5\"\n \t\t\t\t\t\telse\t\t\t\t\tH.healths.icon_state = \"health6\"\n+\t\n+\n+\n+\tif(H.staminas)\n+\t\tif(H.stat == DEAD)\n+\t\t\tH.staminas.icon_state = \"stamina 6\"","path":"code/modules/mob/living/carbon/human/species.dm","position":18,"original_position":18,"commit_id":"a75cc68d8e425d01cf985c5b4ffa886811f1a1c5","original_commit_id":"a75cc68d8e425d01cf985c5b4ffa886811f1a1c5","user":{"login":"Kierany9","id":11261264,"avatar_url":"https://avatars.githubusercontent.com/u/11261264?v=3","gravatar_id":"","url":"https://api.github.com/users/Kierany9","html_url":"https://github.com/Kierany9","followers_url":"https://api.github.com/users/Kierany9/followers","following_url":"https://api.github.com/users/Kierany9/following{/other_user}","gists_url":"https://api.github.com/users/Kierany9/gists{/gist_id}","starred_url":"https://api.github.com/users/Kierany9/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Kierany9/subscriptions","organizations_url":"https://api.github.com/users/Kierany9/orgs","repos_url":"https://api.github.com/users/Kierany9/repos","events_url":"https://api.github.com/users/Kierany9/events{/privacy}","received_events_url":"https://api.github.com/users/Kierany9/received_events","type":"User","site_admin":false},"body":"This should be \"stamina6\", not \"stamina 6\". Or every other one is wrong, iunno.","created_at":"2016-06-01T18:19:03Z","updated_at":"2016-06-01T18:19:03Z","html_url":"https://github.com/HippieStationCode/HippieStation13/pull/2464#discussion_r65414870","pull_request_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/pulls/2464","_links":{"self":{"href":"https://api.github.com/repos/HippieStationCode/HippieStation13/pulls/comments/65414870"},"html":{"href":"https://github.com/HippieStationCode/HippieStation13/pull/2464#discussion_r65414870"},"pull_request":{"href":"https://api.github.com/repos/HippieStationCode/HippieStation13/pulls/2464"}}},"pull_request":{"url":"https://api.github.com/repos/HippieStationCode/HippieStation13/pulls/2464","id":71936216,"html_url":"https://github.com/HippieStationCode/HippieStation13/pull/2464","diff_url":"https://github.com/HippieStationCode/HippieStation13/pull/2464.diff","patch_url":"https://github.com/HippieStationCode/HippieStation13/pull/2464.patch","issue_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/issues/2464","number":2464,"state":"open","locked":false,"title":"Melee damage overhaul","user":{"login":"calibraptor","id":14222370,"avatar_url":"https://avatars.githubusercontent.com/u/14222370?v=3","gravatar_id":"","url":"https://api.github.com/users/calibraptor","html_url":"https://github.com/calibraptor","followers_url":"https://api.github.com/users/calibraptor/followers","following_url":"https://api.github.com/users/calibraptor/following{/other_user}","gists_url":"https://api.github.com/users/calibraptor/gists{/gist_id}","starred_url":"https://api.github.com/users/calibraptor/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/calibraptor/subscriptions","organizations_url":"https://api.github.com/users/calibraptor/orgs","repos_url":"https://api.github.com/users/calibraptor/repos","events_url":"https://api.github.com/users/calibraptor/events{/privacy}","received_events_url":"https://api.github.com/users/calibraptor/received_events","type":"User","site_admin":false},"body":"[Kierany9, Kokojo, TDCoolguy and Zadeon helped to lay the groundwork for this idea, this PR is me trying to make it a reality.]\r\n\r\nForum thread better explaining my plans here: http://hippiestation.com/showthread.php?tid=4141\r\n\r\nBasically, the purpose of this feature is to be able to beat someone until they fall over without getting bwoinked, whether it's to retrieve stolen goods or to drag a trespassing shitdick out of your department.\r\n\r\nA side effect of this PR is that fights between crew members will be longer so long as all participants have a chance to catch their breath and regain lost stamina. Otherwise if you wail on someone they'll go down in about the same number of hits as before, only difference is if you stop wailing on them once they're down they'll get back up on their own most of the time.\r\n\r\nCurrent features in this PR:\r\n\r\n[By me]\r\n- Nearly every weapon including your fists in the game now deals a combination of stamina and regular damage! The ratio of stamina to regular damage depends on the weapon itself such as how heavy or light it is and whether it's sharp or blunt..\r\n\r\n- There is now a functioning stamina indicator! The stamina indicator tracks both your real damage and fake damage whilst your health indicator tracks only your real damage and isn't affected by stamina damage.\r\n\r\n[By Kierany9]\r\n- The more hurt you are when you collapse from stamina loss, the faster you'll get up from it. This is to encourage more non-lethal takedowns and to simulate adrenaline I guess, also makes it a bit more difficult to griff someone by smacking them down each time they get back up from their stamina loss stun. If you collapse with no damage the stun will last 7 ticks, whilst being near crit will reduce it to roughly 2 ticks.\r\n\r\n- Stamina icons!\r\n\r\n![reee](https://cloud.githubusercontent.com/assets/14222370/15686362/e4904224-273d-11e6-9d6d-4328397748e6.png)\r\n\r\n\r\n","created_at":"2016-05-30T20:36:49Z","updated_at":"2016-06-01T18:19:03Z","closed_at":null,"merged_at":null,"merge_commit_sha":"974831edac60e8992380ea44e5ec8ac65932e2a9","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/pulls/2464/commits","review_comments_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/pulls/2464/comments","review_comment_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/pulls/comments{/number}","comments_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/issues/2464/comments","statuses_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/statuses/a75cc68d8e425d01cf985c5b4ffa886811f1a1c5","head":{"label":"calibraptor:Making-melee-great-again","ref":"Making-melee-great-again","sha":"a75cc68d8e425d01cf985c5b4ffa886811f1a1c5","user":{"login":"calibraptor","id":14222370,"avatar_url":"https://avatars.githubusercontent.com/u/14222370?v=3","gravatar_id":"","url":"https://api.github.com/users/calibraptor","html_url":"https://github.com/calibraptor","followers_url":"https://api.github.com/users/calibraptor/followers","following_url":"https://api.github.com/users/calibraptor/following{/other_user}","gists_url":"https://api.github.com/users/calibraptor/gists{/gist_id}","starred_url":"https://api.github.com/users/calibraptor/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/calibraptor/subscriptions","organizations_url":"https://api.github.com/users/calibraptor/orgs","repos_url":"https://api.github.com/users/calibraptor/repos","events_url":"https://api.github.com/users/calibraptor/events{/privacy}","received_events_url":"https://api.github.com/users/calibraptor/received_events","type":"User","site_admin":false},"repo":{"id":60030827,"name":"HippieStation13","full_name":"calibraptor/HippieStation13","owner":{"login":"calibraptor","id":14222370,"avatar_url":"https://avatars.githubusercontent.com/u/14222370?v=3","gravatar_id":"","url":"https://api.github.com/users/calibraptor","html_url":"https://github.com/calibraptor","followers_url":"https://api.github.com/users/calibraptor/followers","following_url":"https://api.github.com/users/calibraptor/following{/other_user}","gists_url":"https://api.github.com/users/calibraptor/gists{/gist_id}","starred_url":"https://api.github.com/users/calibraptor/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/calibraptor/subscriptions","organizations_url":"https://api.github.com/users/calibraptor/orgs","repos_url":"https://api.github.com/users/calibraptor/repos","events_url":"https://api.github.com/users/calibraptor/events{/privacy}","received_events_url":"https://api.github.com/users/calibraptor/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/calibraptor/HippieStation13","description":"PSA: Please remember to remember our coding standards, specifically all of them. Rule 6 under git is the most important.","fork":true,"url":"https://api.github.com/repos/calibraptor/HippieStation13","forks_url":"https://api.github.com/repos/calibraptor/HippieStation13/forks","keys_url":"https://api.github.com/repos/calibraptor/HippieStation13/keys{/key_id}","collaborators_url":"https://api.github.com/repos/calibraptor/HippieStation13/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/calibraptor/HippieStation13/teams","hooks_url":"https://api.github.com/repos/calibraptor/HippieStation13/hooks","issue_events_url":"https://api.github.com/repos/calibraptor/HippieStation13/issues/events{/number}","events_url":"https://api.github.com/repos/calibraptor/HippieStation13/events","assignees_url":"https://api.github.com/repos/calibraptor/HippieStation13/assignees{/user}","branches_url":"https://api.github.com/repos/calibraptor/HippieStation13/branches{/branch}","tags_url":"https://api.github.com/repos/calibraptor/HippieStation13/tags","blobs_url":"https://api.github.com/repos/calibraptor/HippieStation13/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/calibraptor/HippieStation13/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/calibraptor/HippieStation13/git/refs{/sha}","trees_url":"https://api.github.com/repos/calibraptor/HippieStation13/git/trees{/sha}","statuses_url":"https://api.github.com/repos/calibraptor/HippieStation13/statuses/{sha}","languages_url":"https://api.github.com/repos/calibraptor/HippieStation13/languages","stargazers_url":"https://api.github.com/repos/calibraptor/HippieStation13/stargazers","contributors_url":"https://api.github.com/repos/calibraptor/HippieStation13/contributors","subscribers_url":"https://api.github.com/repos/calibraptor/HippieStation13/subscribers","subscription_url":"https://api.github.com/repos/calibraptor/HippieStation13/subscription","commits_url":"https://api.github.com/repos/calibraptor/HippieStation13/commits{/sha}","git_commits_url":"https://api.github.com/repos/calibraptor/HippieStation13/git/commits{/sha}","comments_url":"https://api.github.com/repos/calibraptor/HippieStation13/comments{/number}","issue_comment_url":"https://api.github.com/repos/calibraptor/HippieStation13/issues/comments{/number}","contents_url":"https://api.github.com/repos/calibraptor/HippieStation13/contents/{+path}","compare_url":"https://api.github.com/repos/calibraptor/HippieStation13/compare/{base}...{head}","merges_url":"https://api.github.com/repos/calibraptor/HippieStation13/merges","archive_url":"https://api.github.com/repos/calibraptor/HippieStation13/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/calibraptor/HippieStation13/downloads","issues_url":"https://api.github.com/repos/calibraptor/HippieStation13/issues{/number}","pulls_url":"https://api.github.com/repos/calibraptor/HippieStation13/pulls{/number}","milestones_url":"https://api.github.com/repos/calibraptor/HippieStation13/milestones{/number}","notifications_url":"https://api.github.com/repos/calibraptor/HippieStation13/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/calibraptor/HippieStation13/labels{/name}","releases_url":"https://api.github.com/repos/calibraptor/HippieStation13/releases{/id}","deployments_url":"https://api.github.com/repos/calibraptor/HippieStation13/deployments","created_at":"2016-05-30T18:28:18Z","updated_at":"2016-05-30T18:28:36Z","pushed_at":"2016-06-01T17:38:12Z","git_url":"git://github.com/calibraptor/HippieStation13.git","ssh_url":"git@github.com:calibraptor/HippieStation13.git","clone_url":"https://github.com/calibraptor/HippieStation13.git","svn_url":"https://github.com/calibraptor/HippieStation13","homepage":"http://www.hippiestation.com/","size":810935,"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":"master"}},"base":{"label":"HippieStationCode:master","ref":"master","sha":"8d9090a5a6b48566150cb3f2d1478a182d77fa3b","user":{"login":"HippieStationCode","id":11670901,"avatar_url":"https://avatars.githubusercontent.com/u/11670901?v=3","gravatar_id":"","url":"https://api.github.com/users/HippieStationCode","html_url":"https://github.com/HippieStationCode","followers_url":"https://api.github.com/users/HippieStationCode/followers","following_url":"https://api.github.com/users/HippieStationCode/following{/other_user}","gists_url":"https://api.github.com/users/HippieStationCode/gists{/gist_id}","starred_url":"https://api.github.com/users/HippieStationCode/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/HippieStationCode/subscriptions","organizations_url":"https://api.github.com/users/HippieStationCode/orgs","repos_url":"https://api.github.com/users/HippieStationCode/repos","events_url":"https://api.github.com/users/HippieStationCode/events{/privacy}","received_events_url":"https://api.github.com/users/HippieStationCode/received_events","type":"Organization","site_admin":false},"repo":{"id":33435422,"name":"HippieStation13","full_name":"HippieStationCode/HippieStation13","owner":{"login":"HippieStationCode","id":11670901,"avatar_url":"https://avatars.githubusercontent.com/u/11670901?v=3","gravatar_id":"","url":"https://api.github.com/users/HippieStationCode","html_url":"https://github.com/HippieStationCode","followers_url":"https://api.github.com/users/HippieStationCode/followers","following_url":"https://api.github.com/users/HippieStationCode/following{/other_user}","gists_url":"https://api.github.com/users/HippieStationCode/gists{/gist_id}","starred_url":"https://api.github.com/users/HippieStationCode/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/HippieStationCode/subscriptions","organizations_url":"https://api.github.com/users/HippieStationCode/orgs","repos_url":"https://api.github.com/users/HippieStationCode/repos","events_url":"https://api.github.com/users/HippieStationCode/events{/privacy}","received_events_url":"https://api.github.com/users/HippieStationCode/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/HippieStationCode/HippieStation13","description":"PSA: Please remember to remember our coding standards, specifically all of them. Rule 6 under git is the most important.","fork":false,"url":"https://api.github.com/repos/HippieStationCode/HippieStation13","forks_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/forks","keys_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/keys{/key_id}","collaborators_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/teams","hooks_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/hooks","issue_events_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/issues/events{/number}","events_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/events","assignees_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/assignees{/user}","branches_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/branches{/branch}","tags_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/tags","blobs_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/git/refs{/sha}","trees_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/git/trees{/sha}","statuses_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/statuses/{sha}","languages_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/languages","stargazers_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/stargazers","contributors_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/contributors","subscribers_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/subscribers","subscription_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/subscription","commits_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/commits{/sha}","git_commits_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/git/commits{/sha}","comments_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/comments{/number}","issue_comment_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/issues/comments{/number}","contents_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/contents/{+path}","compare_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/compare/{base}...{head}","merges_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/merges","archive_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/downloads","issues_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/issues{/number}","pulls_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/pulls{/number}","milestones_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/milestones{/number}","notifications_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/labels{/name}","releases_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/releases{/id}","deployments_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/deployments","created_at":"2015-04-05T08:46:33Z","updated_at":"2016-05-28T15:14:32Z","pushed_at":"2016-06-01T17:38:13Z","git_url":"git://github.com/HippieStationCode/HippieStation13.git","ssh_url":"git@github.com:HippieStationCode/HippieStation13.git","clone_url":"https://github.com/HippieStationCode/HippieStation13.git","svn_url":"https://github.com/HippieStationCode/HippieStation13","homepage":"http://www.hippiestation.com/","size":842515,"stargazers_count":20,"watchers_count":20,"language":"DM","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":90,"mirror_url":null,"open_issues_count":90,"forks":90,"open_issues":90,"watchers":20,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/HippieStationCode/HippieStation13/pulls/2464"},"html":{"href":"https://github.com/HippieStationCode/HippieStation13/pull/2464"},"issue":{"href":"https://api.github.com/repos/HippieStationCode/HippieStation13/issues/2464"},"comments":{"href":"https://api.github.com/repos/HippieStationCode/HippieStation13/issues/2464/comments"},"review_comments":{"href":"https://api.github.com/repos/HippieStationCode/HippieStation13/pulls/2464/comments"},"review_comment":{"href":"https://api.github.com/repos/HippieStationCode/HippieStation13/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/HippieStationCode/HippieStation13/pulls/2464/commits"},"statuses":{"href":"https://api.github.com/repos/HippieStationCode/HippieStation13/statuses/a75cc68d8e425d01cf985c5b4ffa886811f1a1c5"}}}}
{"actor":{"display_login":"Kierany9"}}