mirror of
https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git
synced 2025-12-09 17:54:15 +00:00
5814661f08
* Squashed commit of the following: commitd249b39f27Author: nevimer <foxmail@protonmail.com> Date: Tue Sep 14 17:52:17 2021 -0400 lil patch commitd93d156cdcMerge:c369a1f16579f026e4Author: nevimer <foxmail@protonmail.com> Date: Tue Sep 14 17:41:34 2021 -0400 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13-RP into atom_say # Conflicts: # code/game/atoms.dm # code/modules/mob/typing_indicator.dm commitc369a1f16dAuthor: nevimer <77420409+nevimer@users.noreply.github.com> Date: Wed Jun 16 19:54:57 2021 -0400 fixes whispers returning oopsie commit479e1fcb3fMerge:2185394be3dfc5a831Author: nevimer <77420409+nevimer@users.noreply.github.com> Date: Wed Jun 16 01:40:25 2021 -0400 Merge branch 'master' into atom_say commit2185394beaAuthor: nevimer <77420409+nevimer@users.noreply.github.com> Date: Wed Jun 16 00:05:01 2021 -0400 might fix aghost and adds tts devices commitf51e4c9e39Author: nevimer <77420409+nevimer@users.noreply.github.com> Date: Wed Jun 9 20:41:09 2021 -0700 fmissed this commitcee32f19f6Author: nevimer <77420409+nevimer@users.noreply.github.com> Date: Wed Jun 9 20:34:10 2021 -0700 finally? commit434bca6725Author: nevimer <77420409+nevimer@users.noreply.github.com> Date: Wed Jun 9 22:54:47 2021 -0400 trying again commitac8a1e90f7Author: nevimer <77420409+nevimer@users.noreply.github.com> Date: Wed Jun 9 22:11:55 2021 -0400 scream commit12f528519dAuthor: nevimer <77420409+nevimer@users.noreply.github.com> Date: Wed Jun 9 21:38:18 2021 -0400 e? maybe commit3003ba9c8aAuthor: nevimer <77420409+nevimer@users.noreply.github.com> Date: Wed Jun 9 21:14:57 2021 -0400 ok this should fix it grr commit24cc8a48caAuthor: nevimer <77420409+nevimer@users.noreply.github.com> Date: Wed Jun 9 00:40:09 2021 -0400 update, fixes commit284823424fAuthor: nevimer <77420409+nevimer@users.noreply.github.com> Date: Thu May 27 18:22:57 2021 -0400 fixes whispers and emphasis commit676f1fdee9Author: nevimer <77420409+nevimer@users.noreply.github.com> Date: Thu May 27 05:02:37 2021 -0400 Update floating_message.dm commita6a56bd33eAuthor: nevimer <77420409+nevimer@users.noreply.github.com> Date: Thu May 27 04:35:12 2021 -0400 bugfix commit940869f9b8Author: nevimer <77420409+nevimer@users.noreply.github.com> Date: Thu May 27 04:07:57 2021 -0400 Update floating_message.dm commitee5bc05014Author: nevimer <77420409+nevimer@users.noreply.github.com> Date: Wed May 26 21:12:22 2021 -0400 Working preference toggle & chat message parsing. Ready for testing. Let's goooo commitdcdf68ffe2Author: nevimer <77420409+nevimer@users.noreply.github.com> Date: Wed May 26 07:16:48 2021 -0400 disables the say portion for the sake of the PR not ready yet, but the rest if fine for testing. commit0fbbede014Author: nevimer <77420409+nevimer@users.noreply.github.com> Date: Wed May 26 07:15:08 2021 -0400 atom_say, working runechat checkpoint a lot of work, ports from both vorestation and nebula commit0fa68bcc9dAuthor: nevimer <77420409+nevimer@users.noreply.github.com> Date: Tue May 25 07:51:35 2021 -0400 adds atom_say starting point, working build commit60c64ba49eAuthor: Changelogs <action@github.com> Date: Sat May 22 00:38:31 2021 +0000 Automatic changelog compile [ci skip] commita252c25d08Merge:f050edf05edd16301dAuthor: nevimer <77420409+nevimer@users.noreply.github.com> Date: Thu May 20 22:09:18 2021 -0400 Merge remote-tracking branch 'upstream/master' commitf050edf052Author: Changelogs <action@github.com> Date: Fri May 21 00:38:27 2021 +0000 Automatic changelog compile [ci skip] commitad49b8a353Merge:3fa931fe8eb7cc7495Author: nevimer <77420409+nevimer@users.noreply.github.com> Date: Thu May 20 18:59:13 2021 -0400 Merge remote-tracking branch 'upstream/master' commit3fa931fe88Author: Changelogs <action@github.com> Date: Thu May 20 00:35:02 2021 +0000 Automatic changelog compile [ci skip] commited4f37002eAuthor: Changelogs <action@github.com> Date: Tue May 18 00:40:36 2021 +0000 Automatic changelog compile [ci skip] commit02ce64268aAuthor: Changelogs <action@github.com> Date: Mon May 17 00:36:31 2021 +0000 Automatic changelog compile [ci skip] commitdfe942dee2Author: Changelogs <action@github.com> Date: Sun May 16 00:40:06 2021 +0000 Automatic changelog compile [ci skip] commit283aa9bbf3Merge:18e1bc31774e4ac2aeAuthor: nevimer <77420409+nevimer@users.noreply.github.com> Date: Sat May 15 18:11:30 2021 -0400 Merge remote-tracking branch 'upstream/master' commit18e1bc317dAuthor: Changelogs <action@github.com> Date: Sat May 15 00:36:18 2021 +0000 Automatic changelog compile [ci skip] commit45f1758215Merge:0ee283079524c9bf09Author: nevimer <77420409+nevimer@users.noreply.github.com> Date: Fri May 14 09:25:57 2021 -0700 Merge branch 'master' of https://github.com/nevimer/Citadel-Station-13-RP commit0ee283079cMerge:731b6c8407e78914deAuthor: nevimer <77420409+nevimer@users.noreply.github.com> Date: Fri May 14 09:21:27 2021 -0700 Merge remote-tracking branch 'upstream/master' commit524c9bf090Author: Changelogs <action@github.com> Date: Fri May 14 00:38:42 2021 +0000 Automatic changelog compile [ci skip] commitb49c70a2e4Author: Changelogs <action@github.com> Date: Thu May 13 00:38:08 2021 +0000 Automatic changelog compile [ci skip] commitf7c2793d48Author: Changelogs <action@github.com> Date: Tue May 11 00:27:49 2021 +0000 Automatic changelog compile [ci skip] commit731b6c840aMerge:f5118623bb08a4592cAuthor: nevimer <77420409+nevimer@users.noreply.github.com> Date: Mon May 10 11:04:15 2021 -0700 Merge remote-tracking branch 'upstream/master' commitf5118623b3Author: Changelogs <action@github.com> Date: Mon May 10 00:28:54 2021 +0000 Automatic changelog compile [ci skip] commit845d763f73Author: Changelogs <action@github.com> Date: Sun May 9 00:29:28 2021 +0000 Automatic changelog compile [ci skip] commit8ce38a567fAuthor: Changelogs <action@github.com> Date: Sat May 8 00:27:15 2021 +0000 Automatic changelog compile [ci skip] commitdf14298791Author: Changelogs <action@github.com> Date: Fri May 7 00:27:26 2021 +0000 Automatic changelog compile [ci skip] commitfa9e0c269cAuthor: Changelogs <action@github.com> Date: Thu May 6 00:25:25 2021 +0000 Automatic changelog compile [ci skip] commitf3213a4081Author: Changelogs <action@github.com> Date: Wed May 5 00:26:22 2021 +0000 Automatic changelog compile [ci skip] commitdab545149eAuthor: Changelogs <action@github.com> Date: Tue May 4 00:31:19 2021 +0000 Automatic changelog compile [ci skip] commitd8145b94a5Merge:c432f8e2c8c6505935Author: nevimer <77420409+nevimer@users.noreply.github.com> Date: Mon May 3 03:44:34 2021 -0400 Merge branch 'master' of https://github.com/nevimer/Citadel-Station-13-RP commitc432f8e2c9Merge:befa94c8d1a6d61529Author: nevimer <77420409+nevimer@users.noreply.github.com> Date: Mon May 3 03:44:28 2021 -0400 Merge remote-tracking branch 'upstream/master' commit8c6505935fAuthor: Changelogs <action@github.com> Date: Mon May 3 00:36:22 2021 +0000 Automatic changelog compile [ci skip] commitff0770b3cbAuthor: Changelogs <action@github.com> Date: Sun May 2 00:39:51 2021 +0000 Automatic changelog compile [ci skip] commitbefa94c8dfMerge:ad4f7d2757e50e720fAuthor: nevimer <77420409+nevimer@users.noreply.github.com> Date: Sat May 1 00:06:38 2021 -0400 Merge remote-tracking branch 'upstream/master' commitad4f7d275dAuthor: Changelogs <action@github.com> Date: Sat May 1 00:35:51 2021 +0000 Automatic changelog compile [ci skip] commit162d19bf12Author: Changelogs <action@github.com> Date: Fri Apr 30 00:34:16 2021 +0000 Automatic changelog compile [ci skip] commit08a4966a5dMerge:fa900f273bc9f6a34cAuthor: nevimer <77420409+nevimer@users.noreply.github.com> Date: Thu Apr 29 04:32:54 2021 -0400 Merge remote-tracking branch 'upstream/master' commitfa900f2737Author: Changelogs <action@github.com> Date: Thu Apr 29 00:41:22 2021 +0000 Automatic changelog compile [ci skip] commit3a3731d7e6Author: Changelogs <action@github.com> Date: Tue Apr 27 00:41:26 2021 +0000 Automatic changelog compile [ci skip] commit6ea1b5ae9dAuthor: Changelogs <action@github.com> Date: Sun Apr 25 00:44:15 2021 +0000 Automatic changelog compile [ci skip] commit0bf27d747bAuthor: Changelogs <action@github.com> Date: Sat Apr 24 00:42:50 2021 +0000 Automatic changelog compile [ci skip] commit6cf2219f4aAuthor: Changelogs <action@github.com> Date: Thu Apr 22 00:42:36 2021 +0000 Automatic changelog compile [ci skip] commit1c7d64ce99Author: Changelogs <action@github.com> Date: Wed Apr 21 00:41:04 2021 +0000 Automatic changelog compile [ci skip] commitc3e79344b8Author: Changelogs <action@github.com> Date: Tue Apr 20 00:42:12 2021 +0000 Automatic changelog compile [ci skip] commitc3af5cbdf4Author: Changelogs <action@github.com> Date: Sat Apr 17 00:40:41 2021 +0000 Automatic changelog compile [ci skip] commit1473c88d4aAuthor: Changelogs <action@github.com> Date: Fri Apr 16 00:40:07 2021 +0000 Automatic changelog compile [ci skip] commit2421830491Author: Changelogs <action@github.com> Date: Thu Apr 15 00:41:58 2021 +0000 Automatic changelog compile [ci skip] commitdae8a74fb8Author: Changelogs <action@github.com> Date: Mon Apr 12 00:43:34 2021 +0000 Automatic changelog compile [ci skip] commit49b4245638Author: Changelogs <action@github.com> Date: Sun Apr 11 00:44:26 2021 +0000 Automatic changelog compile [ci skip] * Yeah....? * ok we're good, colour bug remains * Update commit, need help