forked from space-wizards/space-station-14
-
Notifications
You must be signed in to change notification settings - Fork 154
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #950 from TheArturZh/corvax-cherrypick-26
Corvax cherrypick 26
- Loading branch information
Showing
860 changed files
with
6,776 additions
and
1,774 deletions.
There are no files selected for viewing
56 changes: 56 additions & 0 deletions
56
Content.Server/Corvax/HiddenDescription/HiddenDescriptionComponent.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| using Content.Shared.Roles; | ||
| using Content.Shared.Whitelist; | ||
| using Robust.Shared.Prototypes; | ||
|
|
||
| namespace Content.Server.Corvax.HiddenDescription; | ||
|
|
||
| /// <summary> | ||
| /// A component that shows players with specific roles or jobs additional information about entities | ||
| /// </summary> | ||
|
|
||
| [RegisterComponent, Access(typeof(HiddenDescriptionSystem))] | ||
| public sealed partial class HiddenDescriptionComponent : Component | ||
| { | ||
| [DataField(required: true)] | ||
| public List<HiddenDescriptionEntry> Entries = new(); | ||
|
|
||
| /// <summary> | ||
| /// Prioritizing the location of classified information in an inspection | ||
| /// </summary> | ||
| [DataField] | ||
| public int PushPriority = 1; | ||
| } | ||
|
|
||
| [DataDefinition, Serializable] | ||
| public readonly partial record struct HiddenDescriptionEntry() | ||
| { | ||
| /// <summary> | ||
| /// Locale string with hidden description | ||
| /// </summary> | ||
| [DataField(required: true)] | ||
| public LocId Label { get; init; } = default!; | ||
|
|
||
| /// <summary> | ||
| /// A player's mind must pass a whitelist check to receive hidden information | ||
| /// </summary> | ||
| [DataField] | ||
| public EntityWhitelist WhitelistMind { get; init; } = new(); | ||
|
|
||
| /// <summary> | ||
| /// A player's body must pass a whitelist check to receive hidden information | ||
| /// </summary> | ||
| [DataField] | ||
| public EntityWhitelist WhitelistBody { get; init; } = new(); | ||
|
|
||
| /// <summary> | ||
| /// The player's mind has to have some job role to access the hidden information | ||
| /// </summary> | ||
| [DataField] | ||
| public List<ProtoId<JobPrototype>> JobRequired { get; init; } = new(); | ||
|
|
||
| /// <summary> | ||
| /// If true, the player needs to go through and whitelist, and have some job. By default, at least one successful checks is sufficient. | ||
| /// </summary> | ||
| [DataField] | ||
| public bool NeedAllCheck { get; init; } = false; | ||
| } |
37 changes: 37 additions & 0 deletions
37
Content.Server/Corvax/HiddenDescription/HiddenDescriptionSystem.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| using Content.Server.Mind; | ||
| using Content.Shared.Examine; | ||
| using Content.Shared.Roles.Jobs; | ||
|
|
||
| namespace Content.Server.Corvax.HiddenDescription; | ||
|
|
||
| public sealed partial class HiddenDescriptionSystem : EntitySystem | ||
| { | ||
|
|
||
| [Dependency] private readonly MindSystem _mind = default!; | ||
|
|
||
| public override void Initialize() | ||
| { | ||
| base.Initialize(); | ||
|
|
||
| SubscribeLocalEvent<HiddenDescriptionComponent, ExaminedEvent>(OnExamine); | ||
| } | ||
|
|
||
| private void OnExamine(Entity<HiddenDescriptionComponent> hiddenDesc, ref ExaminedEvent args) | ||
| { | ||
| _mind.TryGetMind(args.Examiner, out var mindId, out var mindComponent); | ||
| TryComp<JobComponent>(mindId, out var job); | ||
|
|
||
| foreach (var item in hiddenDesc.Comp.Entries) | ||
| { | ||
| var isJobAllow = job?.Prototype != null && item.JobRequired.Contains(job.Prototype.Value); | ||
| var isMindWhitelistPassed = item.WhitelistMind.IsValid(mindId); | ||
| var isBodyWhitelistPassed = item.WhitelistMind.IsValid(args.Examiner); | ||
| var passed = item.NeedAllCheck | ||
| ? isMindWhitelistPassed && isBodyWhitelistPassed && isJobAllow | ||
| : isMindWhitelistPassed || isBodyWhitelistPassed || isJobAllow; | ||
|
|
||
| if (passed) | ||
| args.PushMarkup(Loc.GetString(item.Label), hiddenDesc.Comp.PushPriority); | ||
| } | ||
| } | ||
| } |
41 changes: 41 additions & 0 deletions
41
Resources/Locale/en-US/ss14-ru/prototypes/corvax/reagents/meta/consumable/drink/alcohol.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| reagent-name-yorsh = yorsh | ||
| reagent-desc-yorsh = Taste of childhood. | ||
| reagent-name-alexander = alexander | ||
| reagent-desc-alexander = No Alexander was harmed during production. Maybe... | ||
| reagent-name-daiquiri = daiquiri | ||
| reagent-desc-daiquiri = Do you want to feel like a 19th century miner? The miner did not want to, and tried to forget himself in alcohol. | ||
| reagent-name-campari = campari | ||
| reagent-desc-campari = Tincture based on aromatic herbs and citrus fruits. Non-GMO! | ||
| reagent-name-negroni = negroni | ||
| reagent-desc-negroni = Americano for alcoholics. | ||
| reagent-name-espressoMartini = espresso martini | ||
| reagent-desc-espressoMartini = Wake me up, then fu... Uh-h.. Okay, just wake me up. | ||
| reagent-name-oldFashioned = old fashioned | ||
| reagent-desc-oldFashioned = As the greatest classic said: “This is a classic”. | ||
| reagent-name-badTouch = bad touch | ||
| reagent-desc-badTouch = We're nothing but mammals after all. | ||
| reagent-name-darkAndStormy = dark and stormy | ||
| reagent-desc-darkAndStormy = Straight from Bermuda! The pirate on the left says that this is why the drink disappears. | ||
| reagent-name-bramble = bramble | ||
| reagent-desc-bramble = Berries, gin, and a rather creepy look. | ||
| reagent-name-maiTai = mai tai | ||
| reagent-desc-maiTai = The first person who tried this cocktail exclaimed: ”Mai tai — roa ae!”. What does it mean in Thai... I don't know. Sounds cool! | ||
| reagent-name-moscowMule = moscow mule | ||
| reagent-desc-moscowMule = Cocktail from the USA. Why Moscow? Because vodka. Moscow vodka? No. So why Moscow? VODKA! | ||
| reagent-name-paloma = paloma | ||
| reagent-desc-paloma = Cowboys on top. Maracas on bottom. Hard choice... | ||
| reagent-name-boyarsky = boyarsky | ||
| reagent-desc-boyarsky = What to do if you are tired of life? MIX VODKA! |
8 changes: 0 additions & 8 deletions
8
Resources/Locale/en-US/ss14-ru/prototypes/entities/objects/devices/nuke.ftl
This file was deleted.
Oops, something went wrong.
12 changes: 0 additions & 12 deletions
12
Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/lighting_ground.ftl
This file was deleted.
Oops, something went wrong.
3 changes: 0 additions & 3 deletions
3
Resources/Locale/en-US/ss14-ru/prototypes/entities/structures/wallmounts/emergency_light.ftl
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| zzzz-fmt-direction-North = Север | ||
| zzzz-fmt-direction-South = Юг | ||
| zzzz-fmt-direction-East = Восток | ||
| zzzz-fmt-direction-West = Запад | ||
| zzzz-fmt-direction-NorthEast = Северо-восток | ||
| zzzz-fmt-direction-SouthEast = Юго-восток | ||
| zzzz-fmt-direction-NorthWest = Северо-запад | ||
| zzzz-fmt-direction-SouthWest = Юго-запад |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| accent-parrot-squawk-1 = СКВАК! | ||
| accent-parrot-squawk-2 = СКВАААК! | ||
| accent-parrot-squawk-3 = АВВК! | ||
| accent-parrot-squawk-4 = ААВК! | ||
| accent-parrot-squawk-5 = РАВВК! | ||
| accent-parrot-squawk-6 = РАААВК! | ||
| accent-parrot-squawk-7 = БРААВК! | ||
| accent-parrot-squawk-8 = БРАВВК! |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,3 +6,4 @@ bwoink-system-typing-indicator = | |
| [one] печатает | ||
| *[other] печатают | ||
| }... | ||
| admin-bwoink-play-sound = Бвоинк? | ||
2 changes: 1 addition & 1 deletion
2
Resources/Locale/ru-RU/administration/commands/add-uplink-command.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| aghost-description = Делает вас призраком-админом. | ||
| aghost-no-mind-self = Вы не можете стать призраком! | ||
| aghost-no-mind-other = Эта сущность не может стать призраком! |
2 changes: 1 addition & 1 deletion
2
Resources/Locale/ru-RU/administration/commands/dsay-command.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| dsay-command-description = Отправляет сообщение в чат мертвых от имени администратора | ||
| dsay-command-description = Отправляет сообщение в чат мёртвых от имени администратора | ||
| dsay-command-help-text = Использование: { $command } <message> |
2 changes: 1 addition & 1 deletion
2
Resources/Locale/ru-RU/administration/commands/play-global-sound-command.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
Resources/Locale/ru-RU/administration/commands/set-mind-command.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| set-mind-command-description = Перемещает сознание в указанную сущность. Сущность должна иметь { $requiredComponent }. По умолчанию это заставит разум, который в данный момент посещает другие сущности, вернуться обратно (т.е. вернуть призрака в свое основное тело). | ||
| set-mind-command-description = Перемещает сознание в указанную сущность. Сущность должна иметь { $requiredComponent }. По умолчанию это заставит разум, который в данный момент посещает другие сущности, вернуться обратно (т.е. вернуть призрака в своё основное тело). | ||
| set-mind-command-help-text = Использование: { $command } <entityUid> <username> [unvisit] | ||
| set-mind-command-target-has-no-content-data-message = Целевой игрок не имеет данных о содержимом (wtf?) | ||
| set-mind-command-target-has-no-mind-message = Целевая сущность не обладает разумом (вы забыли сделать ее разумной?) | ||
| set-mind-command-target-has-no-mind-message = Целевая сущность не обладает разумом (вы забыли сделать её разумной?) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
Resources/Locale/ru-RU/administration/commands/stealthmin-command.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| cmd-stealthmin-desc = Переключение видимости вас через adminwho. | ||
| cmd-stealthmin-help = Использование: stealthmin | ||
| Используйте stealthmin для переключения отображение вас в результате вывода команды adminwho. | ||
| cmd-stealthmin-no-console = Вы не можете использовать эту команду через консоль сервера |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.