Disable Psionics (Vault-Overseers#232)

Corvax-Frontier · Jun 28, 2024 · 9f5ebbb · 9f5ebbb
1 parent 8ab3b9d
commit 9f5ebbb
Show file tree

Hide file tree

Showing 44 changed files with 75 additions and 101 deletions.
diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs
@@ -2105,6 +2105,6 @@ public static readonly CVarDef<float>
         ///     Guaranteed psionics will still go through.
         /// </summary>
         public static readonly CVarDef<bool> PsionicRollsEnabled =
-            CVarDef.Create("psionics.rolls_enabled", true, CVar.SERVERONLY);
+            CVarDef.Create("psionics.rolls_enabled", false, CVar.SERVERONLY);
     }
 }
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml
@@ -81,8 +81,8 @@
   - type: ZombieImmune # No zombie servant
   - type: RandomMetadata
     nameSegments: [names_golem]
-  - type: PotentialPsionic
-  - type: Psionic
+  #- type: PotentialPsionic
+  #- type: Psionic
     removable: false
   # - type: PyrokinesisPower # Pending psionic rework
   - type: Grammar

diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/glimmer_creatures.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/glimmer_creatures.yml
@@ -22,8 +22,8 @@
         reagents:
         - ReagentId: Ectoplasm
           Quantity: 15
-  - type: PotentialPsionic
-  - type: Psionic
+  #- type: PotentialPsionic
+  #- type: Psionic
   - type: GlimmerSource
   - type: AmbientSound
     range: 6

diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml
@@ -26,4 +26,4 @@
   - type: NpcFactionMember
     factions:
     - NanoTrasen
-  - type: PotentialPsionic
+  #- type: PotentialPsionic
diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml
@@ -24,7 +24,7 @@
     - type: NpcFactionMember
       factions:
         - NanoTrasen
-    - type: PotentialPsionic
+    #- type: PotentialPsionic
     - type: Respirator
       damage:
        types:

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
@@ -118,7 +118,7 @@
   - type: Grammar
     attributes:
       gender: male
-  - type: PotentialPsionic # Nyano
+  #- type: PotentialPsionic # Nyano
 
 - type: entity
   id: MobRatKingBuff

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -121,10 +121,6 @@
     molsPerSecondPerUnitMass: 0.0005
   - type: Speech
     speechVerb: LargeMob
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
-    chance: -2
-  - type: Psionic #Nyano - Summary: makes psionic by default.
-    removable: false
 
 - type: entity
   name: Praetorian

diff --git a/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml
@@ -11,4 +11,4 @@
     damageRecovery:
       types:
         Asphyxiation: -0.5
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
+  #- type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
diff --git a/Resources/Prototypes/Entities/Mobs/Player/diona.yml b/Resources/Prototypes/Entities/Mobs/Player/diona.yml
@@ -11,7 +11,7 @@
       damageRecovery:
         types:
           Asphyxiation: -1.0
-    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
+    #- type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
 
 # Reformed Diona
 - type: entity

diff --git a/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
@@ -3,5 +3,3 @@
   name: Urist McHands The Dwarf
   parent: BaseMobDwarf
   id: MobDwarf
-  components:
-    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
diff --git a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
@@ -34,7 +34,7 @@
     - PsionicInterloper #Nyano - Summary: makes a part of the psionic faction.
   - type: Alerts
   - type: Familiar
-  - type: Psionic #Nyano - Summary: Makes psionic on creation.
+  #- type: Psionic #Nyano - Summary: Makes psionic on creation.
     removable: false
 
 - type: entity
@@ -90,9 +90,6 @@
   - type: MindContainer
     showExamineInfo: true
   - type: Familiar
-  - type: Dispellable
-  - type: Psionic #Nyano - Summary: makes psionic on creation.
-    removable: false
   - type: Vocal
     sounds:
       Male: Cerberus

diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml
@@ -3,8 +3,8 @@
   name: Urist McHands
   parent: BaseMobHuman
   id: MobHuman
-  components:
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
+  #components:
+  #- type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
 
 #Syndie
 - type: entity
@@ -48,9 +48,9 @@
   components:
     - type: NukeOperative
     - type: RandomHumanoidAppearance
-    - type: PsionicBonusChance #Nyano - Summary: makes more likely to be psionic.
-      multiplier: 7
-      warn: false
+    #- type: PsionicBonusChance #Nyano - Summary: makes more likely to be psionic.
+    #  multiplier: 7
+    #  warn: false
 
 - type: entity
   noSpawn: true
