{"push_id":616117219,"size":28,"distinct_size":0,"ref":"refs/heads/master","head":"3f4cbf4d68860fa296fb7c9d76b38b9f44d58790","before":"57165ad259af942aabf461d3f0d14c5ef2b2eb27","commits":[{"sha":"282d0231e0766bd924d5381fd2d6d6eb7a16bbac","author":{"email":"439d90268220ad340294a26ad924ccf7c10deddd@hotmail.fr","name":"phil235"},"message":"WIP moving carbon/life to living/life()","distinct":false,"url":"https://api.github.com/repos/d-radzyuk/skylab/commits/282d0231e0766bd924d5381fd2d6d6eb7a16bbac"},{"sha":"1e720ae0336e61291b4371813f2debb8b032c3ea","author":{"email":"439d90268220ad340294a26ad924ccf7c10deddd@hotmail.fr","name":"phil235"},"message":"More work on living/life.dm(), simple_animal/life() and robot/life().","distinct":false,"url":"https://api.github.com/repos/d-radzyuk/skylab/commits/1e720ae0336e61291b4371813f2debb8b032c3ea"},{"sha":"456a64f8fdfba3513c4b071e90feec6727741fda","author":{"email":"439d90268220ad340294a26ad924ccf7c10deddd@hotmail.fr","name":"phil235"},"message":"slime from carbon to simple animal","distinct":false,"url":"https://api.github.com/repos/d-radzyuk/skylab/commits/456a64f8fdfba3513c4b071e90feec6727741fda"},{"sha":"182a3da16a0571f1afb45431a85d1f38be664968","author":{"email":"439d90268220ad340294a26ad924ccf7c10deddd@hotmail.fr","name":"phil235"},"message":"More work on slimes. Moving xenobiology items to modules/research/xenobiology","distinct":false,"url":"https://api.github.com/repos/d-radzyuk/skylab/commits/182a3da16a0571f1afb45431a85d1f38be664968"},{"sha":"aecb365f840ba1dcb3e9c141775520309c642923","author":{"email":"439d90268220ad340294a26ad924ccf7c10deddd@hotmail.fr","name":"phil235"},"message":"Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal\n\nConflicts:\n\tcode/modules/mob/living/carbon/alien/life.dm\n\tcode/modules/mob/living/carbon/life.dm\n\tcode/modules/mob/living/carbon/slime/slime.dm\n\tcode/modules/mob/living/silicon/robot/life.dm\n\tcode/modules/mob/living/simple_animal/slime/life.dm","distinct":false,"url":"https://api.github.com/repos/d-radzyuk/skylab/commits/aecb365f840ba1dcb3e9c141775520309c642923"},{"sha":"48bbf303da243335b32117b9707ddbca09266212","author":{"email":"439d90268220ad340294a26ad924ccf7c10deddd@hotmail.fr","name":"phil235"},"message":"Fix conflict in xenobiology.dm\nSimplify simple_animal/attackby()\nmore work on slimes.","distinct":false,"url":"https://api.github.com/repos/d-radzyuk/skylab/commits/48bbf303da243335b32117b9707ddbca09266212"},{"sha":"92684d771780618476193a8376838d4baff56aad","author":{"email":"439d90268220ad340294a26ad924ccf7c10deddd@hotmail.fr","name":"phil235"},"message":"Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal","distinct":false,"url":"https://api.github.com/repos/d-radzyuk/skylab/commits/92684d771780618476193a8376838d4baff56aad"},{"sha":"daa1bdf85669bab9f6b257f37dab0930dabd9145","author":{"email":"439d90268220ad340294a26ad924ccf7c10deddd@hotmail.fr","name":"phil235"},"message":"More work on slime procs.","distinct":false,"url":"https://api.github.com/repos/d-radzyuk/skylab/commits/daa1bdf85669bab9f6b257f37dab0930dabd9145"},{"sha":"98f9916317e39a0d725420723c2093637f0ad2ec","author":{"email":"439d90268220ad340294a26ad924ccf7c10deddd@hotmail.fr","name":"phil235"},"message":"Yet more work on slime procs and life subprocs.","distinct":false,"url":"https://api.github.com/repos/d-radzyuk/skylab/commits/98f9916317e39a0d725420723c2093637f0ad2ec"},{"sha":"7aa21179e0d47ba60523088d1a37281e5eccddc6","author":{"email":"439d90268220ad340294a26ad924ccf7c10deddd@hotmail.fr","name":"phil235"},"message":"small adjustments","distinct":false,"url":"https://api.github.com/repos/d-radzyuk/skylab/commits/7aa21179e0d47ba60523088d1a37281e5eccddc6"},{"sha":"ffd711c26f7234d4e7b7754cbf0bc68bc9813c27","author":{"email":"439d90268220ad340294a26ad924ccf7c10deddd@hotmail.fr","name":"phil235"},"message":"Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal\n\nConflicts:\n\tcode/modules/mob/living/carbon/life.dm\n\tcode/modules/mob/living/carbon/slime/slime.dm\n\tcode/modules/mob/living/simple_animal/friendly/corgi.dm\n\tcode/modules/mob/living/simple_animal/slime/say.dm\n\tcode/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm","distinct":false,"url":"https://api.github.com/repos/d-radzyuk/skylab/commits/ffd711c26f7234d4e7b7754cbf0bc68bc9813c27"},{"sha":"17fb9190204c245f50fc17874ac1c77ddd93c26a","author":{"email":"439d90268220ad340294a26ad924ccf7c10deddd@hotmail.fr","name":"phil235"},"message":"More fixes","distinct":false,"url":"https://api.github.com/repos/d-radzyuk/skylab/commits/17fb9190204c245f50fc17874ac1c77ddd93c26a"},{"sha":"b78ce020e7af013fefd3e00dfae58684b1641cf7","author":{"email":"439d90268220ad340294a26ad924ccf7c10deddd@hotmail.fr","name":"phil235"},"message":"fixing more stuff","distinct":false,"url":"https://api.github.com/repos/d-radzyuk/skylab/commits/b78ce020e7af013fefd3e00dfae58684b1641cf7"},{"sha":"461ea87bdc017ff79c4385e09947d137d7899a03","author":{"email":"386b46a7a20f4fa55265e7561b0030dfcca45474@gmail.com","name":"Jordie0608"},"message":"construction permit's w_class to 1","distinct":false,"url":"https://api.github.com/repos/d-radzyuk/skylab/commits/461ea87bdc017ff79c4385e09947d137d7899a03"},{"sha":"9910cf3fe3a1a07d6a0771d4e4e25d0229d6dc1a","author":{"email":"20f2c87387f7e53fd215abc3a7b975c5bbcf78f8@gmail.com","name":"MrPerson"},"message":"Change holidays into datums\n\nHolidays are now actual datums with procs and vars and everything.\nHolidays run a proc called celebrate() when it's time to celebrate them. Currently none of them do anything but that should change, wink wink.\nHolidays can now run for more than a day. The important ones, april fools, christmas, halloween, new years, and easter, all last at least a week. The idea is so people can celebrate christmas in game without having to, you know, actually play on fucking christmas. And also to put a time limit on how long stuff like the annoying spookoween closet skeletons will stick around so it doesn't overstay its welcome and become annoying as shit like last year.\nThe event SS now allows more than 1 holiday to run at a time. This matters for new years + christmas, easter + april fools, easter + 4/20, and any holiday that can happen on friday the 13th. The events get stored in a list that's only initialized if there's an active holiday so testing for potential holidays is still pretty easy.\nAdded more easter dates so we won't have to add more until 2040. The current batch run out in 2017.","distinct":false,"url":"https://api.github.com/repos/d-radzyuk/skylab/commits/9910cf3fe3a1a07d6a0771d4e4e25d0229d6dc1a"},{"sha":"ce13faed091f6a26d29132f1fde4302e65a01250","author":{"email":"20f2c87387f7e53fd215abc3a7b975c5bbcf78f8@gmail.com","name":"MrPerson"},"message":"Change select holiday names to #defines","distinct":false,"url":"https://api.github.com/repos/d-radzyuk/skylab/commits/ce13faed091f6a26d29132f1fde4302e65a01250"},{"sha":"92b0f9f4cdc406f4f487b4a57cd5327bf06f4f7b","author":{"email":"439d90268220ad340294a26ad924ccf7c10deddd@hotmail.fr","name":"phil235"},"message":"Adding a changelog.\nSome work on death() procs of many animals.\nReplacing most istype(XYZ, mob/living/simple_animal/slime) by isslime(XYZ).\nSome work on slime feeding procs.\nMade simple animal aliens see in the dark like regular aliens (in case somone wants to control one).","distinct":false,"url":"https://api.github.com/repos/d-radzyuk/skylab/commits/92b0f9f4cdc406f4f487b4a57cd5327bf06f4f7b"},{"sha":"1b3eb49a1db469a2984d7a01ebd7bc84766132d4","author":{"email":"439d90268220ad340294a26ad924ccf7c10deddd@hotmail.fr","name":"phil235"},"message":"Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal\n\nConflicts:\n\tcode/modules/mob/living/carbon/human/human.dm\n\tcode/modules/mob/living/carbon/slime/slime.dm\n\tcode/modules/mob/living/simple_animal/slime/say.dm","distinct":false,"url":"https://api.github.com/repos/d-radzyuk/skylab/commits/1b3eb49a1db469a2984d7a01ebd7bc84766132d4"},{"sha":"7a1232012b647daf51ab21f4316953cd8c25c602","author":{"email":"439d90268220ad340294a26ad924ccf7c10deddd@hotmail.fr","name":"phil235"},"message":"Fixes more merge conflicts","distinct":false,"url":"https://api.github.com/repos/d-radzyuk/skylab/commits/7a1232012b647daf51ab21f4316953cd8c25c602"},{"sha":"6881ac8c1de3c523eb76af96a1cf2ad89a06e736","author":{"email":"20f2c87387f7e53fd215abc3a7b975c5bbcf78f8@gmail.com","name":"MrPerson"},"message":"Disallow doing surgery on yourself\n\nThis doesn't solve the fact you can lie down with stuff in your hand (which isn't a bug imo) but it does stop people from cutting their brains out or giving themselves plastic surgery.\nFixes #4001","distinct":false,"url":"https://api.github.com/repos/d-radzyuk/skylab/commits/6881ac8c1de3c523eb76af96a1cf2ad89a06e736"}]}