tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix emitter examining (#13369)

Browse Source
This commit is contained in:
Nemanja
2023-01-10 06:48:05 -05:00
committed by GitHub
parent e79d822206
commit a66790f158
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Shared/Weapons/Ranged/Components/GunComponent.cs
View File

@@ -113,6 +113,13 @@ public class GunComponent : Component
[DataField("selectModeAction")] [DataField("selectModeAction")]
public InstantAction? SelectModeAction; public InstantAction? SelectModeAction;
/// <summary>
/// Whether or not information about
/// the gun will be shown on examine.
/// </summary>
[DataField("showExamineText")]
public bool ShowExamineText = true;
} }
[Flags] [Flags]

2
Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Interactions.cs
View File

@@ -12,7 +12,7 @@ public abstract partial class SharedGunSystem
{ {
private void OnExamine(EntityUid uid, GunComponent component, ExaminedEvent args) private void OnExamine(EntityUid uid, GunComponent component, ExaminedEvent args)
{ {
if (!args.IsInDetailsRange) if (!args.IsInDetailsRange || !component.ShowExamineText)
return; return;
args.PushMarkup(Loc.GetString("gun-selected-mode-examine", ("color", ModeExamineColor), ("mode", GetLocSelector(component.SelectedMode)))); args.PushMarkup(Loc.GetString("gun-selected-mode-examine", ("color", ModeExamineColor), ("mode", GetLocSelector(component.SelectedMode))));

1
Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml
View File

@@ -37,6 +37,7 @@
map: ["enum.StorageVisualLayers.Lock"] map: ["enum.StorageVisualLayers.Lock"]
- type: Emitter - type: Emitter
- type: Gun - type: Gun
showExamineText: false
fireRate: 10 #just has to be fast enough to keep up with upgrades fireRate: 10 #just has to be fast enough to keep up with upgrades
selectedMode: SemiAuto selectedMode: SemiAuto
availableModes: availableModes: