Commit Graph
100 Commits
Author SHA1 Message Date
Morbo c3d53d2c8b Update getters logic 2023-01-29 00:37:48 +03:00
Morbo d6f046af9b Disable by default 2023-01-28 23:18:41 +03:00
Morbo bd6c7e669e Add player slots manager 2023-01-28 21:10:35 +03:00
MorbandGitHub 9a6438eb92 Merge pull request #775 from space-syndicate/upstream-sync
Upstream sync
2023-01-27 11:43:18 -08:00
Morbo 77e7a04d07 Update locale 2023-01-27 21:08:49 +03:00
Morbo 8bff10af81 Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-01-27 21:05:54 +03:00
MorbandGitHub 38b15ffea1 Merge pull request #772 from space-syndicate/upstream-sync
Upstream sync
2023-01-25 17:33:21 -08:00
Morbo 57b3bf567b Remove PosterContrabandGotWood from Ishimura 2023-01-26 02:14:21 +03:00
Morbo 0cdf6735a6 Replace IAA jobs for Barratry 2023-01-26 01:07:03 +03:00
Morbo bfc9dbe3d2 Update locale 2023-01-25 23:42:26 +03:00
Morbo f0783a7147 Fix markings 2023-01-25 23:36:52 +03:00
Morbo d9c226480b Move TTS code to Humanoid dir 2023-01-25 23:36:39 +03:00
Morbo f3bd98ceed Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
#	Content.Server/Zombies/ZombifyOnDeathSystem.cs
#	Content.Shared/Humanoid/HumanoidComponent.cs
#	Content.Shared/Humanoid/SharedHumanoidSystem.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
2023-01-25 22:46:52 +03:00
MorbandGitHub a13f67aba0 [Sponsor] Old USSP black form (#768) 2023-01-24 07:00:03 -08:00
Morbo 15ebc3e08e Add dot and semicolon to TTS whitelist 2023-01-24 01:00:11 +03:00
MorbandGitHub 6eb0d71469 Merge pull request #764 from space-syndicate/upstream-sync
Upstream sync
2023-01-22 04:11:43 +03:00
Morbo 240c417fe7 Replace d100 on Delta 2023-01-22 03:21:14 +03:00
Morbo ada68d3868 Merge ERT jumpsuit with upstream one 2023-01-22 00:54:35 +03:00
Morbo 1119233803 Update locale 2023-01-22 00:10:29 +03:00
Morbo cdfcfe6722 Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-01-22 00:07:21 +03:00
MorbandGitHub 9874ce5f48 Update bolt light after bolts fall (#13636) 2023-01-21 12:33:11 -04:00
Morbo c9736a500f Add space, question & exclamation mark 2023-01-21 16:37:44 +03:00
MorbandGitHub 2b510d7134 Peaceful round end (#761) 2023-01-20 18:13:16 -08:00
MorbandGitHub 77feb22f52 TTS Fix [Part 5] (#762) 2023-01-20 10:53:08 -08:00
MorbandGitHub f0429edbb1 Add panic bunker toggle to admin menu (#13450) 2023-01-20 07:25:35 -08:00
MorbandGitHub 753354a16b [Sponsor] Watches & augments (#760) 2023-01-19 04:18:51 -08:00
MorbandGitHub 720fa10eb9 Add CE and QM to TTS replacer (#752) 2023-01-18 05:42:06 -08:00
MorbandGitHub 7a834c3597 Merge pull request #754 from space-syndicate/upstream-sync
Upstream sync
2023-01-18 02:33:38 +03:00
Morbo ca66dcbb22 Update locale 2023-01-18 00:05:04 +03:00
Morbo b3c177f119 Fix airlock closed light 2023-01-17 23:58:41 +03:00
Morbo fe966efc95 Fix station goal with fax 2023-01-17 23:25:49 +03:00
Morbo 35ea494981 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Client/IoC/ClientContentIoC.cs
#	Content.Server/Doors/Components/AirlockComponent.cs
#	Content.Server/Fax/FaxMachineComponent.cs
#	Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
2023-01-17 22:57:53 +03:00
MorbandGitHub 3d5b0796f0 Merge pull request #739 from space-syndicate/upstream-sync
Upstream sync
2023-01-15 22:27:16 +03:00
Morbo e5a192afff Update locale 2023-01-15 20:32:34 +03:00
Morbo 2807df199f Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-01-15 19:48:27 +03:00
MorbandGitHub d98e077db8 TTS voice mask support (#748) 2023-01-15 07:13:18 -08:00
MorbandGitHub 63c0379765 TTS whisper (#747) 2023-01-15 06:08:06 -08:00
MorbandGitHub 622791b04f TTS Fix [Part 4] (#746) 2023-01-15 05:37:48 -08:00
MorbandGitHub 97cc084a54 More diona customization (#12576) 2023-01-15 00:54:47 -04:00
MorbandGitHub a8f7ad8187 Fix typing indicator state (#745) 2023-01-14 12:08:46 -08:00
MorbandGitHub 0decb1f835 One file for all sponsor stuff (#742) 2023-01-14 08:04:50 -08:00
MorbandGitHub c68b509c1e Update diona scream (#12582) 2023-01-13 21:58:17 -04:00
MorbandGitHub f26bb97ac6 Idle animated speech bubbles (#730) 2023-01-13 17:10:15 -08:00
MorbandGitHub 84d10c6b97 Add lawyer badge for IAA starting gear (#736) 2023-01-12 19:38:52 -08:00
MorbandGitHub d9dda22f3f Merge pull request #735 from space-syndicate/upstream-sync
Upstream sync
2023-01-13 06:18:58 +03:00
Morbo f6d07cceaf Update locale 2023-01-13 05:53:22 +03:00
Morbo 6b8912167b Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Server/Afk/AFKSystem.cs
#	Resources/Prototypes/Maps/marathon.yml
2023-01-13 05:38:06 +03:00
MorbandGitHub ecf82df00d Slang word replace (#733) 2023-01-12 18:15:32 -08:00
c40a761ec5 Shipping Containers (#731)
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
2023-01-12 18:14:53 -08:00
MorbandGitHub 41ea4dccb6 TTS Fix [Part 3] (#732) 2023-01-12 09:37:18 -08:00
MorbandGitHub bb31c9ff1f Check for AFK only inGame status sessions (#12844) 2023-01-12 23:36:20 +11:00
MorbandGitHub 76f8a7e91e Lawyer badge changes typing indicator (#13445) 2023-01-12 23:33:57 +11:00
MorbandGitHub 4daac3a039 TTS Fix [Part 2] (#726) 2023-01-11 01:52:53 -08:00
MorbandGitHub dd56076ca6 Fix TTS [Part 1] (#724) 2023-01-10 23:08:47 -08:00
MorbandGitHub fd9c06a458 TTS (Text-To-Speech) (#618) 2023-01-10 18:01:20 -08:00
MorbandGitHub a5dc85b3c8 Custom app icon (#717) 2023-01-10 10:37:13 -08:00
MorbandGitHub 0c3e1025c9 Merge pull request #722 from space-syndicate/upstream-sync
Upstream sync
2023-01-10 19:16:08 +03:00
Morbo 8674d341f7 Update locale 2023-01-10 18:49:22 +03:00
Morbo 968cc1a8aa Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/ISSUE_TEMPLATE/config.yml
#	Content.Client/Singularity/Visualizers/EmitterVisualizer.cs
#	Resources/Prototypes/Datasets/Names/first.yml
#	Resources/Prototypes/Datasets/Names/first_female.yml
#	Resources/Prototypes/Datasets/Names/first_male.yml
#	Resources/Prototypes/Datasets/Names/last.yml
#	Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
2023-01-10 18:35:59 +03:00
MorbandGitHub d1246f4fb2 Add missing sponsor loadout items (#719) 2023-01-08 17:59:25 -08:00
MorbandGitHub 26ea04a3ee [Sponsor] Old HoS outfit (#718) 2023-01-08 12:44:20 -08:00
MorbandGitHub 1e7f7cc1e1 Update station goals system (#714) 2023-01-08 03:23:21 -08:00
MorbandGitHub 020ee492a1 Remove pacifist trait for diona nukie & zombie (#710) 2023-01-07 05:04:34 -08:00
MorbandGitHub b189d9fcc7 Merge pull request #705 from space-syndicate/upstream-sync
Upstream sync
2023-01-05 20:03:00 +03:00
Morbo d155a0af88 Fix delta map 2023-01-05 18:40:54 +03:00
Morbo edf0dbfb5e Update locale 2023-01-05 17:01:45 +03:00
Morbo b5a246e443 Merge remote-tracking branch 'upstream/master' into upstream-sync 2023-01-05 16:59:25 +03:00
MorbandGitHub 1e2c9a0bae Custom default pool (#700) 2023-01-04 06:50:01 -08:00
MorbandGitHub 5ee15ff275 Merge pull request #695 from space-syndicate/upstream-sync
Upstream sync
2023-01-03 18:08:15 +03:00
Morbo 0da41e391e Add IAA and disable lawyer for Meta station 2023-01-03 17:48:33 +03:00
Morbo f89fe0357a Update locale 2023-01-03 15:52:20 +03:00
Morbo 4dec9dfbaa Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Recipes/Lathes/medical.yml
#	Resources/Prototypes/Recipes/Lathes/sheet.yml
2023-01-03 15:21:22 +03:00
MorbandGitHub a5e8705a23 Merge pull request #686 from space-syndicate/upstream-sync
Upstream sync
2023-01-01 01:57:31 +03:00
Morbo 38086489b5 Update locale 2023-01-01 01:27:24 +03:00
Morbo 88d2445740 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Maps/origin.yml
2023-01-01 01:21:40 +03:00
MorbandGitHub b87dd15f0a [Resprite] Health status (#601) 2022-12-31 11:11:35 -08:00
MorbandGitHub 806809b128 Fix alcoholic bar sign random spawn icon (#678) 2022-12-27 17:33:05 +03:00
MorbandGitHub 82f6be7f49 Fix nuke codes locale (#677) 2022-12-26 01:10:57 -08:00
MorbandGitHub f0210d038b Merge pull request #674 from space-syndicate/upstream-sync
Upstream sync
2022-12-25 20:59:03 +03:00
Morbo 44148313d3 Update locale 2022-12-25 20:28:09 +03:00
Morbo 13d74575f3 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-12-25 20:25:04 +03:00
MorbandGitHub 153d9f816b [Sponsor] Remove Pulsing (Purple) (#669) 2022-12-23 13:33:50 -08:00
MorbandGitHub 096f005b1f [Sponsor] Skeleton outfit + Gamer cloack (#670) 2022-12-23 13:33:32 -08:00
Morbo 3404a1f10d Hotfix loadout 2022-12-23 23:49:34 +03:00
MorbandGitHub 41711b62bb [Sponsor] Atmosian (#665) 2022-12-23 09:53:20 -08:00
MorbandGitHub af45fa7478 Simple loadout (#668) 2022-12-23 09:17:34 -08:00
MorbandGitHub d62a2970d8 Merge pull request #667 from space-syndicate/upstream-sync
Upstream sync
2022-12-23 11:33:01 +03:00
Morbo 923a30f940 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-12-23 10:07:12 +03:00
MorbandGitHub e1d3d7a857 Add missing rule (#664) 2022-12-22 04:48:39 -08:00
MorbandGitHub 1b88d11ac3 Correct signal linker removing (#13058) 2022-12-21 14:47:49 -06:00
MorbandGitHub 265789e763 Merge pull request #658 from space-syndicate/upstream-sync
Upstream sync
2022-12-21 20:55:45 +03:00
Morbo 7943b25f29 Update locale 2022-12-21 20:32:45 +03:00
Morbo 980066b477 Remove missing syndicate helmet rsi state 2022-12-21 20:29:44 +03:00
Morbo bdd758ea49 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Entry/EntryPoint.cs
#	Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
#	Resources/Textures/Structures/Machines/microwave.rsi/meta.json
#	Resources/Textures/Structures/Machines/microwave.rsi/mw1.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json
2022-12-21 20:29:22 +03:00
Morbo fe8871f280 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-12-20 15:15:04 +03:00
Morbo 3f9c6c73bb Update locale 2022-12-20 14:21:48 +03:00
Morbo 6343d1e1f8 Merge remote-tracking branch 'upstream/master' into master-syndie
# Conflicts:
#	Content.Server/Chat/Managers/ChatManager.cs
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/rainbow.rsi/meta.json
2022-12-20 14:15:13 +03:00
MorbandGitHub 3e7c20cbe3 Round end notification (#657) 2022-12-20 03:01:40 -08:00
MorbandGitHub 9e82f002b8 Merge multiple changelog files (#656) 2022-12-20 02:54:11 -08:00
MorbandGitHub 8a2a97d816 Extract CVars class (#653) 2022-12-20 01:08:58 -08:00