diff --git a/Content.Shared/Clumsy/ClumsySystem.cs b/Content.Shared/Clumsy/ClumsySystem.cs index d39e15ea6c..3131ea02cc 100644 --- a/Content.Shared/Clumsy/ClumsySystem.cs +++ b/Content.Shared/Clumsy/ClumsySystem.cs @@ -98,7 +98,7 @@ public sealed class ClumsySystem : EntitySystem private void OnBeforeClimbEvent(Entity ent, ref SelfBeforeClimbEvent args) { // checks if ClumsyVaulting is false, if so, skips. - if (!ent.Comp.ClumsyVaulting) + if (!ent.Comp.ClumsyVaulting || args.PuttingOnTable != ent.Owner) // DeltaV - don't bonk if someone else vaults/biomasses you return; // This event is called in shared, thats why it has all the extra prediction stuff. diff --git a/Resources/Prototypes/_DV/GameRules/unknown_shuttles.yml b/Resources/Prototypes/_DV/GameRules/unknown_shuttles.yml index 2291e4e794..742384eaf9 100644 --- a/Resources/Prototypes/_DV/GameRules/unknown_shuttles.yml +++ b/Resources/Prototypes/_DV/GameRules/unknown_shuttles.yml @@ -125,7 +125,7 @@ - type: RandomMetadata nameSegments: - NamesHologram - - NamesLastMilitary + - NamesMilitaryLast - type: EmitSoundOnSpawn # evil sound sound: /Audio/Ambience/Antag/emagged_borg.ogg - type: RandomHumanoidAppearance