Fix master (#26501)

* Fix master

* this

* messages

* Fix missing verb name parrot

* Fix messagePack for blockgame and spacevillain

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

diff --git a/Content.Server/Arcade/BlockGame/BlockGameArcadeSystem.cs b/Content.Server/Arcade/BlockGame/BlockGameArcadeSystem.cs
index 0d9487dab85131cada2e65f570297c62ad32853b..96001a484bc6e05b674bb54eba6a80ca144165f3 100644 (file)
--- a/Content.Server/Arcade/BlockGame/BlockGameArcadeSystem.cs
+++ b/Content.Server/Arcade/BlockGame/BlockGameArcadeSystem.cs
@@ -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;
@@ -96,7 +98,7 @@ public sealed class BlockGameArcadeSystem : EntitySystem
             component.Player = null;
             if (component.ShouldSayThankYou && TryComp<AdvertiseComponent>(uid, out var advertise))
             {
-                _advertise.SayThankYou(uid, advertise);
+                _advertise.SayAdvertisement(uid, advertise);
                 component.ShouldSayThankYou = false;
             }
         }

diff --git a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs
index 24fa6e32d1980b4ae8086f625feb4618b7c945b0..4d704b8a81179e6dc0ff70e71c9c34febb7d0ff3 100644 (file)
--- a/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs
+++ b/Content.Server/Arcade/SpaceVillainGame/SpaceVillainArcadeSystem.cs
@@ -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;
@@ -121,7 +123,7 @@ public sealed partial class SpaceVillainArcadeSystem : EntitySystem
 
         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;
         }
     }

diff --git a/Resources/Locale/en-US/chat/managers/chat-manager.ftl b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
index 1abe55da7ee88c2c579b959162b8710437cc18fe..38b12251bec6acecbb971c5aadb8324028af3275 100644 (file)
--- a/Resources/Locale/en-US/chat/managers/chat-manager.ftl
+++ b/Resources/Locale/en-US/chat/managers/chat-manager.ftl
@@ -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

diff --git a/Resources/Prototypes/Catalog/Arcade/Advertisements/blockgame.yml b/Resources/Prototypes/Catalog/Arcade/Advertisements/blockgame.yml
index efcb8934a80f9eab5c4efb9091dbc83a8bf14021..226f0cb72b6532d5a03a5f060f306fa0c48e2d43 100644 (file)
--- a/Resources/Prototypes/Catalog/Arcade/Advertisements/blockgame.yml
+++ b/Resources/Prototypes/Catalog/Arcade/Advertisements/blockgame.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: BlockGameAds
-  advertisements:
+  messages:
     - advertisement-block-game-1
     - advertisement-block-game-2
     - advertisement-block-game-3
@@ -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

diff --git a/Resources/Prototypes/Catalog/Arcade/Advertisements/spacevillain.yml b/Resources/Prototypes/Catalog/Arcade/Advertisements/spacevillain.yml
index 98063a62dddd0b9f7a9bed14966dd9bb92c2bd60..bee4ca2baecc42273f84a0055107b92db7e2765c 100644 (file)
--- a/Resources/Prototypes/Catalog/Arcade/Advertisements/spacevillain.yml
+++ b/Resources/Prototypes/Catalog/Arcade/Advertisements/spacevillain.yml
@@ -1,6 +1,6 @@
-- type: advertisementsPack
+- type: messagePack
   id: SpaceVillainAds
-  advertisements:
+  messages:
     - advertisement-space-villain-1
     - advertisement-space-villain-2
     - advertisement-space-villain-3
@@ -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

diff --git a/Resources/Prototypes/Voice/speech_verbs.yml b/Resources/Prototypes/Voice/speech_verbs.yml
index 43fefe04e31413f9a064841626df7e2a53c71a3f..9879cefb75d8d4a92b969069c89e0a86c6aeb1d5 100644 (file)
--- a/Resources/Prototypes/Voice/speech_verbs.yml
+++ b/Resources/Prototypes/Voice/speech_verbs.yml
@@ -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