Skip to content

Commit

Permalink
"implants do not affect language list for radial-menu" was fixed
Browse files Browse the repository at this point in the history
some icons added for lang menu
  • Loading branch information
modern-nm committed Jun 14, 2024
1 parent 0f796d8 commit 66cd055
Show file tree
Hide file tree
Showing 13 changed files with 55 additions and 2 deletions.
6 changes: 6 additions & 0 deletions Content.Server/ADT/LanguagePanel/LanguagePanelSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Content.Shared.ADT.LanguagePanel;
using Content.Shared.Language;
using Content.Server.Language;
using Content.Shared.Language.Components;

namespace Content.Server.ADT.LanguagePanel;

Expand Down Expand Up @@ -52,6 +53,11 @@ private void OnLangAction(EntityUid uid, LanguagePanelComponent component, OpenL
{
ev.Languages.Add(lang);
}
if (EntityManager.TryGetComponent<ImplantedTranslatorComponent>(uid, out var implantedTranslatorComponent))
foreach (var lang in implantedTranslatorComponent.SpokenLanguages)
{
ev.Languages.Add(lang);
}
RaiseNetworkEvent(ev, player);
}

Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/ADT/LanguagePanel/LanguagePanelComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace Content.Shared.ADT.LanguagePanel;
/// This component describes ActionEntity "ActionOpenEmotes". This class is a part of code which is responsible for using RadialUiController.
/// </summary>
[RegisterComponent, NetworkedComponent]
public sealed partial class LanguagePanelComponent: Component
public sealed partial class LanguagePanelComponent : Component
{
[DataField]
public EntProtoId OpenLanguagesAction = "ActionOpenLanguagesM";
Expand Down
12 changes: 12 additions & 0 deletions Resources/Prototypes/ADT/Languages/languages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

# The common galactic tongue.
- type: language
# TODO: icon
id: GalacticCommon
obfuscateSyllables: true
replacement:
Expand All @@ -33,6 +34,7 @@

# Spoken by slimes.
- type: language
# TODO: icon
id: Bubblish
obfuscateSyllables: true
replacement:
Expand Down Expand Up @@ -110,6 +112,7 @@

# Spoken by dionas.
- type: language
# TODO: icon
id: RootSpeak
obfuscateSyllables: true
replacement:
Expand Down Expand Up @@ -177,6 +180,7 @@

# A mess of broken Japanese, spoken by Felinds and Oni
- type: language
icon: { sprite: ADT/Interface/Actions/language_panel.rsi, state: nekomimetic } # language panel icon
id: Nekomimetic
obfuscateSyllables: true
replacement:
Expand Down Expand Up @@ -231,6 +235,7 @@

# Spoken by the Lizard race.
- type: language
icon: ADT/Interface/Actions/language_panel.rsi/draconic.png # language panel icon
id: Draconic
obfuscateSyllables: true
replacement:
Expand Down Expand Up @@ -321,6 +326,7 @@

# Spoken by the Vulpkanin race.
- type: language
# TODO: icon
id: Canilunzt
obfuscateSyllables: true
replacement:
Expand Down Expand Up @@ -385,6 +391,7 @@

# Spoken by the Tajaran race.
- type: language
# TODO: icon
id: SikTaj
obfuscateSyllables: true
replacement:
Expand Down Expand Up @@ -449,6 +456,7 @@

# Spoken by the Nian race.
- type: language
icon: { sprite: ADT/Interface/Actions/language_panel.rsi, state: draconic } # language panel icon
id: Nian
obfuscateSyllables: true
replacement:
Expand Down Expand Up @@ -483,6 +491,7 @@

# Spoken by the Novakid race.
- type: language
icon: { sprite: ADT/Interface/Actions/language_panel.rsi, state: fire } # language panel icon
id: Fire
obfuscateSyllables: true
replacement:
Expand Down Expand Up @@ -560,6 +569,7 @@
- ССС
# IPC
- type: language
icon: { sprite: ADT/Interface/Actions/language_panel.rsi, state: robot_talk } # language panel icon
id: RobotTalk
obfuscateSyllables: true
replacement:
Expand Down Expand Up @@ -648,6 +658,7 @@

# Spoken by the Drask race.
- type: language
icon: { sprite: ADT/Interface/Actions/language_panel.rsi, state: drask } # language panel icon
id: Drask
obfuscateSyllables: true
replacement:
Expand All @@ -671,6 +682,7 @@

# Spoken by the Ursus race.
- type: language
icon: { sprite: ADT/Interface/Actions/language_panel.rsi, state: urs } # language panel icon
id: Urs
obfuscateSyllables: true
replacement:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Mobs/Species/base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@
- type: Emoting
- type: EmoteAnimation
- type: EmotePanel
- type: LanguagePanel # ADT radial-language-panel
- type: LanguagePanel # ADT radial-language-panel, [radial language panel]
- type: BodyEmotes
soundsId: GeneralBodyEmotes
- type: Grammar
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "by modern-nm, radial language panel",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "felenid"
},
{
"name": "human"
},
{
"name": "robot_talk"
},
{
"name": "nian"
},
{
"name": "fire"
},
{
"name": "shadowkin"
},
{
"name": "draconic"
},
{
"name": "urs"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 66cd055

Please sign in to comment.