Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into 2020-08-19-firelocks

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-09-07 12:47:52 +02:00
parent c3858e6151 47554f99f0
commit da4d08432d
28 changed files with 979 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/GameObjects/Components/Interactable/TilePryingComponent.cs
View File

@@ -41,7 +41,7 @@ namespace Content.Server.GameObjects.Components.Interactable
var coordinates = mapGrid.GridTileToLocal(tile.GridIndices);
if (!user.InRangeUnobstructed(coordinates, popup: true))
if (!user.InRangeUnobstructed(coordinates, popup: false))
return;
var tileDef = (ContentTileDefinition)_tileDefinitionManager[tile.Tile.TypeId];

5
Content.Server/GameObjects/Components/LightBehaviourComponent.cs
View File

@@ -1,5 +1,4 @@

using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects;
using Content.Shared.GameObjects.Components;
namespace Content.Server.GameObjects.Components
@@ -8,7 +7,7 @@ namespace Content.Server.GameObjects.Components
/// A component which applies a specific behaviour to a PointLightComponent on its owner.
/// </summary>
[RegisterComponent]
public class LightBehaviourComponent : SharedLightBehaviourComponent
public class LightBehaviourComponent : SharedLightBehaviourComponent
{
}