1696 Commits

Author	SHA1	Message	Date
timothyteakettle	cdaef63fa1	sorry travis	2020-09-03 23:07:19 +01:00
timothyteakettle	90eef6efc9	Merge remote-tracking branch 'upstream/master' into limbs	2020-09-03 22:46:32 +01:00
timothyteakettle	9e2ee588c9	rp prosthetics	2020-09-03 22:05:21 +01:00
Letter N	fe17bee28e	reverts thing kev said about	2020-08-29 14:36:41 +08:00
Letter N	ae482c1bb8	Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT	2020-08-29 14:09:56 +08:00
Timothy Teakettle	fe25046410	Merge branch 'master' into limbs	2020-08-27 18:06:35 +01:00
silicons	973839dee4	ports my baystruments updates from tg (#13219) ... * subsystem * fix * e * update * fix	2020-08-25 21:04:42 +02:00
timothyteakettle	cd7293a9a2	limbs	2020-08-24 03:19:36 +01:00
silicons	7737e76b32	Merge pull request #13224 from Ghommie/Ghommie-cit835 ... Removing priority overlays, update_icon() splitup for guns.	2020-08-22 15:19:07 -07:00
Letter N	0b159b218a	revert moment	2020-08-22 16:30:56 +08:00
Letter N	afe32406c0	Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT	2020-08-22 13:40:36 +08:00
silicons	120bcfc00c	Merge pull request #13178 from lolman360/plumb ... [READY] ports plumbing (no more waiting for tgui4)	2020-08-20 21:32:26 -07:00
Ghommie	fde859bca0	Removing priority overlays, update_icon() splitup for guns.	2020-08-20 18:33:23 +02:00
Letter N	2dd3d71b19	config&copypaste chang.	2020-08-20 16:36:24 +08:00
Letter N	3b7bca28b3	Functional* code	2020-08-20 13:50:33 +08:00
silicons	11467e1cae	Merge pull request #13212 from Putnam3145/reftrack ... Ports reftracking from TG.	2020-08-19 22:03:16 -07:00
silicons	91484356c5	Merge pull request #13183 from SmArtKar/shuttle_hotfix ... Shuttle hotfix so now you can make huge shuttle things	2020-08-19 21:03:58 -07:00
Putnam	81dc6c7ee5	Ports reftracking from TG.	2020-08-18 20:41:43 -07:00
Letter N	5dff3e9a04	deletes ping	2020-08-18 11:35:10 +08:00
Letter N	90cb13f6af	Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT	2020-08-18 10:33:21 +08:00
Letter N	610e25beb7	oops updates asset cache	2020-08-17 20:51:05 +08:00
SmArtKar	e087845745	reee	2020-08-17 13:32:18 +03:00
silicons	f611945b34	Merge pull request #13180 from Detective-Google/glass-floors ... ports multiz glass floors (tgstation/tgstation#50831)	2020-08-17 03:14:15 -07:00
SmArtKar	dd64dcc4ea	Return of the King(and the limits)	2020-08-16 16:21:17 +03:00
SmArtKar	0a6eca818c	Succesfull removal of shuttle limit	2020-08-16 15:59:31 +03:00
Detective Google	016fd2ac3c	woo yeah yeah woo	2020-08-15 23:55:52 -05:00
kiwedespars	eb8574d6d6	heretics from tg (with changes)	2020-08-10 19:17:26 -07:00
lolman360	308d77da7c	Merge branch 'master' into plumb	2020-08-09 22:48:18 +10:00
Letter N	f1c4a7f6ac	Merge remote-tracking branch 'origin/master' into TGUI-4	2020-08-09 14:54:16 +08:00
silicons	1586625e6b	Merge pull request #12960 from timothyteakettle/loadout-you-say ... loadout changes part 1: adds subcategories to the loadout	2020-08-06 21:59:13 -07:00
Letter N	333ca2cc7b	Merge remote-tracking branch 'origin/master' into TGUI-4	2020-08-06 18:26:04 +08:00
silicons	ed5aa7c9f7	Merge pull request #12994 from kappa-sama/patch-37 ... removes dildo	2020-08-05 15:27:29 -07:00
silicons	2d697e1867	Merge pull request #12926 from GlitchyCore/master ... Adds a new fun round end sound	2020-08-05 15:14:20 -07:00
Letter N	454baea55f	Merge remote-tracking branch 'origin/master' into TGUI-4	2020-08-04 09:31:34 +08:00
Timothy Teakettle	289c186f32	Merge remote-tracking branch 'upstream/master' into wounds-part-2	2020-08-02 18:11:07 +01:00
kappa-sama	178976f5e5	no	2020-08-01 16:54:21 -04:00
Letter N	b376a6b6c4	Merge remote-tracking branch 'origin/master' into TGUI-4	2020-07-30 14:43:52 +08:00
Unknown	16722c47c3	CentCom Galactic Ban DB	2020-07-29 21:39:58 -05:00
Timothy Teakettle	31963b32a4	subcategories cool	2020-07-29 17:14:07 +01:00
Timothy Teakettle	9721025582	Merge branch 'master' into wounds-part-2	2020-07-29 15:47:44 +01:00
Lin	81a7542aa6	Merge pull request #12834 from silicons/clickcd_experimental ... Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)	2020-07-28 21:51:10 -05:00
Timothy Teakettle	721e018aec	loadout stuff	2020-07-28 22:52:00 +01:00
GlitchyCore	cf7678c7d4	hey let's forget to add the filetype to this instead of making sure it would actually work	2020-07-27 14:41:10 -05:00
Ghom	f946a157f4	Update mapping.dm	2020-07-27 14:54:46 +02:00
Ghom	7e18e7a7a8	Update mapping.dm	2020-07-27 14:52:05 +02:00
Ghommie	f1c242aadc	Fixing new bugs and stuff.	2020-07-27 14:16:01 +02:00
GlitchyCore	0e780d4ba0	hey you know what it'd be good if the filepath was actually there instead of the the .ogg name	2020-07-26 16:59:26 -05:00
GlitchyCore	e9b397cbad	ADDS END ROUND SOUND	2020-07-26 16:41:48 -05:00
timothyteakettle	315e7e1f99	bugfixes	2020-07-24 23:49:15 +01:00
Timothy Teakettle	7fb55a02a5	section one	2020-07-24 22:34:22 +01:00