diff --git a/Content.Shared/Light/Components/RoofComponent.cs b/Content.Shared/Light/Components/RoofComponent.cs index 47de333af0..8792871427 100644 --- a/Content.Shared/Light/Components/RoofComponent.cs +++ b/Content.Shared/Light/Components/RoofComponent.cs @@ -11,7 +11,7 @@ public sealed partial class RoofComponent : Component public const int ChunkSize = 8; [DataField, AutoNetworkedField] - public Color Color = Color.Black; + public Color Color = new (80, 80, 80); //CP14 Black color replaced on Dark gray /// /// Chunk origin and bitmask of value in chunk. diff --git a/Content.Shared/_CP14/MeleeWeapon/EntitySystems/CP14SharpeningSystem.cs b/Content.Shared/_CP14/MeleeWeapon/EntitySystems/CP14SharpeningSystem.cs index c7b4c0616d..dae5c81745 100644 --- a/Content.Shared/_CP14/MeleeWeapon/EntitySystems/CP14SharpeningSystem.cs +++ b/Content.Shared/_CP14/MeleeWeapon/EntitySystems/CP14SharpeningSystem.cs @@ -67,7 +67,7 @@ public sealed class CP14SharpeningSystem : EntitySystem if (!args.CanReach || args.Target == null || !TryComp(args.Target, out var sharpened)) return; - if (TryComp(stone, out var useDelay) && _useDelay.IsDelayed( new Entity(stone, useDelay))) + if (TryComp(stone, out var useDelay) && _useDelay.IsDelayed((stone, useDelay))) return; SharpThing(stone, args.Target.Value, sharpened, args.User); diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Tools/demiplane_keys.yml b/Resources/Prototypes/_CP14/Entities/Objects/Tools/demiplane_keys.yml index b4a76e2152..7411996204 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/demiplane_keys.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/demiplane_keys.yml @@ -12,7 +12,6 @@ sprite: /Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi layers: - state: core - shader: unshaded - type: GuideHelp guides: - CP14_RU_Demiplanes @@ -45,7 +44,6 @@ - type: Sprite layers: - state: core - shader: unshaded color: red - type: CP14DemiplaneGeneratorData tiersContent: diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Roof/base.yml b/Resources/Prototypes/_CP14/Entities/Structures/Roof/base.yml index 82445738e9..96fc07dd3a 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Roof/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Roof/base.yml @@ -25,6 +25,7 @@ - type: IconSmooth key: CP14roof base: roof + - type: IsRoof - type: entity parent: