16 Commits

Author	SHA1	Message	Date
Archie	87ce4d858c	Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1"" ... This reverts commit 08c8f744a9.	2021-01-08 17:03:24 -03:00
QuoteFox	08c8f744a9	Revert "Merge pull request #838 from ArchieBeepBoop/test1" ... This reverts commit b0dbacee82, reversing changes made to 813a2ea1c7.	2021-01-08 19:28:18 +00:00
kevinz000	939d8258de	Merge pull request #10813 from Ghommie/Ghommie-cit540 ... Unicode support updates from tgstation.	2021-01-08 07:11:56 -03:00
kevinz000	fa655a1b78	Merge pull request #9456 from Thalpy/Spookytime ... [READY] [Spookytime] Adds Jacqueline the Pumpqueen	2020-10-28 16:04:47 -03:00
QuoteFox	de32bcb49e	FPS moved to menu ... FPS moved back into preferences	2020-07-05 16:00:04 +01:00
Improvedname	0c1ddee60e	SINGING	2020-03-06 20:12:43 +01:00
Hatterhat	7c2f3f452e	god i miss having travis	2019-11-15 16:32:14 -06:00
Hatterhat	6658beef2f	mike hawk n ball	2019-11-12 21:47:46 -06:00
Hatterhat	7652b60cb9	Update menu.dm	2019-11-12 21:37:48 -06:00
Hatterhat	f685fd3976	the one where 40 fps gets added maybe	2019-11-12 21:30:15 -06:00
Azarak	103869977b	I dont know where this conflict appeared out of but im fixing it?	2019-11-08 21:17:17 +01:00
quotefox	aaa9b748c6	another fix.	2019-10-18 22:00:04 +01:00
quotefox	81ac8f7c95	fix	2019-10-18 21:39:09 +01:00
quotefox	4b20449a1f	Fix for FPS options	2019-10-18 21:12:57 +01:00
quotefox	1d26cba3b8	FPS menu option	2019-10-18 19:59:05 +01:00
Quotefox	7091cdbe8c	Uploading all files.	2019-09-23 18:26:34 +02:00