1239 Commits

Author	SHA1	Message	Date
Lin	b8ba29e6f8	Merge pull request #13117 from Citadel-Station-13/silicons-patch-3 ... fixes nanite hubs	2020-08-14 13:01:15 -05:00
Lin	ba9a808aaa	Merge pull request #13118 from Citadel-Station-13/silicons-patch-4 ... fixes nanite programmers not ejecting disks	2020-08-14 13:01:08 -05:00
silicons	b931b450ac	Update nanite_cloud_controller.dm	2020-08-12 17:18:56 -07:00
silicons	bb29d85983	Update nanite_programmer.dm	2020-08-12 17:18:40 -07:00
silicons	cd95685eaa	Update nanite_program_hub.dm	2020-08-12 17:18:06 -07:00
silicons	7bcbcda37b	Update nanite_cloud_controller.dm	2020-08-11 00:37:44 -07:00
silicons	471d036881	Update nanite_programmer.dm	2020-08-11 00:35:53 -07:00
silicons	e99414c3d4	Update nanite_program_hub.dm	2020-08-11 00:34:17 -07:00
Letter N	e964b3aabf	skillpannel fix, and nyanite fixes. Minified js does not include pai spoilers	2020-08-08 20:04:16 +08:00
Letter N	83207baaee	reverts nanite thing	2020-08-08 16:30:07 +08:00
Letter N	a19e306137	less redtext - updates anomalies	2020-08-03 20:53:36 +08: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
Timothy Teakettle	9a9993c7be	yep	2020-07-29 19:00:06 +01:00
silicons	9ff94e019b	Merge pull request #12924 from SiliconMain/analyzer ... Ports long range atmos analyzer from skyrat	2020-07-29 01:09:48 -07:00
SiliconMain	63bb9fe0f3	the dangers of copypaste	2020-07-26 16:35:50 -05:00
SiliconMain	abdafe15fa	fuck	2020-07-26 15:21:24 -05:00
silicons	ffd44b78ba	Merge remote-tracking branch 'citadel/master' into clickcd_experimental	2020-07-23 10:26:03 -07:00
silicons	98d3ac80d9	:pika:	2020-07-20 11:25:17 -07:00
silicons	58e26c540c	merge from master	2020-07-20 10:18:44 -07:00
silicons	1a040dd2a6	changes	2020-07-18 18:44:17 -07:00
silicons	7c5d4f863d	click cd breakout	2020-07-18 18:10:21 -07:00
Timothy Teakettle	1a5008fee7	Merge branch 'master' into wound-port	2020-07-18 23:06:49 +01:00
Timothy Teakettle	974b80a2fd	Merge branch 'master' into wound-port	2020-07-18 21:45:24 +01:00
timothyteakettle	8bb9b11922	Merge branch 'wound-port' of https://github.com/timothyteakettle/Citadel-Station-13 into wound-port	2020-07-18 01:26:41 +01:00
timothyteakettle	7714fcfaba	more changes	2020-07-18 01:26:38 +01:00
Timothy Teakettle	93b4570f8d	more changes	2020-07-17 23:23:47 +01:00
silicons	993b4ec222	Merge remote-tracking branch 'citadel/master' into unarmed_parry	2020-07-16 19:39:46 -07:00
Artur	5f9364c5f8	Merge remote-tracking branch 'Upstream/master' into TGUI-3.0	2020-07-13 16:20:54 +03:00
Artur	9de8483bcf	Merge remote-tracking branch 'Upstream/master' into TGUI-3.0	2020-07-09 22:14:20 +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	6d1ca993f6	Merge pull request #12648 from timothyteakettle/tray-and-jar ... bluespace tray + bluespace jar	2020-07-08 03:10:44 -07:00
silicons	6cbab55ef8	Merge remote-tracking branch 'citadel/master' into unarmed_parry	2020-07-07 21:07:58 -07:00
silicons	6ee63f66aa	whew	2020-07-07 20:48:54 -07:00
Artur	280d3de6c3	Merge remote-tracking branch 'origin/master' into TGUI-3.0	2020-07-07 18:37:45 +03:00
Ghom	17ee8c5960	Merge pull request #12660 from YakumoChen/master ... Reverts improv small arms, makes guncrafting easier and faster	2020-07-04 18:35:22 +02:00
Artur	f0154f3f1c	conflicts!!!	2020-07-03 15:45:11 +03:00
Artur	6ee1eba56c	Merge remote-tracking branch 'origin/master' into TGUI-3.0	2020-07-02 23:23:47 +03:00
Sonic121x	4e2b05a22a	Fix the missing Technode icon	2020-07-02 22:33:35 +08:00
Timothy Teakettle	15e137dd18	Merge branch 'master' into tray-and-jar	2020-07-01 22:06:17 +01:00
kappa-sama	cfc14a04f1	Merge branch 'master' into patch-28	2020-07-01 07:48:46 -04:00
kappa-sama	1f38c3029c	yeah ok	2020-07-01 07:40:43 -04:00
Letter N	b35e3f2b93	fix: R&D Console, Vending, and chem master	2020-07-01 19:07:03 +08:00
YakumoChen	8e25b90d54	removes obselete part	2020-07-01 09:08:01 +00:00
YakumoChen	327a36f8bd	removes obselete autolathe designs	2020-07-01 09:06:29 +00:00
timothyteakettle	10a0e1b688	stick it on the right node	2020-06-30 00:46:27 +01:00
Artur	20245f7319	Merge remote-tracking branch 'origin/master' into TGUI-3.0	2020-06-30 02:30:29 +03:00
Ghommie	9dc4b99620	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765	2020-06-30 00:49:06 +02:00
timothyteakettle	2e4c5e322d	tray and jar	2020-06-29 02:49:31 +01:00
kappa-sama	5787a75dee	node	2020-06-27 18:20:13 -04:00