1372 Commits

Author	SHA1	Message	Date
Lin	293e6576c8	Merge pull request #10564 from kevinz000/optimization_1 ... Experimental optimizations	2020-01-29 19:25:13 +00:00
kevinz000	b26d6c443f	Update ticker.dm	2020-01-29 02:23:54 -07:00
kevinz000	2e6cfef224	Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit	2020-01-25 22:13:28 -07:00
Ghom	98c8b6c5c8	Merge pull request #10648 from Citadel-Station-13/kevinz000-patch-19 ... Sprinting in general is now a config	2020-01-26 05:53:53 +01:00
kevinz000	a4c5975b7d	Update fail2topic.dm	2020-01-25 02:03:39 -07:00
Putnam	847b3c0a09	Fixed flavor objectives and added more.	2020-01-24 10:46:07 -08:00
kevinz000	bedb42f147	Merge remote-tracking branch 'citadel/master' into optimization_1	2020-01-24 03:41:40 -07:00
kevinz000	3dcd2a75cf	Update configuration.dm	2020-01-22 02:27:51 -07:00
kevinz000	16c14b55ae	Update game_options.dm	2020-01-22 01:52:43 -07:00
kevinz000	ea5f35a457	Update game_options.dm	2020-01-22 01:06:50 -07:00
kevinz000	b0b90d4d28	Update game_options.dm	2020-01-22 00:45:17 -07:00
kevinz000	12c832b40b	Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit	2020-01-20 17:53:06 -07:00
Putnam	815b4f033d	made flavor things a game option + more hoard	2020-01-20 04:13:54 -08:00
Artur	f5ad854c2c	Conflict fix	2020-01-20 13:50:52 +02:00
Putnam	06c66617e6	m o r e traitor objectives	2020-01-19 18:58:10 -08:00
Ghom	8a091c5140	Merge pull request #10614 from Putnam3145/suicide_option ... Made suicide a config flag	2020-01-20 03:24:00 +01:00
Putnam	1bdb515592	made suicide a config flag	2020-01-19 03:44:45 -08:00
Ghommie	3ee855ab77	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265	2020-01-18 22:14:06 +01:00
Ghom	07b3bac674	Merge pull request #10580 from Putnam3145/craft-log ... Craft logging	2020-01-18 17:47:31 +01:00
Ghommie	9c0b78bc09	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265	2020-01-18 01:23:08 +01:00
Putnam	a4cc73f219	some craft logging	2020-01-16 18:40:00 -08:00
Artur	472d18403c	Merge remote-tracking branch 'Upstream/master' into TGUIs_Nexties	2020-01-16 11:38:09 +02:00
Ghom	7d9f4f9fe5	Merge pull request #10417 from kevinz000/nightshift_1 ... Nightshift improvements: public area settings/levels, nightshift auth requirement change, config changes, etc etc	2020-01-16 03:21:49 +01:00
Ghom	31c3b0f7bb	Merge pull request #10415 from kevinz000/tg_update_1 ... Small controller/backend updates from /tg/	2020-01-15 15:23:09 +01:00
kevinz000	7fb515173d	FUCK	2020-01-15 01:35:03 -07:00
kevinz000	5c94813267	WHYISTHISLITERALLYWASTINGCPUONANULLFUCKINGLIST	2020-01-15 01:31:49 -07:00
kevinz000	ca47a4e762	a	2020-01-15 01:23:49 -07:00
Artur	8b8a112d2c	Ohkay	2020-01-15 09:41:33 +02:00
kevinz000	97ded4b27b	ok	2020-01-14 18:09:12 -07:00
kevinz000	6ead30eab3	more shit	2020-01-14 17:22:54 -07:00
kevinz000	eff86a449f	wew	2020-01-14 16:45:22 -07:00
Ghom	2cc87c3127	Merge pull request #10531 from Trilbyspaceclone/Seed-to-points ... Hydroponics can now make sci points	2020-01-14 18:26:34 +01:00
TrilbySpaceClone	ccfaa294bc	Update research.dm	2020-01-14 10:40:47 -05:00
Ghommie	1d948907f6	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265	2020-01-13 23:26:21 +01:00
TrilbySpaceClone	43dcb70718	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Seed-to-points	2020-01-13 03:27:01 -05:00
kevinz000	884ea59d63	fix logic	2020-01-12 18:38:22 -08:00
kevinz000	8f5d4a0a49	Merge remote-tracking branch 'citadel/master' into nightshift_1	2020-01-12 18:27:03 -08:00
Putnam	4c4c965e86	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into score-instead	2020-01-12 17:36:56 -08:00
kevinz000	90dd0909b8	Merge branch 'master' of github.com-kevinz000:Citadel-Station-13/Citadel-Station-13 into god_wish_your_plushies_holy_shit	2020-01-12 10:25:50 -08:00
Ghommie	c14439494a	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265	2020-01-12 19:18:03 +01:00
AffectedArc07	16a37e2769	Standardises all files from CRLF to LF	2020-01-12 14:28:01 +00:00
Putnam	82d8900e5d	aaand move this over	2020-01-12 03:36:47 -08:00
Putnam	3f5e68765e	am i fucking stupid?	2020-01-12 03:10:42 -08:00
Putnam	295c134243	i'm so dumb dude	2020-01-12 03:06:17 -08:00
Putnam	5dc5ddaa76	daddy compiler please stop hating me	2020-01-11 22:17:18 -08:00
Putnam	0c64ea1351	wow that was fucking dumb	2020-01-11 18:37:16 -08:00
Putnam	37c6119708	Sanity ... this is a commit by jimmy buffett	2020-01-11 18:26:32 -08:00
TrilbySpaceClone	29e7c49627	Pss got any of the good stuf Hydro?	2020-01-11 13:07:02 -05:00
Putnam	85f6367df5	weh	2020-01-11 03:50:19 -08:00
Putnam	9d3873f26f	traitor always available	2020-01-11 03:32:14 -08:00