From ff7713eceaac2b9439528643f41c69ce4c243a8d Mon Sep 17 00:00:00 2001 From: B_Kirill <153602297+B-Kirill@users.noreply.github.com> Date: Fri, 25 Jul 2025 22:01:37 +1000 Subject: [PATCH 01/10] Admin logs for batteries UI (#39208) --- .../Power/EntitySystems/BatteryInterfaceSystem.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs b/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs index 6ce19cfaf6..33e3f8ff2c 100644 --- a/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs +++ b/Content.Server/Power/EntitySystems/BatteryInterfaceSystem.cs @@ -1,4 +1,6 @@ -using Content.Server.Power.Components; +using Content.Server.Administration.Logs; +using Content.Server.Power.Components; +using Content.Shared.Database; using Content.Shared.Power; using Robust.Server.GameObjects; @@ -19,6 +21,7 @@ namespace Content.Server.Power.EntitySystems; /// public sealed class BatteryInterfaceSystem : EntitySystem { + [Dependency] private readonly IAdminLogManager _adminLog = default!; [Dependency] private readonly UserInterfaceSystem _uiSystem = null!; public override void Initialize() @@ -43,12 +46,16 @@ public sealed class BatteryInterfaceSystem : EntitySystem { var netBattery = Comp(ent); netBattery.CanCharge = args.On; + + _adminLog.Add(LogType.Action,$"{ToPrettyString(args.Actor):actor} set input breaker to {args.On} on {ToPrettyString(ent):target}"); } private void HandleSetOutputBreaker(Entity ent, ref BatterySetOutputBreakerMessage args) { var netBattery = Comp(ent); netBattery.CanDischarge = args.On; + + _adminLog.Add(LogType.Action,$"{ToPrettyString(args.Actor):actor} set output breaker to {args.On} on {ToPrettyString(ent):target}"); } private void HandleSetChargeRate(Entity ent, ref BatterySetChargeRateMessage args) From a8db9df2812d06b60f4f61fccfad4f6c54f057a5 Mon Sep 17 00:00:00 2001 From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Fri, 25 Jul 2025 18:04:26 +0200 Subject: [PATCH 02/10] Change potassium-water explosion scaling (#37924) --- Resources/Prototypes/Recipes/Reactions/chemicals.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml index cdd5659c7e..1f53845c4a 100644 --- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml +++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml @@ -112,10 +112,10 @@ effects: - !type:ExplosionReactionEffect explosionType: Default - maxIntensity: 100 - intensityPerUnit: 0.5 # 50+50 reagent for maximum explosion - intensitySlope: 4 + intensityPerUnit: 0.25 maxTotalIntensity: 100 + intensitySlope: 4 + maxIntensity: 7 - type: reaction id: Smoke From ae276eb237cf25f0c9adab0c4f52e11e5b943a68 Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 25 Jul 2025 16:05:36 +0000 Subject: [PATCH 03/10] Automatic changelog update --- Resources/Changelog/Changelog.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 29be0a679d..1b4f8e57d4 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,13 +1,4 @@ Entries: -- author: Entvari - changes: - - message: Added a new Wizard headset. - type: Add - - message: The Wizard now starts with the Wizard headset. - type: Tweak - id: 8295 - time: '2025-04-20T21:38:30.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/35732 - author: aada changes: - message: Filter categories added to the circuit imprinter. @@ -3911,3 +3902,11 @@ id: 8806 time: '2025-07-24T11:24:19.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/39177 +- author: SlamBamActionman + changes: + - message: Potassium-water explosion damage scaling has been tweaked to be less + potent. + type: Tweak + id: 8807 + time: '2025-07-25T16:04:27.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/37924 From d3cdae5a9271f1de3355e2e22b0aa423502c5230 Mon Sep 17 00:00:00 2001 From: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Date: Fri, 25 Jul 2025 18:33:44 +0200 Subject: [PATCH 04/10] Change smoke/foam/explosion chemistry reaction order & energy transfer (#37915) --- .../Prototypes/Recipes/Reactions/chemicals.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml index 1f53845c4a..959488376c 100644 --- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml +++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml @@ -104,6 +104,7 @@ id: PotassiumExplosion impact: High priority: 20 + conserveEnergy: false reactants: Water: amount: 1 @@ -119,8 +120,9 @@ - type: reaction id: Smoke - priority: 10 + priority: -10 impact: High + conserveEnergy: false reactants: Phosphorus: amount: 1 @@ -137,8 +139,9 @@ - type: reaction id: Foam - priority: 10 + priority: -10 impact: High + conserveEnergy: false reactants: Fluorosurfactant: amount: 1 @@ -154,7 +157,8 @@ - type: reaction id: IronMetalFoam impact: High - priority: 10 + priority: -10 + conserveEnergy: false reactants: Iron: amount: 3 @@ -172,7 +176,8 @@ - type: reaction id: AluminiumMetalFoam impact: High - priority: 10 + priority: -10 + conserveEnergy: false reactants: Aluminium: amount: 3 @@ -191,6 +196,7 @@ id: UraniumEmpExplosion impact: High priority: 20 + conserveEnergy: false reactants: Iron: amount: 1 @@ -209,6 +215,7 @@ id: Flash impact: High priority: 20 + conserveEnergy: false reactants: Aluminium: amount: 1 From f501b1b57fe1881fca3f908edcf0308595ee9a2a Mon Sep 17 00:00:00 2001 From: PJBot Date: Fri, 25 Jul 2025 16:34:51 +0000 Subject: [PATCH 05/10] Automatic changelog update --- Resources/Changelog/Changelog.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 1b4f8e57d4..ac65d360ea 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -1,11 +1,4 @@ Entries: -- author: aada - changes: - - message: Filter categories added to the circuit imprinter. - type: Add - id: 8296 - time: '2025-04-20T22:27:49.0000000+00:00' - url: https://github.com/space-wizards/space-station-14/pull/35713 - author: ScarKy0 changes: - message: Mail spawning has been reworked. The mail teleporter now has to be manually @@ -3910,3 +3903,13 @@ id: 8807 time: '2025-07-25T16:04:27.0000000+00:00' url: https://github.com/space-wizards/space-station-14/pull/37924 +- author: SlamBamActionman + changes: + - message: Chemistry foam and smoke reactions now trigger after regular mix reactions. + type: Tweak + - message: Foam, smoke and explosion reactions no longer transfer the reagents' + energies to the container. + type: Tweak + id: 8808 + time: '2025-07-25T16:33:44.0000000+00:00' + url: https://github.com/space-wizards/space-station-14/pull/37915 From b4e81cb8f22b4856a42f3fe4f85e895a57bea02e Mon Sep 17 00:00:00 2001 From: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Date: Fri, 25 Jul 2025 18:53:01 +0200 Subject: [PATCH 06/10] Admin Tool: Observe entities in an extra viewport (#36969) * camera * add console command * change verb name to camera * placeholder text * add button to player panel * orks are indeed the best * visibility flag fix * not a datafield * more follower fixes * more cleanup * add zooming * resizing real * remove commented out code * remove AddForceSend * comment * Use OS window and add some comments * fix comments and variable name * Needs RT update * Minor grammarchange * Fix warning * Cleanup * almost working... * fix bug * oswindow update * Remove need for RequestClosed. --------- Co-authored-by: beck-thompson Co-authored-by: PJB3005 --- .../UI/AdminCamera/AdminCameraControl.xaml | 20 +++ .../UI/AdminCamera/AdminCameraControl.xaml.cs | 101 +++++++++++++++ .../UI/AdminCamera/AdminCameraEui.cs | 117 ++++++++++++++++++ .../UI/AdminCamera/AdminCameraWindow.xaml | 6 + .../UI/AdminCamera/AdminCameraWindow.xaml.cs | 23 ++++ .../UI/PlayerPanel/PlayerPanel.xaml | 1 + .../UI/PlayerPanel/PlayerPanel.xaml.cs | 41 +++--- .../UI/PlayerPanel/PlayerPanelEui.cs | 5 +- .../Administration/Commands/CameraCommand.cs | 58 +++++++++ .../Administration/Systems/AdminVerbSystem.cs | 16 +++ .../Administration/UI/AdminCameraEui.cs | 97 +++++++++++++++ .../Administration/AdminCameraEuiState.cs | 27 ++++ Content.Shared/Eye/VisibilityFlags.cs | 7 +- Content.Shared/Follower/FollowerSystem.cs | 3 + .../en-US/administration/admin-verbs.ftl | 2 + .../en-US/administration/commands/camera.ftl | 5 + .../administration/ui/admin-camera-window.ftl | 5 + .../en-US/administration/ui/player-panel.ftl | 1 + .../Entities/Interface/admin_tools.yml | 14 +++ 19 files changed, 525 insertions(+), 24 deletions(-) create mode 100644 Content.Client/Administration/UI/AdminCamera/AdminCameraControl.xaml create mode 100644 Content.Client/Administration/UI/AdminCamera/AdminCameraControl.xaml.cs create mode 100644 Content.Client/Administration/UI/AdminCamera/AdminCameraEui.cs create mode 100644 Content.Client/Administration/UI/AdminCamera/AdminCameraWindow.xaml create mode 100644 Content.Client/Administration/UI/AdminCamera/AdminCameraWindow.xaml.cs create mode 100644 Content.Server/Administration/Commands/CameraCommand.cs create mode 100644 Content.Server/Administration/UI/AdminCameraEui.cs create mode 100644 Content.Shared/Administration/AdminCameraEuiState.cs create mode 100644 Resources/Locale/en-US/administration/commands/camera.ftl create mode 100644 Resources/Locale/en-US/administration/ui/admin-camera-window.ftl create mode 100644 Resources/Prototypes/Entities/Interface/admin_tools.yml diff --git a/Content.Client/Administration/UI/AdminCamera/AdminCameraControl.xaml b/Content.Client/Administration/UI/AdminCamera/AdminCameraControl.xaml new file mode 100644 index 0000000000..1413eff00c --- /dev/null +++ b/Content.Client/Administration/UI/AdminCamera/AdminCameraControl.xaml @@ -0,0 +1,20 @@ + + + + + + + + + +