tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't add ImplicitRoof to grids with roof component (#38551)

Browse Source 
* Don't add implicitroof to grids with roof component

* changes 1
This commit is contained in:
mtrs163
2025-10-15 06:05:29 +07:00
committed by GitHub
parent 96712acb08
commit f6972de87d
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Shuttles/Systems/ShuttleSystem.cs
View File

@@ -104,7 +104,12 @@ public sealed partial class ShuttleSystem : SharedShuttleSystem
return; return;
EnsureComp<ShuttleComponent>(ev.EntityUid); EnsureComp<ShuttleComponent>(ev.EntityUid);
EnsureComp<ImplicitRoofComponent>(ev.EntityUid);
// This and RoofComponent should be mutually exclusive, so ImplicitRoof should be removed if the grid has RoofComponent
if (HasComp<RoofComponent>(ev.EntityUid))
RemComp<ImplicitRoofComponent>(ev.EntityUid);
else
EnsureComp<ImplicitRoofComponent>(ev.EntityUid);
} }
private void OnShuttleStartup(EntityUid uid, ShuttleComponent component, ComponentStartup args) private void OnShuttleStartup(EntityUid uid, ShuttleComponent component, ComponentStartup args)

2
Content.Shared/Light/Components/ImplicitRoofComponent.cs
View File

@@ -3,7 +3,7 @@ using Robust.Shared.GameStates;
namespace Content.Shared.Light.Components; namespace Content.Shared.Light.Components;
/// <summary> /// <summary>
/// Assumes the entire attached grid is rooved. /// Assumes the entire attached grid is rooved. This component will get removed if the grid has RoofComponent.
/// </summary> /// </summary>
[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
public sealed partial class ImplicitRoofComponent : Component public sealed partial class ImplicitRoofComponent : Component

2
Content.Shared/Light/Components/RoofComponent.cs
View File

@@ -3,7 +3,7 @@ using Robust.Shared.GameStates;
namespace Content.Shared.Light.Components; namespace Content.Shared.Light.Components;
/// <summary> /// <summary>
/// Will draw shadows over tiles flagged as roof tiles on the attached grid. /// Will draw shadows over tiles flagged as roof tiles on the attached grid. ImplicitRoofComponent will get removed if the grid has this component.
/// </summary> /// </summary>
[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
public sealed partial class RoofComponent : Component public sealed partial class RoofComponent : Component