793 Commits

Author	SHA1	Message	Date
silicons	1c11a4bdd1	Merge remote-tracking branch 'citrp/master' into init_1	2021-02-14 03:42:08 -07:00
silicons	b3a4fa802b	jfc	2021-02-14 03:04:42 -07:00
silicons	afad8c53ec	39	2021-02-14 02:09:50 -07:00
silicons	0fcba969d8	lineendings	2021-02-13 21:26:36 -07:00
silicons	774f8db8a6	holy shit	2021-02-13 21:25:44 -07:00
BlackMajor	7f7796687c	fix one bug ya got 99 more	2021-02-14 16:55:38 +13:00
BlackMajor	6339ffdbf2	lavaland fixes	2021-02-14 16:41:18 +13:00
BlackMajor	35998ff33d	Update Boathouse.dmm	2021-02-14 15:39:57 +13:00
BlackMajor	f130362dab	make travis happy	2021-02-14 04:29:14 +13:00
BlackMajor	bcc6298192	missed a spot	2021-02-14 04:11:43 +13:00
BlackMajor	6cf79d1188	Go big or go home	2021-02-14 04:01:34 +13:00
BlackMajor	2e3d0d0bc2	Missed a spot	2021-02-13 09:51:08 +13:00
BlackMajor	7404edcd8d	I scream	2021-02-13 02:05:04 +13:00
BlackMajor	de797a7304	*scream	2021-02-12 16:22:38 +13:00
BlackMajor	30adf3bb9b	conflictn't	2021-02-12 15:31:47 +13:00
BlackMajor	10c9b619e2	Merge branch 'master' into consolidate	2021-02-12 15:26:17 +13:00
BlackMajor	0ac824399b	Area consolidation	2021-02-12 15:22:47 +13:00
harry3124	3d0af699c9	Bug fix	2021-02-10 14:56:09 +09:00
buffyuwu	b5aaedb252	uhhhh	2021-02-09 13:50:00 -05:00
buffyuwu	e81c5b6dac	lets not teleport ai cores lol	2021-02-08 22:31:52 -05:00
buffyuwu	b5cdb533ae	normalize	2021-02-07 21:36:34 -05:00
buffyuwu	178634f239	should be good on issues	2021-02-07 17:54:50 -05:00
buffyuwu	c761d4fc3e	buffy fix 2 planets in 1 commit	2021-02-07 16:24:42 -05:00
buffyuwu	f9a0cad3c8	this should be fine	2021-02-07 13:39:50 -05:00
buffyuwu	1d50e09581	map fix	2021-02-07 13:23:44 -05:00
buffyuwu	da4989ccf0	Update lavaland.dmm	2021-02-07 13:14:25 -05:00
buffyuwu	0e5970c898	Update _lavaland.dm	2021-02-07 12:50:38 -05:00
buffyuwu	b5b4e87e51	Update lavaland.dmm	2021-02-07 12:43:50 -05:00
buffyuwu	07d7a36c3e	phoron fix	2021-02-07 12:19:08 -05:00
buffyuwu	0dfa96ea71	Merge branch 'master' into lavaland	2021-02-07 02:20:40 -05:00
buffyuwu	bad8d7ab18	Merge branch 'master' into lavaland	2021-02-07 01:23:04 -05:00
buffyuwu	bba5f2e071	tgs machine go brr	2021-02-07 01:21:25 -05:00
buffyuwu	29bcaafbf0	Merge branch 'master' into gaiasounds	2021-02-07 01:09:44 -05:00
silicons	9601ec14b8	Merge pull request #2674 from Captain277/Final-Freeze-Fixes ... Shuttle Engines Now Use Fuel and Eleven Other Things	2021-02-06 22:48:38 -07:00
Captain277	e932c93fac	Ha ha, the door kills you.	2021-02-06 01:19:41 -08:00
buffyuwu	9a3475a0c0	fixes gaia world sound	2021-02-04 23:22:02 -05:00
buffyuwu	9154af9a5a	shelters ... ehh lets add more shelter spawns from the weather	2021-02-04 20:28:07 -05:00
buffyuwu	812fc9ff3c	just about it for buffys contribution	2021-02-04 20:18:18 -05:00
buffyuwu	03d232e4a5	lavaland release	2021-02-04 19:48:25 -05:00
Captain277	b3eefca218	Just let me die.	2021-02-04 13:55:55 -08:00
buffyuwu	c4d784ecb9	why does this file exist? ... reverting accidental edits	2021-02-04 13:55:02 -05:00
buffyuwu	e5225b7b6b	2.0	2021-02-04 13:50:02 -05:00
Captain277	3d9fc3e7b7	There's no way we won't need to nerf this later.	2021-02-03 21:57:50 -08:00
buffyuwu	8d51537546	1.1	2021-02-03 22:49:36 -05:00
buffyuwu	65719072e7	1.0	2021-02-03 22:28:40 -05:00
buffyuwu	96dec6f075	first update	2021-02-03 21:42:40 -05:00
Captain277	fa65199fc7	It is finished, at last.	2021-02-03 08:46:20 -08:00
buffyuwu	f6eac77728	initial beginning	2021-02-03 09:55:12 -05:00
Captain277	4e98dc18a7	Remember when I said I'd commit you last? I lied.	2021-02-03 02:00:04 -08:00
Captain277	0114bb3f80	Re-Re Fix.	2021-02-02 22:05:32 -08:00