Added #nyanotrasen code or //Nyanotrasen code to many, many files.

DeltaV-Station · Oct 5, 2023 · 276dcb3 · 276dcb3
1 parent 268273f
commit 276dcb3
Show file tree

Hide file tree

Showing 33 changed files with 47 additions and 43 deletions.
diff --git a/Content.Client/Chat/Managers/ChatManager.cs b/Content.Client/Chat/Managers/ChatManager.cs
@@ -67,6 +67,7 @@ public void SendMessage(string text, ChatSelectChannel channel)
                     _consoleHost.ExecuteCommand($"whisper \"{CommandParsing.Escape(str)}\"");
                     break;
 
+                //Nyanotrasen code. 
                 case ChatSelectChannel.Telepathic:
                     _consoleHost.ExecuteCommand($"tsay \"{CommandParsing.Escape(str)}\"");
                     break;

diff --git a/Content.Server/Anomaly/AnomalySystem.Psionics.cs b/Content.Server/Anomaly/AnomalySystem.Psionics.cs
@@ -1,4 +1,4 @@
-using Content.Server.Abilities.Psionics;
+using Content.Server.Abilities.Psionics; //Nyanotrasen code.
 using Content.Shared.Anomaly;
 using Content.Shared.Anomaly.Components;
 using Robust.Shared.Random;
@@ -15,6 +15,7 @@ private void InitializePsionics()
         SubscribeLocalEvent<AnomalyComponent, DispelledEvent>(OnDispelled);
     }
 