@@ -70,9 +70,9 @@
     - type: NpcFactionMember
       factions:
       - Syndicate
-    - type: PsionicBonusChance #Nyano - Summary: makes more likely to be psionic.
-      multiplier: 7
-      warn: false
+    #- type: PsionicBonusChance #Nyano - Summary: makes more likely to be psionic.
+    #  multiplier: 7
+    #  warn: false
 
 # Space Ninja
 - type: entity

diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -468,9 +468,9 @@
   id: NukeOp
   components:
     - type: NukeOperative
-    - type: PsionicBonusChance #Nyano - Summary: makes more likely to be psionic. 
-      multiplier: 7
-      warn: false
+    #- type: PsionicBonusChance #Nyano - Summary: makes more likely to be psionic.
+    #  multiplier: 7
+    #  warn: false
 
 - type: entity
   id: RandomHumanoidSpawnerCluwne

diff --git a/Resources/Prototypes/Entities/Mobs/Player/moth.yml b/Resources/Prototypes/Entities/Mobs/Player/moth.yml
@@ -1,7 +1,5 @@
 - type: entity
   save: false
   name: Urist McFluff
-  parent: BaseMobMoth  
+  parent: BaseMobMoth
   id: MobMoth
-  components:
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
diff --git a/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml
@@ -3,7 +3,5 @@
   name: Urisst' Mzhand
   parent: BaseMobReptilian
   id: MobReptilian
-  components:
-    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
 
 #Weh
diff --git a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml
@@ -8,7 +8,7 @@
     interactSuccessString: hugging-success-generic
     interactSuccessSound: /Audio/Effects/thudswoosh.ogg
     messagePerceivedByOthers: hugging-success-generic-others
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
+  #- type: PotentialPsionic #Nyano - Summary: makes potentially psionic.
 
 - type: entity
   name: skeleton pirate

diff --git a/Resources/Prototypes/Entities/Mobs/Player/slime.yml b/Resources/Prototypes/Entities/Mobs/Player/slime.yml
@@ -2,5 +2,3 @@
   save: false
   parent: BaseMobSlimePerson
   id: MobSlimePerson
-  components:
-    - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
diff --git a/Resources/Prototypes/Entities/Mobs/Player/vox.yml b/Resources/Prototypes/Entities/Mobs/Player/vox.yml
@@ -3,5 +3,3 @@
   name: Vox
   parent: BaseMobVox
   id: MobVox
-  components:
-  - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. 
diff --git a/Resources/Prototypes/Entities/Mobs/Species/golem.yml b/Resources/Prototypes/Entities/Mobs/Species/golem.yml
@@ -245,7 +245,7 @@
 #         clownedon:
 #           True: {visible: true}
 #           False: {visible: false}
-#   - type: Psionic
+#   #- type: Psionic
 #     removable: false
 #   - type: Laws
 #   - type: IntrinsicUI

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/item_artifacts.yml
@@ -59,7 +59,7 @@
     sprite: Objects/Specific/Xenoarchaeology/item_artifacts.rsi
     heldPrefix: ano01
   - type: Actions
-  - type: Psionic #Nyano - Summary: makes psionic on creation.
+  #- type: Psionic #Nyano - Summary: makes psionic on creation.
   - type: Construction
     graph: Artifact
     node: done

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml
@@ -54,7 +54,7 @@
           ano01_on: Rainbow
     - type: Appearance
     - type: Actions
-    - type: Psionic #Nyano - Summary: Makes psionic on creation.
+    #- type: Psionic #Nyano - Summary: Makes psionic on creation.
     - type: GuideHelp
       guides:
       - Xenoarchaeology

diff --git a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
@@ -47,8 +47,8 @@
   - type: EmitSoundOnSpawn
     sound:
       path: /Audio/Effects/teleport_arrival.ogg
-  - type: Psionic #Nyano - Summary: makes psionic on creation.
-  - type: GlimmerSource #Nyano - Summary: makes this a potential source of Glimmer. 
+  #- type: Psionic #Nyano - Summary: makes psionic on creation.
+  - type: GlimmerSource #Nyano - Summary: makes this a potential source of Glimmer.
     active: false
 
 - type: entity

diff --git a/Resources/Prototypes/Nuclear14/Roles/Jobs/factions.yml b/Resources/Prototypes/Nuclear14/Roles/Jobs/factions.yml
@@ -85,15 +85,14 @@
   - TownDeputy
   - TownSheriff
   - TownMayor
-  
+
 - type: department
   id: Zetan
   description: department-Zetan-description
   color: "#7ec133"
-  editorHidden: true
   roles:
   - Zetan
