cmdrunematti/Delta-v
1
0
Fork 0
mirror of https://github.com/DeltaV-Station/Delta-v.git synced 2026-10-04 05:17:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Nubody Merge" (#5807)

Browse Source 
Revert "Nubody Merge (#5670)"

This reverts commit b465cfb3fd.
This commit is contained in:
BarryNorfolk
2026-05-12 21:05:30 +00:00
committed by GitHub
parent b465cfb3fd
commit d62f7cef10
1593 changed files with 51534 additions and 20316 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Content.Shared/Humanoid/SharedHumanoidMarkingModifierSystem.cs
+39 -15
View File
@@ -1,7 +1,4 @@
using Content.Shared.Body;
using Content.Shared.Humanoid.Markings;
using Content.Shared.Humanoid.Prototypes;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
namespace Content.Shared.Humanoid;
@@ -15,29 +12,56 @@ public enum HumanoidMarkingModifierKey
[Serializable, NetSerializable]
public sealed class HumanoidMarkingModifierMarkingSetMessage : BoundUserInterfaceMessage
{
public Dictionary<ProtoId<OrganCategoryPrototype>, Dictionary<HumanoidVisualLayers, List<Marking>>> Markings { get; }
public MarkingSet MarkingSet { get; }
public bool ResendState { get; }
public HumanoidMarkingModifierMarkingSetMessage(Dictionary<ProtoId<OrganCategoryPrototype>, Dictionary<HumanoidVisualLayers, List<Marking>>> markings)
public HumanoidMarkingModifierMarkingSetMessage(MarkingSet set, bool resendState)
{
Markings = markings;
MarkingSet = set;
ResendState = resendState;
}
}
[Serializable, NetSerializable]
public sealed class HumanoidMarkingModifierBaseLayersSetMessage : BoundUserInterfaceMessage
{
public HumanoidMarkingModifierBaseLayersSetMessage(HumanoidVisualLayers layer, CustomBaseLayerInfo? info, bool resendState)
{
Layer = layer;
Info = info;
ResendState = resendState;
}
public HumanoidVisualLayers Layer { get; }
public CustomBaseLayerInfo? Info { get; }
public bool ResendState { get; }
}
[Serializable, NetSerializable]
public sealed class HumanoidMarkingModifierState : BoundUserInterfaceState
{
// TODO just use the component state, remove the BUI state altogether.
public HumanoidMarkingModifierState(
Dictionary<ProtoId<OrganCategoryPrototype>, Dictionary<HumanoidVisualLayers, List<Marking>>> markings,
Dictionary<ProtoId<OrganCategoryPrototype>, OrganMarkingData> organData,
Dictionary<ProtoId<OrganCategoryPrototype>, OrganProfileData> organProfileData
MarkingSet markingSet,
string species,
Sex sex,
Color skinColor,
Dictionary<HumanoidVisualLayers, CustomBaseLayerInfo> customBaseLayers
)
{
Markings = markings;
OrganData = organData;
OrganProfileData = organProfileData;
MarkingSet = markingSet;
Species = species;
Sex = sex;
SkinColor = skinColor;
CustomBaseLayers = customBaseLayers;
}
public Dictionary<ProtoId<OrganCategoryPrototype>, Dictionary<HumanoidVisualLayers, List<Marking>>> Markings { get; }
public Dictionary<ProtoId<OrganCategoryPrototype>, OrganMarkingData> OrganData { get; }
public Dictionary<ProtoId<OrganCategoryPrototype>, OrganProfileData> OrganProfileData { get; }
public MarkingSet MarkingSet { get; }
public string Species { get; }
public Sex Sex { get; }
public Color SkinColor { get; }
public Color EyeColor { get; }
public Color? HairColor { get; }
public Color? FacialHairColor { get; }
public Dictionary<HumanoidVisualLayers, CustomBaseLayerInfo> CustomBaseLayers { get; }
}