9695 Commits

Author	SHA1	Message	Date
Fox McCloud	6f516d0303	Merge remote-tracking branch 'upstream/master' into ash-drake-rework	2019-09-12 00:42:34 -04:00
Fox McCloud	60c04285cf	Bubblegum rework	2019-09-11 23:06:34 -04:00
variableundefined	db211cfc54	Deconflict	2019-09-11 23:00:13 -04:00
Fox McCloud	59082ff21a	space dragonnnn	2019-09-11 13:52:33 -04:00
Fox McCloud	7964c5f9c6	Reworks Ash Drake, Refactors Colossus, Fixes Endless Animal Attacks	2019-09-11 12:09:24 -04:00
variableundefined	bcd64e99be	Merge pull request #12255 from Fox-McCloud/shards-glass-lights ... Refactors Shards, Improved Light Replacer, Adds Plasmaspear	2019-09-11 10:10:18 -04:00
variableundefined	ee86b56d58	Merge pull request #12250 from Fox-McCloud/linda-upgrade-prep ... Refactors Atmos Air Current Pushing	2019-09-11 01:28:55 -04:00
variableundefined	ba3651258d	Merge pull request #12261 from Terilia/headcrab-fix ... Small Headcrab fix.	2019-09-10 21:06:41 -04:00
Terilia	11784c95e2	Headcrab fix 1	2019-09-11 01:48:53 +02:00
Fox McCloud	40428e47d9	Refactors Shards, Improved Light Replacer, Adds Plasmaspear	2019-09-10 03:08:44 -04:00
variableundefined	69537dd60c	Port TG hitby refactor and detonation of items by projectiles	2019-09-09 22:57:31 -04:00
Fox McCloud	42564c65f3	Refactors Atmos Air Current Pushing	2019-09-09 20:11:26 -04:00
Fox McCloud	43ae1c832a	Ports Frozen Status Effect	2019-09-09 02:45:09 -04:00
variableundefined	ae12fa7dd6	Merge pull request #12111 from KasparoVy/tiger_by_the_tail ... Adds Taj Striped Tail Marking, Allows Tiny+Short Tails for Taj, Renames Vulp Tails	2019-09-08 08:58:53 -04:00
Fox McCloud	5d61ebfee4	Merge remote-tracking branch 'upstream/master' into lavaland-udpate-split	2019-09-08 04:05:25 -04:00
Fox McCloud	92411d7a02	Merge pull request #11853 from Kyep/ts_gateway_fix ... Terror Spider Fixes & Tweaks	2019-09-08 03:51:59 -04:00
Fox McCloud	c0581b48e5	sprite updates	2019-09-08 03:25:40 -04:00
Fox McCloud	4162226cb1	Merge remote-tracking branch 'upstream/master' into lavaland-udpate-split	2019-09-08 02:07:06 -04:00
variableundefined	89dc45e057	Merge pull request #12230 from Fox-McCloud/tendril-refactor ... Refactors Spawners/Tendrils	2019-09-07 20:22:22 -04:00
Fox McCloud	8587f63982	Refactors Spawners/Tendrils	2019-09-07 20:02:53 -04:00
Coul	57d7fc60d7	add restricted flag to zombie	2019-09-07 16:03:13 -04:00
Kyep	49a4e57186	fixes prince special attack animation	2019-09-07 00:52:49 -07:00
Kyep	6b11f4e18f	fixes animation when AI controller spider breaks a light	2019-09-07 00:25:52 -07:00
Kyep	2e1adac158	reduces gray spider regen speed	2019-09-06 23:40:35 -07:00
Fox McCloud	0119d350b4	Lavaland Update Part 2: Mobs	2019-09-07 02:26:31 -04:00
Fox McCloud	0854f75f7b	Fixes Pugs	2019-09-06 19:06:41 -04:00
variableundefined	854e5de97f	Merge pull request #12206 from Fox-McCloud/refactors-corgis ... Refactors Corgis and Other Doggos	2019-09-05 21:17:53 -04:00
Fox McCloud	a54cac4887	foxes are canines	2019-09-05 19:18:24 -04:00
Fox McCloud	b4863db46f	further tweaks	2019-09-05 18:44:55 -04:00
Coul	2986205dfa	another blood fix	2019-09-04 21:32:28 -04:00
Fox McCloud	dca6d98f5f	Refactors Corgis	2019-09-04 18:40:34 -04:00
variableundefined	99fd003586	Merge pull request #12203 from Fox-McCloud/fixes-romerol ... Fixes Romerol--Comments it Out Until Refactor	2019-09-04 00:01:23 -04:00
Fox McCloud	614f768639	forgot this	2019-09-03 23:24:11 -04:00
Fox McCloud	8b72c3b64a	Fixes Romerol--Comments it Out Until Refactor	2019-09-03 23:16:32 -04:00
Kyep	0881948243	fixes graphics bug with grays	2019-09-03 20:15:32 -07:00
Kyep	f4f20211ae	squash	2019-09-03 19:29:02 -07:00
Kyep	3d58873b9a	revert all changes to giant_spider.dm	2019-09-03 19:16:34 -07:00
Kyep	0102aff057	fixes merge conflict	2019-09-03 19:10:19 -07:00
variableundefined	5d813dce6c	Merge pull request #12157 from Fox-McCloud/simple-mob-update ... TG Simple Mob Update	2019-09-03 21:50:24 -04:00
Coul	ba269fdf79	give high functoning zombies the zombie language too	2019-09-03 15:53:04 -04:00
Coul	6b82bfe47d	Merge remote-tracking branch 'upstream/master' into zombies	2019-09-03 15:52:43 -04:00
Coul	2014d57332	override apply_damage, revert set_species changes, allow admemes to convert living people	2019-09-03 15:42:31 -04:00
Fox McCloud	f76e214681	re-include	2019-09-03 14:32:36 -04:00
Fox McCloud	c15b93804d	derp	2019-09-03 03:43:27 -04:00
Fox McCloud	fb7db36350	fixed rapid mobs	2019-09-03 03:34:15 -04:00
Fox McCloud	1105d515e2	spider fixes	2019-09-03 02:53:56 -04:00
Fox McCloud	478d73921b	alterations	2019-09-03 01:00:10 -04:00
Kyep	4d71ccb092	Fox observation	2019-09-02 21:59:45 -07:00
Fox McCloud	473850ff92	Merge remote-tracking branch 'upstream/master' into simple-mob-update	2019-09-02 22:32:08 -04:00
Fox McCloud	4ee863ea5f	fix again	2019-09-02 22:30:21 -04:00