mirror of
https://github.com/space-syndicate/space-station-14.git
synced 2026-10-09 10:21:18 +03:00
Prevent forced Emotes from reagents getting recorded in chat. (#45265)
* basics * go nuclear this emotes do be spammy --------- Co-authored-by: Fildrance <fildrance@gmail.com>
This commit is contained in:
parent
4b8072e3f5
commit
76d464c102
7 changed files with 7 additions and 15 deletions
|
|
@ -17,7 +17,7 @@ public sealed partial class EmoteEntityEffectSystem : EntityEffectSystem<MetaDat
|
|||
if (args.Effect.ShowInChat)
|
||||
_chat.TryEmoteWithChat(entity, args.Effect.EmoteId, ChatTransmitRange.GhostRangeLimit, forceEmote: args.Effect.Force);
|
||||
else
|
||||
_chat.TryEmoteWithoutChat(entity, args.Effect.EmoteId);
|
||||
_chat.TryEmoteWithChat(entity, args.Effect.EmoteId, ChatTransmitRange.HideChat, forceEmote: args.Effect.Force);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -34,7 +34,7 @@ public sealed partial class Emote : EntityEffectBase<Emote>
|
|||
/// If the emote should be recorded in chat.
|
||||
/// </summary>
|
||||
[DataField]
|
||||
public bool ShowInChat;
|
||||
public bool ShowInChat = false;
|
||||
|
||||
/// <summary>
|
||||
/// If the forced emote will be listed in the guidebook.
|
||||
|
|
|
|||
|
|
@ -99,7 +99,6 @@
|
|||
effects:
|
||||
- !type:Emote
|
||||
emote: Cough
|
||||
showInChat: true
|
||||
showInGuidebook: true
|
||||
probability: 0.05
|
||||
reactiveEffects:
|
||||
|
|
|
|||
|
|
@ -341,7 +341,7 @@
|
|||
effects:
|
||||
- !type:Emote
|
||||
emote: Weh
|
||||
showInChat: true
|
||||
showInChat: false
|
||||
showInGuidebook: true
|
||||
force: true
|
||||
probability: 0.5
|
||||
|
|
@ -376,7 +376,7 @@
|
|||
effects:
|
||||
- !type:Emote
|
||||
emote: Hew
|
||||
showInChat: true
|
||||
showInChat: false
|
||||
showInGuidebook: true
|
||||
force: true
|
||||
probability: 0.5
|
||||
|
|
@ -438,7 +438,6 @@
|
|||
reagent: Felinase
|
||||
min: 10
|
||||
emote: Cough
|
||||
showInChat: true
|
||||
showInGuidebook: true
|
||||
force: true
|
||||
probability: 0.05
|
||||
|
|
@ -489,7 +488,6 @@
|
|||
reagent: Caninase
|
||||
min: 10
|
||||
emote: Cough
|
||||
showInChat: true
|
||||
showInGuidebook: true
|
||||
force: true
|
||||
probability: 0.05
|
||||
|
|
|
|||
|
|
@ -279,7 +279,6 @@
|
|||
type: [ Slime ]
|
||||
inverted: true
|
||||
emote: Laugh
|
||||
showInChat: true
|
||||
probability: 0.1
|
||||
- !type:Emote
|
||||
minScale: 0.2
|
||||
|
|
@ -288,7 +287,6 @@
|
|||
type: [ Slime ]
|
||||
inverted: true
|
||||
emote: Scream
|
||||
showInChat: true
|
||||
probability: 0.01
|
||||
- !type:PopupMessage
|
||||
minScale: 0.5
|
||||
|
|
|
|||
|
|
@ -1464,7 +1464,6 @@
|
|||
effects:
|
||||
- !type:Emote
|
||||
emote: Yawn
|
||||
showInChat: true
|
||||
probability: 0.1
|
||||
- !type:ModifyStatusEffect
|
||||
effectProto: StatusEffectDrowsiness
|
||||
|
|
|
|||
|
|
@ -575,7 +575,7 @@
|
|||
effects:
|
||||
- !type:Emote
|
||||
emote: Laugh
|
||||
showInChat: true
|
||||
showInChat: false
|
||||
probability: 0.1
|
||||
conditions:
|
||||
- !type:ReagentCondition
|
||||
|
|
@ -583,7 +583,7 @@
|
|||
max: 20
|
||||
- !type:Emote
|
||||
emote: Whistle
|
||||
showInChat: true
|
||||
showInChat: false
|
||||
probability: 0.1
|
||||
conditions:
|
||||
- !type:ReagentCondition
|
||||
|
|
@ -591,7 +591,7 @@
|
|||
max: 20
|
||||
- !type:Emote
|
||||
emote: Crying
|
||||
showInChat: true
|
||||
showInChat: false
|
||||
probability: 0.1
|
||||
conditions:
|
||||
- !type:ReagentCondition
|
||||
|
|
|
|||
|
|
@ -63,7 +63,6 @@
|
|||
effects:
|
||||
- !type:Emote
|
||||
emote: Yawn
|
||||
showInChat: true
|
||||
probability: 0.1
|
||||
- !type:MovementSpeedModifier
|
||||
walkSpeedModifier: 0.65
|
||||
|
|
@ -584,7 +583,6 @@
|
|||
effects:
|
||||
- !type:Emote
|
||||
emote: Honk
|
||||
showInChat: true
|
||||
showInGuidebook: true
|
||||
force: true
|
||||
probability: 0.2
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue