9824 Commits

Author	SHA1	Message	Date
Unknown	efdb175d52	Conflict Resolution	2019-03-28 15:02:22 -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
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
Anewbe	b8360ae0e8	Fixes #5780	2019-03-27 10:31:59 -04:00
Novacat	dc617243e9	Merge pull request #4634 from Verkister/patch-31 ... Tweaks borg belly passive drain.	2019-03-27 04:45:53 -04:00
Novacat	d8d0ccb682	Merge pull request #4630 from VOREStation/upstream-merge-5799 ... [MIRROR] Fixes Character Preview	2019-03-27 04:45:27 -04:00
Novacat	7ce67d9fb8	Merge pull request #4629 from VOREStation/upstream-merge-5802 ... [MIRROR] Dragging mobs now causes slowdown	2019-03-27 04:45:14 -04:00
Anewbe	0e75d3ad8b	Merge pull request #5799 from Neerti/character_preview_fix ... Fixes Character Preview	2019-03-27 04:27:15 -04:00
Unknown	4e67e1b9ab	Conflict Resolution	2019-03-27 04:11:30 -04:00
Anewbe	09b01407e3	Adds Various Sounds, Looping Sound System	2019-03-27 03:55:21 -04:00
Unknown	c8ca8efa62	Conflict Resolution	2019-03-27 02:37:20 -04:00
Mechoid	c8006a6e84	Event / Future PoI / Other weaponry & tools.	2019-03-27 02:34:28 -04:00
Unknown	e298f07340	Replaces schedule_callback_in ... ...Tested the bell, hopefully the xenochimera revives also work	2019-03-27 01:33:54 -04:00
Unknown	03dcb65c01	Fixes most of the issues	2019-03-27 00:38:44 -04:00
Neerti	86174593bf	Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer	2019-03-26 23:58:26 -04:00