diff --git a/Content.Client/_Sunrise/Razor/RazorBoundUserInterface.cs b/Content.Client/_Sunrise/Razor/RazorBoundUserInterface.cs
index b30b056438..1c2992cbfb 100644
--- 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;
diff --git a/Content.Client/_Sunrise/Razor/RazorSingleMarkingPicker.xaml.cs b/Content.Client/_Sunrise/Razor/RazorSingleMarkingPicker.xaml.cs
index df295f5c2f..92ef62b654 100644
--- 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;
diff --git a/Content.Client/_Sunrise/Razor/RazorSystem.cs b/Content.Client/_Sunrise/Razor/RazorSystem.cs
index a139a09b7f..d90fcd7ecf 100644
--- 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;
diff --git a/Content.Client/_Sunrise/Razor/RazorWindow.xaml.cs b/Content.Client/_Sunrise/Razor/RazorWindow.xaml.cs
index e46d24ca33..62db9f34cb 100644
--- 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;
diff --git a/Content.Server/_Sunrise/HairDye/HairDyeSystem.cs b/Content.Server/_Sunrise/HairDye/HairDyeSystem.cs
index 3f7487d3b7..95ef9c1cd2 100644
--- 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!;
- ///
public override void Initialize()
{
SubscribeLocalEvent(OnHairDyerInteract);
diff --git a/Content.Server/_Sunrise/HairDye/HairDyerComponent.cs b/Content.Server/_Sunrise/HairDye/HairDyerComponent.cs
index a8a6bd6178..1097db19c4 100644
--- 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;
diff --git a/Content.Server/_Sunrise/Razor/RazorSystem.cs b/Content.Server/_Sunrise/Razor/RazorSystem.cs
index cd452fb960..7b5113d6d3 100644
--- 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;
-///
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!;
- ///
public override void Initialize()
{
base.Initialize();
diff --git a/Content.Shared/_Sunrise/Razor/RazorComponent.cs b/Content.Shared/_Sunrise/Razor/RazorComponent.cs
index 78fc6f8017..f2bd193842 100644
--- 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;
-///
-/// This is used for...
-///
[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
public sealed partial class RazorComponent : Component
{
[DataField]
public DoAfterId? DoAfter;
- ///
- /// Magic mirror target, used for validating UI messages.
- ///
[DataField, AutoNetworkedField]
public EntityUid? Target;
- ///
- /// doafter time required to add a new slot
- ///
[DataField, ViewVariables(VVAccess.ReadWrite)]
- public TimeSpan AddSlotTime = TimeSpan.FromSeconds(10); // Sunrise-edit
+ public TimeSpan AddSlotTime = TimeSpan.FromSeconds(10);
- ///
- /// doafter time required to remove a existing slot
- ///
[DataField, ViewVariables(VVAccess.ReadWrite)]
- public TimeSpan RemoveSlotTime = TimeSpan.FromSeconds(8); // Sunrise-edit
+ public TimeSpan RemoveSlotTime = TimeSpan.FromSeconds(8);
- ///
- /// doafter time required to change slot
- ///
[DataField, ViewVariables(VVAccess.ReadWrite)]
- public TimeSpan SelectSlotTime = TimeSpan.FromSeconds(6); // Sunrise-edit
+ public TimeSpan SelectSlotTime = TimeSpan.FromSeconds(6);
- ///
- /// Sound emitted when slots are changed
- ///
[DataField, ViewVariables(VVAccess.ReadWrite)]
public SoundSpecifier? ChangeHairSound = new SoundPathSpecifier("/Audio/Items/scissors.ogg");
diff --git a/Content.Shared/_Sunrise/Razor/SharedRazorSystem.cs b/Content.Shared/_Sunrise/Razor/SharedRazorSystem.cs
index 5ad712bc9a..92b91fdae3 100644
--- 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;
///
-/// Система для электробритвы - копия ножниц с вайлдберрис. Она не может менять цвет!! (шок)
+/// Система для электробритвы - копия ножниц с вайлдберрис. Бритва не может менять цвет волос!
///
public abstract class SharedRazorSystem : EntitySystem
{
[Dependency] private readonly SharedInteractionSystem _interaction = default!;
[Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!;
- ///
public override void Initialize()
{
base.Initialize();
diff --git a/Resources/Locale/ru-RU/_sunrise/access/access.ftl b/Resources/Locale/ru-RU/_sunrise/access/access.ftl
new file mode 100644
index 0000000000..52efe369df
--- /dev/null
+++ b/Resources/Locale/ru-RU/_sunrise/access/access.ftl
@@ -0,0 +1 @@
+id-card-access-level-barber = Парикмахерская
diff --git a/Resources/Prototypes/Access/command.yml b/Resources/Prototypes/Access/command.yml
index da03795d5a..13e7212e84 100644
--- 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
diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml
index 2b9d63de6d..148a6c5e69 100644
--- 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
diff --git a/Resources/Prototypes/Access/service.yml b/Resources/Prototypes/Access/service.yml
index cb62a3f6e7..4312c1f167 100644
--- a/Resources/Prototypes/Access/service.yml
+++ b/Resources/Prototypes/Access/service.yml
@@ -42,3 +42,4 @@
- Theatre
- Chapel
- Lawyer
+ - Barber # Sunrise-edit
diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
index 8fe5b6ed13..1422253fac 100644
--- 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 ]
diff --git a/Resources/Prototypes/_Sunrise/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_Sunrise/Entities/Structures/Machines/vending_machines.yml
index a99f0cc433..608616b898 100644
--- 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
diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/Civillian/barber.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/Civillian/barber.yml
index 2066e3dc0a..6d37c17b29 100644
--- 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