Skip to content

[Fix] Minor Fixes #169

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

Merged
UmbiMax merged 9 commits into from
Aug 3, 2026
+11 −2
Merged

[Fix] Minor Fixes #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3fdac52
[Fix] Пару фиксов шедовкинов и лодаута ИО
BloodyDog0021 Aug 1, 2026
8481dc3
[Fix][Translate] Подкоректировал ладаут ГСБ и локализацию категории в…
BloodyDog0021 Aug 1, 2026
7440fa0
Merge branch 'master' into Fix
UmbiMax Aug 1, 2026
fa1751c
Update Resources/Prototypes/Loadouts/role_loadouts.yml
BloodyDog0021 Aug 1, 2026
8da11c4
Правки
BloodyDog0021 Aug 1, 2026
1ed4d01
Revert "Правки"
BloodyDog0021 Aug 1, 2026
dad065a
Правки 2
BloodyDog0021 Aug 1, 2026
3bb4fca
Merge branch 'master' into Fix
UmbiMax Aug 2, 2026
f62332f
Merge branch 'master' into Fix
UmbiMax Aug 3, 2026
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: 1 addition & 0 deletions Resources/Locale/ru-RU/_Goobstation/loadouts/loadout-groups.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,5 +180,6 @@ loadout-group-boxer-envirohelm = Экошлем боксёра
loadout-group-boxer-envirosuit = Экокостюм боксёра
# Misc
loadout-group-plasma-tank = баллон плазмы
loadout-group-security-gloves = Перчатки СБ
# Shaft Miner
loadout-group-shaft-miner-jumpsuit = комбинезон шахтёра
2 changes: 1 addition & 1 deletion Resources/Prototypes/Loadouts/role_loadouts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,7 @@
- SecurityBelt
- HeadofSecurityOuterClothing
- HeadofSecurityShoes # Goobstation edit
- SecurityGloves #goob
# - SecurityGloves #goob Arcane-Edit: The HoS has HeadofSecurityGloves
- SurvivalSecurity
- Trinkets
- Patron # Arcane
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/_EinsteinEngines/Voice/speech_emote_sounds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
Scream:
collection: SlimeFemaleScreams
Laugh:
collection: MaleLaugh
collection: FemaleLaugh # Arcane-Edit
Sneeze:
collection: FemaleSneezes
Cough:
Expand Down
8 changes: 8 additions & 0 deletions Resources/Prototypes/_EinsteinEngines/Voice/speech_emotes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,14 @@
- mars
- marsing
- marsed
# Arcane-Start
- марс
- марс!
- марс.
- мар
- мар!
- мар.
# Arcane-End

- type: emoteSounds
id: UnisexPlasmaman
Expand Down
Loading