Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Фиксики багулин #300

Merged
merged 3 commits into from
Oct 24, 2024
Merged

Фиксики багулин #300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a07ffb
Фиксики багулин
Farrellka-dev Oct 24, 2024
c8c013e
Фикс фиксов
Farrellka-dev Oct 24, 2024
0d918c8
И ещё забыл
Farrellka-dev Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 37 additions & 37 deletions Content.Server/Chat/Managers/ChatSanitizationManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,24 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager
// Corvax-Localization-Start
{ "хд", "chatsan-laughs" },
{ "хд.", "chatsan-laughs" },
{ "о-о", "chatsan-wide-eyed" }, // cyrillic о
{ "о.о", "chatsan-wide-eyed" }, // cyrillic о
{ "0_о", "chatsan-wide-eyed" }, // cyrillic о
{ "о-о", "chatsan-wide-eyed" }, // cyrillic о нет
{ "о.о", "chatsan-wide-eyed" }, // cyrillic о нет
{ "0_о", "chatsan-wide-eyed" }, // cyrillic о нет
{ "о/", "chatsan-waves" }, // cyrillic о
{ "о7", "chatsan-salutes" }, // cyrillic о
{ "0_o", "chatsan-wide-eyed" },
{ "0_o", "chatsan-wide-eyed" }, // нет
{ "лмао", "chatsan-laughs" },
{ "лмао.", "chatsan-laughs" },
{ "рофл", "chatsan-laughs" },
{ "рофл.", "chatsan-laughs" },
{ "яхз", "chatsan-shrugs" },
{ "яхз.", "chatsan-shrugs" },
{ ":0", "chatsan-surprised" },
{ ":р", "chatsan-stick-out-tongue" }, // cyrillic р
{ ":р", "chatsan-stick-out-tongue" }, // cyrillic р . в канал гарнитуры
{ "кек", "chatsan-laughs" },
{ "кек.", "chatsan-laughs" },
{ "T_T", "chatsan-cries" },
{ "Т_Т", "chatsan-cries" }, // cyrillic T
{ "T_T", "chatsan-cries" }, // нет
{ "Т_Т", "chatsan-cries" }, // cyrillic T нет
Farrellka-dev marked this conversation as resolved.
Show resolved Hide resolved
{ "=_(", "chatsan-cries" },
{ "!с", "chatsan-laughs" },
{ "!с.", "chatsan-laughs" },
Expand Down Expand Up @@ -65,60 +65,60 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager
// I could've done this with regex, but felt it wasn't the right idea.
{ ":)", "chatsan-smiles" },
{ ":]", "chatsan-smiles" },
{ "=)", "chatsan-smiles" },
{ "=)", "chatsan-smiles" }, // = + улыбается
{ "=]", "chatsan-smiles" },
{ "(:", "chatsan-smiles" },
{ "[:", "chatsan-smiles" },
{ "[:", "chatsan-smiles" }, // : в ООС
{ "(=", "chatsan-smiles" },
{ "[=", "chatsan-smiles" },
{ "^^", "chatsan-smiles" },
{ "^-^", "chatsan-smiles" },
{ ":(", "chatsan-frowns" },
{ ":[", "chatsan-frowns" },
{ "=(", "chatsan-frowns" },
{ "=(", "chatsan-frowns" }, // = + хмурится
{ "=[", "chatsan-frowns" },
{ "):", "chatsan-frowns" },
{ ")=", "chatsan-frowns" },
{ "]:", "chatsan-frowns" },
{ "]:", "chatsan-frowns" }, // : в админ
{ "]=", "chatsan-frowns" },
{ ":D", "chatsan-smiles-widely" },
{ ":D", "chatsan-smiles-widely" }, //нет канала с ключём , . в шёпот
{ "D:", "chatsan-frowns-deeply" },
{ ":O", "chatsan-surprised" },
{ ":O", "chatsan-surprised" }, // . в безопасность
{ ":3", "chatsan-smiles" }, //nope
{ ":S", "chatsan-uncertain" },
{ ":S", "chatsan-uncertain" }, //нет канала с ключём, . в шёпот
{ ":>", "chatsan-grins" },
{ ":<", "chatsan-pouts" },
{ "xD", "chatsan-laughs" },
{ "xD", "chatsan-laughs" }, // нет
{ ":'(", "chatsan-cries" },
{ ":'[", "chatsan-cries" },
{ "='(", "chatsan-cries" },
{ "='(", "chatsan-cries" }, // =' + хмурится
{ "='[", "chatsan-cries" },
{ ")':", "chatsan-cries" },
{ "]':", "chatsan-cries" },
{ "]':", "chatsan-cries" }, // ': в админ чат
{ ")'=", "chatsan-cries" },
{ "]'=", "chatsan-cries" },
{ "]'=", "chatsan-cries" }, // '= в админ чат
{ ";-;", "chatsan-cries" },
{ ";_;", "chatsan-cries" },
{ "qwq", "chatsan-cries" },
{ ":u", "chatsan-smiles-smugly" },
{ ":v", "chatsan-smiles-smugly" },
{ ">:i", "chatsan-annoyed" },
{ ":i", "chatsan-sighs" },
{ "qwq", "chatsan-cries" }, // нет
{ ":u", "chatsan-smiles-smugly" }, // нет канала с ключём, . в шёпот
{ ":v", "chatsan-smiles-smugly" }, // нет канала с ключём, . в шёпот
{ ">:i", "chatsan-annoyed" }, // :i в чат
{ ":i", "chatsan-sighs" }, // нет канала с ключём, . в шёпот
{ ":|", "chatsan-sighs" },
{ ":p", "chatsan-stick-out-tongue" },
{ ";p", "chatsan-stick-out-tongue" },
{ ":b", "chatsan-stick-out-tongue" },
{ "0-0", "chatsan-wide-eyed" },
{ "o-o", "chatsan-wide-eyed" },
{ "o.o", "chatsan-wide-eyed" },
{ "._.", "chatsan-surprised" },
{ ":p", "chatsan-stick-out-tongue" }, // нет канала с ключём, . в шёпот
{ ";p", "chatsan-stick-out-tongue" }, // Р в общий
{ ":b", "chatsan-stick-out-tongue" }, // нет канала с ключём, . в шёпот
Farrellka-dev marked this conversation as resolved.
Show resolved Hide resolved
{ "0-0", "chatsan-wide-eyed" }, // нет
{ "o-o", "chatsan-wide-eyed" }, // нет
{ "o.o", "chatsan-wide-eyed" }, // нет
Farrellka-dev marked this conversation as resolved.
Show resolved Hide resolved
{ "._.", "chatsan-surprised" },
{ ".-.", "chatsan-confused" },
{ "-_-", "chatsan-unimpressed" },
{ "smh", "chatsan-unimpressed" },
{ "smh", "chatsan-unimpressed" }, // нет
{ "o/", "chatsan-waves" },
{ "^^/", "chatsan-waves" },
{ ":/", "chatsan-uncertain" },
{ ":\\", "chatsan-uncertain" },
{ ":\\", "chatsan-uncertain" }, // нет канала с \
{ "lmao", "chatsan-laughs" },
{ "lmao.", "chatsan-laughs" },
{ "lol", "chatsan-laughs" },
Expand All @@ -127,23 +127,23 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager
{ "lel.", "chatsan-laughs" },
{ "kek", "chatsan-laughs" },
{ "kek.", "chatsan-laughs" },
{ "rofl", "chatsan-laughs" },
{ "rofl", "chatsan-laughs" }, // нет
{ "o7", "chatsan-salutes" },
{ ";_;7", "chatsan-tearfully-salutes"},
{ "idk", "chatsan-shrugs" },
{ "idk.", "chatsan-shrugs" },
{ ";)", "chatsan-winks" },
{ ";]", "chatsan-winks" },
{ "(;", "chatsan-winks" },
{ "[;", "chatsan-winks" },
{ "[;", "chatsan-winks" }, // ; в OOC
{ ":')", "chatsan-tearfully-smiles" },
{ ":']", "chatsan-tearfully-smiles" },
{ "=')", "chatsan-tearfully-smiles" },
{ "=')", "chatsan-tearfully-smiles" }, // =' + улыбается
{ "=']", "chatsan-tearfully-smiles" },
{ "(':", "chatsan-tearfully-smiles" },
{ "[':", "chatsan-tearfully-smiles" },
{ "[':", "chatsan-tearfully-smiles" }, // ': в OOC
{ "('=", "chatsan-tearfully-smiles" },
{ "['=", "chatsan-tearfully-smiles" },
{ "['=", "chatsan-tearfully-smiles" }, // '= в админ чат
};

private bool _doSanitize;
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/DeltaV/Entities/Objects/Specific/Command/safe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
components:
- IdCard
- type: AccessReader
access: [["DV-SpareSafe"]]
access: [["Command"]]
Farrellka-dev marked this conversation as resolved.
Show resolved Hide resolved

- type: entity
id: SpareIdCabinetFilled
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,8 @@
- state: subdepartment
color: "#58C800"
- state: chaplain
- type: PresetIdCard
job: Chaplain
- type: PresetIdCard
job: Chaplain

- type: entity
parent: IDCardStandard
Expand Down
Loading