Merge branch 'master' of https://github.com/fansana/floofstation1 int…

…o floof/selective-merge-2024-11-04
Fansana · Nov 4, 2024 · ec87dc8 · ec87dc8
2 parents cce93eb + 71d6476
commit ec87dc8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Resources/Locale/en-US/Floof/hypno.ftl b/Resources/Locale/en-US/Floof/hypno.ftl
@@ -12,7 +12,7 @@ hypno-free = I feel able to make my own toughts again.
 hypno-release = Release Subject
 
 hypno-start = You stare into {POSS-ADJ($target)} eyes...
-hypno-phase-1 = {CAPITALIZE($entity)} eyes glows in such pretty colors... it's hard to look away...
+hypno-phase-1 = {CAPITALIZE($target)} eyes glows in such pretty colors... it's hard to look away...
 hypno-phase-2 = The more you stare at {POSS-ADJ($target)} eyes... the more its i's hard to think... to have a thought...
 hypno-phase-3 = What was I doing... again? It's so hard to think... maybe I don't need to anymore, just stare... its just... so pretty...
 hypno-success = {CAPITALIZE(SUBJECT($target))} stares into your eyes, lost in them, lost in you.

diff --git a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml
@@ -17,4 +17,4 @@
     TelekineticPulsePower: 0.15
     PyrokineticFlare: 0.3
     SummonImpPower: 0.15
-    HypnosisPower: 0.15 # Floofstation
+#    HypnosisPower: 0.15 # Floofstation