Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Ведь без тебя нет смысла жить

Browse Source
This commit is contained in:
Remuchi
2024-03-28 00:35:43 +07:00
parent fa18556a8f
commit face21c33a
8 changed files with 28 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Client/Doors/AirlockSystem.cs
View File

@@ -14,20 +14,10 @@ public sealed class AirlockSystem : SharedAirlockSystem
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<AirlockComponent, BeforeDoorClosedEvent>(OnBeforeDoorClosed);
SubscribeLocalEvent<AirlockComponent, ComponentStartup>(OnComponentStartup);
SubscribeLocalEvent<AirlockComponent, AppearanceChangeEvent>(OnAppearanceChange);
}
// А нужен ли ты блять
private void OnBeforeDoorClosed(EntityUid uid, AirlockComponent airlock, BeforeDoorClosedEvent args)
{
if (_appearanceSystem.TryGetData<bool>(uid, DoorVisuals.BoltLights, out var boltLights) && boltLights)
{
args.Cancel();
}
}
private void OnComponentStartup(EntityUid uid, AirlockComponent comp, ComponentStartup args)
{
// Has to be on component startup because we don't know what order components initialize in and running this before DoorComponent inits _will_ crash.

17
Content.Client/Preferences/UI/HumanoidProfileEditor.xaml.cs
View File

@@ -1163,26 +1163,17 @@ namespace Content.Client.Preferences.UI
var hairMarking = Profile.Appearance.HairStyleId switch
{
HairStyles.DefaultHairStyle => new List<Marking>(),
_ => [new Marking(Profile.Appearance.HairStyleId, [Profile.Appearance.HairColor])],
_ => new List<Marking> { new(Profile.Appearance.HairStyleId, new List<Color> { Profile.Appearance.HairColor }) },
};
var facialHairMarking = Profile.Appearance.FacialHairStyleId switch
{
HairStyles.DefaultFacialHairStyle => new List<Marking>(),
_ =>
[
new Marking(Profile.Appearance.FacialHairStyleId, [Profile.Appearance.FacialHairColor])
],
_ => new List<Marking> { new(Profile.Appearance.FacialHairStyleId, new List<Color> { Profile.Appearance.FacialHairColor }) },
};
_hairPicker.UpdateData(
hairMarking,
Profile.Species,
1);
_facialHairPicker.UpdateData(
facialHairMarking,
Profile.Species,
1);
_hairPicker.UpdateData(hairMarking, Profile.Species, 1);
_facialHairPicker.UpdateData(facialHairMarking, Profile.Species, 1);
}
private void UpdateCMarkingsHair()