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

Куча мелких фиксов #642

Merged
merged 2 commits into from
Nov 19, 2024
Merged

Куча мелких фиксов #642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39bb452
Куча мелких фиксов
kanopus952 Nov 15, 2024
35af5f2
Merge branch 'master' into minor_fixes
kanopus952 Nov 16, 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
1 change: 0 additions & 1 deletion Content.Server/Chat/Managers/ChatSanitizationManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ public sealed class ChatSanitizationManager : IChatSanitizationManager
{ "рофл", "chatsan-laughs" },
{ "яхз", "chatsan-shrugs" },
{ ":0", "chatsan-surprised" },
{ ":р", "chatsan-stick-out-tongue" }, // cyrillic р
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

зачем это?..

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Прикол в том, что :р это команда в чат, которая автоматически выбирает тебе частоту того отдела, в котором ты состоишь. В итоге когда чел это прописывает, у него ещё и язык высовывается

{ "кек", "chatsan-laughs" },
{ "T_T", "chatsan-cries" },
{ "Т_Т", "chatsan-cries" }, // cyrillic T
Expand Down
1 change: 1 addition & 0 deletions Resources/Locale/en-US/_strings/_sunrise/chat/emotes.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ chat-emote-name-meows = Мяукать
chat-emote-name-vomit = Тошнота
chat-emote-name-headache = Головная боль
chat-emote-name-insult = Инсульт
chat-emote-name-whines = Скулить
1 change: 1 addition & 0 deletions Resources/Prototypes/Catalog/VendingMachines/Inventories/atmosdrobe.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
ClothingBackpackDuffelAtmospherics: 2
ClothingBackpackSatchelAtmospherics: 2
ClothingBackpackAtmospherics: 2
MaterialBag: 3 # Sunrise-edit
ClothingUniformJumpsuitAtmos: 3
ClothingUniformJumpskirtAtmos: 3
ClothingUniformJumpsuitAtmosCasual: 3
Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Traits/speech.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
- type: Accentless
removes:
- type: OwOAccent # Sunrise-traits
- type: VulpaAccent # Sunrise-traits
- type: TajaranAccent # Sunrise-traits
- type: LizardAccent
- type: MothAccent
- type: ReplacementAccent
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/Voice/speech_emotes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,9 @@
- gasp
- gasps
- gasped
#Sunrise-start
- задыхается
#Sunrise-end

- type: emote
id: DefaultDeathgasp
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_Sunrise/Entities/Mobs/Species/vulpkanin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
- type: Absorbable
- type: Speech
speechVerb: Vulpkanin
allowedEmotes: ['Growl', 'Bark', 'Howl']
allowedEmotes: ['Growl', 'Bark', 'Howl', 'Whines']
- type: HumanoidAppearance
species: Vulpkanin
- type: Icon
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/_Sunrise/Entities/Objects/Specific/Engineering/material_bag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
- RawMaterial
- Tile
- PowerCell
- PowerCellSmall
- Ingot
- DoorElectronics
- AirAlarmElectronics
- CapacitorStockPart
- MicroManipulatorStockPart
- MatterBinStockPart
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/_Sunrise/Voice/speech_emote_sounds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
collection: MaleSneezes
Cough:
collection: MaleCoughs
Sigh:
collection: MaleSigh
Crying:
collection: MaleCry
Whistle:
Expand Down Expand Up @@ -39,6 +41,8 @@
collection: FemaleSneezes
Cough:
collection: FemaleCoughs
Sigh:
collection: FemaleSigh
Crying:
collection: FemaleCry
Whistle:
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/_Sunrise/Voice/speech_emotes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@
id: Whines
name: chat-emote-name-whines
category: Vocal
available: false
icon: Interface/Emotes/cry.png
whitelist:
components:
Expand Down
Loading