Merge remote-tracking branch 'upstream/master' into weapon_anims
# Conflicts: # Resources/Prototypes/MeleeWeaponAnimations/default.yml
This commit is contained in:
@@ -108,6 +108,9 @@ namespace Content.Shared.GameObjects.Components.Sound
|
||||
|
||||
public void ExposeData(ObjectSerializer serializer)
|
||||
{
|
||||
if (!serializer.Reading)
|
||||
return;
|
||||
|
||||
Filename = serializer.ReadDataField("filename", "");
|
||||
Delay = serializer.ReadDataField("delay", 0u);
|
||||
RandomDelay = serializer.ReadDataField("randomdelay", 0u);
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
using System;
|
||||
using Robust.Shared.GameObjects;
|
||||
using Robust.Shared.Serialization;
|
||||
|
||||
namespace Content.Shared.GameObjects.Components.Weapons.Ranged
|
||||
{
|
||||
/// <summary>
|
||||
/// This is sent if the MagazineBarrel AutoEjects the magazine
|
||||
/// </summary>
|
||||
[Serializable, NetSerializable]
|
||||
public sealed class MagazineAutoEjectMessage : ComponentMessage {}
|
||||
}
|
||||
Reference in New Issue
Block a user