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

Replace ProtoId<EntityPrototype> uses with EntProtoId (#29892)

Browse Source
This commit is contained in:
Tayrtahn
2024-07-10 20:01:30 -04:00
committed by GitHub
parent b014d4d0e0
commit 2df65f10f5
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Geras/GerasComponent.cs
View File

@@ -12,7 +12,7 @@ public sealed partial class GerasComponent : Component
{ {
[DataField] public ProtoId<PolymorphPrototype> GerasPolymorphId = "SlimeMorphGeras"; [DataField] public ProtoId<PolymorphPrototype> GerasPolymorphId = "SlimeMorphGeras";
[DataField] public ProtoId<EntityPrototype> GerasAction = "ActionMorphGeras"; [DataField] public EntProtoId GerasAction = "ActionMorphGeras";
[DataField] public EntityUid? GerasActionEntity; [DataField] public EntityUid? GerasActionEntity;
} }

4
Content.Shared/Bed/Sleep/SleepingSystem.cs
View File

@@ -34,8 +34,8 @@ public sealed partial class SleepingSystem : EntitySystem
[Dependency] private readonly SharedEmitSoundSystem _emitSound = default!; [Dependency] private readonly SharedEmitSoundSystem _emitSound = default!;
[Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!; [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!;
public static readonly ProtoId<EntityPrototype> SleepActionId = "ActionSleep"; public static readonly EntProtoId SleepActionId = "ActionSleep";
public static readonly ProtoId<EntityPrototype> WakeActionId = "ActionWake"; public static readonly EntProtoId WakeActionId = "ActionWake";
public override void Initialize() public override void Initialize()
{ {

2
Content.Shared/Explosion/Components/OnTrigger/SmokeOnTriggerComponent.cs
View File

@@ -29,7 +29,7 @@ public sealed partial class SmokeOnTriggerComponent : Component
/// Defaults to smoke but you can use foam if you want. /// Defaults to smoke but you can use foam if you want.
/// </summary> /// </summary>
[DataField, ViewVariables(VVAccess.ReadWrite)] [DataField, ViewVariables(VVAccess.ReadWrite)]
public ProtoId<EntityPrototype> SmokePrototype = "Smoke"; public EntProtoId SmokePrototype = "Smoke";
/// <summary> /// <summary>
/// Solution to add to each smoke cloud. /// Solution to add to each smoke cloud.

2
Content.Shared/PAI/PAIComponent.cs
View File

@@ -31,7 +31,7 @@ public sealed partial class PAIComponent : Component
public EntityUid? MidiAction; public EntityUid? MidiAction;
[DataField] [DataField]
public ProtoId<EntityPrototype> MapActionId = "ActionPAIOpenMap"; public EntProtoId MapActionId = "ActionPAIOpenMap";
[DataField, AutoNetworkedField] [DataField, AutoNetworkedField]
public EntityUid? MapAction; public EntityUid? MapAction;