-  
+
 - type: department
   id: Followers
   description: department-Followers-description

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -5,7 +5,7 @@
   name: mystagogue's hardsuit helmet
   description: Lightweight hardsuit helmet that has a galaxy-first psionic passthrough system.
   components:
-  - type: Psionic
+  #- type: Psionic
   - type: TinfoilHat
     passthrough: true
     destroyOnFry: false

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Clothing/psionic_clothing.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/psionic_clothing.yml
@@ -11,7 +11,7 @@
   - type: VisionCorrection
   - type: ClothingGrantPsionicPower
     power: TelegnosisPower
-  - type: Psionic
+  #- type: Psionic
 
 - type: entity
   id: BedsheetInvisibilityCloak
@@ -25,7 +25,7 @@
     sprite: Clothing/Neck/Bedsheets/black.rsi
   - type: ClothingGrantPsionicPower
     power: PsionicInvisibilityPower
-  - type: Psionic
+  #- type: Psionic
 
 - type: entity
   parent: ClothingHandsBase
@@ -45,7 +45,7 @@
   - type: FingerprintMask
   - type: ClothingGrantPsionicPower
     power: DispelPower
-  - type: Psionic
+  #- type: Psionic
 
 - type: entity
   parent: ClothingHandsBase
@@ -63,4 +63,4 @@
   - type: FingerprintMask
   - type: ClothingGrantPsionicPower
     power: NoosphericZapPower
-  - type: Psionic
+  #- type: Psionic
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/NPCs/mutants.yml
@@ -143,8 +143,8 @@
 #     bloodReagent: DemonsBlood
 #   - type: Body
 #     prototype: VampiricAnimalLarge
-#   - type: PotentialPsionic
-#   - type: Psionic
+#   #- type: PotentialPsionic
+#   #- type: Psionic
 #     removable: false
 #   - type: MetapsionicPower
 #   - type: MeleeWeapon

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml
@@ -32,4 +32,4 @@
   - type: NpcFactionMember
     factions:
     - NanoTrasen
-  - type: PotentialPsionic
+  #- type: PotentialPsionic
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml
@@ -49,5 +49,5 @@
   - type: NpcFactionMember
     factions:
     - NanoTrasen
-  - type: PotentialPsionic
+  #- type: PotentialPsionic
 
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/special.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/special.yml
@@ -14,7 +14,7 @@
     layers:
       - state: eyeball
         shader: unshaded
-  - type: Psionic
+  #- type: Psionic
   - type: MindContainer
   - type: Clickable
   - type: InteractionOutline

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Research/crystals.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Research/crystals.yml
@@ -23,7 +23,7 @@
 #     state: bluespace
 #     color: purple
 #   - type: Speech
-#   - type: Psionic
+#   #- type: Psionic
 #   - type: SoulCrystal
 #   - type: SolutionContainerManager
 #     solutions:

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml
@@ -22,4 +22,4 @@
             NoMind: { state: pod_1 }
             Gore: { state: pod_1 }
             Idle: { state: pod_0 }
-    - type: Psionic
+    #- type: Psionic
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/glimmer_prober.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/glimmer_prober.yml
@@ -4,7 +4,7 @@
   name: glimmer prober
   description: Probes the noösphere to generate research points. Might be worth turning off if glimmer is a problem.
   components:
-  - type: Psionic
+  #- type: Psionic
   - type: GlimmerSource
   - type: Construction
     graph: GlimmerDevices
@@ -90,7 +90,7 @@
   name: glimmer drain
   description: Uses electricity to try and sort out the noösphere, reducing its level of entropy.
   components:
-  - type: Psionic
+  #- type: Psionic
   - type: GlimmerSource
     addToGlimmer: false
   - type: Construction

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml
@@ -16,7 +16,7 @@
   - type: Oracle
   - type: Speech
     speechSounds: Tenor
-  - type: Psionic
+  #- type: Psionic
   - type: SolutionContainerManager
     solutions:
       fountain:

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml
@@ -27,8 +27,8 @@
     channels:
     - Common
     - Science
-  - type: PotentialPsionic #this makes her easier to access for glimmer events, dw about it
-  - type: Psionic
+  #- type: PotentialPsionic #this makes her easier to access for glimmer events, dw about it
+  #- type: Psionic
   - type: Grammar
     attributes:
       gender: female

diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
@@ -22,7 +22,7 @@
   special:
   - !type:AddComponentSpecial
     components:
-    - type: Psionic
+    #- type: Psionic
     - type: MetapsionicPower
   setPreference: false