From 1c6223afcb9a0fcc9bca3ac2249f8bdb6cd1cb42 Mon Sep 17 00:00:00 2001
From: deltanedas <@deltanedas:kde.org>
Date: Fri, 10 Jan 2025 17:22:37 +0000
Subject: [PATCH 1/2] move psionic action textures to the rsi

---
 .../Interface/VerbIcons/dispel.png.yml        |   2 -
 .../Interface/VerbIcons/license.txt           |  13 ------
 .../Interface/VerbIcons/mass_sleep.png.yml    |   2 -
 .../Interface/VerbIcons/metapsionic.png.yml   |   2 -
 .../Interface/VerbIcons/mind_swap.png.yml     |   2 -
 .../VerbIcons/mind_swap_return.png.yml        |   2 -
 .../VerbIcons/noospheric_zap.png.yml          |   2 -
 .../VerbIcons/psionic_invisibility.png.yml    |   2 -
 .../psionic_invisibility_off.png.yml          |   2 -
 .../VerbIcons/psionic_regeneration.png.yml    |   2 -
 .../Interface/VerbIcons/pyrokinesis.png.yml   |   2 -
 .../Interface/VerbIcons/telegnosis.png.yml    |   2 -
 .../Actions/actions_psionics.rsi}/dispel.png  | Bin
 .../actions_psionics.rsi}/mass_sleep.png      | Bin
 .../Actions/actions_psionics.rsi/meta.json    |  39 ++++++++++++++++--
 .../actions_psionics.rsi}/metapsionic.png     | Bin
 .../actions_psionics.rsi}/mind_swap.png       | Bin
 .../mind_swap_return.png                      | Bin
 .../actions_psionics.rsi}/noospheric_zap.png  | Bin
 .../psionic_invisibility.png                  | Bin
 .../psionic_invisibility_off.png              | Bin
 .../psionic_regeneration.png                  | Bin
 .../actions_psionics.rsi}/pyrokinesis.png     | Bin
 .../actions_psionics.rsi}/telegnosis.png      | Bin
 24 files changed, 36 insertions(+), 38 deletions(-)
 delete mode 100644 Resources/Textures/Nyanotrasen/Interface/VerbIcons/dispel.png.yml
 delete mode 100644 Resources/Textures/Nyanotrasen/Interface/VerbIcons/license.txt
 delete mode 100644 Resources/Textures/Nyanotrasen/Interface/VerbIcons/mass_sleep.png.yml
 delete mode 100644 Resources/Textures/Nyanotrasen/Interface/VerbIcons/metapsionic.png.yml
 delete mode 100644 Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap.png.yml
 delete mode 100644 Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap_return.png.yml
 delete mode 100644 Resources/Textures/Nyanotrasen/Interface/VerbIcons/noospheric_zap.png.yml
 delete mode 100644 Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png.yml
 delete mode 100644 Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png.yml
 delete mode 100644 Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png.yml
 delete mode 100644 Resources/Textures/Nyanotrasen/Interface/VerbIcons/pyrokinesis.png.yml
 delete mode 100644 Resources/Textures/Nyanotrasen/Interface/VerbIcons/telegnosis.png.yml
 rename Resources/Textures/{Nyanotrasen/Interface/VerbIcons => _DV/Interface/Actions/actions_psionics.rsi}/dispel.png (100%)
 rename Resources/Textures/{Nyanotrasen/Interface/VerbIcons => _DV/Interface/Actions/actions_psionics.rsi}/mass_sleep.png (100%)
 rename Resources/Textures/{Nyanotrasen/Interface/VerbIcons => _DV/Interface/Actions/actions_psionics.rsi}/metapsionic.png (100%)
 rename Resources/Textures/{Nyanotrasen/Interface/VerbIcons => _DV/Interface/Actions/actions_psionics.rsi}/mind_swap.png (100%)
 rename Resources/Textures/{Nyanotrasen/Interface/VerbIcons => _DV/Interface/Actions/actions_psionics.rsi}/mind_swap_return.png (100%)
 rename Resources/Textures/{Nyanotrasen/Interface/VerbIcons => _DV/Interface/Actions/actions_psionics.rsi}/noospheric_zap.png (100%)
 rename Resources/Textures/{Nyanotrasen/Interface/VerbIcons => _DV/Interface/Actions/actions_psionics.rsi}/psionic_invisibility.png (100%)
 rename Resources/Textures/{Nyanotrasen/Interface/VerbIcons => _DV/Interface/Actions/actions_psionics.rsi}/psionic_invisibility_off.png (100%)
 rename Resources/Textures/{Nyanotrasen/Interface/VerbIcons => _DV/Interface/Actions/actions_psionics.rsi}/psionic_regeneration.png (100%)
 rename Resources/Textures/{Nyanotrasen/Interface/VerbIcons => _DV/Interface/Actions/actions_psionics.rsi}/pyrokinesis.png (100%)
 rename Resources/Textures/{Nyanotrasen/Interface/VerbIcons => _DV/Interface/Actions/actions_psionics.rsi}/telegnosis.png (100%)

diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/dispel.png.yml b/Resources/Textures/Nyanotrasen/Interface/VerbIcons/dispel.png.yml
deleted file mode 100644
index 5c43e233050..00000000000
--- a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/dispel.png.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-sample:
-  filter: true
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/license.txt b/Resources/Textures/Nyanotrasen/Interface/VerbIcons/license.txt
deleted file mode 100644
index ad1d595d9bd..00000000000
--- a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/license.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-The eleven files below are licensed under CC-BY-SA 4.0 by the author who can be found on GitHub @Vordenburg.
-
-dispel.png
-mass_sleep.png
-metapsionic.png
-mind_swap.png
-mind_swap_return.png
-noospheric_zap.png
-psionic_invisibility.png
-psionic_invisibility_off.png
-psionic_regeneration.png
-pyrokinesis.png
-telegnosis.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mass_sleep.png.yml b/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mass_sleep.png.yml
deleted file mode 100644
index 5c43e233050..00000000000
--- a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mass_sleep.png.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-sample:
-  filter: true
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/metapsionic.png.yml b/Resources/Textures/Nyanotrasen/Interface/VerbIcons/metapsionic.png.yml
deleted file mode 100644
index 5c43e233050..00000000000
--- a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/metapsionic.png.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-sample:
-  filter: true
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap.png.yml b/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap.png.yml
deleted file mode 100644
index 5c43e233050..00000000000
--- a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap.png.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-sample:
-  filter: true
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap_return.png.yml b/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap_return.png.yml
deleted file mode 100644
index 5c43e233050..00000000000
--- a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap_return.png.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-sample:
-  filter: true
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/noospheric_zap.png.yml b/Resources/Textures/Nyanotrasen/Interface/VerbIcons/noospheric_zap.png.yml
deleted file mode 100644
index 5c43e233050..00000000000
--- a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/noospheric_zap.png.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-sample:
-  filter: true
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png.yml b/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png.yml
deleted file mode 100644
index 5c43e233050..00000000000
--- a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-sample:
-  filter: true
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png.yml b/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png.yml
deleted file mode 100644
index 5c43e233050..00000000000
--- a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-sample:
-  filter: true
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png.yml b/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png.yml
deleted file mode 100644
index 5c43e233050..00000000000
--- a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-sample:
-  filter: true
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/pyrokinesis.png.yml b/Resources/Textures/Nyanotrasen/Interface/VerbIcons/pyrokinesis.png.yml
deleted file mode 100644
index 5c43e233050..00000000000
--- a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/pyrokinesis.png.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-sample:
-  filter: true
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/telegnosis.png.yml b/Resources/Textures/Nyanotrasen/Interface/VerbIcons/telegnosis.png.yml
deleted file mode 100644
index 5c43e233050..00000000000
--- a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/telegnosis.png.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-sample:
-  filter: true
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/dispel.png b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/dispel.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/dispel.png
rename to Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/dispel.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mass_sleep.png b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/mass_sleep.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/mass_sleep.png
rename to Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/mass_sleep.png
diff --git a/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/meta.json b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/meta.json
index e0c9ccac8c5..a148d7713d9 100644
--- a/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/meta.json
+++ b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/meta.json
@@ -1,14 +1,47 @@
 {
     "version": 1,
     "license": "CC-BY-SA-4.0",
-    "copyright": "Sprited by chamomileteatime on Discord for DeltaV",
+    "copyright": "Created by @Vordenburg (github) for Nyanotrasen. Precognition sprited by chamomileteatime on Discord for DeltaV",
     "size": {
         "x": 64,
         "y": 64
     },
     "states": [
-        {
-            "name": "precognition"
+    	{
+			"name": "dispel"
+		},
+		{
+			"name": "mass_sleep"
+		},
+		{
+			"name": "metapsionic"
+		},
+		{
+			"name": "mind_swap"
+		},
+		{
+			"name": "mind_swap_return"
+		},
+		{
+			"name": "noospheric_zap"
+		},
+		{
+			"name": "precognition"
+		},
+		{
+			"name": "psionic_invisibility_off"
+		},
+		{
+			"name": "psionic_invisibility"
+		},
+		{
+			"name": "psionic_regeneration"
+		},
+		{
+			"name": "pyrokinesis"
+		},
+		{
+			"name": "telegnosis"
         }
     ]
 }
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/metapsionic.png b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/metapsionic.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/metapsionic.png
rename to Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/metapsionic.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap.png b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/mind_swap.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap.png
rename to Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/mind_swap.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap_return.png b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/mind_swap_return.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap_return.png
rename to Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/mind_swap_return.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/noospheric_zap.png b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/noospheric_zap.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/noospheric_zap.png
rename to Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/noospheric_zap.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/psionic_invisibility.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png
rename to Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/psionic_invisibility.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/psionic_invisibility_off.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png
rename to Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/psionic_invisibility_off.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/psionic_regeneration.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png
rename to Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/psionic_regeneration.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/pyrokinesis.png b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/pyrokinesis.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/pyrokinesis.png
rename to Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/pyrokinesis.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/telegnosis.png b/Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/telegnosis.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/telegnosis.png
rename to Resources/Textures/_DV/Interface/Actions/actions_psionics.rsi/telegnosis.png

From 03a0fca27eadde9f3b7b67a4f5005b8f350915f5 Mon Sep 17 00:00:00 2001
From: deltanedas <@deltanedas:kde.org>
Date: Fri, 10 Jan 2025 17:24:39 +0000
Subject: [PATCH 2/2] move psionic actions to _DV psionic.yml, let them be used
 while cuffed

---
 .../en-US/nyanotrasen/abilities/psionic.ftl   |  32 ----
 .../Prototypes/Nyanotrasen/Actions/types.yml  | 125 -------------
 Resources/Prototypes/_DV/Actions/psionic.yml  | 169 ++++++++++++++++++
 Resources/Prototypes/_DV/Actions/types.yml    |  14 --
 4 files changed, 169 insertions(+), 171 deletions(-)
 create mode 100644 Resources/Prototypes/_DV/Actions/psionic.yml

diff --git a/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl b/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
index d0e8db72f8c..4b9198663a4 100644
--- a/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
+++ b/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
@@ -3,43 +3,16 @@ cage-resist-third-person = {CAPITALIZE(THE($user))} starts removing {POSS-ADJ($u
 
 cage-uncage-verb = Uncage
 
-action-name-metapsionic = Metapsionic Pulse
-action-description-metapsionic = Send a mental pulse through the area to see if there are any psychics nearby.
-
 metapsionic-pulse-success = You detect psychic presence nearby.
 metapsionic-pulse-failure = You don't detect any psychic presence nearby.
 metapsionic-pulse-power = You detect that {$power} was used nearby.
 
-action-name-dispel = Dispel
-action-description-dispel = Dispel summoned entities such as familiars or forcewalls.
-
-action-name-mass-sleep = Mass Sleep
-action-description-mass-sleep = Put targets in a small area to sleep.
-
 accept-psionics-window-title = Psionic!
 accept-psionics-window-prompt-text-part = You rolled a psionic power!
                                          It's possible that certain anti-psychic forces may hunt you,
                                          so you should consider keeping it secret.
                                          Do you still wish to be psionic?
 
-action-name-psionic-invisibility = Psionic Invisibility
-action-description-psionic-invisibility = Render yourself invisible to any entity that could potentially be psychic. Borgs, animals, and so on are not affected.
-
-action-name-psionic-invisibility-off = Turn Off Psionic Invisibility
-action-description-psionic-invisibility-off = Return to visibility, and receive a stun.
-
-action-name-mind-swap = Mind Swap
-action-description-mind-swap = Swap minds with the target. Either can change back after 20 seconds.
-
-action-name-mind-swap-return = Reverse Mind Swap
-action-description-mind-swap-return = Return to your original body.
-
-action-name-telegnosis = Telegnosis
-action-description-telegnosis = Create a telegnostic projection to remotely observe things.
-
-action-name-psionic-regeneration = Psionic Regeneration
-action-description-psionic-regeneration = Push your natural metabolism to the limit to power your body's regenerative capability.
-
 glimmer-report = Current Glimmer Level: {$level}Ψ.
 glimmer-event-report-generic = Noöspheric discharge detected. Glimmer level has decreased by {$decrease} to {$level}Ψ.
 glimmer-event-report-signatures = New psionic signatures manifested. Glimmer level has decreased by {$decrease} to {$level}Ψ.
@@ -56,11 +29,6 @@ telegnostic-trapped-entity-desc = Its many eyes betray sadness.
 psionic-burns-up = {CAPITALIZE(THE($item))} burns up with arcs of strange energy!
 psionic-burn-resist = Strange arcs dance across {THE($item)}!
 
-action-name-noospheric-zap = Noospheric Zap
-action-description-noospheric-zap = Shocks the conciousness of the target and leaves them stunned and stuttering.
-
-action-name-pyrokinesis = Pyrokinesis
-action-description-pyrokinesis = Light a flammable target on fire.
 pyrokinesis-power-used = A wisp of flame engulfs {THE($target)}, igniting {OBJECT($target)}!
 
 action-name-psychokinesis = Psychokinesis
diff --git a/Resources/Prototypes/Nyanotrasen/Actions/types.yml b/Resources/Prototypes/Nyanotrasen/Actions/types.yml
index 31ea8f5316f..fb8194050af 100644
--- a/Resources/Prototypes/Nyanotrasen/Actions/types.yml
+++ b/Resources/Prototypes/Nyanotrasen/Actions/types.yml
@@ -17,128 +17,3 @@
     icon: { sprite: Nyanotrasen/Objects/Specific/Species/felinid.rsi, state: icon }
     useDelay: 30
     event: !type:HairballActionEvent
-
-- type: entity
-  id: ActionDispel
-  name: action-name-dispel
-  description: action-description-dispel
-  components:
-  - type: EntityTargetAction
-    icon: Nyanotrasen/Interface/VerbIcons/dispel.png
-    useDelay: 45
-    checkCanAccess: false
-    range: 6
-    itemIconStyle: BigAction
-    canTargetSelf: false
-    event: !type:DispelPowerActionEvent
-
-- type: entity
-  id: ActionMassSleep
-  name: action-name-mass-sleep
-  description: action-description-mass-sleep
-  components:
-  - type: WorldTargetAction
-    icon: Nyanotrasen/Interface/VerbIcons/mass_sleep.png
-    useDelay: 60
-    checkCanAccess: false
-    range: 8
-    itemIconStyle: BigAction
-    event: !type:MassSleepPowerActionEvent
-
-- type: entity
-  id: ActionMindSwapPsionic
-  name: action-name-mind-swap
-  description: action-description-mind-swap
-  components:
-  - type: EntityTargetAction
-    icon: Nyanotrasen/Interface/VerbIcons/mind_swap.png
-    useDelay: 240
-    checkCanAccess: false
-    range: 8
-    itemIconStyle: BigAction
-    event: !type:MindSwapPowerActionEvent
-
-- type: entity
-  id: ActionMindSwapReturn
-  name: action-name-mind-swap-return
-  description: action-description-mind-swap-return
-  components:
-  - type: InstantAction
-    icon: Nyanotrasen/Interface/VerbIcons/mind_swap_return.png
-    useDelay: 20
-    checkCanInteract: false
-    event: !type:MindSwapPowerReturnActionEvent
-
-- type: entity
-  id: ActionNoosphericZap
-  name: action-name-noospheric-zap
-  description: action-description-noospheric-zap
-  components:
-  - type: EntityTargetAction
-    icon: Nyanotrasen/Interface/VerbIcons/noospheric_zap.png
-    useDelay: 100
-    range: 5
-    itemIconStyle: BigAction
-    event: !type:NoosphericZapPowerActionEvent
-
-- type: entity
-  id: ActionPyrokinesis
-  name: action-name-pyrokinesis
-  description: action-description-pyrokinesis
-  components:
-  - type: EntityTargetAction
-    icon: Nyanotrasen/Interface/VerbIcons/pyrokinesis.png
-    useDelay: 50
-    range: 6
-    checkCanAccess: false
-    itemIconStyle: BigAction
-    event: !type:PyrokinesisPowerActionEvent
-
-- type: entity
-  id: ActionMetapsionic
-  name: action-name-metapsionic
-  description: action-description-metapsionic
-  components:
-  - type: InstantAction
-    icon: Nyanotrasen/Interface/VerbIcons/metapsionic.png
-    useDelay: 45
-    event: !type:MetapsionicPowerActionEvent
-
-- type: entity
-  id: ActionPsionicRegeneration
-  name: action-name-psionic-regeneration
-  description: action-description-psionic-regeneration
-  components:
-  - type: InstantAction
-    icon: Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png
-    useDelay: 120
-    event: !type:PsionicRegenerationPowerActionEvent
-
-- type: entity
-  id: ActionTelegnosis
-  name: action-name-telegnosis
-  description: action-description-telegnosis
-  components:
-  - type: InstantAction
-    icon: Nyanotrasen/Interface/VerbIcons/telegnosis.png
-    useDelay: 150
-    event: !type:TelegnosisPowerActionEvent
-
-- type: entity
-  id: ActionPsionicInvisibility
-  name: action-name-psionic-invisibility
-  description: action-description-psionic-invisibility
-  components:
-  - type: InstantAction
-    icon: Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png
-    useDelay: 120
-    event: !type:PsionicInvisibilityPowerActionEvent
-
-- type: entity
-  id: ActionPsionicInvisibilityUsed
-  name: action-name-psionic-invisibility-off
-  description: action-description-psionic-invisibility-off
-  components:
-  - type: InstantAction
-    icon: Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png
-    event: !type:RemovePsionicInvisibilityOffPowerActionEvent
diff --git a/Resources/Prototypes/_DV/Actions/psionic.yml b/Resources/Prototypes/_DV/Actions/psionic.yml
new file mode 100644
index 00000000000..4f8ccf406be
--- /dev/null
+++ b/Resources/Prototypes/_DV/Actions/psionic.yml
@@ -0,0 +1,169 @@
+- type: entity
+  id: ActionDispel
+  name: Dispel
+  description: Dispel summoned entities such as familiars or forcewalls.
+  components:
+  - type: EntityTargetAction
+    icon:
+      sprite: _DV/Interface/Actions/actions_psionics.rsi
+      state: dispel
+    useDelay: 45
+    checkCanAccess: false
+    checkCanInteract: false
+    range: 6
+    itemIconStyle: BigAction
+    canTargetSelf: false
+    event: !type:DispelPowerActionEvent
+
+- type: entity
+  id: ActionMassSleep
+  name: Mass Sleep
+  description: Put targets in a small area to sleep.
+  components:
+  - type: WorldTargetAction
+    icon:
+      sprite: _DV/Interface/Actions/actions_psionics.rsi
+      state: mass_sleep
+    useDelay: 60
+    checkCanAccess: false
+    checkCanInteract: false
+    range: 8
+    itemIconStyle: BigAction
+    event: !type:MassSleepPowerActionEvent
+
+- type: entity
+  id: ActionMindSwapPsionic
+  name: Mind Swap
+  description: Swap minds with the target. Either can change back after 20 seconds.
+  components:
+  - type: EntityTargetAction
+    icon:
+      sprite: _DV/Interface/Actions/actions_psionics.rsi
+      state: mind_swap
+    useDelay: 240
+    checkCanAccess: false
+    checkCanInteract: false
+    range: 8
+    itemIconStyle: BigAction
+    event: !type:MindSwapPowerActionEvent
+
+- type: entity
+  id: ActionMindSwapReturn
+  name: Reverse Mind Swap
+  description: Return to your original body.
+  components:
+  - type: InstantAction
+    icon:
+      sprite: _DV/Interface/Actions/actions_psionics.rsi
+      state: mind_swap_return
+    useDelay: 20
+    checkCanInteract: false
+    event: !type:MindSwapPowerReturnActionEvent
+
+- type: entity
+  id: ActionNoosphericZap
+  name: Noospheric Zap
+  description: Shocks the conciousness of the target and leaves them stunned and stuttering.
+  components:
+  - type: EntityTargetAction
+    icon:
+      sprite: _DV/Interface/Actions/actions_psionics.rsi
+      state: noospheric_zap
+    useDelay: 100
+    checkCanInteract: false
+    range: 5
+    itemIconStyle: BigAction
+    event: !type:NoosphericZapPowerActionEvent
+
+- type: entity
+  id: ActionPyrokinesis
+  name: Pyrokinesis
+  description: Light a flammable target on fire.
+  components:
+  - type: EntityTargetAction
+    icon:
+      sprite: _DV/Interface/Actions/actions_psionics.rsi
+      state: pyrokinesis
+    useDelay: 50
+    range: 6
+    checkCanAccess: false
+    itemIconStyle: BigAction
+    event: !type:PyrokinesisPowerActionEvent
+
+- type: entity
+  id: ActionMetapsionic
+  name: Metapsionic Pulse
+  description: Send a mental pulse through the area to see if there are any psychics nearby.
+  components:
+  - type: InstantAction
+    icon:
+      sprite: _DV/Interface/Actions/actions_psionics.rsi
+      state: metapsionic
+    useDelay: 45
+    checkCanInteract: false
+    event: !type:MetapsionicPowerActionEvent
+
+- type: entity
+  id: ActionPsionicRegeneration
+  name: Psionic Regeneration
+  description: Push your natural metabolism to the limit to power your body's regenerative capability.
+  components:
+  - type: InstantAction
+    icon:
+      sprite: _DV/Interface/Actions/actions_psionics.rsi
+      state: regeneration
+    useDelay: 120
+    checkCanInteract: false
+    event: !type:PsionicRegenerationPowerActionEvent
+
+- type: entity
+  id: ActionTelegnosis
+  name: Telegnosis
+  description: Create a telegnostic projection to remotely observe things.
+  components:
+  - type: InstantAction
+    icon:
+      sprite: _DV/Interface/Actions/actions_psionics.rsi
+      state: telegnosis
+    useDelay: 150
+    checkCanInteract: false
+    event: !type:TelegnosisPowerActionEvent
+
+- type: entity
+  id: ActionPsionicInvisibility
+  name: Psionic Invisibility
+  description: Render yourself invisible to any entity that could potentially be psychic. Borgs, animals, and so on are not affected.
+  components:
+  - type: InstantAction
+    icon:
+      sprite: _DV/Interface/Actions/actions_psionics.rsi
+      state: invisibility
+    useDelay: 120
+    checkCanInteract: false
+    event: !type:PsionicInvisibilityPowerActionEvent
+
+- type: entity
+  id: ActionPsionicInvisibilityUsed
+  name: Turn Off Psionic Invisibility
+  description: Return to visibility, and receive a stun.
+  components:
+  - type: InstantAction
+    icon:
+      sprite: _DV/Interface/Actions/actions_psionics.rsi
+      state: invisibility_off
+    checkCanInteract: false
+    event: !type:RemovePsionicInvisibilityOffPowerActionEvent
+
+- type: entity
+  id: ActionPrecognition
+  name: Precognition
+  description: See into the future to get a hint about the next random event.
+  components:
+  - type: InstantAction
+    icon:
+      sprite: _DV/Interface/Actions/actions_psionics.rsi
+      state: precognition
+    useDelay: 240
+    checkCanInteract: false
+    checkConsciousness: false
+    event: !type:PrecognitionPowerActionEvent
diff --git a/Resources/Prototypes/_DV/Actions/types.yml b/Resources/Prototypes/_DV/Actions/types.yml
index bf5649feccb..0a9b44d3d5f 100644
--- a/Resources/Prototypes/_DV/Actions/types.yml
+++ b/Resources/Prototypes/_DV/Actions/types.yml
@@ -34,17 +34,3 @@
       sprite: Structures/Furniture/Tables/generic.rsi
       state: full
     event: !type:ToggleCrawlingStateEvent
-
-- type: entity
-  id: ActionPrecognition
-  name: Precognition
-  description: See into the future to get a hint about the next random event.
-  components:
-  - type: InstantAction
-    icon:
-      sprite: _DV/Interface/Actions/actions_psionics.rsi
-      state: precognition
-    useDelay: 240
-    checkCanInteract: false
-    checkConsciousness: false
-    event: !type:PrecognitionPowerActionEvent