Фикс парикмахера (#278)

* fix Signed-off-by: JDtrimble <igor.mamaev1@gmail.com> * accessfix Signed-off-by: JDtrimble <igor.mamaev1@gmail.com> * locale fix Signed-off-by: JDtrimble <igor.mamaev1@gmail.com> * accessfix Signed-off-by: JDtrimble <igor.mamaev1@gmail.com> --------- Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
2024-08-14 20:36:11 +03:00 · 2024-08-14 20:36:11 +03:00 · 0fbd734906
commit 0fbd734906
parent fd4edf43f1
16 changed files with 47 additions and 41 deletions
--- a/Content.Client/_Sunrise/Razor/RazorBoundUserInterface.cs
+++ b/Content.Client/_Sunrise/Razor/RazorBoundUserInterface.cs
@ -1,4 +1,6 @@
-using Content.Shared.Humanoid.Markings;
+// © SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt;
+
+using Content.Shared.Humanoid.Markings;
 using Content.Shared._Sunrise.Razor;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface;
--- a/Content.Client/_Sunrise/Razor/RazorSingleMarkingPicker.xaml.cs
+++ b/Content.Client/_Sunrise/Razor/RazorSingleMarkingPicker.xaml.cs
@ -1,4 +1,6 @@
-using System.Linq;
+// © SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt;
+
+using System.Linq;
 using Content.Shared.Humanoid.Markings;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
--- a/Content.Client/_Sunrise/Razor/RazorSystem.cs
+++ b/Content.Client/_Sunrise/Razor/RazorSystem.cs
@ -1,4 +1,6 @@
-using Content.Shared._Sunrise.Razor;
+// © SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt;
+
+using Content.Shared._Sunrise.Razor;

 namespace Content.Client._Sunrise.Razor;

--- a/Content.Client/_Sunrise/Razor/RazorWindow.xaml.cs
+++ b/Content.Client/_Sunrise/Razor/RazorWindow.xaml.cs
@ -1,4 +1,6 @@
-using Content.Shared._Sunrise.Razor;
+// © SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt;
+
+using Content.Shared._Sunrise.Razor;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.CustomControls;
--- a/Content.Server/_Sunrise/HairDye/HairDyeSystem.cs
+++ b/Content.Server/_Sunrise/HairDye/HairDyeSystem.cs
@ -1,4 +1,6 @@
-using Content.Server.DoAfter;
+// © SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt;
+
+using Content.Server.DoAfter;
 using Content.Server.Humanoid;
 using Content.Server.Popups;
 using Content.Shared._Sunrise.HairDye;
@ -20,7 +22,6 @@ public sealed class HairDyeSystem : EntitySystem
    [Dependency] private readonly PopupSystem _popup = default!;
    [Dependency] private readonly DoAfterSystem _doAfter = default!;
    [Dependency] private readonly HumanoidAppearanceSystem _humanoid = default!;
-    /// <inheritdoc/>
    public override void Initialize()
    {
        SubscribeLocalEvent<HairDyerComponent, AfterInteractEvent>(OnHairDyerInteract);
--- a/Content.Server/_Sunrise/HairDye/HairDyerComponent.cs
+++ b/Content.Server/_Sunrise/HairDye/HairDyerComponent.cs
@ -1,4 +1,6 @@
-using Content.Shared.DoAfter;
+// © SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt;
+
+using Content.Shared.DoAfter;

 namespace Content.Server._Sunrise.HairDye;

--- a/Content.Server/_Sunrise/Razor/RazorSystem.cs
+++ b/Content.Server/_Sunrise/Razor/RazorSystem.cs
@ -1,4 +1,6 @@
-using System.Linq;
+// © SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt;
+
+using System.Linq;
 using Content.Server.DoAfter;
 using Content.Server.Humanoid;
 using Content.Shared.Buckle.Components;
@ -13,7 +15,6 @@ using Robust.Shared.Prototypes;

 namespace Content.Server._Sunrise.Razor;

-/// <inheritdoc/>
 public sealed class RazorSystem : SharedRazorSystem
 {
    [Dependency] private readonly SharedAudioSystem _audio = default!;
@ -21,7 +22,6 @@ public sealed class RazorSystem : SharedRazorSystem
    [Dependency] private readonly MarkingManager _markings = default!;
    [Dependency] private readonly HumanoidAppearanceSystem _humanoid = default!;

-    /// <inheritdoc/>
    public override void Initialize()
    {
        base.Initialize();
--- a/Content.Shared/_Sunrise/Razor/RazorComponent.cs
+++ b/Content.Shared/_Sunrise/Razor/RazorComponent.cs
@ -1,46 +1,30 @@
-using Content.Shared.DoAfter;
+// © SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt;
+
+using Content.Shared.DoAfter;
 using Robust.Shared.Audio;
 using Robust.Shared.GameStates;
 using Robust.Shared.Serialization;

 namespace Content.Shared._Sunrise.Razor;

-/// <summary>
-/// This is used for...
-/// </summary>
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class RazorComponent : Component
 {
    [DataField]
    public DoAfterId? DoAfter;

-    /// <summary>
-    /// Magic mirror target, used for validating UI messages.
-    /// </summary>
    [DataField, AutoNetworkedField]
    public EntityUid? Target;

-    /// <summary>
-    /// doafter time required to add a new slot
-    /// </summary>
    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public TimeSpan AddSlotTime = TimeSpan.FromSeconds(10);  // Sunrise-edit
+    public TimeSpan AddSlotTime = TimeSpan.FromSeconds(10);

-    /// <summary>
-    /// doafter time required to remove a existing slot
-    /// </summary>
    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public TimeSpan RemoveSlotTime = TimeSpan.FromSeconds(8);  // Sunrise-edit
+    public TimeSpan RemoveSlotTime = TimeSpan.FromSeconds(8);

-    /// <summary>
-    /// doafter time required to change slot
-    /// </summary>
    [DataField, ViewVariables(VVAccess.ReadWrite)]
-    public TimeSpan SelectSlotTime = TimeSpan.FromSeconds(6);  // Sunrise-edit
+    public TimeSpan SelectSlotTime = TimeSpan.FromSeconds(6);

-    /// <summary>
-    /// Sound emitted when slots are changed
-    /// </summary>
    [DataField, ViewVariables(VVAccess.ReadWrite)]
    public SoundSpecifier? ChangeHairSound = new SoundPathSpecifier("/Audio/Items/scissors.ogg");

--- a/Content.Shared/_Sunrise/Razor/SharedRazorSystem.cs
+++ b/Content.Shared/_Sunrise/Razor/SharedRazorSystem.cs
@ -1,4 +1,6 @@
-using Content.Shared._Sunrise.Razor;
+// © SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt;
+
+using Content.Shared._Sunrise.Razor;
 using Content.Shared.DoAfter;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
@ -10,14 +12,13 @@ using Robust.Shared.Serialization;
 namespace Content.Shared._Sunrise.Razor;

 /// <summary>
-/// Система для электробритвы - копия ножниц с вайлдберрис. Она не может менять цвет!! (шок)
+/// Система для электробритвы - копия ножниц с вайлдберрис. Бритва не может менять цвет волос!
 /// </summary>
 public abstract class SharedRazorSystem : EntitySystem
 {
    [Dependency] private readonly SharedInteractionSystem _interaction = default!;
    [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!;

-    /// <inheritdoc/>
    public override void Initialize()
    {
        base.Initialize();
--- a/Resources/Locale/ru-RU/_sunrise/access/access.ftl
+++ b/Resources/Locale/ru-RU/_sunrise/access/access.ftl
@ -0,0 +1 @@
+id-card-access-level-barber = Парикмахерская
--- a/Resources/Prototypes/Access/command.yml
+++ b/Resources/Prototypes/Access/command.yml
@ -21,9 +21,9 @@
  - Captain
  - HeadOfPersonnel
  - Cryogenics
-  - BlueShield
-  - Magistrat
-  - Ntrep
+  - BlueShield  # Sunrise-edit
+  - Magistrat  # Sunrise-edit
+  - Ntrep  # Sunrise-edit

 - type: accessLevel
  id: EmergencyShuttleRepealAll
--- a/Resources/Prototypes/Access/misc.yml
+++ b/Resources/Prototypes/Access/misc.yml
@ -32,6 +32,7 @@
  - Chapel
  - Hydroponics
  - Atmospherics
-  - Magistrat
-  - BlueShield
-  - Ntrep
+  - Magistrat  # Sunrise-edit
+  - BlueShield  # Sunrise-edit
+  - Ntrep  # Sunrise-edit
+  - Barber  # Sunrise-edit
--- a/Resources/Prototypes/Access/service.yml
+++ b/Resources/Prototypes/Access/service.yml
@ -42,3 +42,4 @@
  - Theatre
  - Chapel
  - Lawyer
+  - Barber  # Sunrise-edit
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@ -53,6 +53,7 @@
  - Cargo
  - Atmospherics
  - Medical
+  - Barber  # Sunrise-edit
  special:
  - !type:AddImplantSpecial
    implants: [ MindShieldImplant ]
--- a/Resources/Prototypes/_Sunrise/Entities/Structures/Machines/vending_machines.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Structures/Machines/vending_machines.yml
@ -11,6 +11,9 @@
    normalState: normal-unshaded
  - type: Advertise
    pack: BarberAds
+  - type: AccessReader
+    breakOnEmag: true
+    access: [["Barber", "Service"]]
  - type: SpeakOnUIClosed
    pack: GenericVendGoodbyes
  - type: Speech
--- a/Resources/Prototypes/_Sunrise/Roles/Jobs/Civillian/barber.yml
+++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/Civillian/barber.yml
@ -1,3 +1,5 @@
+# © SUNRISE, An EULA/CLA with a hosting restriction, full text: https://github.com/space-sunrise/space-station-14/blob/master/CLA.txt;
+
 - type: job
  id: Barber
  name: job-name-barber
@ -8,6 +10,7 @@
  supervisors: job-supervisors-hop
  access:
  - Barber
+  - Service
  - Maintenance

 - type: startingGear
				`@ -0,0 +1 @@`
				`id-card-access-level-barber = Парикмахерская`