21878 Commits

Author	SHA1	Message	Date
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
Unknown	5d28c9f326	Enables most Virgo mobs ... Grub, Oties, and Shadekin Not included Temporarily disables Mob riding	2019-02-21 18:53:59 -05:00
Sebbe9123	b0bc86103d	WHY THE FUCK CAN'T I UPLOAD STRAIGHT INTO THE RIGHT FOLDER.	2019-02-20 21:55:16 +01:00
Sebbe9123	47163d685d	Adds Carp since it was removed... for some reason.	2019-02-20 20:37:44 +01:00
Unknown	4fd5615cda	Fixes runtimes, readds runtime belly	2019-02-20 14:01:01 -05:00
Unknown	c055bb3957	Fixes whitespace stuff	2019-02-20 12:26:58 -05:00
Unknown	29c4f7d36b	Removes job check	2019-02-20 12:26:58 -05:00
Unknown	beb1672988	Follow script should be included in check	2019-02-20 12:26:58 -05:00
Unknown	de18c9321f	Fixes Spirit for AI Overhaul ... - Also fixes an error with Phi's ring	2019-02-20 12:26:58 -05:00
Sebbe9123	ad35326865	Un-edits and fixes mobpaths.	2019-02-18 11:34:12 +01:00
Poojawa	4e6156a180	swaps files because why not	2019-02-02 08:25:57 -06:00
Poojawa	2e7e39c359	oh my fuck travis quit complaining ... Travis doesn't like comments in the lists.	2019-02-02 08:17:32 -06:00
Poojawa	4f671f32ec	Update ventcrawl.dm ... fucking indentation memes	2019-02-02 08:12:20 -06:00
Poojawa	a9d025b1f0	Shifts vore mobs to proper locations, cleans loose folder ... also attempts a Travis complaint fix The command "awk -f tools/indentation.awk **/*.dm" exited with 1.	2019-02-02 08:07:20 -06:00
Poojawa	8d178972a1	ports #4581 Startup Runtime fix	2019-02-02 06:03:40 -06:00
Poojawa	f05675e269	Resolves compile errors	2019-02-02 04:33:13 -06:00
Poojawa	6f2548e47b	Merge remote-tracking branch 'refs/remotes/origin/master' into upstream/upstream-merge-5735	2019-02-02 03:55:21 -06:00
Spades	30ab44613d	Merge pull request #4540 from VOREStation/upstream-merge-5714 ... [MIRROR] Borg, Gripper, and Integrated Circuit interaction update.	2019-01-21 11:42:38 -05:00
Sebbe9123	b0735ffa88	Adds Fluffy.	2019-01-21 09:15:55 +01:00
Sebbe9123	b556acac8f	Adds Foxes and Renault.	2019-01-21 09:14:46 +01:00
Sebbe9123	a78bc1a73c	Adds Poisionous Koi.	2019-01-21 09:13:10 +01:00
Sebbe9123	79345970e4	Adds space mobs. Mimic, snake(noodle), Gaslamp.	2019-01-21 09:12:03 +01:00
Spades	c6c7d98a2d	Merge branch 'master' into upstream-merge-5735	2019-01-14 11:20:55 -05:00
Cameron653	9dd973221d	Resolves compile errors with the exception of map errors.	2019-01-12 21:09:29 -05:00
Spades	fb6f5e33ca	Corrected commented code	2019-01-11 22:33:53 -05:00
Spades	096ae8e226	Disables Shadekin smite because no shadekin	2019-01-11 22:32:13 -05:00
Spades	1927479ce7	Revert "Moves all old mobs to a legacy mob folder" ... This reverts commit 9a4f291859.	2019-01-11 21:51:53 -05:00
Spades	9a4f291859	Moves all old mobs to a legacy mob folder	2019-01-11 21:49:43 -05:00
Spades	fc959cd1e8	Removes redundant files	2019-01-07 09:36:11 -05:00
Verkister	890803e0c6	Fixes movement draining nutrition below negatives ... And these negative numbers were apparently breaking the weight loss and examination messages.	2019-01-06 15:46:20 +02:00
Spades	fc2f451bd4	Merge pull request #4586 from Verkister/boyidie ... Fixes undefined z-levels shitting caves all over the place	2019-01-05 17:02:33 -05:00
Spades	1d6d0b75ae	Missed one.	2019-01-05 17:01:01 -05:00
Spades	5cb647993c	Conflicts resolved, excluding the .dme	2019-01-05 16:38:33 -05:00
Spades	58e4a98a94	Breaks a Vorestation Edit in death.dm ... Nobody wants to help me fix these things so I'm just going to break them and see what happens.	2019-01-05 16:35:07 -05:00
Spades	1338225afa	Resolves some merge conflicts	2019-01-05 16:29:19 -05:00
Spades	81f7b979c2	Merge pull request #4628 from Heroman3003/shellguard-fix ... Fixes shellguard-noble sprites not actually having sprites	2019-01-05 00:04:40 -05:00
Spades	ac93866ddc	Merge pull request #4610 from Heroman3003/borg-making-fix ... Fixed creation of borgs through non-spawn method	2019-01-05 00:03:32 -05:00
Spades	2c288ee62b	Merge pull request #4624 from Verkister/patch-30 ... Fixes food not getting digested on itemweak.	2019-01-05 00:01:35 -05:00
Spades	35c54b4324	Merge pull request #4614 from Novacat/nova-heterochromia ... Virgo Language Fixes	2019-01-05 00:01:15 -05:00
Spades	8c1b8aacb2	Merge pull request #4550 from Zap-zapper/size-im ... Size control implant	2019-01-04 23:59:17 -05:00
Spades	68401ebe5e	Merge pull request #4594 from Novacat/nova-survival ... Ports synth overheating fixes	2019-01-04 23:58:14 -05:00
Heroman3003	cae9207bae	Fixes shellguard-noble sprites not actually having sprites	2019-01-03 06:45:22 +10:00
Ketrai	4c62b1abde	Fixes nutriment stacking ... Currently cooking the pizza caused the intended amount of nutriment to be too high. This fixes it.	2019-01-02 00:36:27 +01:00
Ketrai	257a7809d0	Update snacks_vr.dm	2019-01-01 17:39:20 +01:00
Ketrai	1841614d78	Update snacks_vr.dm	2019-01-01 17:05:42 +01:00
Ketrai	681f52123f	Update snacks_vr.dm	2019-01-01 16:40:00 +01:00
Ketrai	1c43cfd638	Update snacks_vr.dm	2019-01-01 16:22:29 +01:00