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

Up16112024 #121

Merged
merged 19 commits into from
Nov 15, 2024
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
4 changes: 4 additions & 0 deletions Content.Server/Radio/Components/RadioSpeakerComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,8 @@ public sealed partial class RadioSpeakerComponent : Component

[DataField("enabled")]
public bool Enabled;

[DataField("IsSpeaker")] // Set to true for broadcast radio speakers so that it speaks instead of whispers the message.
public bool IsSpeaker;

}
4 changes: 3 additions & 1 deletion Content.Server/Radio/EntitySystems/RadioDeviceSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,9 @@ private void OnReceiveRadio(EntityUid uid, RadioSpeakerComponent component, ref

// log to chat so people can identity the speaker/source, but avoid clogging ghost chat if there are many radios
var message = args.OriginalChatMsg.Message; // The chat system will handle the rest and re-obfuscate if needed.
_chat.TrySendInGameICMessage(uid, message, InGameICChatType.Whisper, ChatTransmitRange.GhostRangeLimit, nameOverride: name, checkRadioPrefix: false, languageOverride: args.Language);
var chatType = component.IsSpeaker ? InGameICChatType.Speak : InGameICChatType.Whisper;
_chat.TrySendInGameICMessage(uid, message, chatType, ChatTransmitRange.GhostRangeLimit, nameOverride: name, checkRadioPrefix: false, languageOverride: args.Language);

}

private void OnBeforeIntercomUiOpen(EntityUid uid, IntercomComponent component, BeforeActivatableUIOpenEvent args)
Expand Down
Binary file not shown.
6 changes: 4 additions & 2 deletions Resources/Credits/Patrons.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
- Name: "TheTrueRatKing"
Tier: Nuclear
- Name: "maxxorion"
Tier: Silver
Tier: Nuclear
- Name: "Baron216"
Tier: Silver
- Name: "Gruinspace"
Tier: Gold
Tier: Gold
- Name: "DeadManWalking97" # jado
Tier: Silver
1 change: 1 addition & 0 deletions Resources/Locale/en-US/_Nuclear14/headset-component.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ chat-radio-bosmidwest = Brotherhood Midwest
chat-radio-boswashington = Brotherhood Washington
chat-radio-enclave = Enclave
chat-radio-ncr = NCR
chat-radio-pbs = Public Broadcast
59 changes: 57 additions & 2 deletions Resources/Locale/en-US/_Nuclear14/undecidedloadout.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -145,14 +145,15 @@ undecided-loadout-category-bos-default-name = Brotherhood Basic Issue Kit
undecided-loadout-category-bos-default-description =
A crate containing everything a member of Brotherhood might need.
For soldiers and laser lovers alike.
Includes 1 laser rifle, 1 laser pistol, 3 MF cells, 2 energy cells, 1 stimpak, C ration MRE
Includes 1 AER-9 laser rifle, 1 laser pistol, 3 MF cells, 2 energy cells, 1 stimpak, C ration MRE

undecided-loadout-category-bos-carbine-name = Brotherhood Carbine Issue Kit
undecided-loadout-category-bos-carbine-description =
A crate containing everything a member of Brotherhood might need.
For your ballistic needs.
Includes 1 pre-war carbine rifle, 1 laser pistol, 3 carbine 556 magazines,
2 energy cells, 1 stimpak, 1 C ration MRE

undecided-loadout-category-bos-laser-name = Brotherhood Laser Issue Kit
undecided-loadout-category-bos-laser-description =
A crate containing everything a member of the Brotherhood might need
Expand All @@ -171,7 +172,7 @@ undecided-loadout-category-bos-scribe-field-name = Brotherhood Scribe Field Kit
undecided-loadout-category-bos-scribe-field-description =
A crate containing everything a member of Brotherhood scribes.
For supporting your unit from the back.
Includes 1 varmint rifle, 1 5.56 ammo box, 1 AEP-7 pistol, 2 energy cells, 1 medical belt,
Includes 1 AEP-7 pistol, 2 energy cells, 1 medical belt,
1 field scribe clothing, 1 knife, 1 stimpak, 1 C ration MRE

