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

Fix master #26501

Merged
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: 3 additions & 1 deletion Content.Server/Arcade/BlockGame/BlockGameArcadeSystem.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
using Content.Server.Power.Components;
using Content.Shared.UserInterface;
using Content.Server.Advertise;
using Content.Server.Advertise.Components;
using Content.Server.Advertise.EntitySystems;
using Content.Shared.Arcade;
using Robust.Server.GameObjects;
using Robust.Shared.Player;
Expand Down Expand Up @@ -96,7 +98,7 @@ private void OnAfterUiClose(EntityUid uid, BlockGameArcadeComponent component, B
component.Player = null;
if (component.ShouldSayThankYou && TryComp<AdvertiseComponent>(uid, out var advertise))
{
_advertise.SayThankYou(uid, advertise);
_advertise.SayAdvertisement(uid, advertise);
component.ShouldSayThankYou = false;
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
using Content.Server.Power.Components;
using Content.Shared.UserInterface;
using Content.Server.Advertise;
using Content.Server.Advertise.Components;
using Content.Server.Advertise.EntitySystems;
using static Content.Shared.Arcade.SharedSpaceVillainArcadeComponent;
using Robust.Server.GameObjects;
using Robust.Shared.Audio;
Expand Down Expand Up @@ -121,7 +123,7 @@ private void OnBoundUIClosed(Entity<SpaceVillainArcadeComponent> ent, ref BoundU

if (ent.Comp.ShouldSayThankYou && TryComp<AdvertiseComponent>(ent.Owner, out var advertise))
{
_advertise.SayThankYou(ent.Owner, advertise);
_advertise.SayAdvertisement(ent.Owner, advertise);
ent.Comp.ShouldSayThankYou = false;
}
}
Expand Down
1 change: 1 addition & 0 deletions Resources/Locale/en-US/chat/managers/chat-manager.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ chat-speech-verb-monkey-2 = screeches

chat-speech-verb-name-cluwne = Cluwne

chat-speech-verb-name-parrot = Parrot
chat-speech-verb-parrot-1 = squawks
chat-speech-verb-parrot-2 = tweets
chat-speech-verb-parrot-3 = chirps
Expand Down
30 changes: 15 additions & 15 deletions Resources/Prototypes/Catalog/Arcade/Advertisements/blockgame.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- type: advertisementsPack
- type: messagePack
id: BlockGameAds
advertisements:
messages:
- advertisement-block-game-1
- advertisement-block-game-2
- advertisement-block-game-3
Expand All @@ -14,16 +14,16 @@
- advertisement-block-game-11
- advertisement-block-game-12
- advertisement-block-game-13
thankyous:
- thankyou-block-game-1
- thankyou-block-game-2
- thankyou-block-game-3
- thankyou-block-game-4
- thankyou-block-game-5
- thankyou-block-game-6
- thankyou-block-game-7
- thankyou-block-game-8
- thankyou-block-game-9
- thankyou-block-game-10
- thankyou-block-game-11
- thankyou-block-game-12
# thankyous:
# - thankyou-block-game-1
# - thankyou-block-game-2
# - thankyou-block-game-3
# - thankyou-block-game-4
# - thankyou-block-game-5
# - thankyou-block-game-6
# - thankyou-block-game-7
# - thankyou-block-game-8
# - thankyou-block-game-9
# - thankyou-block-game-10
# - thankyou-block-game-11
# - thankyou-block-game-12
30 changes: 15 additions & 15 deletions Resources/Prototypes/Catalog/Arcade/Advertisements/spacevillain.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- type: advertisementsPack
- type: messagePack
id: SpaceVillainAds
advertisements:
messages:
- advertisement-space-villain-1
- advertisement-space-villain-2
- advertisement-space-villain-3
Expand All @@ -16,16 +16,16 @@
- advertisement-space-villain-13
- advertisement-space-villain-14
- advertisement-space-villain-15
thankyous:
- thankyou-space-villain-1
- thankyou-space-villain-2
- thankyou-space-villain-3
- thankyou-space-villain-4
- thankyou-space-villain-5
- thankyou-space-villain-6
- thankyou-space-villain-7
- thankyou-space-villain-8
- thankyou-space-villain-9
- thankyou-space-villain-10
- thankyou-space-villain-11
- thankyou-space-villain-12
# thankyous:
# - thankyou-space-villain-1
# - thankyou-space-villain-2
# - thankyou-space-villain-3
# - thankyou-space-villain-4
# - thankyou-space-villain-5
# - thankyou-space-villain-6
# - thankyou-space-villain-7
# - thankyou-space-villain-8
# - thankyou-space-villain-9
# - thankyou-space-villain-10
# - thankyou-space-villain-11
# - thankyou-space-villain-12
1 change: 1 addition & 0 deletions Resources/Prototypes/Voice/speech_verbs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@

- type: speechVerb
id: Parrot
name: chat-speech-verb-name-parrot
speechVerbStrings:
- chat-speech-verb-parrot-1
- chat-speech-verb-parrot-2
Expand Down
Loading