9836 Commits

Author	SHA1	Message	Date
Mechoid	023815e2d2	Flash rebalance.	2019-03-28 18:23:33 -04:00
Novacat	65cd059497	Merge pull request #4751 from VOREStation/upstream-merge-5869 ... [MIRROR] Adds the Zaddat Race + Modifies pressure damage calculations	2019-03-28 18:17:11 -04:00
Novacat	7e90225e81	Merge pull request #4736 from VOREStation/upstream-merge-5918 ... [MIRROR] [READY] Fixes pixel projectiles critical bugs	2019-03-28 17:44:22 -04:00
Unknown	ad181e797a	Conflict Resolution ... Also fixes a compiling error with previous PR	2019-03-28 17:24:03 -04:00
elgeonmb	9d056decda	Adds the Zaddat Race + Modifies pressure damage calculations	2019-03-28 16:54:32 -04:00
Novacat	615f413354	Merge pull request #4727 from VOREStation/upstream-merge-5798 ... [MIRROR] Adds Alien Reality pods, aka AR pods, for use in events or PoIs.	2019-03-28 16:30:53 -04:00
Unknown	75ede8c745	Fixes Merge Conflicts	2019-03-28 16:03:52 -04:00
Neerti	279ffc5dc9	[READY] Fixes pixel projectiles critical bugs	2019-03-28 15:56:47 -04:00
Unknown	efdb175d52	Conflict Resolution	2019-03-28 15:02:22 -04:00
Novacat	a4919caba2	Merge pull request #4719 from VOREStation/upstream-merge-5636 ... [MIRROR] [READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work	2019-03-28 14:52:51 -04:00
Mechoid	c604e38036	Adds Alien Reality pods, aka AR pods, for use in events or PoIs.	2019-03-28 14:51:50 -04:00
Novacat	3a0dbf687b	Merge pull request #4720 from VOREStation/upstream-merge-5896 ... [MIRROR] Changeling & Straight Jacket modifications.	2019-03-28 14:35:51 -04:00
Unknown	a4373601f0	Fixes Merge Errors	2019-03-28 13:53:03 -04:00
Unknown	cf39c61c2d	Conflict Resolution ... This one made a lynx cry.	2019-03-28 13:19:19 -04:00
Neerti	3256202407	[READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work	2019-03-27 22:02:07 -04:00
Novacat	d2cd4ff7b5	Merge pull request #4718 from VOREStation/upstream-merge-5893 ... [MIRROR] Additional Hair	2019-03-27 21:19:42 -04:00
Novacat	e0597368d5	Merge pull request #4712 from VOREStation/upstream-merge-5895 ... [MIRROR] Fixes some AI bugs.	2019-03-27 21:08:01 -04:00
Neerti	519890613f	Fixes some AI bugs.	2019-03-27 20:54:31 -04:00
Atermonera	cbf66a9b0b	Merge pull request #5894 from Neerti/pun_pun_fix ... Fixes Some Mob Init Bugs	2019-03-27 20:42:50 -04:00
Novacat	893976536e	Merge pull request #4706 from VOREStation/upstream-merge-5889 ... [MIRROR] Allows borgs to move up and down with jetpacks	2019-03-27 20:39:35 -04:00
Novacat	b3ded9752c	Merge pull request #4708 from king5327/vplf ... Fixes protean languages for real this time.	2019-03-27 20:39:03 -04:00
Novacat	f15ac5a224	Merge pull request #4697 from VOREStation/upstream-merge-5849 ... [MIRROR] Fixes a few mob AI bugs	2019-03-27 20:29:08 -04:00
Novacat	62820d333a	Merge pull request #4690 from VOREStation/upstream-merge-5841 ... [MIRROR] Voice changer tweaks and fixes	2019-03-27 20:27:42 -04:00
Novacat	2609d9fc2b	Merge branch 'master' into upstream-merge-5889	2019-03-27 20:15:17 -04:00
Novacat	8ff24f1c30	Merge pull request #4702 from VOREStation/upstream-merge-5885 ... [MIRROR] Bots don't speak gibberish	2019-03-27 19:25:50 -04:00
Novacat	3c7327ae54	Merge pull request #4699 from VOREStation/upstream-merge-5870 ... [MIRROR] Borgs can use audible emotes again	2019-03-27 19:15:04 -04:00
Neerti	04280c8372	Fixes a few mob AI bugs	2019-03-27 19:05:59 -04:00
Novacat	4c18bff57b	Merge pull request #4696 from VOREStation/upstream-merge-5859 ... [MIRROR] Audible emotes can be used again	2019-03-27 19:01:55 -04:00
Atermonera	20604f2952	Merge pull request #5841 from Anewbe/voice_changer ... Voice changer tweaks and fixes	2019-03-27 18:57:49 -04:00
Novacat	713e33054e	Merge pull request #4688 from VOREStation/upstream-merge-5843 ... [MIRROR] Adds Gibberish	2019-03-27 18:01:56 -04:00
Novacat	dce3466f3b	Merge pull request #4684 from VOREStation/upstream-merge-5814 ... [MIRROR] [READY]Makes a bunch of processes subsystems instead	2019-03-27 17:46:31 -04:00
Novacat	97e98dd04d	Merge pull request #4682 from VOREStation/upstream-merge-5829 ... [MIRROR] Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it	2019-03-27 16:37:45 -04:00
Unknown	ec19a66eff	Conflict Resolution	2019-03-27 16:36:41 -04:00
kevinz000	6415e4193f	[READY]Makes a bunch of processes subsystems instead	2019-03-27 16:03:51 -04:00
Unknown	6636f1ba37	Conflict Resolution Part 2	2019-03-27 15:51:05 -04:00
Unknown	55b4d304f5	Conflict Resolution Part One	2019-03-27 15:21:58 -04:00
Novacat	696872690e	Merge pull request #4677 from VOREStation/upstream-merge-5776 ... [MIRROR] Adds pressure protection bounds to clothing.	2019-03-27 15:18:17 -04:00
Neerti	fe0b7373b3	Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it	2019-03-27 14:49:30 -04:00
Novacat	823354433e	Merge pull request #4659 from VOREStation/upstream-merge-5796 ... [MIRROR] Adds New PoI Features + Bonus PoI	2019-03-27 13:52:46 -04:00
Novacat	b176b056e0	Merge pull request #4655 from VOREStation/upstream-merge-5793 ... [MIRROR] Upgrades SDQL2 and refactors it to a datum	2019-03-27 13:52:08 -04:00
Unknown	be1601bb68	Conflict Resolution	2019-03-27 13:51:07 -04:00
Neerti	9d46150515	Adds pressure protection bounds to clothing.	2019-03-27 13:26:07 -04:00
Novacat	42df71908b	Merge pull request #4644 from VOREStation/upstream-merge-5803 ... [MIRROR] Guns sounds refactor and improvements	2019-03-27 12:35:26 -04:00
Unknown	54b1d524ea	Conflict Resolution	2019-03-27 12:19:15 -04:00
Neerti	91a5203e32	Adds New PoI Features + Bonus PoI	2019-03-27 12:15:50 -04:00
kevinz000	dfbd0bd72b	Upgrades SDQL2 and refactors it to a datum	2019-03-27 11:50:49 -04:00
Novacat	2670a031d6	Merge pull request #4640 from VOREStation/upstream-merge-5806 ... [MIRROR] Fixes #5780	2019-03-27 11:22:02 -04:00
Novacat	682b06f126	Merge pull request #4639 from VOREStation/upstream-merge-5809 ... [MIRROR] Allows Prometheans to choose Sol Common as a language.	2019-03-27 11:21:54 -04:00
Unknown	1e45296d31	Conflict Resolution	2019-03-27 10:58:53 -04:00
Spades	eb0e2ec1f5	Guns sounds refactor and improvements	2019-03-27 10:42:18 -04:00