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.

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

AdvertiseComponent: No advertisements for players. #3040

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

AdvertiseComponent: No advertisements for players. #3040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
343a344
Random Speak System
dvir001 Mar 1, 2025
8b2d897
Merge branch 'new-frontiers-14:master' into 2025-03-01-RandomSpeak
dvir001 Mar 1, 2025
842082d
Merge branch 'master' into 2025-03-01-RandomSpeak
dvir001 Mar 1, 2025
25f86f9
Update RandomSpeakComponent.cs
dvir001 Mar 1, 2025
b7132a8
Update mob_hostile_base.yml
dvir001 Mar 1, 2025
2ab81ac
Update Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_syndic…
dvir001 Mar 1, 2025
621b2ab
Update Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml
dvir001 Mar 1, 2025
6c31a67
Update Content.Server/_NF/RandomSpeak/RandomSpeakSystem.cs
dvir001 Mar 1, 2025
d210c07
Merge branch 'master' into 2025-03-01-RandomSpeak
dvir001 Mar 1, 2025
0060eee
Update RandomSpeakSystem.cs
dvir001 Mar 2, 2025
df4ea4c
Merge branch 'master' into 2025-03-01-RandomSpeak
dvir001 Mar 3, 2025
bb45d18
Merge branch 'master' into 2025-03-01-RandomSpeak
whatston3 Mar 6, 2025
8507e68
RandomSpeak: revert back to Advertise
whatston3 Mar 6, 2025
28f5f45
Remove RandomSpeakComponent and System
whatston3 Mar 6, 2025
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
9 changes: 9 additions & 0 deletions Content.Server/Advertise/EntitySystems/AdvertiseSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Content.Server.Chat.Systems;
using Content.Server.Power.Components;
using Content.Shared.VendingMachines;
using Robust.Shared.Player; // Frontier
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
using Robust.Shared.Timing;
Expand Down Expand Up @@ -31,6 +32,7 @@ public override void Initialize()

SubscribeLocalEvent<ApcPowerReceiverComponent, AttemptAdvertiseEvent>(OnPowerReceiverAttemptAdvertiseEvent);
SubscribeLocalEvent<VendingMachineComponent, AttemptAdvertiseEvent>(OnVendingAttemptAdvertiseEvent);
SubscribeLocalEvent<ActorComponent, AttemptAdvertiseEvent>(OnActorAttemptAdvertiseEvent); // Frontier: no player advertisements

_nextCheckTime = TimeSpan.MinValue;
}
Expand Down Expand Up @@ -97,6 +99,13 @@ private static void OnVendingAttemptAdvertiseEvent(EntityUid uid, VendingMachine
{
args.Cancelled |= machine.Broken;
}

// Frontier: no player advertisements
private static void OnActorAttemptAdvertiseEvent(EntityUid uid, ActorComponent actor, ref AttemptAdvertiseEvent args)
{
args.Cancelled = true;
}
// End Frontier
}

[ByRefEvent]
Expand Down
6 changes: 2 additions & 4 deletions Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_base.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,6 @@
- type: Access
- type: Timer
- type: TimedSpawner
- type: Advertise
pack: FuelVendAds # placeholder, required field, unused
- type: Jittering

- type: entity
Expand Down Expand Up @@ -408,8 +406,8 @@
deathPenalty: 0.5
- type: Advertise
pack: syndicatehumanoidchatter
minimumWait: 120 # 1 * 2
maximumWait: 240 # 2 * 60
minimumWait: 120
maximumWait: 240
nextAdvertisementTime: 0
- type: FTLKnockdownImmune
- type: Respirator
Expand Down
5 changes: 0 additions & 5 deletions Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_rogue_ai.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,6 @@
- type: Vocal
sounds:
Unsexed: UnisexSiliconSyndicate
#- type: Advertise
#pack: mercenaryhumanoidchatter
#minimumWait: 30
#maximumWait: 120
#nextAdvertisementTime: 10
- type: AutoWakeUp
- type: FootstepModifier
footstepSoundCollection:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/_NF/Entities/Mobs/NPCs/mob_hostile_syndicate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,8 +662,8 @@
baseSprintSpeed: 6
- type: Advertise
pack: mimehumanoidchatter
minimumWait: 120 # 1 * 2
maximumWait: 240 # 2 * 60
minimumWait: 120
maximumWait: 240
nextAdvertisementTime: 0

# Syndicate Chemwarrior, shoots healthy mixes of chems
Expand Down
Loading