undecided-loadout-category-bos-scribe-engineer-name = Brotherhood Scribe Engineer Kit
Expand Down Expand Up @@ -202,3 +203,57 @@ undecided-loadout-category-bos-ballistics-description =
Includes 1 assault rifle, 3 5.56 magazines, 1 12.7mm pistol,
2 12.7mm pistol magazines, 5.56 ammo box, 1 stimpak, 1 C ration MRE

undecided-loadout-category-bos-washington-default-name = Brotherhood Basic Issue Kit
undecided-loadout-category-bos-washington-default-description =
A crate containing everything a member of Brotherhood might need.
For soldiers and laser lovers alike.
Includes 1 1 plasma rifle, 1 laser pistol, 3 MF cells, 2 energy cells, 1 stimpak, C ration MRE

undecided-loadout-category-bos-washington-carbine-name = Brotherhood Carbine Issue Kit
undecided-loadout-category-bos-washington-carbine-description =
A crate containing everything a member of Brotherhood might need.
For your ballistic needs.
Includes 1 pre-war carbine rifle, 10mm pistol, 3 carbine 556 magazines,
2 10mm pistol magazines, 1 stimpak, 1 C ration MRE

undecided-loadout-category-bos-washington-plasma-name = Brotherhood Plasma Issue Kit
undecided-loadout-category-bos-washington-plasma-description =
A crate containing everything a member of the Brotherhood might need
too lay down some laser and lead.
Includes 1 modified plasma rifle, 1 10mm pistol, 3 plasma cartridges,
2 10mm pistol magazines, 1 stimpak, 1 C ration MRE

undecided-loadout-category-bos-washington-scribe-medic-name = Brotherhood Scribe Medical Kit
undecided-loadout-category-bos-washington-scribe-medic-description =
A crate containing everything a member of Brotherhood scribes.
For keeping the fighting forces alive.
Includes 1 AEP-7 pistol, 2 energy cells, 1 medical belt,
1 bullet wound kit, 1 medical scribe clothing, 1 knife, 1 stimpak, 1 C ration MRE

undecided-loadout-category-bos-washington-scribe-field-name = Brotherhood Scribe Field Kit
undecided-loadout-category-bos-washington-scribe-field-description =
A crate containing everything a member of Brotherhood scribes.
For supporting your unit from the back.
Includes 1 AEP-7 pistol, 1 AEP-7 pistol, 2 energy cells, 1 medical belt,
1 field scribe clothing, 1 knife, 1 stimpak, 1 C ration MRE

undecided-loadout-category-bos-washington-scribe-engineer-name = Brotherhood Scribe Engineer Kit
undecided-loadout-category-bos-washington-scribe-engineer-description =
A crate containing everything a member of Brotherhood scribes.
For upkeeping the base and tinkering alike.
Includes 1 AEP-7 laser pistol, 2 energy cells, 1 utility belt,
1 engineer scribe clothing, 1 fire-axe, 1 stimpak, 1 C ration MRE

undecided-loadout-category-bos-washington-ranged-name = Brotherhood Marksman Paladin Kit
undecided-loadout-category-bos-washington-ranged-description =
A crate containing everything a paladin of Brotherhood might need.
For open range fights.
Includes 1 wattz 2000 rifle, 1 laser pistol, 3 H-MF cells, 2 energy cells,
1 stimpak, 1 C ration MRE

undecided-loadout-category-bos-washington-ballistics-name = Brotherhood Assault Paladin Kit
undecided-loadout-category-bos-washington-ballistics-description =
A crate containing everything a paladin of Brotherhood might need.
For his insane need of bullets downrange.
Includes 1 assault rifle, 3 5.56 magazines, 1 10mm pistol,
2 10mm pistol magazines, 5.56 ammo box, 1 stimpak, 1 C ration MRE
Loading
Loading