177 Commits

Author	SHA1	Message	Date
raspy-on-osu	622a3df378	Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor	2021-01-24 19:21:24 -05:00
silicons	bffc43e95e	fixes	2021-01-08 18:59:26 -08:00
silicons	bd3761d39e	proper smooth movement	2021-01-08 10:51:48 -08:00
raspy-on-osu	0e652cb64c	init	2020-12-26 06:02:09 -05:00
Letter N	a808f805d4	ASYNC EVERYTHING!	2020-12-21 16:24:51 +08:00
silicons	5b03f5b0ec	more	2020-11-12 23:36:18 -07:00
silicons	95ebeac5b6	fix	2020-09-15 17:27:11 -07:00
Letter N	454baea55f	Merge remote-tracking branch 'origin/master' into TGUI-4	2020-08-04 09:31:34 +08:00
silicons	06f5ce6401	buffs shoving (#12925) ... * ^w^ * ok * ok	2020-08-02 18:30:09 +02:00
Letter N	b376a6b6c4	Merge remote-tracking branch 'origin/master' into TGUI-4	2020-07-30 14:43:52 +08:00
Letter N	10fefca674	another batch. MAJOR: chem_master, pandemic	2020-07-30 14:06:20 +08:00
silicons	98d3ac80d9	:pika:	2020-07-20 11:25:17 -07:00
silicons	993b4ec222	Merge remote-tracking branch 'citadel/master' into unarmed_parry	2020-07-16 19:39:46 -07:00
silicons	e03948dcba	Merge pull request #12229 from Arturlang/TGUI-3.0 ... [READY]TGUI 3.0	2020-07-16 17:28:42 -07:00
Letter N	2afab07b4a	https://github.com/tgstation/tgstation/pull/52255	2020-07-16 20:05:37 +08:00
Artur	5f9364c5f8	Merge remote-tracking branch 'Upstream/master' into TGUI-3.0	2020-07-13 16:20:54 +03:00
Putnam	a625d6562b	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real	2020-07-08 22:02:03 -07:00
silicons	6ee63f66aa	whew	2020-07-07 20:48:54 -07:00
Artur	c41d2e78be	Conflicts!!!	2020-06-22 17:39:24 +03:00
kevinz000	a0ecf85e4b	Update conveyor2.dm	2020-06-16 08:27:58 -07:00
Artur	9d04b0835b	Conflicts galore	2020-05-21 21:08:12 +03:00
Ghom	335f5a37b9	Plane adjustments on several low layer objects. (#12286)	2020-05-17 17:02:57 -07:00
Artur	5b7d9a9008	Merge conflict fix	2020-05-13 12:37:18 +03:00
Putnam	e8d7da56f4	Ported C++mos from yogs (help me)	2020-05-11 15:44:26 -07:00
Artur	80b47ec1c0	Ports https://github.com/tgstation/tgstation/pull/50497	2020-04-23 09:55:28 +03:00
Ghommie	42201343a9	Backward 512 compatibility removal.	2020-04-23 00:59:23 +02:00
Winter Flare	8e3f48a761	Reduces (or gives) weight classes to several items.	2020-04-19 17:13:19 -04:00
Ghommie	59b1a223a3	Ok, done.	2020-03-08 22:51:36 +01:00
kevinz000	93d995eb18	k	2020-03-06 10:13:11 -07:00
kevinz000	0e4692c63d	Merge remote-tracking branch 'citadel/master' into mobility_flags	2020-02-18 18:16:34 -07:00
Ghom	fdbef6a93c	Update bin.dm	2020-02-13 13:10:36 +01:00
kevinz000	6a8a606f97	Merge remote-tracking branch 'citadel/master' into mobility_flags	2020-02-04 16:01:25 -07:00
Artur	fe92573fc3	Forgot this	2020-02-02 13:44:44 +01:00
Artur	e7ddfdd8d8	Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties	2020-02-02 13:31:54 +01:00
Ghommie	7f14fa3c71	not-so-wip now.	2020-01-31 19:20:59 +01:00
Artur	db36a90e35	Fixes.	2020-01-30 19:23:38 +01:00
kevinz000	611fd7ea89	Merge remote-tracking branch 'citadel/master' into mobility_flags	2020-01-27 23:35:35 -07:00
Artur	e360ac1d36	Conflict fix	2020-01-24 23:06:32 +01:00
Artur	f5ad854c2c	Conflict fix	2020-01-20 13:50:52 +02:00
Seris02	ab771d9505	I deleted an important thing	2020-01-20 15:48:55 +08:00
Seris02	afd848e45a	weh	2020-01-20 10:29:09 +08:00
kevinz000	f85527ab4b	Merge remote-tracking branch 'citadel/master' into mobility_flags	2020-01-19 16:18:12 -07:00
kevinz000	7bcb37c5d1	Merge remote-tracking branch 'citadel/master' into mobility_flags	2020-01-16 21:12:56 -07:00
Artur	d04c09aba0	Compiles, just need to fix goonchat	2020-01-15 09:44:03 +02:00
Artur	8b8a112d2c	Ohkay	2020-01-15 09:41:33 +02: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
kevinz000	7378d91684	([\W\.])Knockdown\(	2020-01-06 03:39:20 -08:00
Ghommie	686a76dd1d	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265	2020-01-04 13:35:05 +01:00
Lin	f7b91f9b65	Merge pull request #10238 from Ghommie/Ghommie-cit478 ... Brings in some mapping code updates.	2020-01-03 00:01:54 +00:00