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

Action container rejig (#20260)

Browse Source 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
This commit is contained in:
Leon Friedrich
2023-09-23 04:49:39 -04:00
committed by GitHub
parent c80c90ed65
commit 684b334806
50 changed files with 889 additions and 740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/CombatMode/CombatModeComponent.cs
View File

@@ -35,7 +35,7 @@ namespace Content.Shared.CombatMode
[DataField("combatToggleAction", customTypeSerializer: typeof(PrototypeIdSerializer<EntityPrototype>))]
public string CombatToggleAction = "ActionCombatModeToggle";
[DataField("combatToggleActionEntity")]
[DataField, AutoNetworkedField]
public EntityUid? CombatToggleActionEntity;
[ViewVariables(VVAccess.ReadWrite), DataField("isInCombatMode"), AutoNetworkedField]