21965 Commits

Author	SHA1	Message	Date
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
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
Novacat	dbd85f3243	Merge pull request #4656 from VOREStation/upstream-merge-5816 ... [MIRROR] Guns should once again let people know that they've been fired	2019-03-27 12:07:35 -04:00
Unknown	0e6c82ed60	Conflict Resolution	2019-03-27 12:05:38 -04:00
kevinz000	dfbd0bd72b	Upgrades SDQL2 and refactors it to a datum	2019-03-27 11:50:49 -04:00
Novacat	b91b10aaa5	Merge pull request #4642 from TheFurryFeline/patch-2 ... Boost Belly Limit	2019-03-27 11:22:30 -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
Spades	60ce08ef82	Fixes a typo that broke the saketini recipe (#5807) ... Ported from https://github.com/VOREStation/VOREStation/pull/4534	2019-03-27 10:28:43 -04:00
Novacat	db08a8dd60	Merge pull request #4631 from VOREStation/upstream-merge-5804 ... [MIRROR] IC News update for 1st Jan	2019-03-27 04:49:46 -04:00
Novacat	70d0a30868	Merge pull request #4635 from TheFurryFeline/master ... Holocollar Addition to Autolathe. Take 3	2019-03-27 04:46:02 -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
Unknown	039b6c2b6c	Why is this even a conflict	2019-03-27 04:41:57 -04:00
Atermonera	49bdfc2db6	IC News update for 1st Jan	2019-03-27 04:41:39 -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
Novacat	8cb235f1e7	Merge pull request #4615 from VOREStation/upstream-merge-5795 ... [MIRROR] Standardises SifGov to VirGov	2019-03-27 03:40:16 -04:00
Unknown	486602c194	Conflict Resolution	2019-03-27 03:27:53 -04:00
Neerti	b9adc37685	Standardizes rotation verbs	2019-03-27 03:17:07 -04:00
Novacat	1d0bb53293	Merge pull request #4597 from VOREStation/upstream-merge-5786 ... [MIRROR] Fixes issue #5788.	2019-03-27 03:03:40 -04:00
Novacat	0b13775536	Merge pull request #4596 from VOREStation/upstream-merge-5783 ... [MIRROR] Removes "allowed_roles" from Cloaks	2019-03-27 03:03:09 -04:00
Novacat	39101cdb43	Merge pull request #4591 from VOREStation/upstream-merge-5764 ... [MIRROR] Event / Future PoI / Other weaponry & tools.	2019-03-27 02:46:36 -04:00
Novacat	84c2b53ce2	Merge pull request #4589 from VOREStation/upstream-merge-5773 ... [MIRROR] Adds Identification System, New Autoinjectors	2019-03-27 02:46:25 -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
Neerti	585b688709	Adds Identification System, New Autoinjectors	2019-03-27 02:25:55 -04:00
Neerti	1dd3bb4532	Stops initialization from grinding to a halt when loading maps	2019-03-27 01:49:25 -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
Unknown	976aec2f71	Sorts out this PR	2019-03-26 21:43:56 -04:00
Atermonera	131636b1d2	Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding	2019-03-26 13:21:08 -04:00
Sebbe	706a70a643	Fixes icky voremob mistakes. ... I made some initial faults when porting voremobs in the first wave, this aims at rectifying those mistakes.	2019-03-04 15:04:20 +01:00
Heroman	87f89f2728	Fixed elevator button being borked	2019-03-03 18:16:02 +10:00
Spades	76633d35b2	Merge pull request #4566 from VOREStation/upstream-merge-5746 ... [MIRROR] Adds like 4 million articles.	2019-03-02 08:24:45 -05:00
Spades	43c03b3b82	Merge pull request #4565 from VOREStation/upstream-merge-5757 ... [MIRROR] Adds several new map/event oriented objects	2019-03-02 08:24:32 -05:00
Spades	af14eaef05	Merge pull request #4563 from VOREStation/upstream-merge-5756 ... [MIRROR] Fixes a few AI bugs	2019-03-02 08:24:15 -05:00
Spades	d47c2366de	Merge pull request #4558 from VOREStation/upstream-merge-5760 ... [MIRROR] Adds BIOACID damage type	2019-03-02 08:10:04 -05:00
Spades	bd8c62bde8	Merge pull request #4557 from VOREStation/upstream-merge-5758 ... [MIRROR] Fixes several bugs with AI mobs	2019-03-02 08:09:55 -05:00
Spades	4320afc530	Merge branch 'master' into upstream-merge-5757	2019-03-02 08:05:51 -05:00
Spades	41bcb6a729	Merge pull request #4805 from Sebbe9123/master ... Changes vore egg_types to not interfere with mob egg_types.	2019-03-02 08:03:58 -05:00
Spades	0aac0a8ebb	Merge branch 'master' into upstream-merge-5756	2019-03-02 08:03:30 -05:00
Spades	f7b300ac68	Merge branch 'master' into upstream-merge-5758	2019-03-02 08:01:51 -05:00
Spades	629eebd803	Merge pull request #4555 from VOREStation/upstream-merge-5654 ... [MIRROR] Makes math helpers defines for performance	2019-03-02 07:57:57 -05:00