From ed54c26b56b8280490625c4d82885d041ebc607a Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Fri, 10 Jan 2025 14:18:10 -0500 Subject: [PATCH 01/17] Glimmer Rework --- .../Cartridges/GlimmerMonitorUiFragment.xaml | 1 + .../GlimmerMonitorUiFragment.xaml.cs | 16 +- .../AnomalyPowerSystem.EntitySpawn.cs | 2 +- .../Abilities/HealOtherPowerSystem.cs | 14 +- .../Abilities/Psionics/AnomalyPowerSystem.cs | 4 +- .../PsionicAbilitiesSystem.Functions.cs | 4 +- .../Chapel/SacrificialAltarSystem.cs | 2 +- Content.Server/Chat/TelepathicChatSystem.cs | 8 +- .../ChangeGlimmerReactionEffect.cs | 6 +- .../RaiseGlimmerConditionComponent.cs | 8 +- .../Systems/RaiseGlimmerConditionSystem.cs | 6 +- .../SophicScribe/SophicScribeSystem.cs | 8 +- .../Psionics/Glimmer/GlimmerCommands.cs | 8 +- .../Psionics/Glimmer/GlimmerReactiveSystem.cs | 18 +- .../Glimmer/PassiveGlimmerReductionSystem.cs | 98 ++++----- .../Structures/GlimmerSourceComponent.cs | 59 ++++-- .../Structures/GlimmerStructuresSystem.cs | 70 +++++- Content.Server/Psionics/PsionicsSystem.cs | 3 +- .../Research/Oracle/OracleSystem.cs | 2 +- .../Components/NoosphericFryRuleComponent.cs | 5 + .../StationEvents/EventManagerSystem.cs | 4 +- .../StationEvents/Events/FreeProberRule.cs | 2 +- .../Events/GlimmerEventSystem.cs | 42 ++-- .../StationEvents/Events/NoosphericFryRule.cs | 4 +- .../Events/NoosphericStormRule.cs | 5 +- .../Systems/ArtifactAnalyzerSystem.cs | 2 +- Content.Shared/CCVar/CCVars.cs | 8 +- .../Chapel/SacrificialAltarComponent.cs | 2 +- .../Psionics/Glimmer/GlimmerSystem.cs | 199 ++++++++++++++---- .../Psionics/SharedPsionicAbilitiesSystem.cs | 4 +- Resources/Locale/en-US/guidebook/psionics.ftl | 4 + .../DeltaV/Entities/Mobs/NPCs/familiars.yml | 1 + .../Entities/Mobs/NPCs/elemental.yml | 3 + .../Entities/Mobs/NPCs/glimmer_creatures.yml | 3 + .../Entities/Mobs/NPCs/revenant.yml | 1 + .../Prototypes/Entities/Mobs/NPCs/xeno.yml | 1 + .../Entities/Mobs/Player/familiars.yml | 2 + .../Entities/Mobs/Player/guardian.yml | 2 + .../Entities/Objects/Misc/books.yml | 23 ++ .../Objects/Specific/Medical/healing.yml | 4 + .../Objects/Specific/Research/misc.yml | 4 +- .../Machines/metempsychoticMachine.yml | 2 + .../Entities/Structures/Specific/oracle.yml | 3 + Resources/Prototypes/Guidebook/psionics.yml | 35 +++ Resources/Prototypes/Guidebook/science.yml | 7 - Resources/Prototypes/Guidebook/ss14.yml | 1 + .../Prototypes/Loadouts/Generic/head.yml | 1 + .../Loadouts/Jobs/Epistemics/acolyte.yml | 1 + .../Loadouts/Jobs/Epistemics/cataloger.yml | 1 + .../Loadouts/Jobs/Epistemics/chaplain.yml | 1 + .../Loadouts/Jobs/Epistemics/golemancer.yml | 1 + .../Loadouts/Jobs/Epistemics/mystagogue.yml | 1 + .../Loadouts/Jobs/Epistemics/mystic.yml | 1 + .../Loadouts/Jobs/Epistemics/noviciate.yml | 1 + .../Jobs/Epistemics/psionicMantis.yml | 2 + .../Loadouts/Jobs/Security/uncategorized.yml | 1 + .../Catalog/Fills/Boxes/ammunition.yml | 3 + .../Clothing/Head/hardsuit-helmets.yml | 2 + .../Entities/Clothing/Head/hats.yml | 5 + .../Entities/Clothing/psionic_clothing.yml | 8 + .../Entities/Mobs/Player/special.yml | 2 + .../Objects/Specific/Medical/pills.yml | 6 + .../Guns/Ammunition/Cartridges/shotgun.yml | 4 +- .../Structures/Research/glimmer_prober.yml | 8 + .../Structures/Research/sophicscribe.yml | 3 + .../Nyanotrasen/GameRules/events.yml | 31 +-- .../Nyanotrasen/Guidebook/epistemics.yml | 5 - .../Roles/Jobs/Epistemics/forensicmantis.yml | 2 +- .../Roles/Jobs/Civilian/chaplain.yml | 1 + .../Roles/Jobs/Civilian/librarian.yml | 2 +- .../Roles/Jobs/Science/research_assistant.yml | 1 + .../Roles/Jobs/Science/research_director.yml | 3 +- .../Roles/Jobs/Science/roboticist.yml | 1 + .../Roles/Jobs/Science/scientist.yml | 1 + .../Roles/Jobs/Science/senior_researcher.yml | 1 + .../Psionics}/Altar.xml | 0 .../ServerInfo/Guidebook/Psionics/Glimmer.xml | 74 +++++++ .../GlimmerCreatures.xml | 0 .../Guidebook/Psionics/Mindbreaking.xml | 17 ++ .../Guidebook/Psionics/PsionicInsulation.xml | 14 ++ .../Guidebook/Psionics/Psionics.xml | 53 +++++ 81 files changed, 718 insertions(+), 250 deletions(-) create mode 100644 Resources/Locale/en-US/guidebook/psionics.ftl create mode 100644 Resources/Prototypes/Guidebook/psionics.yml rename Resources/ServerInfo/{Nyanotrasen/Guidebook/Epistemics => Guidebook/Psionics}/Altar.xml (100%) create mode 100644 Resources/ServerInfo/Guidebook/Psionics/Glimmer.xml rename Resources/ServerInfo/Guidebook/{DeltaV/Epistemics => Psionics}/GlimmerCreatures.xml (100%) create mode 100644 Resources/ServerInfo/Guidebook/Psionics/Mindbreaking.xml create mode 100644 Resources/ServerInfo/Guidebook/Psionics/PsionicInsulation.xml create mode 100644 Resources/ServerInfo/Guidebook/Psionics/Psionics.xml diff --git a/Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml b/Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml index e09a422ddf7..7dcd993f807 100644 --- a/Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml +++ b/Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml @@ -3,6 +3,7 @@