From f37060fc1be72e809730ad39f3ed849796168327 Mon Sep 17 00:00:00 2001 From: Flareguy <78941145+Flareguy@users.noreply.github.com> Date: Fri, 7 Jun 2024 21:15:13 -0500 Subject: [PATCH] Ports the singularity's values from vgstation (#28720) * ports the singularity values from vgstation * guidebook fix * 5000 energy level 6 singulo --- .../EntitySystems/SingularitySystem.cs | 20 ++++++++++--------- .../Guidebook/Engineering/Singularity.xml | 3 +-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Content.Server/Singularity/EntitySystems/SingularitySystem.cs b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs index de7df32374..b273b2099d 100644 --- a/Content.Server/Singularity/EntitySystems/SingularitySystem.cs +++ b/Content.Server/Singularity/EntitySystems/SingularitySystem.cs @@ -132,10 +132,12 @@ public sealed class SingularitySystem : SharedSingularitySystem singularity.Energy = value; SetLevel(uid, value switch { - >= 2400 => 6, - >= 1600 => 5, - >= 900 => 4, - >= 300 => 3, + // Normally, a level 6 singularity requires the supermatter + 3000 energy. + // The required amount of energy has been bumped up to compensate for the lack of the supermatter. + >= 5000 => 6, + >= 2000 => 5, + >= 1000 => 4, + >= 500 => 3, >= 200 => 2, > 0 => 1, _ => 0 @@ -319,11 +321,11 @@ public sealed class SingularitySystem : SharedSingularitySystem { comp.EnergyDrain = args.NewValue switch { - 6 => 20, - 5 => 15, - 4 => 12, - 3 => 8, - 2 => 2, + 6 => 0, + 5 => 0, + 4 => 20, + 3 => 10, + 2 => 5, 1 => 1, _ => 0 }; diff --git a/Resources/ServerInfo/Guidebook/Engineering/Singularity.xml b/Resources/ServerInfo/Guidebook/Engineering/Singularity.xml index 3c0dd665e2..6881452278 100644 --- a/Resources/ServerInfo/Guidebook/Engineering/Singularity.xml +++ b/Resources/ServerInfo/Guidebook/Engineering/Singularity.xml @@ -88,8 +88,7 @@ [color=red]Do not[/color] turn the PA on unless all the other subsystems are working properly and there is enough power to start the engine. - Turn power on using the PA control computer. Set the strength to an appropiate level. Currently the only appropriate level is [color=#f0684d]1[/color]; anything above that will ensure that singularity grows too strong to handle. - The higher the output stength is set on PA control computer, the bigger the singularity will be. + Turn power on using the PA control computer. Set the strength to an appropiate level. The higher the output stength is set on PA control computer, the bigger the singularity will be. Currently, the output power does not affect the ball lightning, beyond giving the ball lightning extra orbs around it. -- 2.51.2