1167 Commits

Author	SHA1	Message	Date
kevinz000	570fa0cd3b	fix	2019-07-14 03:53:15 -07:00
Poojawa	245bd3e650	Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into last-word-hearing-psychics	2019-07-13 10:18:13 -05:00
Poojawa	4d895ae6c0	Gang victory news report and last words for discord bot ... also slight improvement to gangster greetings	2019-07-13 08:38:19 -05:00
Ghommie	71720f8a32	missed bits.	2019-07-13 07:12:37 +02:00
Ghommie	8f410429de	Ports "Renames SSsqueak to SSminor_mapping"	2019-07-13 07:08:03 +02:00
Ghommie	bef0027287	In a haste, we forget thousand things.	2019-07-11 08:50:47 +02:00
Poojawa	c4f736eb94	Merge branch 'master' into job-menu-improvements	2019-07-10 18:55:29 -05:00
Thalpy	c418312cc6	Merge branch 'master' into master	2019-07-09 05:33:09 +01:00
kevinz000	30a006e42f	additions, and it now nulls out.	2019-07-08 18:21:04 -07:00
kevinz000	adf2166c57	t	2019-07-08 12:31:15 -07:00
kevinz000	fd592e5815	Merge pull request #8827 from Ghommie/Ghommie-cit112 ... Ports "Makes looping sounds use client time"	2019-07-07 02:31:10 -07:00
Thalpy	cc39c9f896	Merge branch 'master' into master	2019-07-06 16:03:17 +01:00
Ghommie	3ca31617aa	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit114	2019-07-05 23:06:57 +02:00
Ghommie	03315d1cbb	Ports a toggleable darkmode to the game!	2019-07-05 22:29:50 +02:00
kevinz000	748550895d	Merge pull request #8632 from Arturlang/Traitor_Codeword_Highlight ... Ports traitor codeword highlighting	2019-07-05 06:57:49 -07:00
Ghommie	7be9305b03	Ports "Makes looping sounds use client time"	2019-07-04 22:50:11 +02:00
Poojawa	f66ee6f967	Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements	2019-07-04 00:44:29 -05:00
Thalpy	8a6e669060	Merge branch 'master' into master	2019-07-04 03:14:29 +01:00
Ghommie	1fd50cc15a	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit96	2019-07-03 04:52:57 +02:00
Thalpy	696d879874	Merge branch 'master' into master	2019-06-29 15:48:25 +01:00
kevinz000	a6caf4c63f	Merge pull request #8729 from Ghommie/Ghommie-cit79 ... Ports "Removes SSreligion"	2019-06-28 20:30:44 -07:00
Ghommie	3291b9c47a	Porting in donut fixes, beepsky smash and Neurotoxin reworks.	2019-06-28 23:17:12 +02:00
Ghommie	28d3747c5e	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54	2019-06-24 16:55:10 +02:00
Fermi	10109d0fe5	Merge branch 'pr/18'	2019-06-23 19:15:07 +01:00
kevinz000	c9d67ecd49	Merge pull request #8667 from Ghommie/Ghommie-cit61 ... Ports the system for randomized semi-persistent chem reactions.	2019-06-23 06:54:43 -07:00
kevinz000	294e1e48d2	Merge pull request #8659 from Ghommie/Ghommie-cit57 ... ports "Componentizes orbiting"	2019-06-23 06:50:32 -07:00
Ghommie	38bc8a4efd	Ports "Removes SSreligion"	2019-06-23 01:45:21 +02:00
Fermi	713d849c03	Merge remote-tracking branch 'upstream/master'	2019-06-19 21:02:30 +01:00
Ghom	2845428c03	ports "Improve efficiency of SSmapping init" (#8651)	2019-06-17 11:18:28 -07:00
Thalpy	41eee65b15	Merge branch 'master' into master	2019-06-17 12:18:40 +01:00
Ghommie	50dd512be7	Ports system for randomized semi-persistent chem reactions.	2019-06-17 10:50:40 +02:00
Poojawa	f19a3541a3	cleans up runtimes	2019-06-16 19:30:14 -05:00
Poojawa	762a3e3c02	Ports revised job backend from TG	2019-06-16 18:45:26 -05:00
Ghommie	b782226900	ports "Componentizes orbiting"	2019-06-17 00:19:57 +02:00
Ghommie	ba3a2c00bb	ports in the Hilbert's Hotel.	2019-06-16 10:50:59 +02:00
Ghommie	b5e3da68bd	Ports "areas_in_z after start population fix"	2019-06-16 08:45:37 +02:00
Fermi	6b9becce71	Merge branch 'pr/14'	2019-06-14 21:29:04 +01:00
unknown	b90d344afc	It works. It just works.	2019-06-12 01:10:21 +03:00
Ghommie	92e925f1f7	Stuff to fix, fools to blame.	2019-06-07 07:14:24 +02:00
Fermi	91f10442cf	Merge branch 'pr/12'	2019-05-26 02:05:48 +01:00
CalamaBanana	4b91eb89b4	Update vote.dm	2019-05-18 16:05:38 +02:00
CalamaBanana	5c4da48593	Plays a sound if a vote is started	2019-05-18 16:03:59 +02:00
deathride58	02eb7f9e61	Merge pull request #8268 from Citadel-Station-13/kevinz000-patch-38 ... Makes auto transfer delay loaded from config rather than hardcoded to 2 hours	2019-05-17 00:34:17 -04:00
deathride58	aa1fdd9fb7	Merge pull request #8311 from Trilbyspaceclone/patch-114 ... Adds new phobias and tweaks others - syndicate, eye phobia	2019-05-17 00:33:12 -04:00
Thalpy	926bd65392	Merge branch 'master' into FermiChem	2019-05-11 14:14:20 +01:00
Useroth	b80bb21219	Dildo-shaped circuit assemblies. Because that's what the community needs.	2019-05-09 08:45:47 +02:00
Trilbyspaceclone	8d7297c178	Update traumas.dm	2019-05-02 20:07:18 -04:00
Trilbyspaceclone	21d4c0614d	Update traumas.dm	2019-05-02 18:50:24 -04:00
Trilbyspaceclone	16dff1969e	Update traumas.dm	2019-05-02 18:32:33 -04:00
Trilbyspaceclone	44e02f7f6a	Update traumas.dm	2019-05-02 17:40:39 -04:00