diff --git a/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
index 32ef267ba8..083d214773 100644
--- a/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
+++ b/Content.Client/Administration/UI/Tabs/AdminTab/AdminTab.xaml
@@ -3,6 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
xmlns:at="clr-namespace:Content.Client.Administration.UI.Tabs.AdminTab"
+ xmlns:wd="clr-namespace:Content.Client._White.Administration"
Margin="4"
MinSize="50 50">
@@ -18,6 +19,7 @@
+
diff --git a/Content.Client/_White/Administration/HoursPanel.xaml b/Content.Client/_White/Administration/HoursPanel.xaml
new file mode 100644
index 0000000000..6ea7218d98
--- /dev/null
+++ b/Content.Client/_White/Administration/HoursPanel.xaml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Content.Client/_White/Administration/HoursPanel.xaml.cs b/Content.Client/_White/Administration/HoursPanel.xaml.cs
new file mode 100644
index 0000000000..c51cedc28d
--- /dev/null
+++ b/Content.Client/_White/Administration/HoursPanel.xaml.cs
@@ -0,0 +1,104 @@
+using Content.Shared.Administration;
+using Content.Shared.Roles;
+using JetBrains.Annotations;
+using Robust.Client.AutoGenerated;
+using Robust.Client.Console;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Prototypes;
+using static Robust.Client.UserInterface.Controls.LineEdit;
+
+namespace Content.Client._White.Administration;
+
+[GenerateTypedNameReferences]
+[UsedImplicitly]
+public sealed partial class HoursPanel : DefaultWindow
+{
+ public HoursPanel()
+ {
+ RobustXamlLoader.Load(this);
+ var roles = new Dictionary();
+ PlayerNameLine.OnTextChanged += _ => OnNamesChanged();
+ PlayerList.OnSelectionChanged += OnPlayerSelectionChanged;
+ HourButton.OnPressed += _ => AddMinutes(60);
+ MinutesLine.OnTextChanged += UpdateButtonsText;
+ RoleOption.OnItemSelected += args => RoleOption.SelectId(args.Id);
+ SubmitButton.OnPressed += _ => OnSubmitButtonOnPressed(roles);
+ SaveButton.OnPressed += _ => OnSaveButtonOnPressed();
+ OnNamesChanged();
+ InitRoleList(roles);
+
+ }
+ private void InitRoleList(Dictionary roles)
+ {
+ var roleInd = 0;
+ RoleOption.AddItem("общее", roleInd);
+ roles.Add(roleInd, "Overall");
+ roleInd++;
+ foreach (var dep in IoCManager.Resolve().EnumeratePrototypes())
+ {
+ foreach (var role in dep.Roles)
+ {
+ RoleOption.AddItem(Loc.GetString($"Job{role.Id}"), roleInd);
+ roles.Add(roleInd, $"Job{role.Id}");
+ roleInd++;
+ }
+ }
+ RoleOption.SelectId(0);
+ }
+
+ private bool TryGetMinutes(string str, out uint minutes)
+ {
+ minutes = 0;
+ return !string.IsNullOrWhiteSpace(str) && uint.TryParse(str, out minutes);
+ }
+
+ private void AddMinutes(uint add)
+ {
+ if (!TryGetMinutes(MinutesLine.Text, out var minutes))
+ minutes = 0;
+
+ MinutesLine.Text = $"{minutes + add}";
+ UpdateButtons(minutes + add);
+ OnNamesChanged();
+ }
+
+ private void UpdateButtonsText(LineEditEventArgs obj)
+ {
+ if (!TryGetMinutes(obj.Text, out var minutes))
+ return;
+
+ UpdateButtons(minutes);
+ OnNamesChanged();
+ }
+
+ private void UpdateButtons(uint minutes)
+ {
+ HourButton.Text = $"+1h ({minutes / 60})";
+ }
+
+ private void OnNamesChanged()
+ {
+ SubmitButton.Disabled = string.IsNullOrEmpty(PlayerNameLine.Text) || !TryGetMinutes(MinutesLine.Text, out _);
+ }
+
+ private void OnPlayerSelectionChanged(PlayerInfo? player)
+ {
+ PlayerNameLine.Text = player?.Username ?? string.Empty;
+ OnNamesChanged();
+ }
+
+ private void OnSubmitButtonOnPressed(Dictionary roles)
+ {
+ IoCManager.Resolve().ExecuteCommand(
+ $"playtime_addrole {PlayerNameLine.Text} {roles[RoleOption.SelectedId]} {MinutesLine.Text}");
+ SaveButton.Disabled = false;
+ }
+
+ private void OnSaveButtonOnPressed()
+ {
+ IoCManager.Resolve().ExecuteCommand(
+ $"playtime_save {PlayerNameLine.Text}");
+ SaveButton.Disabled = true;
+ }
+}
diff --git a/Content.Server/Administration/Commands/PlayTimeCommands.cs b/Content.Server/Administration/Commands/PlayTimeCommands.cs
index dd64528a93..5dbbc5b25f 100644
--- a/Content.Server/Administration/Commands/PlayTimeCommands.cs
+++ b/Content.Server/Administration/Commands/PlayTimeCommands.cs
@@ -93,7 +93,7 @@ public sealed class PlayTimeAddRoleCommand : IConsoleCommand
}
_playTimeTracking.AddTimeToTracker(player, role, TimeSpan.FromMinutes(minutes));
- var time = _playTimeTracking.GetOverallPlaytime(player);
+ var time = _playTimeTracking.GetPlayTimeForTracker(player, role);
shell.WriteLine(Loc.GetString("cmd-playtime_addrole-succeed",
("username", userName),
("role", role),
diff --git a/Content.Server/Chemistry/ReagentEffects/HealthChange.cs b/Content.Server/Chemistry/ReagentEffects/HealthChange.cs
index 24880cfd37..6ca7c8cc44 100644
--- a/Content.Server/Chemistry/ReagentEffects/HealthChange.cs
+++ b/Content.Server/Chemistry/ReagentEffects/HealthChange.cs
@@ -2,7 +2,9 @@ using Content.Shared.Chemistry.Reagent;
using Content.Shared.Damage;
using Content.Shared.Damage.Prototypes;
using Content.Shared.FixedPoint;
+using Content.Shared.Inventory;
using Content.Shared.Localizations;
+using Content.Shared.Tag;
using JetBrains.Annotations;
using Robust.Shared.Prototypes;
using System.Linq;
@@ -35,6 +37,14 @@ namespace Content.Server.Chemistry.ReagentEffects
[JsonPropertyName("ignoreResistances")]
public bool IgnoreResistances = true;
+ ///
+ /// WD.
+ /// Whether this will work through hardsuits or not.
+ ///
+ [DataField]
+ [JsonPropertyName("pierceHardsuit")]
+ public bool PierceHardsuit = true;
+
protected override string ReagentEffectGuidebookText(IPrototypeManager prototype, IEntitySystemManager entSys)
{
var damages = new List();
@@ -112,6 +122,11 @@ namespace Content.Server.Chemistry.ReagentEffects
public override void Effect(ReagentEffectArgs args)
{
+ if (!PierceHardsuit &&
+ args.EntityManager.System().TryGetSlotEntity(args.SolutionEntity, "outerClothing", out var suit) &&
+ args.EntityManager.System().HasTag(suit.Value, "Hardsuit"))
+ return; // WD
+
var scale = ScaleByQuantity ? args.Quantity : FixedPoint2.New(1);
scale *= args.Scale;
diff --git a/Resources/Changelog/ChangelogWhite.yml b/Resources/Changelog/ChangelogWhite.yml
index e2868e5c17..be50fb0555 100644
--- a/Resources/Changelog/ChangelogWhite.yml
+++ b/Resources/Changelog/ChangelogWhite.yml
@@ -1,12 +1,4 @@
Entries:
-- author: RavMorgan
- changes:
- - message: "\u041A\u0430\u0441\u0442\u043E\u043C\u043D\u044B\u0435 \u043F\u0440\u0438\
- \u0437\u0440\u0430\u043A\u0438 \u0442\u0435\u043F\u0435\u0440\u044C \u0432\u0441\
- \u0435\u0433\u0434\u0430 \u0440\u0430\u0431\u043E\u0442\u0430\u044E\u0442!"
- type: Add
- id: 148
- time: '2023-04-28T11:59:36.0000000+00:00'
- author: RavMorgan
changes:
- message: "\u0420\u0430\u0437\u043C\u0435\u0440 \u0447\u0430\u0442\u0430 \u0442\
@@ -8919,3 +8911,17 @@
id: 647
time: '2025-01-01T13:55:57.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/855
+- author: BIG_Zi_348
+ changes:
+ - message: "\u0422\u0435\u043F\u0435\u0440\u044C \u0441\u0438\u043D\u0442\u0435\u043F\
+ \u043B\u043E\u0442\u044C, \u0441\u0443\u043B\u044C\u0444\u0430\u0434\u0438\u0430\
+ \u0437\u0438\u043D \u0441\u0435\u0440\u0435\u0431\u0440\u0430 \u0438 \u043A\u0440\
+ \u043E\u0432\u043E\u043E\u0441\u0442\u0430\u043D\u0430\u0432\u043B\u0438\u0432\
+ \u0430\u044E\u0449\u0430\u044F \u043F\u0443\u0434\u0440\u0430 \u043D\u0435 \u0440\
+ \u0430\u0431\u043E\u0442\u0430\u044E\u0442 \u043D\u0430 \u043F\u0435\u0440\u0441\
+ \u043E\u043D\u0430\u0436\u0430\u0445 \u0432 \u0441\u043A\u0430\u0444\u0430\u043D\
+ \u0434\u0440\u0430\u0445."
+ type: Tweak
+ id: 648
+ time: '2025-01-01T19:37:15.0000000+00:00'
+ url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/867
diff --git a/Resources/Locale/ru-RU/job/job-names.ftl b/Resources/Locale/ru-RU/job/job-names.ftl
index 4e8ec08c20..6c0d39b275 100644
--- a/Resources/Locale/ru-RU/job/job-names.ftl
+++ b/Resources/Locale/ru-RU/job/job-names.ftl
@@ -56,6 +56,7 @@ job-name-bomzh = бомж
# Role timers - Make these alphabetical or I cut you
JobAtmosphericTechnician = атмосферный техник
JobBartender = бармен
+JobBomzh = бомж
JobBorg = борг
JobBotanist = ботаник
JobBoxer = боксер
@@ -69,7 +70,7 @@ JobChiefEngineer = старший инженер
JobChiefMedicalOfficer = главный врач
JobClown = клоун
JobDetective = детектив
-JobBrigmedic = Бригмедик
+JobBrigmedic = бригмедик
JobERTEngineer = инженер ОБР
JobERTJanitor = уборщик ОБР
JobERTLeader = лидер ОБР
@@ -77,9 +78,11 @@ JobERTMedical = медик ОБР
JobERTSecurity = офицер безопасности ОБР
JobHeadOfPersonnel = глава персонала
JobHeadOfSecurity = глава службы безопасности
+JobInspector = инспектор
JobJanitor = уборщик
JobLawyer = юрист
JobLibrarian = библиотекарь
+JobMaid = прислуга
JobMedicalDoctor = врач
JobMedicalIntern = интерн
JobMime = мим
@@ -105,3 +108,4 @@ JobStationEngineer = инженер
JobTechnicalAssistant = технический ассистент
JobWarden = смотритель
JobZookeeper = зоотехник
+JobVisitor = посетитель
diff --git a/Resources/Locale/ru-RU/players/play-time/play-time-commands.ftl b/Resources/Locale/ru-RU/players/play-time/play-time-commands.ftl
index 427d2702c6..7ab62302b6 100644
--- a/Resources/Locale/ru-RU/players/play-time/play-time-commands.ftl
+++ b/Resources/Locale/ru-RU/players/play-time/play-time-commands.ftl
@@ -6,14 +6,14 @@ parse-session-fail = Не найдена сессия для '{ $username }'
# - playtime_addoverall
cmd-playtime_addoverall-desc = Добавляет указанное число минут к общему игровому времени игрока
cmd-playtime_addoverall-help = Использование: { $command }
-cmd-playtime_addoverall-succeed = Общее игровое время { $username } увеличено на { TOSTRING($time, "dddd\\:hh\\:mm") }.
+cmd-playtime_addoverall-succeed = Общее игровое время { $username } увеличено до { TOSTRING($time, "dddd\\:hh\\:mm") }.
cmd-playtime_addoverall-arg-user =
cmd-playtime_addoverall-arg-minutes =
cmd-playtime_addoverall-error-args = Ожидается ровно два аргумента
# - playtime_addrole
cmd-playtime_addrole-desc = Добавляет указанное число минут к времени игрока на определённой роли
cmd-playtime_addrole-help = Использование: { $command }
-cmd-playtime_addrole-succeed = Игровое время для { $username } / \'{ $role }\' увеличено на { TOSTRING($time, "dddd\\:hh\\:mm") }.
+cmd-playtime_addrole-succeed = Игровое время для { $username } / \'{ $role }\' увеличено до { TOSTRING($time, "dddd\\:hh\\:mm") }.
cmd-playtime_addrole-arg-user =
cmd-playtime_addrole-arg-role =
cmd-playtime_addrole-arg-minutes =
diff --git a/Resources/Locale/ru-RU/reagents/meta/medicine.ftl b/Resources/Locale/ru-RU/reagents/meta/medicine.ftl
index be9cfc81a0..012dba5f0b 100644
--- a/Resources/Locale/ru-RU/reagents/meta/medicine.ftl
+++ b/Resources/Locale/ru-RU/reagents/meta/medicine.ftl
@@ -151,5 +151,5 @@ reagent-desc-psicodine = Подавляет тревогу и прочие фо
reagent-name-potassium-iodide = йодистый калий
reagent-desc-potassium-iodide = Снижает поражающее действие от радиации на 90%. Только профилактическое применение.
-reagent-name-haloperidol = галоперидол
-reagent-desc-haloperidol = Выводит из организма большую часть стимулирующих или галлюцигенных химикатов. Вызывает сонливость.
\ No newline at end of file
+reagent-name-haloperidol = галоперидол
+reagent-desc-haloperidol = Выводит из организма большую часть стимулирующих или галлюцигенных химикатов. Вызывает сонливость.
diff --git a/Resources/Locale/ru-RU/ui/misc.ftl b/Resources/Locale/ru-RU/ui/misc.ftl
new file mode 100644
index 0000000000..daae4e3f54
--- /dev/null
+++ b/Resources/Locale/ru-RU/ui/misc.ftl
@@ -0,0 +1 @@
+Filter = Фильтр
diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
index 3dc8509c6e..11299d4d6c 100644
--- a/Resources/Prototypes/Reagents/medicine.yml
+++ b/Resources/Prototypes/Reagents/medicine.yml
@@ -1162,7 +1162,7 @@
conditions:
- !type:ReagentThreshold
min: 12
-
+
- type: reagent
id: Opporozidone #Name based of an altered version of the startreck chem "Opporozine"
name: reagent-name-opporozidone
@@ -1249,6 +1249,7 @@
effects:
- !type:HealthChange
scaleByQuantity: true
+ pierceHardsuit: false
damage:
groups:
Brute: -1.25
@@ -1280,6 +1281,7 @@
effects:
- !type:HealthChange
scaleByQuantity: true
+ pierceHardsuit: false
damage:
types:
Heat: -2
@@ -1307,6 +1309,7 @@
effects:
- !type:HealthChange
scaleByQuantity: true
+ pierceHardsuit: false
damage:
groups:
Brute: -2