diff --git a/Content.Shared/EntityEffects/Effects/EmoteEntityEffectSystem.cs b/Content.Shared/EntityEffects/Effects/EmoteEntityEffectSystem.cs index 6111a48cdb..97bb965827 100644 --- a/Content.Shared/EntityEffects/Effects/EmoteEntityEffectSystem.cs +++ b/Content.Shared/EntityEffects/Effects/EmoteEntityEffectSystem.cs @@ -17,7 +17,7 @@ public sealed partial class EmoteEntityEffectSystem : EntityEffectSystem /// If the emote should be recorded in chat. /// [DataField] - public bool ShowInChat; + public bool ShowInChat = false; /// /// If the forced emote will be listed in the guidebook. diff --git a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml index 3c874be6fa..378b9fe224 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml @@ -99,7 +99,6 @@ effects: - !type:Emote emote: Cough - showInChat: true showInGuidebook: true probability: 0.05 reactiveEffects: diff --git a/Resources/Prototypes/Reagents/fun.yml b/Resources/Prototypes/Reagents/fun.yml index 7ac15c2d10..9e28805560 100644 --- a/Resources/Prototypes/Reagents/fun.yml +++ b/Resources/Prototypes/Reagents/fun.yml @@ -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 diff --git a/Resources/Prototypes/Reagents/gases.yml b/Resources/Prototypes/Reagents/gases.yml index 5410a268d8..13c1489068 100644 --- a/Resources/Prototypes/Reagents/gases.yml +++ b/Resources/Prototypes/Reagents/gases.yml @@ -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 diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml index e0f6e68001..4db41e6ea9 100644 --- a/Resources/Prototypes/Reagents/medicine.yml +++ b/Resources/Prototypes/Reagents/medicine.yml @@ -1464,7 +1464,6 @@ effects: - !type:Emote emote: Yawn - showInChat: true probability: 0.1 - !type:ModifyStatusEffect effectProto: StatusEffectDrowsiness diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml index f3673dc552..ae51fbb082 100644 --- a/Resources/Prototypes/Reagents/narcotics.yml +++ b/Resources/Prototypes/Reagents/narcotics.yml @@ -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 diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml index 1365b83333..f488910990 100644 --- a/Resources/Prototypes/Reagents/toxins.yml +++ b/Resources/Prototypes/Reagents/toxins.yml @@ -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