21939 Commits

Author	SHA1	Message	Date
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
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
Unknown	fe43d06351	Fixes Mob Vore	2019-03-01 22:03:44 -05:00
Unknown	690ecfdbdf	Fixes Digestion Toggle ... ...Not sure why this was disabled, it is an easy fix.	2019-03-01 19:35:36 -05:00
Spades	6e2172a5ae	Merge branch 'master' into upstream-merge-5654	2019-03-01 05:42:07 -05:00
Spades	71d1a05531	Merge pull request #4543 from VOREStation/upstream-merge-5747 ... [MIRROR] Makes fulltile windows seperate from dir	2019-02-25 08:57:19 -05:00
Spades	1a02378f70	Merge pull request #4556 from VOREStation/upstream-merge-5744 ... [MIRROR] Adds 12 new futuristic loadout clothing items + colour variants	2019-02-25 07:46:24 -05:00
Spades	aedcf169a6	Merge pull request #4539 from VOREStation/upstream-merge-5723 ... [MIRROR] Promethean Regen tweaks. (The one with the devil's deal.)	2019-02-25 07:41:47 -05:00
Sebbe9123	22c9bd416e	changes vore eggtype to not mess with mob eggtype	2019-02-25 12:03:07 +01:00
Sebbe9123	628ae84c15	Changes eggtype to not mess with simple_mobs	2019-02-25 11:58:14 +01:00
Sebbe9123	f1e9a1c7b8	Changes vore eggtype to not mess with simple_mobs	2019-02-25 11:57:27 +01:00
Sebbe9123	7d6f22ae2e	gives back egg_type to nurse spider	2019-02-25 11:13:40 +01:00
Heroman3003	6740b839fc	Returns ability for prometheans to eat dirt	2019-02-24 06:44:02 +10:00
Heroman3003	bffe666af7	Preserves vorestation removals while porting tweaks	2019-02-24 06:38:54 +10:00
Unknown	a4317b1910	[5654] Makes this PR Compile ... This one made me cry.	2019-02-23 12:30:16 -05:00
Spades	4b19e3a9b3	Merge pull request #4538 from VOREStation/upstream-merge-5726 ... [MIRROR] Refactors Sun and Inactivity processes to subsystems, and a few globa lvariables to be managed	2019-02-23 12:01:38 -05:00
Spades	14fad52791	Merge branch 'master' into upstream-merge-5744	2019-02-23 11:51:40 -05:00
Spades	190ead1dfd	Merge pull request #4552 from VOREStation/upstream-merge-5748 ... [MIRROR] Adds ability to selectively disable submap rotation.	2019-02-23 11:45:49 -05:00
Spades	172f2088db	Merge pull request #4790 from Sebbe9123/upstream-merge-5735 ... More AI fixes, fixes crates, spawners, adds ION spiders and MORE.	2019-02-22 20:42:29 -05:00
Sebbe9123	aabb168bf4	retries a fix I did before.	2019-02-22 17:48:08 +01:00
Sebbe9123	dea8170bc0	Removes an indentation someone made.	2019-02-22 17:14:02 +01:00
Unknown	f74f7c3e42	Ports Shadekin (Minus AI)	2019-02-21 20:47:22 -05:00