Actual lockers (#195)
Adds storing entities into lockers the way we all know and love. Relies on an implementation of ITileDefinition in https://github.com/space-wizards/space-station-14/pull/193 (just like origin/master) #191
This commit is contained in:
committed by
Pieter-Jan Briers
parent
1fe24eeb12
commit
903961771b
@@ -122,5 +122,6 @@
|
||||
<Name>Robust.Shared</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup />
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
@@ -7,7 +7,7 @@ namespace Content.Shared.GameObjects.Components.Storage
|
||||
{
|
||||
public abstract class SharedStorageComponent : Component
|
||||
{
|
||||
public sealed override string Name => "Storage";
|
||||
public override string Name => "Storage";
|
||||
public override uint? NetID => ContentNetIDs.INVENTORY;
|
||||
public override Type StateType => typeof(StorageComponentState);
|
||||
|
||||
|
||||
@@ -17,5 +17,6 @@
|
||||
public const uint SOUND = 1012;
|
||||
public const uint ITEM = 1013;
|
||||
public const uint CLOTHING = 1014;
|
||||
public const uint ENTITYSTORAGE = 1015;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,10 +8,10 @@ namespace Content.Shared.Physics
|
||||
[Flags]
|
||||
public enum CollisionGroup
|
||||
{
|
||||
None = 0x0000,
|
||||
Grid = 0x0001, // Walls
|
||||
Mob = 0x0002, // Mobs, like the player or NPCs
|
||||
Fixture = 0x0004, // wall fixtures, like APC or posters
|
||||
Items = 0x008, // Items on the ground
|
||||
None = 0,
|
||||
Grid = 1, // Walls
|
||||
Mob = 2, // Mobs, like the player or NPCs
|
||||
Fixture = 4, // wall fixtures, like APC or posters
|
||||
Items = 8 // Items on the ground
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user