From 2e033b816ec621816dc729069b22da3fcf462713 Mon Sep 17 00:00:00 2001 From: mirrorcult Date: Tue, 15 Feb 2022 21:00:36 -0700 Subject: [PATCH] Drones stop emoting challenge (#6735) --- Content.Server/Drone/DroneSystem.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Content.Server/Drone/DroneSystem.cs b/Content.Server/Drone/DroneSystem.cs index 2d8de11d87..f6404804bb 100644 --- a/Content.Server/Drone/DroneSystem.cs +++ b/Content.Server/Drone/DroneSystem.cs @@ -8,6 +8,7 @@ using Content.Server.Mind.Components; using Content.Server.Ghost.Roles.Components; using Content.Server.Hands.Components; using Content.Shared.Body.Components; +using Content.Shared.Emoting; using Robust.Shared.Player; using Content.Shared.Tag; @@ -24,6 +25,7 @@ namespace Content.Server.Drone SubscribeLocalEvent(OnExamined); SubscribeLocalEvent(OnMindAdded); SubscribeLocalEvent(OnMindRemoved); + SubscribeLocalEvent(OnEmoteAttempt); } private void OnExamined(EntityUid uid, DroneComponent component, ExaminedEvent args) @@ -90,6 +92,12 @@ namespace Content.Server.Drone EnsureComp(uid); } + private void OnEmoteAttempt(EntityUid uid, DroneComponent component, EmoteAttemptEvent args) + { + // No. + args.Cancel(); + } + private void UpdateDroneAppearance(EntityUid uid, DroneStatus status) { if (TryComp(uid, out var appearance))