10 Commits

Author	SHA1	Message	Date
Poojawa	b6430559e9	datums	2018-09-11 02:49:41 -05:00
deathride58	3e18d8208e	Updates to tgstation commit 78e471d	2018-07-05 01:22:27 -04:00
deathride58	91805b8789	and that just leaves the modules folder	2018-07-02 00:28:51 -04:00
deathride58	d37ff6135a	Merge branch 'master' into upstream-merge-37389	2018-04-27 09:32:54 +00:00
Jordan Brown	f0a259d3e5	Removes redundant COMPONENT_INCOMPATIBLE crashes	2018-04-25 05:54:41 -05:00
AnturK	1d3f9bd4ec	Fixes thermite immunities (#37359)	2018-04-23 02:06:22 -05:00
Emmett Gaines	9d0a4722e5	turns the baseturf var into a part time list (#33705)	2017-12-25 19:11:06 -06:00
Jordan Brown	09c802f984	Merge pull request #33550 from ninjanomnom/instanceless-component-dupe ... Adds instanceless component dupe mode	2017-12-21 00:51:02 -06:00
Leo	e9daba0cd3	Merge pull request #32984 from ninjanomnom/thermite-burns ... Fixes thermite burning lava	2017-11-24 14:10:26 -06:00
Jordan Brown	82c388b3e8	Makes thermite a component	2017-10-27 17:36:38 -05:00