{"push_id":875144632,"size":30,"distinct_size":30,"ref":"refs/heads/oprayx73","head":"d9cf6fc173abbe394aadf599f709bdcb2d1837bc","before":"0b783091a4ae0184acb5b044c6befb33e1ccad9f","commits":[{"sha":"7db1249eb07086c119df6979dfb61055b3344b13","author":{"email":"4d064d194daa97049d9055f9f042d184b7cd3566@Gmail.com","name":"Alex Noir"},"message":"Moves martial arts to modules, puts every martial art into it's own file instead of being dumped in a single .dm for less headaches (especially when porting Atlas martial arts improvements)","distinct":true,"url":"https://api.github.com/repos/oprayx73/HippieStation13/commits/7db1249eb07086c119df6979dfb61055b3344b13"},{"sha":"5892be780dd1f2d46fd4d81f7b5c4735c4fdd4c6","author":{"email":"4d064d194daa97049d9055f9f042d184b7cd3566@Gmail.com","name":"Alex Noir"},"message":"Fuck, fix tgstation.dme including stuff from other branch","distinct":true,"url":"https://api.github.com/repos/oprayx73/HippieStation13/commits/5892be780dd1f2d46fd4d81f7b5c4735c4fdd4c6"},{"sha":"1bbe37de931e4fbbaacfce28267d3af70c4809a7","author":{"email":"4d064d194daa97049d9055f9f042d184b7cd3566@Gmail.com","name":"Alex Noir"},"message":"Merge remote-tracking branch 'remote/master' into Martial_Arts\n\nConflicts:\n\tcode/datums/martial.dm","distinct":true,"url":"https://api.github.com/repos/oprayx73/HippieStation13/commits/1bbe37de931e4fbbaacfce28267d3af70c4809a7"},{"sha":"2fca7e709dcb7c7a714cb6bb4c1f1c345cf6cbca","author":{"email":"4d064d194daa97049d9055f9f042d184b7cd3566@Gmail.com","name":"Alex Noir"},"message":"Ported Atlas' wrestling mechanics, + made it so being tablepushed onto a glass table has a chance to embed the shard into you and deals 5 brute.","distinct":true,"url":"https://api.github.com/repos/oprayx73/HippieStation13/commits/2fca7e709dcb7c7a714cb6bb4c1f1c345cf6cbca"},{"sha":"63abdb51769ea102925d309d769cb2f835ad28f8","author":{"email":"e503f8050a166b68522b9a33b8bba225cd435892@gmail.com","name":"Chronitonity"},"message":"Merge remote-tracking branch 'refs/remotes/HippieStationCode/master'","distinct":true,"url":"https://api.github.com/repos/oprayx73/HippieStation13/commits/63abdb51769ea102925d309d769cb2f835ad28f8"},{"sha":"2b3950a0c7f4ca6cc2609599e545ffc2d112f1a5","author":{"email":"4d064d194daa97049d9055f9f042d184b7cd3566@Gmail.com","name":"Alex Noir"},"message":"Tweaks wrestling, tweaks resisting out of pindowns, makes pindowns part of the new security martial art, fixed CQC scroll not working","distinct":true,"url":"https://api.github.com/repos/oprayx73/HippieStation13/commits/2b3950a0c7f4ca6cc2609599e545ffc2d112f1a5"},{"sha":"8c04a3971671e6fa2c9c35da2f4ffaf8f72dab74","author":{"email":"4d064d194daa97049d9055f9f042d184b7cd3566@Gmail.com","name":"Alex Noir"},"message":"Fixed teleporting issue with grabs\nvarious tweaks\nSECURITY OFFICERS now start with krav maga\nComplete CQC rework","distinct":true,"url":"https://api.github.com/repos/oprayx73/HippieStation13/commits/8c04a3971671e6fa2c9c35da2f4ffaf8f72dab74"},{"sha":"84ba3dc98b508bf10fc537e1fd5715622bd4bf85","author":{"email":"c9c4d3f371b34306f4de9ae131dec8369bf13da4@gmail.com","name":"DerptheStewpidGoat"},"message":"Merge remote-tracking branch 'refs/remotes/HippieStationCode/master'","distinct":true,"url":"https://api.github.com/repos/oprayx73/HippieStation13/commits/84ba3dc98b508bf10fc537e1fd5715622bd4bf85"},{"sha":"6a88cf89c31988aa55d9256403e9577ef1cd70c9","author":{"email":"c9c4d3f371b34306f4de9ae131dec8369bf13da4@gmail.com","name":"DerptheStewpidGoat"},"message":"New gorka + camo boots on-mob icons, new ALC for nuke ops\n\nThis adds new on-mob sprites for the gorka uniform and camo boots. Also\nadds the new Automatic Laser Carbine available to nuke ops for 16 TC.\nUses specialized plasma cartridges in 24-round magazines. Can also fire\nin bursts of 3.\n\nhttp://puu.sh/ltbVz/fb55c6e22e.png","distinct":true,"url":"https://api.github.com/repos/oprayx73/HippieStation13/commits/6a88cf89c31988aa55d9256403e9577ef1cd70c9"},{"sha":"7712c179b8d1c5f94bd9b820197b8d33d800c5b4","author":{"email":"c9c4d3f371b34306f4de9ae131dec8369bf13da4@gmail.com","name":"DerptheStewpidGoat"},"message":"Gives Sgt. Fragg credit in the changelog for clothing sprites","distinct":true,"url":"https://api.github.com/repos/oprayx73/HippieStation13/commits/7712c179b8d1c5f94bd9b820197b8d33d800c5b4"},{"sha":"d4ae1a62b7a69f8de3eea1933c08d7735e17efad","author":{"email":"c9c4d3f371b34306f4de9ae131dec8369bf13da4@gmail.com","name":"DerptheStewpidGoat"},"message":"Merge remote-tracking branch 'refs/remotes/HippieStationCode/master'","distinct":true,"url":"https://api.github.com/repos/oprayx73/HippieStation13/commits/d4ae1a62b7a69f8de3eea1933c08d7735e17efad"},{"sha":"f6b60af736e8d95ad8ac4ec0a75cfafb5043856e","author":{"email":"4d064d194daa97049d9055f9f042d184b7cd3566@Gmail.com","name":"Alex Noir"},"message":"Finalized reworks of all known martial arts except for Sleeping Carp and BoStaff\nReduced cooldown for resisting grabs from 10 seconds to 5 secons\nAdded a sound effect and visible_message to being slammed into walls by throws\nPlasma Fist made absolutely more useful, the Ei Nath-type combo made much harder to execute\nFixed disarms for Crav Maga and CQC","distinct":true,"url":"https://api.github.com/repos/oprayx73/HippieStation13/commits/f6b60af736e8d95ad8ac4ec0a75cfafb5043856e"},{"sha":"f399af0efc4830718b0eb8863137200c1a21b6b6","author":{"email":"e503f8050a166b68522b9a33b8bba225cd435892@gmail.com","name":"Chronitonity"},"message":"Merge remote-tracking branch 'refs/remotes/HippieStationCode/master'","distinct":true,"url":"https://api.github.com/repos/oprayx73/HippieStation13/commits/f399af0efc4830718b0eb8863137200c1a21b6b6"},{"sha":"6c21931105b3f5144d900563afb1710a50b92bdb","author":{"email":"e503f8050a166b68522b9a33b8bba225cd435892@gmail.com","name":"Chronitonity"},"message":"PORTS","distinct":true,"url":"https://api.github.com/repos/oprayx73/HippieStation13/commits/6c21931105b3f5144d900563afb1710a50b92bdb"},{"sha":"3eeb73dc3ce7708b93dc78cdce55c040ff219d3a","author":{"email":"e503f8050a166b68522b9a33b8bba225cd435892@gmail.com","name":"Chronitonity"},"message":"Merge remote-tracking branch 'refs/remotes/HippieStationCode/master' into ports","distinct":true,"url":"https://api.github.com/repos/oprayx73/HippieStation13/commits/3eeb73dc3ce7708b93dc78cdce55c040ff219d3a"},{"sha":"ffc717663a89d32ff2af69cb6be7295da7a23d04","author":{"email":"e503f8050a166b68522b9a33b8bba225cd435892@gmail.com","name":"Chronitonity"},"message":"Changelog","distinct":true,"url":"https://api.github.com/repos/oprayx73/HippieStation13/commits/ffc717663a89d32ff2af69cb6be7295da7a23d04"},{"sha":"15b277a836134a889d996d44677ba6b50e5963cc","author":{"email":"4d064d194daa97049d9055f9f042d184b7cd3566@Gmail.com","name":"Alex Noir"},"message":"Fixed martial art clash with temporary VS permament, now permament martial arts will always be given back to you after you remove your temp. ones.\nAdded a combo indicator to human HUD so you can see where you are during the combo fun time.","distinct":true,"url":"https://api.github.com/repos/oprayx73/HippieStation13/commits/15b277a836134a889d996d44677ba6b50e5963cc"},{"sha":"3c4d1a0166b03dd5e39b9ae918f5ffd44e0a1c3d","author":{"email":"4d064d194daa97049d9055f9f042d184b7cd3566@Gmail.com","name":"Alex Noir"},"message":"Final commit","distinct":true,"url":"https://api.github.com/repos/oprayx73/HippieStation13/commits/3c4d1a0166b03dd5e39b9ae918f5ffd44e0a1c3d"},{"sha":"3e6a282f36e2a0009aca91f250046b468b59dfb4","author":{"email":"4d064d194daa97049d9055f9f042d184b7cd3566@Gmail.com","name":"Alex Noir"},"message":"Added hotkeys for changing your limb targeting zone to the numpad.","distinct":true,"url":"https://api.github.com/repos/oprayx73/HippieStation13/commits/3e6a282f36e2a0009aca91f250046b468b59dfb4"},{"sha":"d3836dcf696c6bad501e3f1a0b811bd31617f0dc","author":{"email":"4d064d194daa97049d9055f9f042d184b7cd3566@Gmail.com","name":"Alex Noir"},"message":"Giving credit where it's due, here's the PR: https://github.com/tgstation/-tg-station/pull/12162","distinct":true,"url":"https://api.github.com/repos/oprayx73/HippieStation13/commits/d3836dcf696c6bad501e3f1a0b811bd31617f0dc"}]}