+    //Nyanotrasen code.
     private void OnDispelled(EntityUid uid, AnomalyComponent component, DispelledEvent args)
     {
         _dispel.DealDispelDamage(uid);

diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -242,6 +242,7 @@ public void TrySendInGameICMessage(
             case InGameICChatType.Emote:
                 SendEntityEmote(source, message, range, nameOverride, hideLog: hideLog, ignoreActionBlocker: ignoreActionBlocker);
                 break;
+            //Nyanotrasen code case. 
             case InGameICChatType.Telepathic:
                 _nyanoChatSystem.SendTelepathicChat(source, message, range == ChatTransmitRange.HideChat);
                 break;
@@ -875,7 +876,7 @@ public enum InGameICChatType : byte
     Speak,
     Emote,
     Whisper,
-    Telepathic
+    Telepathic //Nyanotrasen code
 }
 
 /// <summary>

diff --git a/Content.Server/NPC/Systems/NpcFactionSystem.cs b/Content.Server/NPC/Systems/NpcFactionSystem.cs
@@ -6,6 +6,7 @@ namespace Content.Server.NPC.Systems;
 
 /// <summary>
 ///     Outlines faction relationships with each other.
+///     part of psionics rework was making this a partial class. Should've already been handled upstream, based on the linter. 
 /// </summary>
 public sealed partial class NpcFactionSystem : EntitySystem
 {

diff --git a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
@@ -13,7 +13,7 @@
 using Robust.Shared.Map.Components;
 using Robust.Shared.Physics.Events;
 using Robust.Shared.Timing;
-using Content.Shared.Abilities.Psionics;
+using Content.Shared.Abilities.Psionics; //Nyanotrasen code. 
 
 namespace Content.Server.Singularity.EntitySystems;
 

diff --git a/Content.Server/StationEvents/EventManagerSystem.cs b/Content.Server/StationEvents/EventManagerSystem.cs
@@ -17,7 +17,7 @@ public sealed class EventManagerSystem : EntitySystem
     [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] public readonly GameTicker GameTicker = default!;
-    [Dependency] private readonly GlimmerSystem _glimmerSystem = default!;
+    [Dependency] private readonly GlimmerSystem _glimmerSystem = default!; //Nyanotrasen code.
 
     private ISawmill _sawmill = default!;
 

diff --git a/Content.Shared.Database/LogType.cs b/Content.Shared.Database/LogType.cs
@@ -89,6 +89,6 @@ public enum LogType
     ItemConfigure = 84,
     DeviceLinking = 85,
     Tile = 86,
-    BagOfHolding = 420,
-    Psionics = 421,
+    BagOfHolding = 420, //Nyanotrasen code.
+    Psionics = 421, //Nyanotrasen code.
 }
diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
@@ -1955,7 +1955,7 @@
   - type: NpcFactionMember
     factions:
     - SimpleHostile
-    - PsionicInterloper
+    - PsionicInterloper #Nyanotrasen code.
   - type: InteractionPopup
     successChance: 0 # Override the automatic success that would normally be inherited from MobCorgi.
     interactSuccessString: petting-success-corrupted-corgi # Normally impossible but added an easter egg just in case.

diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml
@@ -121,9 +121,9 @@
     molsPerSecondPerUnitMass: 0.0005
   - type: Speech
     speechVerb: LargeMob
-  - type: PotentialPsionic
+  - type: PotentialPsionic #Nyanotrasen code.
     chance: -2
-  - type: Psionic
+  - type: Psionic #Nyanotrasen code.
 
 - 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
+  - type: PotentialPsionic #Nyanotrasen code.
diff --git a/Resources/Prototypes/Entities/Mobs/Player/diona.yml b/Resources/Prototypes/Entities/Mobs/Player/diona.yml
@@ -11,4 +11,4 @@
       damageRecovery:
         types:
           Asphyxiation: -1.0
-    - type: PotentialPsionic
+    - type: PotentialPsionic #Nyanotrasen code.
diff --git a/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml
@@ -4,4 +4,4 @@
   parent: BaseMobDwarf
   id: MobDwarf
   components:
-    - type: PotentialPsionic
+    - type: PotentialPsionic #Nyanotrasen code.
diff --git a/Resources/Prototypes/Entities/Mobs/Player/familiars.yml b/Resources/Prototypes/Entities/Mobs/Player/familiars.yml
@@ -28,10 +28,10 @@
   - type: NpcFactionMember
     factions:
     - PetsNT
-    - PsionicInterloper
+    - PsionicInterloper #Nyanotrasen code.
   - type: Alerts
   - type: Familiar
-  - type: Psionic
+  - type: Psionic #Nyanotrasen code.
     removable: false
 
 - type: entity
@@ -61,7 +61,7 @@
   - type: NpcFactionMember
     factions:
     - SimpleNeutral
-    - PsionicInterloper
+    - PsionicInterloper #Nyanotrasen code.
   - type: InteractionPopup
     successChance: 0.5
     interactSuccessString: petting-success-corrupted-corgi
@@ -86,7 +86,7 @@
     showExamineInfo: true
   - type: Familiar
   - type: Dispellable
-  - type: Psionic
+  - type: Psionic #Nyanotrasen code.
     removable: false
   - type: Vocal
     sounds:

diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml
@@ -4,7 +4,7 @@
   parent: BaseMobHuman
   id: MobHuman
   components:
-  - type: PotentialPsionic
+  - type: PotentialPsionic #Nyanotrasen code.
 
 #Syndie
 - type: entity
@@ -36,7 +36,7 @@
   components:
     - type: NukeOperative
     - type: RandomHumanoidAppearance
-    - type: PsionicBonusChance
+    - type: PsionicBonusChance #Nyanotrasen code.
       multiplier: 7
       warn: false
 
@@ -58,7 +58,7 @@
     - type: NpcFactionMember
       factions:
       - Syndicate
-    - type: PsionicBonusChance
+    - type: PsionicBonusChance #Nyanotrasen code.
       multiplier: 7
       warn: false
 

diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml
@@ -355,7 +355,7 @@
   id: NukeOp
   components:
     - type: NukeOperative
-    - type: PsionicBonusChance
+    - type: PsionicBonusChance #Nyanotrasen code.
       multiplier: 7
       warn: false
 

diff --git a/Resources/Prototypes/Entities/Mobs/Player/moth.yml b/Resources/Prototypes/Entities/Mobs/Player/moth.yml
@@ -4,4 +4,4 @@
   parent: BaseMobMoth  
   id: MobMoth
   components:
-  - type: PotentialPsionic
+  - type: PotentialPsionic #Nyanotrasen code.
diff --git a/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml
@@ -4,6 +4,6 @@
   parent: BaseMobReptilian
   id: MobReptilian
   components:
-    - type: PotentialPsionic
+    - type: PotentialPsionic #Nyanotrasen code.
 
 #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
+  - type: PotentialPsionic #Nyanotrasen code.
 
 - type: entity
   name: Skeleton Pirate

diff --git a/Resources/Prototypes/Entities/Mobs/Player/slime.yml b/Resources/Prototypes/Entities/Mobs/Player/slime.yml
@@ -3,4 +3,4 @@
   parent: BaseMobSlimePerson
   id: MobSlimePerson
   components:
-    - type: PotentialPsionic
+    - type: PotentialPsionic #Nyanotrasen code.
diff --git a/Resources/Prototypes/Entities/Mobs/Player/vox.yml b/Resources/Prototypes/Entities/Mobs/Player/vox.yml
@@ -4,4 +4,4 @@
   parent: BaseMobVox
   id: MobVox
   components:
-  - type: PotentialPsionic
+  - type: PotentialPsionic #Nyanotrasen code.
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -138,8 +138,8 @@
     - TemporaryBlindness
     - Pacified
     - StaminaModifier
-    - PsionicsDisabled
-    - PsionicallyInsulated
+    - PsionicsDisabled #Nyanotrasen code.
+    - PsionicallyInsulated #Nyanotrasen code.
   - type: Reflect
     enabled: false
     reflectProb: 0

diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -20,7 +20,7 @@
     spawned:
     - id: FoodMeatHuman
       amount: 5
-  - type: PotentialPsionic
+  - type: PotentialPsionic #Nyanotrasen code.
 
 - type: entity
   parent: BaseSpeciesDummy

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml b/Resources/Prototypes/Entities/Objects/Specific/Xenoarchaeology/structure_artifacts.yml
@@ -55,7 +55,7 @@
           ano01_on: Rainbow
     - type: Appearance
     - type: Actions
-    - type: Psionic
+    - type: Psionic #Nyanotrasen code.
     - type: GuideHelp
       guides:
       - Xenoarchaeology

diff --git a/Resources/Prototypes/Entities/Structures/Specific/anomalies.yml b/Resources/Prototypes/Entities/Structures/Specific/anomalies.yml
@@ -47,8 +47,8 @@
   - type: EmitSoundOnSpawn
     sound:
       path: /Audio/Effects/teleport_arrival.ogg
-  - type: Psionic
-  - type: GlimmerSource
+  - type: Psionic #Nyanotrasen code.
+  - type: GlimmerSource #Nyanotrasen code.
     active: false
 
 - type: entity

diff --git a/Resources/Prototypes/Reagents/medicine.yml b/Resources/Prototypes/Reagents/medicine.yml
@@ -11,16 +11,16 @@
       metabolismRate: 0.1
       effects:
       - !type:GenericStatusEffect
-        key: PsionicallyInsulated
-        component: PsionicInsulation
+        key: PsionicallyInsulated #Nyanotrasen code.
+        component: PsionicInsulation #Nyanotrasen code.
         type: Add
       - !type:GenericStatusEffect
         key: Stutter
         component: ScrambledAccent
         type: Add
       - !type:GenericStatusEffect
-        key: PsionicsDisabled
-        component: PsionicsDisabled
+        key: PsionicsDisabled #Nyanotrasen code.
+        component: PsionicsDisabled #Nyanotrasen code.
         type: Add
 
 - type: reagent

diff --git a/Resources/Prototypes/Reagents/narcotics.yml b/Resources/Prototypes/Reagents/narcotics.yml
@@ -249,7 +249,7 @@
         type: Add
         time: 5
         refresh: false
-      - !type:ChemRerollPsionic
+      - !type:ChemRerollPsionic #Nyanotrasen code.
         conditions:
         - !type:ReagentThreshold
           reagent: SpaceDrugs

diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
@@ -324,7 +324,7 @@
         damage:
           groups:
             Toxin: 2
-      - !type:ChemRemovePsionic
+      - !type:ChemRemovePsionic #Nyanotrasen code.
         conditions:
         - !type:ReagentThreshold
           reagent: MindbreakerToxin

diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
@@ -16,7 +16,7 @@
     - type: BibleUser #Lets them heal with bibles
   - !type:AddComponentSpecial
     components:
-    - type: PsionicBonusChance
+    - type: PsionicBonusChance #Nyanotrasen code.
       multiplier: 3
 
 - type: startingGear

diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -33,7 +33,7 @@
   special:
   - !type:AddComponentSpecial
     components:
-    - type: PsionicBonusChance
+    - type: PsionicBonusChance #Nyanotrasen code.
       flatBonus: 0.025
 
 - type: startingGear

diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -59,7 +59,7 @@
   special:
   - !type:AddComponentSpecial
     components:
-    - type: PsionicBonusChance
+    - type: PsionicBonusChance #Nyanotrasen code.
       flatBonus: 0.025
 
 - type: startingGear

diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -31,7 +31,7 @@
   special:
   - !type:AddComponentSpecial
     components:
-    - type: PsionicBonusChance
+    - type: PsionicBonusChance #Nyanotrasen code.
       flatBonus: 0.025
 
 - type: startingGear

diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -34,7 +34,7 @@
   special:
   - !type:AddComponentSpecial
     components:
-    - type: PsionicBonusChance
+    - type: PsionicBonusChance #Nyanotrasen code.
       flatBonus: 0.025
 
 - type: startingGear

diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -40,7 +40,7 @@
   special:
   - !type:AddComponentSpecial
     components:
-    - type: PsionicBonusChance
+    - type: PsionicBonusChance #Nyanotrasen code.
       flatBonus: 0.025
 
 - type: startingGear