From 99565dd2a5a0e539824c3605201e6398aeb4c265 Mon Sep 17 00:00:00 2001 From: Farrellka <104170263+Farrellka-dev@users.noreply.github.com> Date: Sat, 19 Oct 2024 22:12:02 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=8F=D0=B7=D1=8B=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=B2=20=D1=87=D0=B0=D1=82=D0=B5=20=D0=B8=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D1=87=D0=B5=D0=B5=20(#288)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Язык, ОСЩ, .45 * Фикс * Фиксики * Убрал Судью у ВС --- Content.Server/Chat/Systems/ChatSystem.cs | 8 ++- .../Radio/EntitySystems/RadioSystem.cs | 6 +- Content.Shared/Language/LanguagePrototype.cs | 5 +- .../Locale/en-US/_LostParadise/Jobs/jobs.ftl | 4 +- .../Locale/ru-RU/_LostParadise/Jobs/jobs.ftl | 4 +- .../ru-RU/chat/managers/chat-language.ftl | 33 +++++++++++ .../ru-RU/chat/managers/chat-manager.ftl | 6 +- .../ru-RU/headset/headset-component.ftl | 4 +- .../entities/objects/devices/pda.ftl | 2 +- .../guns/launchers/blueshield_laser.ftl | 2 +- .../storage/closets/lockers/lockers.ftl | 2 +- .../roles/jobs/centcom/blueshieldoficer.ftl | 2 +- .../Entities/Structures/Machines/lathe.yml | 1 + .../Language/Species-Specific/diona.yml | 1 + .../Language/Species-Specific/harpy.yml | 1 + .../Language/Species-Specific/moth.yml | 1 + .../Language/Species-Specific/nekomimetic.yml | 1 + .../Language/Species-Specific/reptilian.yml | 2 + .../Language/Species-Specific/slimeperson.yml | 1 + .../Language/Species-Specific/vulpkanin.yml | 1 + .../Prototypes/Language/Standard/elyran.yml | 1 + .../Language/Standard/freespeak.yml | 1 + .../Language/Standard/solcommon.yml | 1 + .../Language/Standard/taucetibasic.yml | 1 + .../Language/Standard/tradeband.yml | 1 + Resources/Prototypes/Language/animal.yml | 15 +++++ .../Prototypes/Language/genericlanguages.yml | 3 + .../Prototypes/Recipes/Lathes/security.yml | 8 +++ .../_LostParadise/Language/languageslpp.yml | 3 + .../Loadouts/Jobs/blueshield.yml | 55 +++++++++++++++++++ .../_LostParadise/Loadouts/Jobs/justice.yml | 43 +++++++++------ 31 files changed, 187 insertions(+), 32 deletions(-) create mode 100644 Resources/Locale/ru-RU/chat/managers/chat-language.ftl create mode 100644 Resources/Prototypes/_LostParadise/Loadouts/Jobs/blueshield.yml diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs index 0ec565dce3a..73490afd26d 100644 --- a/Content.Server/Chat/Systems/ChatSystem.cs +++ b/Content.Server/Chat/Systems/ChatSystem.cs @@ -870,6 +870,7 @@ public string WrapWhisperMessage(EntityUid source, LocId defaultWrap, string ent public string WrapMessage(LocId wrapId, InGameICChatType chatType, EntityUid source, string entityName, string message, LanguagePrototype? language) { language ??= _language.GetLanguage(source); + if (language.SpeechOverride.MessageWrapOverrides.TryGetValue(chatType, out var wrapOverride)) wrapId = wrapOverride; @@ -878,6 +879,10 @@ public string WrapMessage(LocId wrapId, InGameICChatType chatType, EntityUid sou ? _random.Pick(verbsOverride).ToString() : _random.Pick(speech.SpeechVerbStrings); var color = DefaultSpeakColor; + var languageDisplay = language.IsVisibleLanguage + ? $"{language.ChatName} | " + : ""; + if (language.SpeechOverride.Color is { } colorOverride) color = Color.InterpolateBetween(color, colorOverride, colorOverride.A); @@ -887,7 +892,8 @@ public string WrapMessage(LocId wrapId, InGameICChatType chatType, EntityUid sou ("verb", Loc.GetString(verbId)), ("fontType", language.SpeechOverride.FontId ?? speech.FontId), ("fontSize", language.SpeechOverride.FontSize ?? speech.FontSize), - ("message", message)); + ("message", message), + ("language", languageDisplay)); } /// diff --git a/Content.Server/Radio/EntitySystems/RadioSystem.cs b/Content.Server/Radio/EntitySystems/RadioSystem.cs index 5fce6f770a2..186bbf8274d 100644 --- a/Content.Server/Radio/EntitySystems/RadioSystem.cs +++ b/Content.Server/Radio/EntitySystems/RadioSystem.cs @@ -183,6 +183,9 @@ private string WrapRadioMessage(EntityUid source, RadioChannelPrototype channel, var languageColor = channel.Color; if (language.SpeechOverride.Color is { } colorOverride) languageColor = Color.InterpolateBetween(languageColor, colorOverride, colorOverride.A); + var languageDisplay = language.IsVisibleLanguage + ? $"{language.ChatName} | " + : ""; return Loc.GetString(speech.Bold ? "chat-radio-message-wrap-bold" : "chat-radio-message-wrap", ("color", channel.Color), @@ -192,7 +195,8 @@ private string WrapRadioMessage(EntityUid source, RadioChannelPrototype channel, ("verb", Loc.GetString(_random.Pick(speech.SpeechVerbStrings))), ("channel", $"\\[{channel.LocalizedName}\\]"), ("name", name), - ("message", message)); + ("message", message), + ("language", languageDisplay)); } /// diff --git a/Content.Shared/Language/LanguagePrototype.cs b/Content.Shared/Language/LanguagePrototype.cs index d40a7b40681..2d838a0c5aa 100644 --- a/Content.Shared/Language/LanguagePrototype.cs +++ b/Content.Shared/Language/LanguagePrototype.cs @@ -7,7 +7,9 @@ namespace Content.Shared.Language; public sealed class LanguagePrototype : IPrototype { [IdDataField] - public string ID { get; private set; } = default!; + public string ID { get; private set; } = default!; + [DataField("isvisiblelanguage")] + public bool IsVisibleLanguage { get; set; } /// /// Obfuscation method used by this language. By default, uses @@ -26,6 +28,7 @@ public sealed class LanguagePrototype : IPrototype /// The in-world name of this language, localized. /// public string Name => Loc.GetString($"language-{ID}-name"); + public string ChatName => Loc.GetString($"chat-language-{ID}-name"); /// /// The in-world description of this language, localized. diff --git a/Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl b/Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl index 5ab0575e484..12c0620bc28 100644 --- a/Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl +++ b/Resources/Locale/en-US/_LostParadise/Jobs/jobs.ftl @@ -3,9 +3,9 @@ job-description-lppparamedic = Следите за жизнями экипажа job-name-adjutant = Адъютант job-description-adjutant = Вы помощник всего коммандования, слушайте рацию и набирайтесь опыта в работе всей структуры. JobLPPadjutant = Адъютант -JobLPPBlueShieldOfficer = Офицер "Синий щит" +JobLPPBlueShieldOfficer = Офицер "Синий Щит" job-name-centcom-representative = представитель ЦентКом -job-name-blueshieldofficer = Офицер "Синий щит" +job-name-blueshieldofficer = Офицер "Синий Щит" job-description-blueshieldofficer = Ваша задача защитить всех глав на станции. Следите за ними department-Law = Юридический отдел department-CentCom = Центральное Командование diff --git a/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl b/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl index 09dc0b4a028..7c144519d4d 100644 --- a/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl +++ b/Resources/Locale/ru-RU/_LostParadise/Jobs/jobs.ftl @@ -3,9 +3,9 @@ job-description-lppparamedic = Следите за жизнями экипажа job-name-adjutant = Адъютант job-description-adjutant = Вы помощник всего коммандования, слушайте рацию и набирайтесь опыта в работе всей структуры. JobLPPadjutant = Адъютант -JobLPPBlueShieldOfficer = Офицер "Синий щит" +JobLPPBlueShieldOfficer = Офицер "Синий Щит" job-name-centcom-representative = представитель ЦентКом -job-name-blueshieldofficer = Офицер "Синий щит" +job-name-blueshieldofficer = Офицер "Синий Щит" job-description-blueshieldofficer = Ваша задача защитить всех глав на станции. Следите за ними department-Law = Юридический отдел department-CentCom = Центральное Командование diff --git a/Resources/Locale/ru-RU/chat/managers/chat-language.ftl b/Resources/Locale/ru-RU/chat/managers/chat-language.ftl new file mode 100644 index 00000000000..50d7ead238c --- /dev/null +++ b/Resources/Locale/ru-RU/chat/managers/chat-language.ftl @@ -0,0 +1,33 @@ +chat-language-ElfLang-name = Эльфийский +chat-language-DwarfLang-name = Дварфский +chat-language-LPPSikTaj-name = Сик' таяран +chat-language-Universal-name = Универсальный +chat-language-Bubblish-name = Пузырчатый +chat-language-RootSpeak-name = Песнь корней +chat-language-Nekomimetic-name = Неко +chat-language-Draconic-name = Синта'унати +chat-language-Azaziba-name = Синта'Азазиба +chat-language-SolCommon-name = Солнечный +chat-language-TauCetiBasic-name = Общегалактический +chat-language-Tradeband-name = Торговый +chat-language-Freespeak-name = Свободный +chat-language-Elyran-name = Элиранский +chat-language-Canilunzt-name = Канилунц +chat-language-Moffic-name = Ткачий +chat-language-RobotTalk-name = Робо +chat-language-ValyrianStandard-name = Валирийский +chat-language-Cat-name = Кошачий +chat-language-Dog-name = Собачий +chat-language-Fox-name = Лисичий +chat-language-Xeno-name = Ксено +chat-language-Monkey-name = Обезьяний +chat-language-Mouse-name = Мышиный +chat-language-Chicken-name = Куриный +chat-language-Duck-name = Утиный +chat-language-Cow-name = Коровий +chat-language-Sheep-name = Овечий +chat-language-Kangaroo-name = Кенгуручий +chat-language-Pig-name = Свиной +chat-language-Crab-name = Крабий +chat-language-Kobold-name = Кобольдский +chat-language-Hissing-name = Паучий diff --git a/Resources/Locale/ru-RU/chat/managers/chat-manager.ftl b/Resources/Locale/ru-RU/chat/managers/chat-manager.ftl index d83f3f95090..5f054cf36a8 100644 --- a/Resources/Locale/ru-RU/chat/managers/chat-manager.ftl +++ b/Resources/Locale/ru-RU/chat/managers/chat-manager.ftl @@ -19,9 +19,9 @@ chat-manager-whisper-headset-on-message = Вы не можете шептать chat-manager-server-wrap-message = [bold]{ $message }[/bold] chat-manager-sender-announcement-wrap-message = [font size=14][bold]Объявление { $sender }:[/font][font size=12] { $message }[/bold][/font] -chat-manager-entity-say-wrap-message = [BubbleHeader][bold][Name]{ $entityName }[/Name][/bold][/BubbleHeader] { $verb }, [font={ $fontType } size={ $fontSize } ]"[BubbleContent]{ $message }[/BubbleContent]"[/font] -chat-manager-entity-say-bold-wrap-message = [BubbleHeader][bold][Name]{ $entityName }[/Name][/bold][/BubbleHeader] { $verb }, [font={ $fontType } size={ $fontSize }]"[BubbleContent][bold]{ $message }[/bold][/BubbleContent]"[/font] -chat-manager-entity-whisper-wrap-message = [font size=11][italic][BubbleHeader][Name]{ $entityName }[/Name][/BubbleHeader] шепчет,"[BubbleContent]{ $message }[/BubbleContent]"[/italic][/font] +chat-manager-entity-say-wrap-message = [BubbleHeader][bold][Name]{ $language }{ $entityName }[/Name][/bold][/BubbleHeader] { $verb }, [font={ $fontType } size={ $fontSize } ]"[BubbleContent]{ $message }[/BubbleContent]"[/font] +chat-manager-entity-say-bold-wrap-message = [BubbleHeader][bold][Name]{ $language }{ $entityName }[/Name][/bold][/BubbleHeader] { $verb }, [font={ $fontType } size={ $fontSize }]"[BubbleContent][bold]{ $message }[/bold][/BubbleContent]"[/font] +chat-manager-entity-whisper-wrap-message = [font size=11][italic][BubbleHeader][Name]{ $language }{ $entityName }[/Name][/BubbleHeader] шепчет,"[BubbleContent]{ $message }[/BubbleContent]"[/italic][/font] chat-manager-entity-whisper-unknown-wrap-message = [font size=11][italic][BubbleHeader]Кто-то[/BubbleHeader] шепчет, "[BubbleContent]{ $message }[/BubbleContent]"[/italic][/font] chat-manager-entity-me-wrap-message = [italic]{ $entityName } { $message }[/italic] chat-manager-entity-looc-wrap-message = LOOC: [bold]{ $entityName }:[/bold] { $message } diff --git a/Resources/Locale/ru-RU/headset/headset-component.ftl b/Resources/Locale/ru-RU/headset/headset-component.ftl index 21d1da37fe3..01a0c429714 100644 --- a/Resources/Locale/ru-RU/headset/headset-component.ftl +++ b/Resources/Locale/ru-RU/headset/headset-component.ftl @@ -1,6 +1,6 @@ # Chat window radio wrap (prefix and postfix) -chat-radio-message-wrap = [color={ $color }]{ $channel } [bold]{ $name }[/bold] { $verb }, [font={ $fontType } size={ $fontSize }]"{ $message }"[/font][/color] -chat-radio-message-wrap-bold = [color={ $color }]{ $channel } [bold]{ $name }[/bold] { $verb }, [font={ $fontType } size={ $fontSize }][bold]"{ $message }"[/bold][/font][/color] +chat-radio-message-wrap = [color={ $color }]{ $channel } [bold]{ $language }{ $name }[/bold] { $verb }, [font={ $fontType } size={ $fontSize }]"{ $message }"[/font][/color] +chat-radio-message-wrap-bold = [color={ $color }]{ $channel } [bold]{ $language }{ $name }[/bold] { $verb }, [font={ $fontType } size={ $fontSize }][bold]"{ $message }"[/bold][/font][/color] examine-headset-default-channel = Отображается, что каналом по умолчанию этой гарнитуры является [color={ $color }]{ $channel }[/color]. chat-radio-common = Общий chat-radio-centcom = Центком diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/devices/pda.ftl index e678b92cb04..a5fd83cb390 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/devices/pda.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/devices/pda.ftl @@ -1,6 +1,6 @@ ent-LPPSecurityEngineerPDA = КПК полевого инженера .desc = Красный, чтобы скрыть пятна крови пассажиров. -ent-LPPBlueShieldOfficerPDA = КПК офицера "Синий щит" +ent-LPPBlueShieldOfficerPDA = КПК офицера "Синий Щит" .desc = Пахнет защитой. ent-LPPAdjutantPDA = КПК Адъютанта .desc = Пора почувствовать себя крутым. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/launchers/blueshield_laser.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/launchers/blueshield_laser.ftl index f4c39e39175..890841730d0 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/launchers/blueshield_laser.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/objects/weapons/guns/launchers/blueshield_laser.ftl @@ -1,2 +1,2 @@ ent-LPPBlueshieldlaser = Лазерный револьвер офицера "Синий Щит" - .desc = Скорострельный лазерный револьвер, стоящий на вооружении всего отряда представителей "Синий щит". + .desc = Скорострельный лазерный револьвер, стоящий на вооружении всего отряда представителей "Синий Щит". diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/storage/closets/lockers/lockers.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/storage/closets/lockers/lockers.ftl index 4bee35f8d74..121b2843a3f 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/storage/closets/lockers/lockers.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/entities/structures/storage/closets/lockers/lockers.ftl @@ -1,4 +1,4 @@ -ent-LPPLockerBlueShield = Шкафчик офицера "Синий щит" +ent-LPPLockerBlueShield = Шкафчик офицера "Синий Щит" .desc = { ent-LockerBaseSecure.desc } ent-LPPLockerSecEng = Шкаф полевого инженера .desc = { ent-LockerBaseSecure.desc } diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/roles/jobs/centcom/blueshieldoficer.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/roles/jobs/centcom/blueshieldoficer.ftl index 72dffaeaea6..3afe3b49983 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/roles/jobs/centcom/blueshieldoficer.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_lostparadise/roles/jobs/centcom/blueshieldoficer.ftl @@ -1,2 +1,2 @@ -ent-LPPSpawnBlueShieldOfficer = Офицер "Синий щит" +ent-LPPSpawnBlueShieldOfficer = Офицер "Синий Щит" .desc = { ent-SpawnPointJobBase.desc } diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index e8d7925082d..f160b404944 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -754,6 +754,7 @@ - MagazineBoxRifle - MagazineBoxLightRifle - SpeedLoaderMagnum + - MagazineMagnum - MagazineUniversalMagnum - ClothingOuterArmorPlateCarrier # DeltaV - plate carrier body armour - ClothingOuterArmorDuraVest # DeltaV - stabproof vest body armour diff --git a/Resources/Prototypes/Language/Species-Specific/diona.yml b/Resources/Prototypes/Language/Species-Specific/diona.yml index 52c7741457d..025c609db51 100644 --- a/Resources/Prototypes/Language/Species-Specific/diona.yml +++ b/Resources/Prototypes/Language/Species-Specific/diona.yml @@ -2,6 +2,7 @@ # TODO: Replace this with a much better language. - type: language id: RootSpeak + isvisiblelanguage: true speech: color: "#ce5e14dd" fontId: Noganas diff --git a/Resources/Prototypes/Language/Species-Specific/harpy.yml b/Resources/Prototypes/Language/Species-Specific/harpy.yml index 876e6b1db48..e8e577f4801 100644 --- a/Resources/Prototypes/Language/Species-Specific/harpy.yml +++ b/Resources/Prototypes/Language/Species-Specific/harpy.yml @@ -1,5 +1,6 @@ - type: language id: ValyrianStandard + isvisiblelanguage: true speech: fontId: Cambria color: "#008ecc" diff --git a/Resources/Prototypes/Language/Species-Specific/moth.yml b/Resources/Prototypes/Language/Species-Specific/moth.yml index 341ebf714c4..b02fd37f1fd 100644 --- a/Resources/Prototypes/Language/Species-Specific/moth.yml +++ b/Resources/Prototypes/Language/Species-Specific/moth.yml @@ -2,6 +2,7 @@ # TODO: Replace this with a much better language. - type: language id: Moffic + isvisiblelanguage: true speech: color: "#c7df2edd" fontId: Copperplate diff --git a/Resources/Prototypes/Language/Species-Specific/nekomimetic.yml b/Resources/Prototypes/Language/Species-Specific/nekomimetic.yml index 9e24b31922a..fdd3337934e 100644 --- a/Resources/Prototypes/Language/Species-Specific/nekomimetic.yml +++ b/Resources/Prototypes/Language/Species-Specific/nekomimetic.yml @@ -2,6 +2,7 @@ # TODO: Replace this with a much better language. - type: language id: Nekomimetic + isvisiblelanguage: true speech: color: "#df57aaee" fontId: Manga diff --git a/Resources/Prototypes/Language/Species-Specific/reptilian.yml b/Resources/Prototypes/Language/Species-Specific/reptilian.yml index 3973590f606..42aeabf45b1 100644 --- a/Resources/Prototypes/Language/Species-Specific/reptilian.yml +++ b/Resources/Prototypes/Language/Species-Specific/reptilian.yml @@ -1,6 +1,7 @@ # Spoken by Unathi. - type: language id: Draconic + isvisiblelanguage: true speech: color: "#2aca2add" obfuscation: @@ -97,6 +98,7 @@ # !Do Not Make A Translator For This Language. - type: language id: Azaziba + isvisiblelanguage: true speech: color: "#2aca2add" obfuscation: diff --git a/Resources/Prototypes/Language/Species-Specific/slimeperson.yml b/Resources/Prototypes/Language/Species-Specific/slimeperson.yml index d980f58c30d..47fdfdf62e5 100644 --- a/Resources/Prototypes/Language/Species-Specific/slimeperson.yml +++ b/Resources/Prototypes/Language/Species-Specific/slimeperson.yml @@ -2,6 +2,7 @@ # TODO: Replace this with a much better language. - type: language id: Bubblish + isvisiblelanguage: true speech: color: "#00a3e2dd" fontId: RubikBubbles diff --git a/Resources/Prototypes/Language/Species-Specific/vulpkanin.yml b/Resources/Prototypes/Language/Species-Specific/vulpkanin.yml index 104777691b6..3e943419d77 100644 --- a/Resources/Prototypes/Language/Species-Specific/vulpkanin.yml +++ b/Resources/Prototypes/Language/Species-Specific/vulpkanin.yml @@ -2,6 +2,7 @@ # TODO: Replace this with a much better language. - type: language id: Canilunzt + isvisiblelanguage: true speech: color: "#d69b3dcc" obfuscation: diff --git a/Resources/Prototypes/Language/Standard/elyran.yml b/Resources/Prototypes/Language/Standard/elyran.yml index 9348c43fa4b..398969cf95c 100644 --- a/Resources/Prototypes/Language/Standard/elyran.yml +++ b/Resources/Prototypes/Language/Standard/elyran.yml @@ -1,5 +1,6 @@ - type: language id: Elyran + isvisiblelanguage: true speech: color: "#8282fbaa" obfuscation: diff --git a/Resources/Prototypes/Language/Standard/freespeak.yml b/Resources/Prototypes/Language/Standard/freespeak.yml index c8c4fe6c1b7..e263da4e240 100644 --- a/Resources/Prototypes/Language/Standard/freespeak.yml +++ b/Resources/Prototypes/Language/Standard/freespeak.yml @@ -1,5 +1,6 @@ - type: language id: Freespeak + isvisiblelanguage: true speech: color: "#597d35" obfuscation: diff --git a/Resources/Prototypes/Language/Standard/solcommon.yml b/Resources/Prototypes/Language/Standard/solcommon.yml index 7d704df0c44..23b5de4a48e 100644 --- a/Resources/Prototypes/Language/Standard/solcommon.yml +++ b/Resources/Prototypes/Language/Standard/solcommon.yml @@ -1,5 +1,6 @@ - type: language id: SolCommon + isvisiblelanguage: true speech: color: "#8282fbaa" obfuscation: diff --git a/Resources/Prototypes/Language/Standard/taucetibasic.yml b/Resources/Prototypes/Language/Standard/taucetibasic.yml index 72deef40e00..1006638f354 100644 --- a/Resources/Prototypes/Language/Standard/taucetibasic.yml +++ b/Resources/Prototypes/Language/Standard/taucetibasic.yml @@ -1,6 +1,7 @@ # The "Default Language" other than Universal. - type: language id: TauCetiBasic + isvisiblelanguage: false obfuscation: !type:SyllableObfuscation minSyllables: 1 diff --git a/Resources/Prototypes/Language/Standard/tradeband.yml b/Resources/Prototypes/Language/Standard/tradeband.yml index 5784f2fc563..0ba083612e1 100644 --- a/Resources/Prototypes/Language/Standard/tradeband.yml +++ b/Resources/Prototypes/Language/Standard/tradeband.yml @@ -1,5 +1,6 @@ - type: language id: Tradeband + isvisiblelanguage: true speech: color: "#597d35" obfuscation: diff --git a/Resources/Prototypes/Language/animal.yml b/Resources/Prototypes/Language/animal.yml index 526207c5a94..de4e4f2fcd1 100644 --- a/Resources/Prototypes/Language/animal.yml +++ b/Resources/Prototypes/Language/animal.yml @@ -1,6 +1,7 @@ # Languages spoken by various critters. - type: language id: Cat + isvisiblelanguage: false obfuscation: !type:SyllableObfuscation minSyllables: 1 @@ -13,6 +14,7 @@ - type: language id: Dog + isvisiblelanguage: false obfuscation: !type:SyllableObfuscation minSyllables: 1 @@ -27,6 +29,7 @@ - type: language id: Fox + isvisiblelanguage: false obfuscation: !type:SyllableObfuscation minSyllables: 1 @@ -42,6 +45,7 @@ - type: language id: Xeno + isvisiblelanguage: false obfuscation: !type:SyllableObfuscation minSyllables: 1 @@ -52,6 +56,7 @@ - type: language id: Monkey + isvisiblelanguage: false obfuscation: !type:SyllableObfuscation minSyllables: 1 @@ -62,6 +67,7 @@ - type: language id: Mouse + isvisiblelanguage: false obfuscation: !type:SyllableObfuscation minSyllables: 2 @@ -78,6 +84,7 @@ - type: language id: Chicken + isvisiblelanguage: false obfuscation: !type:SyllableObfuscation minSyllables: 1 @@ -89,6 +96,7 @@ - type: language id: Duck + isvisiblelanguage: false obfuscation: !type:SyllableObfuscation minSyllables: 1 @@ -100,6 +108,7 @@ - type: language id: Cow + isvisiblelanguage: false obfuscation: !type:SyllableObfuscation minSyllables: 1 @@ -110,6 +119,7 @@ - type: language id: Sheep + isvisiblelanguage: false obfuscation: !type:SyllableObfuscation minSyllables: 1 @@ -121,6 +131,7 @@ - type: language id: Kangaroo + isvisiblelanguage: false obfuscation: !type:SyllableObfuscation minSyllables: 1 @@ -133,6 +144,7 @@ - type: language id: Pig + isvisiblelanguage: false obfuscation: !type:SyllableObfuscation minSyllables: 1 @@ -143,6 +155,7 @@ - type: language id: Crab + isvisiblelanguage: false obfuscation: !type:SyllableObfuscation minSyllables: 1 @@ -158,6 +171,7 @@ - type: language id: Kobold + isvisiblelanguage: false obfuscation: !type:SyllableObfuscation minSyllables: 2 @@ -177,6 +191,7 @@ - type: language id: Hissing + isvisiblelanguage: false obfuscation: !type:SyllableObfuscation minSyllables: 2 diff --git a/Resources/Prototypes/Language/genericlanguages.yml b/Resources/Prototypes/Language/genericlanguages.yml index ebbadf9ba71..b322db7e0d7 100644 --- a/Resources/Prototypes/Language/genericlanguages.yml +++ b/Resources/Prototypes/Language/genericlanguages.yml @@ -3,6 +3,7 @@ # with the Xenoglossy psionic power, as well as Ghosts, and AGhosts. - type: language id: Universal + isvisiblelanguage: false obfuscation: !type:ReplacementObfuscation replacement: @@ -12,6 +13,7 @@ # TODO: Replace this with much better languages. Yes, robots can have languages. - type: language id: RobotTalk + isvisiblelanguage: true speech: fontId: Monospace obfuscation: @@ -25,6 +27,7 @@ # Example of a sign language. Used by the Sign Language trait. - type: language id: Sign + isvisiblelanguage: false speech: allowRadio: false requireSpeech: false diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index 4109eb4b21f..aab7edb30f0 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -292,6 +292,14 @@ materials: Steel: 100 +- type: latheRecipe + id: MagazineMagnum + result: MagazineMagnum + category: Ammo + completetime: 5 + materials: + Steel: 150 + - type: latheRecipe id: MagazineUniversalMagnum result: MagazineUniversalMagnum diff --git a/Resources/Prototypes/_LostParadise/Language/languageslpp.yml b/Resources/Prototypes/_LostParadise/Language/languageslpp.yml index ac41f727079..608f3320489 100644 --- a/Resources/Prototypes/_LostParadise/Language/languageslpp.yml +++ b/Resources/Prototypes/_LostParadise/Language/languageslpp.yml @@ -1,5 +1,6 @@ - type: language id: ElfLang + isvisiblelanguage: true obfuscation: !type:SyllableObfuscation minSyllables: 2 @@ -106,6 +107,7 @@ # Spoken by the Dwarf race. - type: language id: DwarfLang + isvisiblelanguage: true obfuscation: !type:SyllableObfuscation minSyllables: 2 @@ -132,6 +134,7 @@ # Spoken by the Tajaran race. - type: language id: LPPSikTaj + isvisiblelanguage: true obfuscation: !type:SyllableObfuscation minSyllables: 2 diff --git a/Resources/Prototypes/_LostParadise/Loadouts/Jobs/blueshield.yml b/Resources/Prototypes/_LostParadise/Loadouts/Jobs/blueshield.yml new file mode 100644 index 00000000000..fdd1080846f --- /dev/null +++ b/Resources/Prototypes/_LostParadise/Loadouts/Jobs/blueshield.yml @@ -0,0 +1,55 @@ +- type: loadout + id: LoadoutCommandBSEnergySword + category: JobsCommand + cost: 0 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - LPPBlueShieldOfficer + items: + - EnergySwordHoS + +- type: loadout + id: LoadoutCommandBSWeaponPistolN1984 + category: JobsCommand + cost: 2 + requirements: + - !type:CharacterJobRequirement + jobs: + - LPPBlueShieldOfficer + items: + - WeaponPistolN1984 + +- type: loadout + id: LoadoutCommandBSWeaponPistolUniversal + category: JobsCommand + cost: 2 + requirements: + - !type:CharacterJobRequirement + jobs: + - LPPBlueShieldOfficer + items: + - WeaponPistolUniversal + +- type: loadout + id: LoadoutCommandBSMagazineUniversalMagnum + category: JobsCommand + cost: 1 + requirements: + - !type:CharacterJobRequirement + jobs: + - LPPBlueShieldOfficer + items: + - MagazineUniversalMagnum + +- type: loadout + id: LoadoutCommandBSMagazineMagnum + category: JobsCommand + cost: 1 + requirements: + - !type:CharacterJobRequirement + jobs: + - LPPBlueShieldOfficer + items: + - MagazineMagnum \ No newline at end of file diff --git a/Resources/Prototypes/_LostParadise/Loadouts/Jobs/justice.yml b/Resources/Prototypes/_LostParadise/Loadouts/Jobs/justice.yml index a0f607c1825..2972770884d 100644 --- a/Resources/Prototypes/_LostParadise/Loadouts/Jobs/justice.yml +++ b/Resources/Prototypes/_LostParadise/Loadouts/Jobs/justice.yml @@ -12,25 +12,36 @@ - ClothingOuterRobesJudge - type: loadout - id: LoadoutLPPWeaponRevolverJudge + id: LPPLoadoutJudgeEquipmentEnergyGunMini category: JobsCommand - cost: 6 - exclusive: true - requirements: - - !type:CharacterJobRequirement - jobs: - - ChiefJustice - items: - - LPPWeaponRevolverJudge - -- type: loadout - id: LoadoutMagazineBoxAntiMateriel - category: JobsCommand - cost: 1 - exclusive: true + cost: 0 requirements: - !type:CharacterJobRequirement jobs: - ChiefJustice items: - - MagazineBoxAntiMateriel \ No newline at end of file + - WeaponEnergyGunMini + +#- type: loadout +# id: LoadoutLPPWeaponRevolverJudge +# category: JobsCommand +# cost: 7 +# exclusive: true +# requirements: +# - !type:CharacterJobRequirement +# jobs: +# - ChiefJustice +# items: +# - LPPWeaponRevolverJudge + +#- type: loadout +# id: LoadoutMagazineBoxAntiMateriel +# category: JobsCommand +# cost: 1 +# exclusive: true +# requirements: +# - !type:CharacterJobRequirement +# jobs: +# - ChiefJustice +# items: +# - MagazineBoxAntiMateriel