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.

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

Мелкий фикс #120

Merged
merged 3 commits into from
Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -848,7 +848,7 @@ public void ProcessChatMessage(ChatMessage msg, bool speechBubble = true)
break;

case ChatChannel.LOOC:
const string prefixText = "(LOOC: ";
const string prefixText = "(";
const string prefixEndText = ")";
AddSpeechBubble(msg, SpeechBubble.SpeechType.Looc, prefixText, prefixEndText);
break;
Expand Down
4 changes: 4 additions & 0 deletions Resources/Locale/ru-RU/ADT/Objects/Fan/plushie_aidan.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -121,3 +121,7 @@ ent-ADTPlushieAmira = Амира
ent-ADTPlushieOvai = Овай
.desc = На вид мягкий и милый ящер-атмос.
.suffix = { "" }

ent-ADTPlushieFritz = Фицджеральд Эллис
.desc = Мягкая плюшевая игрушка одетая в форму главы персонала, если присмотреться левый глаз игрушки зашит белыми нитями. Предмет пахнет чернилами, а на одной из ног имеется бирка "Cybersun Plus Industries". Этого главу персонала вы уж точно можете лапать безнаказанно.
.suffix = { "" }
1 change: 1 addition & 0 deletions Resources/Prototypes/ADT/Catalog/Fills/Crates/fun.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
- id: ADTPlushieAkula
- id: ADTPlushiePrazat
- id: ADTPlushieLo
- id: ADTPlushieFritz

- type: entity
id: ADTCrateBirthdayParty
Expand Down
10 changes: 10 additions & 0 deletions Resources/Prototypes/ADT/Entities/Objects/Fun/toys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -393,3 +393,13 @@
- type: Sprite
sprite: ADT/Objects/Fun/toys.rsi
state: plushie_ovai

- type: entity
parent: BasePlushie
id: ADTPlushieFritz
name: Ellis plushie
description: It looks like a soft and cute atmos.
components:
- type: Sprite
sprite: ADT/Objects/Fun/toys.rsi
state: plushie_ellis
3 changes: 3 additions & 0 deletions Resources/Textures/ADT/Objects/Fun/toys.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@
},
{
"name": "plushie_ovai"
},
{
"name": "plushie_ellis"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading