Downstream fixes for .net10
This commit is contained in:
parent
eb33b88067
commit
987361b5ce
|
|
@ -61,4 +61,4 @@ public sealed partial class StationStockMarketComponent : Component
|
||||||
}
|
}
|
||||||
|
|
||||||
[DataRecord]
|
[DataRecord]
|
||||||
public record struct MarketChange(float Chance, Vector2 Range);
|
public partial record struct MarketChange(float Chance, Vector2 Range);
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,7 @@ namespace Content.Shared.Roles
|
||||||
/// Nyano/DV: For e.g. prisoners, they'll never use their latejoin spawner.
|
/// Nyano/DV: For e.g. prisoners, they'll never use their latejoin spawner.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[DataField("alwaysUseSpawner")]
|
[DataField("alwaysUseSpawner")]
|
||||||
public bool AlwaysUseSpawner { get; } = false;
|
public bool AlwaysUseSpawner { get; private set; } = false; // DeltaV - Added private set
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The "weight" or importance of this job. If this number is large, the job system will assign this job
|
/// The "weight" or importance of this job. If this number is large, the job system will assign this job
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ public sealed partial class NukieOperationPrototype : IPrototype
|
||||||
{
|
{
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
[IdDataField]
|
[IdDataField]
|
||||||
public string ID { get; } = default!;
|
public string ID { get; private set; } = default!;
|
||||||
|
|
||||||
[DataField(required: true)]
|
[DataField(required: true)]
|
||||||
public List<EntProtoId> OperationObjectives = new();
|
public List<EntProtoId> OperationObjectives = new();
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ public enum NanoChatUiMessageType : byte
|
||||||
|
|
||||||
// putting this here because i can
|
// putting this here because i can
|
||||||
[Serializable, NetSerializable, DataRecord]
|
[Serializable, NetSerializable, DataRecord]
|
||||||
public struct NanoChatRecipient
|
public partial struct NanoChatRecipient
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The recipient's unique NanoChat number.
|
/// The recipient's unique NanoChat number.
|
||||||
|
|
@ -100,7 +100,7 @@ public struct NanoChatRecipient
|
||||||
}
|
}
|
||||||
|
|
||||||
[Serializable, NetSerializable, DataRecord]
|
[Serializable, NetSerializable, DataRecord]
|
||||||
public struct NanoChatMessage
|
public partial struct NanoChatMessage
|
||||||
{
|
{
|
||||||
public const int MaxContentLength = 256;
|
public const int MaxContentLength = 256;
|
||||||
|
|
||||||
|
|
@ -146,7 +146,7 @@ public struct NanoChatMessage
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <remarks>Used by the LogProbe</remarks>
|
/// <remarks>Used by the LogProbe</remarks>
|
||||||
[Serializable, NetSerializable, DataRecord]
|
[Serializable, NetSerializable, DataRecord]
|
||||||
public readonly struct NanoChatData(
|
public readonly partial struct NanoChatData(
|
||||||
Dictionary<uint, NanoChatRecipient> recipients,
|
Dictionary<uint, NanoChatRecipient> recipients,
|
||||||
Dictionary<uint, List<NanoChatMessage>> messages,
|
Dictionary<uint, List<NanoChatMessage>> messages,
|
||||||
uint? cardNumber,
|
uint? cardNumber,
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ public sealed partial class FeedbackPopupPrototype : IPrototype
|
||||||
{
|
{
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
[IdDataField]
|
[IdDataField]
|
||||||
public string ID { get; } = default!;
|
public string ID { get; private set; } = default!;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Name of the popup. This is relayed in the discord webhook.
|
/// Name of the popup. This is relayed in the discord webhook.
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ namespace Content.Shared._DV.Kitchen;
|
||||||
/// we can still reuse it for guidebook generation without duping the code.
|
/// we can still reuse it for guidebook generation without duping the code.
|
||||||
/// </remarks>
|
/// </remarks>
|
||||||
[Prototype]
|
[Prototype]
|
||||||
public sealed class DeepFryerRecipePrototype : IPrototype
|
public sealed partial class DeepFryerRecipePrototype : IPrototype
|
||||||
{
|
{
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
[IdDataField]
|
[IdDataField]
|
||||||
|
|
|
||||||
|
|
@ -7,9 +7,9 @@ namespace Content.Shared._DV.Mail;
|
||||||
/// Generic random weighting dataset to use.
|
/// Generic random weighting dataset to use.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Prototype]
|
[Prototype]
|
||||||
public sealed class MailDeliveryPoolPrototype : IPrototype
|
public sealed partial class MailDeliveryPoolPrototype : IPrototype
|
||||||
{
|
{
|
||||||
[IdDataField] public string ID { get; } = default!;
|
[IdDataField] public string ID { get; private set; } = default!;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Mail that can be sent to everyone.
|
/// Mail that can be sent to everyone.
|
||||||
|
|
|
||||||
|
|
@ -18,12 +18,12 @@ public sealed partial class QuickPhrasePrototype : IPrototype, IInheritingProtot
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[ViewVariables]
|
[ViewVariables]
|
||||||
[ParentDataField(typeof(AbstractPrototypeIdArraySerializer<QuickPhrasePrototype>))]
|
[ParentDataField(typeof(AbstractPrototypeIdArraySerializer<QuickPhrasePrototype>))]
|
||||||
public string[]? Parents { get; }
|
public string[]? Parents { get; private set; }
|
||||||
|
|
||||||
[ViewVariables]
|
[ViewVariables]
|
||||||
[NeverPushInheritance]
|
[NeverPushInheritance]
|
||||||
[AbstractDataField]
|
[AbstractDataField]
|
||||||
public bool Abstract { get; }
|
public bool Abstract { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The phrase that this prototype represents.
|
/// The phrase that this prototype represents.
|
||||||
|
|
|
||||||
|
|
@ -7,13 +7,13 @@ namespace Content.Shared.Shipyard.Prototypes;
|
||||||
/// Prevents making typos being silently ignored by the linter.
|
/// Prevents making typos being silently ignored by the linter.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Prototype("vesselCategory")]
|
[Prototype("vesselCategory")]
|
||||||
public sealed class VesselCategoryPrototype : IPrototype
|
public sealed partial class VesselCategoryPrototype : IPrototype
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The unique ID for the vessel category.
|
/// The unique ID for the vessel category.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[ViewVariables, IdDataField]
|
[ViewVariables, IdDataField]
|
||||||
public string ID { get; } = default!;
|
public string ID { get; private set; } = default!;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The LocId containing the localization ID of the category name.
|
/// The LocId containing the localization ID of the category name.
|
||||||
|
|
|
||||||
|
|
@ -5,10 +5,10 @@ using Robust.Shared.Utility;
|
||||||
namespace Content.Shared.Shipyard.Prototypes;
|
namespace Content.Shared.Shipyard.Prototypes;
|
||||||
|
|
||||||
[Prototype("vessel")]
|
[Prototype("vessel")]
|
||||||
public sealed class VesselPrototype : IPrototype
|
public sealed partial class VesselPrototype : IPrototype
|
||||||
{
|
{
|
||||||
[ViewVariables, IdDataField]
|
[ViewVariables, IdDataField]
|
||||||
public string ID { get; } = default!;
|
public string ID { get; private set; } = default!;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Already localized name of the vessel.
|
/// Already localized name of the vessel.
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ namespace Content.Shared._DV.Speech.Prototypes;
|
||||||
public sealed partial class SyllableObfuscationAccentPrototype : IPrototype
|
public sealed partial class SyllableObfuscationAccentPrototype : IPrototype
|
||||||
{
|
{
|
||||||
[IdDataField]
|
[IdDataField]
|
||||||
public string ID { get; } = default!;
|
public string ID { get; private set; } = default!;
|
||||||
|
|
||||||
[DataField]
|
[DataField]
|
||||||
public int MinSyllables = 1;
|
public int MinSyllables = 1;
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ namespace Content.Shared._DV.VendingMachines;
|
||||||
/// Similar to <c>VendingMachineInventoryPrototype</c> but for <see cref="ShopVendorComponent"/>.
|
/// Similar to <c>VendingMachineInventoryPrototype</c> but for <see cref="ShopVendorComponent"/>.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[Prototype]
|
[Prototype]
|
||||||
public sealed class ShopInventoryPrototype : IPrototype
|
public sealed partial class ShopInventoryPrototype : IPrototype
|
||||||
{
|
{
|
||||||
[IdDataField]
|
[IdDataField]
|
||||||
public string ID { get; private set; } = default!;
|
public string ID { get; private set; } = default!;
|
||||||
|
|
@ -20,4 +20,4 @@ public sealed class ShopInventoryPrototype : IPrototype
|
||||||
}
|
}
|
||||||
|
|
||||||
[DataRecord, Serializable]
|
[DataRecord, Serializable]
|
||||||
public record struct ShopListing(EntProtoId Id, uint Cost);
|
public partial record struct ShopListing(EntProtoId Id, uint Cost);
|
||||||
|
|
|
||||||
|
|
@ -4,10 +4,10 @@ using Robust.Shared.Prototypes;
|
||||||
namespace Content.Shared._DV.Whitelist;
|
namespace Content.Shared._DV.Whitelist;
|
||||||
|
|
||||||
[Prototype("whitelistTier")]
|
[Prototype("whitelistTier")]
|
||||||
public sealed class WhitelistTierPrototype : IPrototype
|
public sealed partial class WhitelistTierPrototype : IPrototype
|
||||||
{
|
{
|
||||||
[IdDataField]
|
[IdDataField]
|
||||||
public string ID { get; } = default!;
|
public string ID { get; private set; } = default!;
|
||||||
|
|
||||||
[DataField]
|
[DataField]
|
||||||
public string Name = string.Empty;
|
public string Name = string.Empty;
|
||||||
|
|
|
||||||
|
|
@ -10,10 +10,10 @@ using Robust.Shared.Prototypes;
|
||||||
namespace Content.Shared._Goobstation.Devil.Contract;
|
namespace Content.Shared._Goobstation.Devil.Contract;
|
||||||
|
|
||||||
[Prototype("clause")]
|
[Prototype("clause")]
|
||||||
public sealed class DevilClausePrototype : IPrototype
|
public sealed partial class DevilClausePrototype : IPrototype // DeltaV - Added partial
|
||||||
{
|
{
|
||||||
[IdDataField]
|
[IdDataField]
|
||||||
public string ID { get; private init; } = default!;
|
public string ID { get; private set; } = default!; // DeltaV - Added private set
|
||||||
|
|
||||||
[DataField(required: true)]
|
[DataField(required: true)]
|
||||||
public int ClauseWeight;
|
public int ClauseWeight;
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ using Robust.Shared.Prototypes;
|
||||||
namespace Content.Shared._Goobstation.Devil;
|
namespace Content.Shared._Goobstation.Devil;
|
||||||
|
|
||||||
[Prototype("devilBranchPrototype")]
|
[Prototype("devilBranchPrototype")]
|
||||||
public sealed class DevilBranchPrototype : IPrototype
|
public sealed partial class DevilBranchPrototype : IPrototype // DeltaV - Added partial
|
||||||
{
|
{
|
||||||
[IdDataField]
|
[IdDataField]
|
||||||
public string ID { get; set; } = default!;
|
public string ID { get; set; } = default!;
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ namespace Content.Shared._Mono.CorticalBorer;
|
||||||
public sealed partial class CorticalBorerChemicalPrototype : IPrototype
|
public sealed partial class CorticalBorerChemicalPrototype : IPrototype
|
||||||
{
|
{
|
||||||
[IdDataField]
|
[IdDataField]
|
||||||
public string ID { get; } = default!;
|
public string ID { get; private set; } = default!; // DeltaV - Added private set
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Chemical cost per u of reagent
|
/// Chemical cost per u of reagent
|
||||||
|
|
|
||||||
|
|
@ -20,4 +20,4 @@ public sealed partial class RMCClothingFoldableComponent : Component
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[DataRecord]
|
[DataRecord]
|
||||||
[Serializable, NetSerializable]
|
[Serializable, NetSerializable]
|
||||||
public readonly record struct FoldableType(string Prefix, LocId Name, int Priority, string? BlacklistedPrefix, LocId? BlacklistPopup);
|
public readonly partial record struct FoldableType(string Prefix, LocId Name, int Priority, string? BlacklistedPrefix, LocId? BlacklistPopup); // DeltaV - Added partial
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue