1018 Commits

Author	SHA1	Message	Date
Putnam3145	f0e51d666c	Merge pull request #13617 from timothyteakettle/loadout-json ... loadout 2: electric boogaloo	2020-12-11 18:11:56 -08:00
Timothy Teakettle	132a3c9526	color non polychromic items	2020-12-08 19:29:34 +00:00
timothyteakettle	81eaa8a2b9	woops	2020-12-06 23:51:03 +00:00
timothyteakettle	16b98adb9f	no more debug	2020-12-06 23:40:00 +00:00
timothyteakettle	a84f1648f4	Update preferences_savefile.dm	2020-12-06 22:57:57 +00:00
Timothy Teakettle	e413fcb091	more fixes	2020-12-06 22:14:35 +00:00
Timothy Teakettle	53a434cfb1	suggested change	2020-12-06 20:07:50 +00:00
timothyteakettle	61cc33d995	Merge remote-tracking branch 'upstream/master' into loadout-json	2020-12-06 17:26:04 +00:00
timothyteakettle	0f540884eb	Merge branch 'master' into loadout-json	2020-12-06 17:24:24 +00:00
timothyteakettle	5566c00a69	fixes	2020-12-06 17:24:12 +00:00
timothyteakettle	a478da678e	bugfixes	2020-12-06 15:50:33 +00:00
timothyteakettle	cbbcc0c386	fix the migration	2020-12-06 00:16:56 +00:00
silicons	b721cf3128	Update preferences.dm	2020-12-03 05:41:56 -07:00
silicons	0f9734b1f7	Merge pull request #13698 from timothyteakettle/communication-hotkeys ... ports rebindable communication hotkeys from tg	2020-11-28 09:12:40 -07:00
silicons	47c74c3fac	sigh	2020-11-27 06:42:55 -07:00
silicons	ead209f507	sigh	2020-11-27 06:31:05 -07:00
silicons	ae756749cc	woops	2020-11-27 05:15:40 -07:00
silicons	564766d11d	sigh	2020-11-27 00:16:53 -07:00
silicons	5e965d099f	COME ON	2020-11-26 23:37:27 -07:00
silicons	fa516b1097	Merge pull request #13685 from uomo91/adminlogging ... Ports: Admins can now see chronological order of events in logging tabs.	2020-11-25 22:21:34 -07:00
timothyteakettle	8a2e996817	migration runtimes	2020-11-24 01:55:36 +00:00
Timothy Teakettle	5075aec151	webedit adds spaces for some reason	2020-11-22 21:43:15 +00:00
Timothy Teakettle	a976d42305	Revert "webedit adds spaces for some reason" ... This reverts commit 8d41c15b75.	2020-11-22 21:42:36 +00:00
Timothy Teakettle	8d41c15b75	webedit adds spaces for some reason	2020-11-22 21:42:14 +00:00
Timothy Teakettle	285208ece3	Merge branch 'master' into communication-hotkeys	2020-11-22 21:30:43 +00:00
Timothy Teakettle	5de801ac40	communication hotkeys	2020-11-22 21:08:58 +00:00
silicons	c7396632db	Merge pull request #13582 from timothyteakettle/i-hate-mcolor ... adds advanced colouring mode: allows you to individually colour mutant parts	2020-11-22 13:33:28 -07:00
uomo91	cfaa988217	Merge master and fix newline conflict.	2020-11-19 17:12:19 -06:00
uomo91	be009f2e54	Better labeling to differentiate log types.	2020-11-18 06:08:14 -06:00
timothyteakettle	60077f028e	port	2020-11-17 01:41:19 +00:00
silicons	803bff4e5f	funny	2020-11-12 23:34:42 -07:00
Timothy Teakettle	9cfecfa507	Update preferences_savefile.dm	2020-11-10 23:07:01 +00:00
LetterJay	10c90e06c1	Merge pull request #13661 from timothyteakettle/age-verification ... adds in-game age verification as an alternative to access requests	2020-11-08 11:07:05 -06:00
Timothy Teakettle	185939a09f	stable version	2020-11-08 16:49:49 +00:00
Timothy Teakettle	7a82f53e75	attempte fixes	2020-11-08 16:45:32 +00:00
Timothy Teakettle	d358a170fa	fixes	2020-11-08 14:32:10 +00:00
Timothy Teakettle	48ecffa8f4	Revert "Revert "fixes"" ... This reverts commit 2fb9dc88e7.	2020-11-08 12:48:00 +00:00
Timothy Teakettle	2fb9dc88e7	Revert "fixes" ... This reverts commit a7e0bafde3.	2020-11-08 02:23:55 +00:00
Timothy Teakettle	a7e0bafde3	fixes	2020-11-08 01:46:43 +00:00
Timothy Teakettle	82e561675c	yes	2020-11-06 21:47:22 +00:00
Timothy Teakettle	e2ca7164b9	age verification	2020-11-06 21:00:14 +00:00
Timothy Teakettle	022f996cfa	better fix	2020-11-05 17:28:32 +00:00
timothyteakettle	8126eb5a12	fixes a lot of things	2020-11-02 23:07:27 +00:00
timothyteakettle	f34882cf60	Update preferences_savefile.dm	2020-11-01 23:27:34 +00:00
timothyteakettle	ede19dd47d	Update preferences_savefile.dm	2020-11-01 23:25:09 +00:00
Timothy Teakettle	22823f629d	an actual fix	2020-11-01 20:40:08 +00:00
Timothy Teakettle	f4f322dd0e	better fix	2020-10-30 19:39:43 +00:00
timothyteakettle	cf49e78d45	Merge remote-tracking branch 'upstream/master' into i-hate-mcolor	2020-10-27 22:12:55 +00:00
timothyteakettle	a987420d22	fix for mam markings	2020-10-27 21:40:07 +00:00
timothyteakettle	a9f2b86da9	tonne of fixes	2020-10-27 21:32:08 +00:00