{"action":"created","comment":{"url":"https://api.github.com/repos/HippieStationCode/HippieStation13/pulls/comments/61651789","id":61651789,"diff_hunk":"@@ -15,70 +64,70 @@\n \tw_class = 4\n \tmaterials = list(MAT_GLASS=7500, MAT_METAL=1000)\n \torigin_tech = \"materials=2\"\n-\tattack_verb = list(\"shoved\", \"bashed\")\n-\tvar/cooldown = 0 //shield bash cooldown. based on world.time\n+\tslowdown_deployed = 2\n+\tblock_chance_deployed = list(melee = 70, bullet = 60, laser = 40, energy = 30)\n+\tvar/cooldown = 0\n \n-/obj/item/weapon/shield/riot/attackby(obj/item/weapon/W, mob/user, params)\n-\tif(istype(W, /obj/item/weapon/melee/baton))\n+/obj/item/weapon/shield/deployable/riot/attack_self(mob/living/user)\n+\t..()\n+\tblock_push = active\n+\n+/obj/item/weapon/shield/deployable/riot/attackby(obj/item/weapon/W, mob/user, params)\n+\tif(istype(W, /obj/item/weapon/melee/baton) && active)\n \t\tif(cooldown < world.time - 25)\n \t\t\tuser.visible_message(\"<span class='warning'>[user] bashes [src] with [W]!</span>\")\n \t\t\tplaysound(user.loc, 'sound/effects/shieldbash.ogg', 50, 1)\n \t\t\tcooldown = world.time\n \telse\n \t\t..()\n \n-/obj/item/weapon/shield/riot/roman\n-\tname = \"roman shield\"\n-\tdesc = \"Bears an inscription on the inside: <i>\\\"Romanes venio domus\\\"</i>.\"\n-\ticon_state = \"roman_shield\"\n-\titem_state = \"roman_shield\"\n+/obj/item/weapon/shield/deployable/riot/dropped(mob/user)\n+\tif(active && user)\n+\t\tattack_self(user)\n \n-/obj/item/weapon/shield/energy\n+/obj/item/weapon/shield/deployable/energy\n \tname = \"energy combat shield\"\n \tdesc = \"A shield capable of stopping most melee attacks. Protects user from almost all energy projectiles. It can be retracted, expanded, and stored anywhere.\"\n-\ticon = 'icons/obj/weapons.dmi'\n-\ticon_state = \"eshield0\" // eshield1 for expanded\n+\ticon_state = \"eshield\"","path":"code/game/objects/items/weapons/shields.dm","position":105,"original_position":105,"commit_id":"515453e40bebfa2bcc1555bcfabdbc99e2ac03c5","original_commit_id":"515453e40bebfa2bcc1555bcfabdbc99e2ac03c5","user":{"login":"JohnGinnane","id":3355198,"avatar_url":"https://avatars.githubusercontent.com/u/3355198?v=3","gravatar_id":"","url":"https://api.github.com/users/JohnGinnane","html_url":"https://github.com/JohnGinnane","followers_url":"https://api.github.com/users/JohnGinnane/followers","following_url":"https://api.github.com/users/JohnGinnane/following{/other_user}","gists_url":"https://api.github.com/users/JohnGinnane/gists{/gist_id}","starred_url":"https://api.github.com/users/JohnGinnane/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/JohnGinnane/subscriptions","organizations_url":"https://api.github.com/users/JohnGinnane/orgs","repos_url":"https://api.github.com/users/JohnGinnane/repos","events_url":"https://api.github.com/users/JohnGinnane/events{/privacy}","received_events_url":"https://api.github.com/users/JohnGinnane/received_events","type":"User","site_admin":false},"body":"Should this not be \"eshield0\" so when it's created it's inactive?","created_at":"2016-04-29T22:12:51Z","updated_at":"2016-04-29T22:12:51Z","html_url":"https://github.com/HippieStationCode/HippieStation13/pull/2226#discussion_r61651789","pull_request_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/pulls/2226","_links":{"self":{"href":"https://api.github.com/repos/HippieStationCode/HippieStation13/pulls/comments/61651789"},"html":{"href":"https://github.com/HippieStationCode/HippieStation13/pull/2226#discussion_r61651789"},"pull_request":{"href":"https://api.github.com/repos/HippieStationCode/HippieStation13/pulls/2226"}}},"pull_request":{"url":"https://api.github.com/repos/HippieStationCode/HippieStation13/pulls/2226","id":68303173,"html_url":"https://github.com/HippieStationCode/HippieStation13/pull/2226","diff_url":"https://github.com/HippieStationCode/HippieStation13/pull/2226.diff","patch_url":"https://github.com/HippieStationCode/HippieStation13/pull/2226.patch","issue_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/issues/2226","number":2226,"state":"open","locked":false,"title":"Shield Overhaul","user":{"login":"Crystalwarrior","id":3470436,"avatar_url":"https://avatars.githubusercontent.com/u/3470436?v=3","gravatar_id":"","url":"https://api.github.com/users/Crystalwarrior","html_url":"https://github.com/Crystalwarrior","followers_url":"https://api.github.com/users/Crystalwarrior/followers","following_url":"https://api.github.com/users/Crystalwarrior/following{/other_user}","gists_url":"https://api.github.com/users/Crystalwarrior/gists{/gist_id}","starred_url":"https://api.github.com/users/Crystalwarrior/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Crystalwarrior/subscriptions","organizations_url":"https://api.github.com/users/Crystalwarrior/orgs","repos_url":"https://api.github.com/users/Crystalwarrior/repos","events_url":"https://api.github.com/users/Crystalwarrior/events{/privacy}","received_events_url":"https://api.github.com/users/Crystalwarrior/received_events","type":"User","site_admin":false},"body":"changes:\r\n  - bugfix: \"Fixed inactive shields (teleshields, energy shields) still blocking projectiles even when inactive\"\r\n  - tweak: \"Shields now have varying protect chances on various damage types\"\r\n  - tweak: \" + Changeling Shield:\tmelee = 70, bullet = 50, laser = 40, energy = 30\"\r\n  - tweak: \" + Tray Shield:\t\t\tmelee = 70, bullet = 50, laser = 40, energy = 30\"\r\n  - tweak: \" + Bo Staff:\t\t\tmelee = 50, bullet = 50, laser = 50, energy = 50\"\r\n  - tweak: \" + Riot Shield:\t\t\tmelee = 70, bullet = 60, laser = 40, energy = 30 (Added slowdown when deployed, can be deployed similar to telescopic/energy shield)\"\r\n  - tweak: \" + Energy Shield:\t\tmelee = 60, bullet = 70, laser = 60, energy = 40 (still 100% reflect chance on energy projectiles tho)\"\r\n  - tweak: \" + Telescopic Shield:\tmelee = 50, bullet = 30, laser = 20, energy = 20\"\r\n  - tweak: \" + Roman Shield:\t\tmelee = 70, bullet = 50, laser = 50, energy = 50\"","created_at":"2016-04-28T22:52:12Z","updated_at":"2016-04-29T22:12:51Z","closed_at":null,"merged_at":null,"merge_commit_sha":"8c49046768318076fae07d2a1fe7731e4a1cee87","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/pulls/2226/commits","review_comments_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/pulls/2226/comments","review_comment_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/pulls/comments{/number}","comments_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/issues/2226/comments","statuses_url":"https://api.github.com/repos/HippieStationCode/HippieStation13/statuses/515453e40bebfa2bcc1555bcfabdbc99e2ac03c5","head":{"label":"Crystalwarrior:Shield_Overhaul","ref":"Shield_Overhaul","sha":"515453e40bebfa2bcc1555bcfabdbc99e2ac03c5","user":{"login":"Crystalwarrior","id":3470436,"avatar_url":"https://avatars.githubusercontent.com/u/3470436?v=3","gravatar_id":"","url":"https://api.github.com/users/Crystalwarrior","html_url":"https://github.com/Crystalwarrior","followers_url":"https://api.github.com/users/Crystalwarrior/followers","following_url":"https://api.github.com/users/Crystalwarrior/following{/other_user}","gists_url":"https://api.github.com/users/Crystalwarrior/gists{/gist_id}","starred_url":"https://api.github.com/users/Crystalwarrior/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Crystalwarrior/subscriptions","organizations_url":"https://api.github.com/users/Crystalwarrior/orgs","repos_url":"https://api.github.com/users/Crystalwarrior/repos","events_url":"https://api.github.com/users/Crystalwarrior/events{/privacy}","received_events_url":"https://api.github.com/users/Crystalwarrior/received_events","type":"User","site_admin":false},"repo":{"id":45267808,"name":"HippieStation13","full_name":"Crystalwarrior/HippieStation13","owner":{"login":"Crystalwarrior","id":3470436,"avatar_url":"https://avatars.githubusercontent.com/u/3470436?v=3","gravatar_id":"","url":"https://api.github.com/users/Crystalwarrior","html_url":"https://github.com/Crystalwarrior","followers_url":"https://api.github.com/users/Crystalwarrior/followers","following_url":"https://api.github.com/users/Crystalwarrior/following{/other_user}","gists_url":"https://api.github.com/users/Crystalwarrior/gists{/gist_id}","starred_url":"https://api.github.com/users/Crystalwarrior/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Crystalwarrior/subscriptions","organizations_url":"https://api.github.com/users/Crystalwarrior/orgs","repos_url":"https://api.github.com/users/Crystalwarrior/repos","events_url":"https://api.github.com/users/Crystalwarrior/events{/privacy}","received_events_url":"https://api.github.com/users/Crystalwarrior/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/Crystalwarrior/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/Crystalwarrior/HippieStation13","forks_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/forks","keys_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/keys{/key_id}","collaborators_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/teams","hooks_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/hooks","issue_events_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/issues/events{/number}","events_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/events","assignees_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/assignees{/user}","branches_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/branches{/branch}","tags_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/tags","blobs_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/git/refs{/sha}","trees_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/git/trees{/sha}","statuses_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/statuses/{sha}","languages_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/languages","stargazers_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/stargazers","contributors_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/contributors","subscribers_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/subscribers","subscription_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/subscription","commits_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/commits{/sha}","git_commits_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/git/commits{/sha}","comments_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/comments{/number}","issue_comment_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/issues/comments{/number}","contents_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/contents/{+path}","compare_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/compare/{base}...{head}","merges_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/merges","archive_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/downloads","issues_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/issues{/number}","pulls_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/pulls{/number}","milestones_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/milestones{/number}","notifications_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/labels{/name}","releases_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/releases{/id}","deployments_url":"https://api.github.com/repos/Crystalwarrior/HippieStation13/deployments","created_at":"2015-10-30T18:00:23Z","updated_at":"2016-04-02T14:22:02Z","pushed_at":"2016-04-29T21:43:02Z","git_url":"git://github.com/Crystalwarrior/HippieStation13.git","ssh_url":"git@github.com:Crystalwarrior/HippieStation13.git","clone_url":"https://github.com/Crystalwarrior/HippieStation13.git","svn_url":"https://github.com/Crystalwarrior/HippieStation13","homepage":"http://www.hippie-station-13.com/forums/viewtopic.php?f=51&t=1120","size":796486,"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":"8e2ca74f9eeb22858ae51d7522218ab6756a54d2","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-04-12T14:47:04Z","pushed_at":"2016-04-29T21:17:56Z","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":827059,"stargazers_count":16,"watchers_count":16,"language":"DM","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":83,"mirror_url":null,"open_issues_count":63,"forks":83,"open_issues":63,"watchers":16,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/HippieStationCode/HippieStation13/pulls/2226"},"html":{"href":"https://github.com/HippieStationCode/HippieStation13/pull/2226"},"issue":{"href":"https://api.github.com/repos/HippieStationCode/HippieStation13/issues/2226"},"comments":{"href":"https://api.github.com/repos/HippieStationCode/HippieStation13/issues/2226/comments"},"review_comments":{"href":"https://api.github.com/repos/HippieStationCode/HippieStation13/pulls/2226/comments"},"review_comment":{"href":"https://api.github.com/repos/HippieStationCode/HippieStation13/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/HippieStationCode/HippieStation13/pulls/2226/commits"},"statuses":{"href":"https://api.github.com/repos/HippieStationCode/HippieStation13/statuses/515453e40bebfa2bcc1555bcfabdbc99e2ac03c5"}}}}