Merge branch 'master' into ed-25-08-2025-upstream-sync

2025-09-08 11:31:28 +03:00
parent f77aec1720 2ae9ccbf15
commit e659a2a007
177 changed files with 2400 additions and 896 deletions
--- a/Resources/Prototypes/_CP14/Alerts/status_effect.yml
+++ b/Resources/Prototypes/_CP14/Alerts/status_effect.yml
@@ -22,4 +22,10 @@
  description: cp14-alerts-confused-aura-desc
  icons:
  - sprite: _CP14/Actions/Spells/meta.rsi
-    state: magic_vision_shuffled
+    state: magic_vision_shuffled
+
+- type: alert
+  id: CP14Vuln
+  icons:
+  - sprite: _CP14/Actions/Spells/misc.rsi
+    state: vulnerability
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Athletic/dash.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Athletic/dash.yml
@@ -4,7 +4,7 @@
  name: Dash
  description: You make a quick dash to the chosen position to quickly close the distance or dodge danger.
  components:
-  - type: CP14MagicEffectStaminaCost
+  - type: CP14ActionStaminaCost
    stamina: 40
  - type: CP14MagicEffect
    effects:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Athletic/kick.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Athletic/kick.yml
@@ -9,7 +9,7 @@
    state: kick
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.4
-  - type: CP14MagicEffectStaminaCost
+  - type: CP14ActionStaminaCost
    stamina: 40
  - type: CP14MagicEffect
    effects:
@@ -32,7 +32,7 @@
  - type: CP14MagicEffectEmoting
    startEmote: cp14-kick-emote-start
    endEmote: cp14-kick-emote
-  - type: CP14MagicEffectPacifiedBlock
+  - type: CP14ActionDangerous
  - type: Action
    icon:
      sprite: _CP14/Actions/Spells/physical.rsi
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Athletic/sprint.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Athletic/sprint.yml
@@ -9,7 +9,7 @@
    state: sprint
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 1.3
-  - type: CP14MagicEffectStaminaCost
+  - type: CP14ActionStaminaCost
    stamina: 1.5
  - type: CP14MagicEffect
    effects:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/darkmist.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/darkmist.yml
@@ -4,8 +4,8 @@
  name: Impenetrable darkness
  description: You summon a thick fog that obscures vision and disorients mortals.
  components:
-  - type: CP14MagicEffectReligionRestricted
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionReligionRestricted
+  - type: CP14ActionManaCost
    manaCost: 10
  - type: CP14MagicEffect
    telegraphyEffects:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/mind_degrade.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/mind_degrade.yml
@@ -4,8 +4,8 @@
  name: The Wrath of Lumera
  description: "You unleash your anger on the creature, stunning it, inflicting damage, and burning its mind, removing 0.5 memory points."
  components:
-  - type: CP14MagicEffectReligionRestricted
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionReligionRestricted
+  - type: CP14ActionManaCost
    manaCost: 300
  - type: CP14MagicEffect
    telegraphyEffects:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/mind_upgrade.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/mind_upgrade.yml
@@ -4,9 +4,9 @@
  name: Expansion of consciousness
  description: "You expand the boundaries of what is possible for the chosen creature, revealing to it the secrets of the universe. The target gains +0.5 memory points, up to a maximum of 6.5"
  components:
-  - type: CP14MagicEffectReligionRestricted
+  - type: CP14ActionReligionRestricted
    onlyOnFollowers: true
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 300
  - type: CP14MagicEffect
    telegraphyEffects:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/moon_strike.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/moon_strike.yml
@@ -4,8 +4,8 @@
  name: Lunar strike
  description: You focus the concentrated light of the stars into a single point, blinding and damaging everything that comes within reach of the angry goddess.
  components:
-  - type: CP14MagicEffectReligionRestricted
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionReligionRestricted
+  - type: CP14ActionManaCost
    manaCost: 30
  - type: CP14MagicEffect
    telegraphyEffects:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/touch.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/touch.yml
@@ -4,8 +4,8 @@
  name: Touch of Lumera
  description: "Multitasking effects on the world: depending on what you click on, the effect may vary. Using it on an empty space will create a glowing sign that attracts the attention of mortals."
  components:
-  - type: CP14MagicEffectReligionRestricted
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionReligionRestricted
+  - type: CP14ActionManaCost
    manaCost: 5
  - type: CP14MagicEffect
    effects:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/portal_to_city.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/portal_to_city.yml
@@ -6,7 +6,7 @@
  components:
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.5
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 30
  - type: CP14MagicEffect
    telegraphyEffects:
@@ -17,7 +17,7 @@
    - !type:CP14SpellTeleportToCity
  - type: CP14MagicEffectCastingVisual
    proto: CP14ImpactEffectShadowStep
-  - type: CP14MagicEffectSomaticAspect
+  - type: CP14ActionFreeHandsRequired
  - type: Action
    icon:
      sprite: _CP14/Actions/Spells/dimension.rsi
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/shadow_grab.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/shadow_grab.yml
@@ -7,7 +7,7 @@
  - type: Sprite
    sprite: _CP14/Actions/Spells/dimension.rsi
    state: shadow_grab
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 20
  - type: CP14MagicEffect
    telegraphyEffects:
@@ -23,7 +23,7 @@
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
      - CP14ImpactEffectShadowStep
-  - type: CP14MagicEffectSomaticAspect
+  - type: CP14ActionFreeHandsRequired
  - type: Action
    icon:
      sprite: _CP14/Actions/Spells/dimension.rsi
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/shadow_step.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/shadow_step.yml
@@ -9,7 +9,7 @@
    state: shadow_step
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.8
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 20
  - type: CP14MagicEffect
    telegraphyEffects:
@@ -20,7 +20,7 @@
    - !type:CP14SpellCasterTeleport
  - type: CP14MagicEffectCastingVisual
    proto: CP14ImpactEffectShadowStep
-  - type: CP14MagicEffectSomaticAspect
+  - type: CP14ActionFreeHandsRequired
  - type: Action
    icon:
      sprite: _CP14/Actions/Spells/dimension.rsi
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/shadow_swap.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/shadow_swap.yml
@@ -9,7 +9,7 @@
    state: shadow_swap
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.8
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 20
  - type: CP14MagicEffect
    telegraphyEffects:
@@ -23,8 +23,8 @@
    - !type:CP14SpellCasterSwap
  - type: CP14MagicEffectCastingVisual
    proto: CP14ImpactEffectShadowStep
-  - type: CP14MagicEffectSomaticAspect
-  - type: CP14MagicEffectTargetMobStatusRequired
+  - type: CP14ActionFreeHandsRequired
+  - type: CP14ActionTargetMobStatusRequired
  - type: Action
    icon:
      sprite: _CP14/Actions/Spells/dimension.rsi
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/MOB_subterranean_leap.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/MOB_subterranean_leap.yml
@@ -5,7 +5,7 @@
  components:
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: -1.0
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 5
  - type: CP14MagicEffect
    telegraphyEffects:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/T1_earth_wall.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/T1_earth_wall.yml
@@ -9,7 +9,7 @@
    state: earth_wall
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.3
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 15
  - type: CP14MagicEffect
    telegraphyEffects:
@@ -20,11 +20,11 @@
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
      - CP14WallSpawnEarthWall
-  - type: CP14MagicEffectMaterialAspect
+  - type: CP14ActionMaterialCost
    requirement: !type:StackResource
      stack: CP14Dirt
      count: 2
-  - type: CP14MagicEffectVerbalAspect
+  - type: CP14ActionSpeaking
    startSpeech: "Surgite terram..."
    endSpeech: "de profundis terrae"
  - type: CP14MagicEffectCastingVisual
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/electric_trap.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/electric_trap.yml
@@ -0,0 +1,187 @@
+- type: entity
+  id: CP14ActionSpellElectricTrap
+  parent: CP14ActionSpellBase
+  name: Electric trap
+  description: Creates a electric trap at the selected location. Don't forget to recharge it with mana.
+  components:
+  - type: Sprite
+    sprite: _CP14/Actions/Spells/electromancy.rsi
+    state: electric_trap
+  - type: CP14MagicEffectCastSlowdown
+    speedMultiplier: 0.9
+  - type: CP14ActionManaCost
+    manaCost: 40
+  - type: CP14MagicEffect
+    telegraphyEffects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14ImpactEffectElectricTrap
+    effects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14SpawnMagicElectricTrap
+  - type: CP14ActionSpeaking
+    startSpeech: "Signum electricum..."
+    endSpeech: "hunc locum custodi"
+  - type: CP14MagicEffectCastingVisual
+    proto: CP14RuneElectricTrap
+  - type: Action
+    icon:
+      sprite: _CP14/Actions/Spells/electromancy.rsi
+      state: electric_trap
+  - type: TargetAction
+    range: 3
+  - type: WorldTargetAction
+    event: !type:CP14DelayedWorldTargetActionEvent
+      cooldown: 4
+
+- type: entity
+  id: CP14RuneElectricTrap
+  parent: CP14BaseMagicTrap
+  categories: [ HideSpawnMenu ]
+  save: false
+  components:
+  - type: PointLight
+    color: "#e8ff4c"
+  - type: Sprite
+    layers:
+    - state: small_circle
+      color: "#e8ff4c"
+      shader: unshaded
+    - state: rune_fire
+      color: "#e8ff4c"
+      shader: unshaded
+
+- type: entity
+  id: CP14ImpactEffectElectricTrap
+  parent: CP14BaseMagicImpact
+  categories: [ HideSpawnMenu ]
+  save: false
+  components:
+  - type: Sprite
+    layers:
+    - state: particles_up
+      color: "#e8ff4c"
+      shader: unshaded
+
+- type: entity
+  id: CP14SpawnMagicElectricTrap
+  parent: CP14BaseMagicTrap
+  name: electric trap
+  description: A rune of electric drawn on the ground using magic — it's best not to step on it.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Sprite
+    layers:
+    - state: small_circle
+      color: "#e8ff4c"
+      shader: unshaded
+    - state: rune_energia
+      color: "#e8ff4c"
+      shader: unshaded
+  - type: Fixtures
+    fixtures:
+      trap:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.2,-0.2,0.2,0.2"
+        hard: false
+        mask:
+          - MobMask
+        layer:
+          - SlipLayer
+  - type: CP14MagicEnergyExaminable
+  - type: CP14MagicEnergyContainer
+    maxEnergy: 42
+    energy: 42
+    unsafeSupport: true
+  - type: CP14MagicEnergyDraw
+    energy: -0.5
+    delay: 5
+  - type: CP14MagicUnsafeDamage
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 1
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+  - type: TriggerOnCollide
+    fixtureID: trap
+  - type: SpawnOnTrigger
+    proto: CP14ActionSpellElectricTrapEffect
+  - type: DeleteOnTrigger
+
+- type: entity
+  id: CP14ActionSpellElectricTrapEffect
+  name: electric star
+  categories: [ HideSpawnMenu ]
+  save: false
+  components:
+  - type: Sprite
+    sprite: _CP14/Effects/Magic/cast_impact.rsi
+    drawdepth: Mobs
+    noRot: true
+    layers:
+      - state: stars
+        color: "#e8ff4c"
+        shader: unshaded
+  - type: TimedDespawn
+    lifetime: 1
+  - type: Tag
+    tags:
+      - HideContextMenu
+  - type: CP14AreaEntityEffect
+    range: 2
+    effects:
+    - !type:CP14SpellApplyEntityEffect
+      effects:
+      - !type:HealthChange
+        ignoreResistances: false
+        damage:
+          types:
+            Shock: 10
+      - !type:MovespeedModifier
+        walkSpeedModifier: 1.3
+        sprintSpeedModifier: 1.3
+        statusLifetime: 4
+      - !type:Jitter
+      - !type:CP14StaminaChange
+        staminaDelta: -100
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Effects/PowerSink/electric.ogg
+      params:
+        variation: 0.1
+        volume: -2
+  - type: TriggerOnSpawn
+
+- type: entity
+  parent: CP14BaseSpellScrollElectric
+  id: CP14SpellScrollElectricTrap
+  name: electric trap spell scroll
+  components:
+  - type: CP14SpellStorage
+    spells:
+    - CP14ActionSpellElectricTrap
+
+- type: entity
+  parent: CP14SpawnMagicElectricTrap
+  id: CP14SpawnMagicElectricTrapInvisible
+  suffix: Invisible. Permanent
+  components:
+  - type: Visibility
+    layer: 16
+  - type: CP14MagicEnergyDraw
+    energy: 0
+    delay: 0
+
+- type: entity
+  parent: CP14SpawnMagicElectricTrap
+  id: CP14SpawnMagicElectricTrapPermanent
+  suffix: Permanent
+  components:
+  - type: CP14MagicEnergyDraw
+    energy: 0
+    delay: 0
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/lightning_strike.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/lightning_strike.yml
@@ -6,10 +6,9 @@
  components:
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.5
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 20
  - type: CP14MagicEffect
-    magicType: Energia
    effects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
@@ -29,12 +28,12 @@
    - !type:CP14SpellThrowFromUser
      throwPower: 4
      distance: 1
-  - type: CP14MagicEffectVerbalAspect
+  - type: CP14ActionSpeaking
    startSpeech: "A fulgur percutiens... "
    endSpeech: "erit ledo vobis!"
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneLightningStrike
-  - type: CP14MagicEffectPacifiedBlock
+  - type: CP14ActionDangerous
  - type: Action
    icon:
      sprite: _CP14/Actions/Spells/electromancy.rsi
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/lightning_strike_small.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/lightning_strike_small.yml
@@ -6,10 +6,9 @@
  components:
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.5
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 7
  - type: CP14MagicEffect
-    magicType: Energia
    effects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
@@ -29,7 +28,7 @@
    - !type:CP14SpellThrowFromUser
      throwPower: 2
      distance: 0.5
-  - type: CP14MagicEffectPacifiedBlock
+  - type: CP14ActionDangerous
  - type: Action
    icon:
      sprite: _CP14/Actions/Spells/electromancy.rsi
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/speed_ballade.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/speed_ballade.yml
@@ -6,10 +6,9 @@
  components:
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 1
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 1
  - type: CP14MagicEffect
-    magicType: Energia
    effects:
    - !type:CP14SpellArea
      affectCaster: true
@@ -28,7 +27,7 @@
          walkSpeedModifier: 1.2
          sprintSpeedModifier: 1.2
          statusLifetime: 1.8
-  - type: CP14MagicEffectRequiredMusicTool
+  - type: CP14ActionRequiredMusicTool
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneSpeedBallade
  - type: Action
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/fire_trap.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/fire_trap.yml
@@ -0,0 +1,152 @@
+- type: entity
+  id: CP14ActionSpellFireTrap
+  parent: CP14ActionSpellBase
+  name: Fire trap
+  description: Creates a fire trap at the selected location. Don't forget to recharge it with mana.
+  components:
+  - type: Sprite
+    sprite: _CP14/Actions/Spells/fire.rsi
+    state: fire_trap
+  - type: CP14MagicEffectCastSlowdown
+    speedMultiplier: 0.9
+  - type: CP14ActionManaCost
+    manaCost: 40
+  - type: CP14MagicEffect
+    telegraphyEffects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14ImpactEffectFireTrap
+    effects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14SpawnMagicFireTrap
+  - type: CP14ActionSpeaking
+    startSpeech: "Signum ignis..."
+    endSpeech: "hunc locum custodi"
+  - type: CP14MagicEffectCastingVisual
+    proto: CP14RuneFireTrap
+  - type: Action
+    icon:
+      sprite: _CP14/Actions/Spells/fire.rsi
+      state: fire_trap
+  - type: TargetAction
+    range: 3
+  - type: WorldTargetAction
+    event: !type:CP14DelayedWorldTargetActionEvent
+      cooldown: 4
+
+- type: entity
+  id: CP14RuneFireTrap
+  parent: CP14BaseMagicTrap
+  categories: [ HideSpawnMenu ]
+  save: false
+  components:
+  - type: PointLight
+    color: "#eea911"
+  - type: Sprite
+    layers:
+    - state: small_circle
+      color: "#fdda5d"
+      shader: unshaded
+    - state: rune_fire
+      color: "#eea911"
+      shader: unshaded
+
+- type: entity
+  id: CP14ImpactEffectFireTrap
+  parent: CP14BaseMagicImpact
+  categories: [ HideSpawnMenu ]
+  save: false
+  components:
+  - type: Sprite
+    layers:
+    - state: particles_up
+      color: "#eea911"
+      shader: unshaded
+
+- type: entity
+  id: CP14SpawnMagicFireTrap
+  parent: CP14BaseMagicTrap
+  name: fire trap
+  description: A rune of fire drawn on the ground using magic — it's best not to step on it.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Sprite
+    layers:
+    - state: small_circle
+      color: "#fdda5d"
+      shader: unshaded
+    - state: rune_fire
+      color: "#eea911"
+      shader: unshaded
+  - type: Fixtures
+    fixtures:
+      trap:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.2,-0.2,0.2,0.2"
+        hard: false
+        mask:
+          - MobMask
+        layer:
+          - SlipLayer
+  - type: CP14MagicEnergyExaminable
+  - type: CP14MagicEnergyContainer
+    maxEnergy: 42
+    energy: 42
+    unsafeSupport: true
+  - type: CP14MagicEnergyDraw
+    energy: -0.5
+    delay: 5
+  - type: CP14MagicUnsafeDamage
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 1
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+  - type: TriggerOnCollide
+    fixtureID: trap
+  - type: IgnitionSource
+    temperature: 400
+    ignited: true
+  - type: IgniteOnCollide
+    fireStacks: 3
+  - type: ExplodeOnTrigger
+  - type: Explosive
+    explosionType: FireBomb
+    totalIntensity: 10.0
+    intensitySlope: 4
+    maxIntensity: 3
+  - type: DeleteOnTrigger
+
+- type: entity
+  parent: CP14BaseSpellScrollFire
+  id: CP14SpellScrollFireTrap
+  name: fire trap spell scroll
+  components:
+  - type: CP14SpellStorage
+    spells:
+    - CP14ActionSpellFireTrap
+
+- type: entity
+  parent: CP14SpawnMagicFireTrap
+  id: CP14SpawnMagicFireTrapInvisible
+  suffix: Invisible. Permanent
+  components:
+  - type: Visibility
+    layer: 16
+  - type: CP14MagicEnergyDraw
+    energy: 0
+    delay: 0
+
+- type: entity
+  parent: CP14SpawnMagicFireTrap
+  id: CP14SpawnMagicFireTrapPermanent
+  suffix: Permanent
+  components:
+  - type: CP14MagicEnergyDraw
+    energy: 0
+    delay: 0
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/fireball.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/fireball.yml
@@ -6,23 +6,22 @@
  components:
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.3
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 20
  - type: CP14MagicEffect
-    magicType: Fire
    effects:
    - !type:CP14SpellSpawnEntityOnUser
      spawns:
      - CP14ImpactEffectFireball
    - !type:CP14SpellProjectile
      prototype: CP14Fireball
-  - type: CP14MagicEffectVerbalAspect
+  - type: CP14ActionSpeaking
    startSpeech: "Quaeso, quemdam inter vos quaero... "
    endSpeech: "A pila!"
-  - type: CP14MagicEffectSomaticAspect
+  - type: CP14ActionFreeHandsRequired
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneFireball
-  - type: CP14MagicEffectPacifiedBlock
+  - type: CP14ActionDangerous
  - type: Action
    icon:
      sprite: _CP14/Actions/Spells/fire.rsi
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firewave.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firewave.yml
@@ -9,21 +9,20 @@
    state: firewave
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.75
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 10
  - type: CP14MagicEffect
-    magicType: Fire
    effects:
    - !type:CP14SpellProjectile
      prototype: CP14Firebolt
      spread: 2
      projectileSpeed: 5
      projectileCount: 8
-  - type: CP14MagicEffectVerbalAspect
+  - type: CP14ActionSpeaking
    endSpeech: "Ignis acus!"
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneFirebolt
-  - type: CP14MagicEffectPacifiedBlock
+  - type: CP14ActionDangerous
  - type: Action
    icon:
      sprite: _CP14/Actions/Spells/fire.rsi
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/flame_creation.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/flame_creation.yml
@@ -4,10 +4,9 @@
  name: Flame creation
  description: A artificial flame forms in your hand, illuminating your surroundings. You can throw it to use it as a disposable weapon.
  components:
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 5
  - type: CP14MagicEffect
-    magicType: Fire
    effects:
    - !type:CP14SpellSpawnEntityOnTarget
      clientside: true
@@ -16,10 +15,10 @@
    - !type:CP14SpellSpawnInHandEntity
      spawns:
      - CP14FlameCreationArtificialFlame
-  - type: CP14MagicEffectVerbalAspect
+  - type: CP14ActionSpeaking
    startSpeech: "Et conteret ignis..."
    endSpeech: "in manu mea"
-  - type: CP14MagicEffectSomaticAspect
+  - type: CP14ActionFreeHandsRequired
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneFlameCreation
  - type: Action
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/heat.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/heat.yml
@@ -9,10 +9,9 @@
    state: heat
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.8
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 7
  - type: CP14MagicEffect
-    magicType: Fire
    effects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
@@ -24,11 +23,11 @@
      - !type:AdjustTemperature
        amount: 20000
      - !type:ExtinguishReaction
-  - type: CP14MagicEffectVerbalAspect
+  - type: CP14ActionSpeaking
    startSpeech: "Vos adepto calidum..."
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneHeat
-  - type: CP14MagicEffectPacifiedBlock
+  - type: CP14ActionDangerous
  - type: Action
    icon:
      sprite: _CP14/Actions/Spells/fire.rsi
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/hell_ballade.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/hell_ballade.yml
@@ -9,10 +9,9 @@
    state: fire_music
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.5
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 8
  - type: CP14MagicEffect
-    magicType: Fire
    effects:
    - !type:CP14SpellArea
      range: 3
@@ -32,10 +31,10 @@
        - !type:AdjustTemperature
          amount: 500
        - !type:Ignite
-  - type: CP14MagicEffectRequiredMusicTool
+  - type: CP14ActionRequiredMusicTool
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneHellBallade
-  - type: CP14MagicEffectPacifiedBlock
+  - type: CP14ActionDangerous
  - type: Action
    icon:
      sprite: _CP14/Actions/Spells/fire.rsi
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/tiefling_inner_fire.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/tiefling_inner_fire.yml
@@ -9,7 +9,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneTieflingRevenge
  - type: CP14MagicEffect
-    magicType: Fire
    effects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/air_saturation.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/air_saturation.yml
@@ -6,10 +6,9 @@
  components:
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.4
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 5
  - type: CP14MagicEffect
-    magicType: Life
    effects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_heat.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_heat.yml
@@ -6,10 +6,9 @@
  components:
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.5
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 12
  - type: CP14MagicEffect
-    magicType: Life
    telegraphyEffects:
    - !type:CP14SpellSpawnEntityOnTarget
      clientside: true
@@ -29,8 +28,8 @@
            Heat: -10
            Shock: -10
      - !type:Jitter
-  - type: CP14MagicEffectTargetMobStatusRequired
-  - type: CP14MagicEffectVerbalAspect
+  - type: CP14ActionTargetMobStatusRequired
+  - type: CP14ActionSpeaking
    startSpeech: "Pellis dolorem..."
    endSpeech: "non novit"
  - type: CP14MagicEffectCastingVisual
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_poison.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_poison.yml
@@ -9,10 +9,9 @@
    state: cure_poison
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.5
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 12
  - type: CP14MagicEffect
-    magicType: Life
    telegraphyEffects:
    - !type:CP14SpellSpawnEntityOnTarget
      clientside: true
@@ -34,10 +33,10 @@
      - !type:Jitter
      - !type:ModifyBloodLevel
        amount: 25
-  - type: CP14MagicEffectVerbalAspect
+  - type: CP14ActionSpeaking
    startSpeech: "Nella coda..."
    endSpeech: "sta il veleno"
-  - type: CP14MagicEffectTargetMobStatusRequired
+  - type: CP14ActionTargetMobStatusRequired
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneBloodPurification
  - type: Action
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_wounds.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_wounds.yml
@@ -9,10 +9,9 @@
    state: cure_wounds
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.5
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 12
  - type: CP14MagicEffect
-    magicType: Life
    telegraphyEffects:
    - !type:CP14SpellSpawnEntityOnTarget
      clientside: true
@@ -34,10 +33,10 @@
      - !type:Jitter
      - !type:ModifyBleedAmount
        amount: -5
-  - type: CP14MagicEffectVerbalAspect
+  - type: CP14ActionSpeaking
    startSpeech: "Et curabuntur..."
    endSpeech: "vulnera tua"
-  - type: CP14MagicEffectTargetMobStatusRequired
+  - type: CP14ActionTargetMobStatusRequired
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneCureWounds
  - type: Action
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/magical_acceleration.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/magical_acceleration.yml
@@ -9,10 +9,9 @@
    state: magical_acceleration
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 1.3
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 3
  - type: CP14MagicEffect
-    magicType: Life
    effects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/peace_ballade.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/peace_ballade.yml
@@ -9,10 +9,9 @@
    state: peace_music
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.8
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 2
  - type: CP14MagicEffect
-    magicType: Life
    effects:
    - !type:CP14SpellArea
      range: 4
@@ -32,7 +31,7 @@
          component: Pacified
          type: Add
          time: 1.8
-  - type: CP14MagicEffectRequiredMusicTool
+  - type: CP14ActionRequiredMusicTool
  - type: CP14MagicEffectCastingVisual
    proto: CP14RunePeaceBallade
  - type: Action
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/plant_growth.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/plant_growth.yml
@@ -6,10 +6,9 @@
  components:
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.8
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 5
  - type: CP14MagicEffect
-    magicType: Life
    effects:
    - !type:CP14SpellSpawnEntityOnTarget
      clientside: true
@@ -44,7 +43,7 @@
        energy: 3
        resourse: 3
      - !type:Jitter
-  - type: CP14MagicEffectVerbalAspect
+  - type: CP14ActionSpeaking
    startSpeech: "Plantae durant..."
  - type: CP14MagicEffectCastingVisual
    proto: CP14RunePlantGrowth
@@ -70,7 +69,7 @@
  id: CP14ActionSpellPlantGrowthSilva
  name: Blessing of silvas
  components:
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 3

 # Scrolls
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/resurrection.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/resurrection.yml
@@ -6,13 +6,12 @@
  components:
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.2
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 100
-  - type: CP14MagicEffectTargetMobStatusRequired
+  - type: CP14ActionTargetMobStatusRequired
    allowedStates:
    - Dead
  - type: CP14MagicEffect
-    magicType: Life
    telegraphyEffects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
@@ -36,7 +35,7 @@
            Asphyxiation: -500
            Bloodloss: -100
      - !type:Jitter
-  - type: CP14MagicEffectVerbalAspect
+  - type: CP14ActionSpeaking
    startSpeech: "Redi animam meam..."
    endSpeech: "Eu rezei por ti"
  - type: CP14MagicEffectCastingVisual
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/sheep_polymorph.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/sheep_polymorph.yml
@@ -9,10 +9,9 @@
    state: polymorph
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.5
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 30
  - type: CP14MagicEffect
-    magicType: Life
    telegraphyEffects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
@@ -25,12 +24,12 @@
      effects:
      - !type:Polymorph
        prototype: CP14Sheep
-  - type: CP14MagicEffectVerbalAspect
+  - type: CP14ActionSpeaking
    startSpeech: "Pascam et custodiam..."
    endSpeech: "pecora tua"
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneSheepPolymorph
-  - type: CP14MagicEffectTargetMobStatusRequired
+  - type: CP14ActionTargetMobStatusRequired
  - type: Action
    icon:
      sprite: _CP14/Actions/Spells/misc.rsi
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/flash_light.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/flash_light.yml
@@ -7,10 +7,9 @@
  - type: Sprite
    sprite: _CP14/Actions/Spells/light.rsi
    state: flash_light
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 10
  - type: CP14MagicEffect
-    magicType: Light
    telegraphyEffects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
@@ -19,7 +18,7 @@
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
      - CP14SpawnEffectFlashLight
-  - type: CP14MagicEffectVerbalAspect
+  - type: CP14ActionSpeaking
    startSpeech: "Lux clara..."
    endSpeech: "excaecant inimicos meos"
  - type: CP14MagicEffectCastingVisual
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/search_of_life.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/search_of_life.yml
@@ -7,10 +7,9 @@
  - type: Sprite
    sprite: _CP14/Actions/Spells/light.rsi
    state: search_of_life
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 30
  - type: CP14MagicEffect
-    magicType: Light
    effects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
@@ -18,10 +17,10 @@
    - !type:CP14SpellPointerToAlive
      pointerEntity: CP14SearchOfLifePointer
      searchRange: 30
-  - type: CP14MagicEffectVerbalAspect
+  - type: CP14ActionSpeaking
    startSpeech: "Ego vultus..."
    endSpeech: "parumper vita"
-  - type: CP14MagicEffectSomaticAspect
+  - type: CP14ActionFreeHandsRequired
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneSearchOfLife
  - type: Action
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/sphere_of_light.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/sphere_of_light.yml
@@ -7,10 +7,9 @@
  - type: Sprite
    sprite: _CP14/Actions/Spells/light.rsi
    state: sphere_of_light
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 10
  - type: CP14MagicEffect
-    magicType: Light
    effects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
@@ -18,10 +17,10 @@
    - !type:CP14SpellApplyStatusEffect
      statusEffect: CP14StatusEffectGlowing
      duration: 120
-  - type: CP14MagicEffectVerbalAspect
+  - type: CP14ActionSpeaking
    startSpeech: "Appare in manu tua..."
    endSpeech: "sphaera lucis"
-  - type: CP14MagicEffectSomaticAspect
+  - type: CP14ActionFreeHandsRequired
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneSphereOfLight
  - type: Action
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Kick.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Kick.yml
@@ -7,7 +7,7 @@
  - type: Sprite
    sprite: _CP14/Actions/Spells/lurker.rsi
    state: kick
-  - type: CP14MagicEffectStaminaCost
+  - type: CP14ActionStaminaCost
    stamina: 20
  - type: CP14MagicEffect
    telegraphyEffects:
@@ -36,7 +36,7 @@
  - type: CP14MagicEffectEmoting
    startEmote: cp14-kick-lurker-start
    endEmote: cp14-kick-lurker
-  - type: CP14MagicEffectPacifiedBlock
+  - type: CP14ActionDangerous
  - type: Action
    icon:
      sprite: _CP14/Actions/Spells/lurker.rsi
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_armor.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_armor.yml
@@ -6,7 +6,7 @@
  components:
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.5
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 15
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneManaTrance
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_ballade.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_ballade.yml
@@ -9,7 +9,7 @@
    state: magic_music
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.8
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 5
    canModifyManacost: false
  - type: CP14MagicEffect
@@ -30,7 +30,7 @@
        - !type:CP14ManaChange
          manaDelta: 1.2
          safe: true
-  - type: CP14MagicEffectRequiredMusicTool
+  - type: CP14ActionRequiredMusicTool
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneMagicBallade
  - type: Action
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_consume.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_consume.yml
@@ -18,7 +18,7 @@
      - CP14ImpactEffectManaConsume
    - !type:CP14SpellConsumeManaEffect
      mana: 10
-  - type: CP14MagicEffectSomaticAspect
+  - type: CP14ActionFreeHandsRequired
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneManaConsume
  - type: Action
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_gift.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_gift.yml
@@ -7,7 +7,7 @@
  - type: Sprite
    sprite: _CP14/Actions/Spells/meta.rsi
    state: mana_gift
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 10
    canModifyManacost: false
  - type: CP14MagicEffect
@@ -24,7 +24,7 @@
      - !type:CP14ManaChange
        manaDelta: 10
        safe: false
-  - type: CP14MagicEffectSomaticAspect
+  - type: CP14ActionFreeHandsRequired
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneManaGift
  - type: Action
@@ -50,7 +50,7 @@
  name: Carefull mana transfer
  description: You transfer mana at a tremendous rate without dealing damage to the target.
  components:
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 20
  - type: CP14MagicEffect
    effects:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_splitting.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_splitting.yml
@@ -6,7 +6,7 @@
  components:
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.7
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 10
  - type: CP14MagicEffect
    effects:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_splitting_small.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_splitting_small.yml
@@ -6,7 +6,7 @@
  components:
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.7
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 10
  - type: CP14MagicEffect
    telegraphyEffects:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Misc/MOB_vuln_spikes.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Misc/MOB_vuln_spikes.yml
@@ -0,0 +1,108 @@
+- type: entity
+  id: CP14ActionVulnSpikes
+  parent: CP14ActionSpellBase
+  name: Weakness Spikes
+  description: You throw out several small spikes that cause weakness.
+  components:
+  - type: CP14MagicEffectCastSlowdown
+    speedMultiplier: 0.8
+  - type: CP14MagicEffect
+    effects:
+    - !type:CP14SpellProjectile
+      prototype: CP14SpikeVuln
+      spread: 1.5
+      projectileSpeed: 10
+      projectileCount: 10
+  - type: CP14MagicEffectCastingVisual
+    proto: CP14RuneVulnSpikes
+  - type: CP14ActionDangerous
+  - type: Action
+    useDelay: 7.5
+    icon:
+      sprite: _CP14/Actions/Spells/misc.rsi
+      state: vulnerability
+      color: "#a81e33"
+  - type: TargetAction
+    repeat: false
+    checkCanAccess: false
+    range: 60
+  - type: EntityTargetAction
+    event: !type:CP14DelayedEntityTargetActionEvent
+      cooldown: 7.5
+      castDelay: 1.0
+      breakOnDamage: false
+      breakOnMove: false
+      hidden: true
+
+- type: entity
+  id: CP14RuneVulnSpikes
+  parent: CP14BaseMagicRune
+  categories: [ HideSpawnMenu ]
+  save: false
+  components:
+  - type: PointLight
+    color: "#7c1fff"
+  - type: Sprite
+    layers:
+    - state: double_outer
+      color: "#7c1fff"
+      shader: unshaded
+
+- type: entity
+  parent: BaseBullet
+  id: CP14SpikeVuln
+  name: weakness quill
+  description: Organically spiked with a weakening liquid inside.
+  categories: [ ForkFiltered ]
+  components:
+    - type: Sprite
+      sprite: _CP14/Objects/Weapons/Ranged/Projectiles/spike.rsi
+      layers:
+        - state: spike
+          shader: unshaded
+    - type: PointLight
+      color: "#62316b"
+      radius: 3.0
+      energy: 15.0
+    - type: EmbeddableProjectile
+      minimumSpeed: 3
+      removalTime: 0.5
+      offset: 0.0,0.0
+    - type: Projectile
+      damage:
+        types:
+          Piercing: 0.5
+    - type: SolutionContainerManager
+      solutions:
+        melee:
+          maxVol: 1
+          reagents:
+            - ReagentId: CP14MonsterToxinVuln
+              Quantity: 1
+    - type: SolutionInjectOnEmbed
+      transferAmount: 1
+      blockSlots: NONE
+      solution: melee
+    - type: SolutionTransfer
+      maxTransferAmount: 1
+    - type: TimedDespawn
+      lifetime: 10
+    - type: Ammo
+      muzzleFlash: null
+    - type: Destructible
+      thresholds:
+        - trigger:
+            !type:DamageTrigger
+            damage: 30
+          behaviors:
+            - !type:DoActsBehavior
+              acts: [ "Destruction" ]
+        - trigger:
+            !type:DamageTrigger
+            damage: 20
+          behaviors:
+            - !type:PlaySoundBehavior
+              sound:
+                collection: GlassBreak
+            - !type:DoActsBehavior
+              acts: [ "Destruction" ]
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/bite.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/bite.yml
@@ -7,8 +7,8 @@
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.3
  - type: CP14MagicEffectVampire
-  - type: CP14MagicEffectSSDBlock
-  - type: CP14MagicEffectTargetMobStatusRequired
+  - type: CP14ActionSSDBlock
+  - type: CP14ActionTargetMobStatusRequired
    allowedStates:
    - Alive
  - type: CP14MagicEffect
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/blood_step.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/blood_step.yml
@@ -7,7 +7,7 @@
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.4
  - type: CP14MagicEffectVampire
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 30
  - type: CP14MagicEffect
    telegraphyEffects:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/cure_wounds.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/cure_wounds.yml
@@ -6,10 +6,10 @@
  components:
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.5
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 12
  - type: CP14MagicEffectVampire
-  - type: CP14MagicEffectSkillPointCost
+  - type: CP14ActionSkillPointCost
    skillPoint: Blood
    count: 0.1
  - type: CP14MagicEffect
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/essence_create.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/essence_create.yml
@@ -4,9 +4,9 @@
  name: Form the essence of blood
  description: You extract the essence of life stolen from other beings from your body to pass on to other vampires or use in rituals.
  components:
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 15
-  - type: CP14MagicEffectSkillPointCost
+  - type: CP14ActionSkillPointCost
    skillPoint: Blood
    count: 1
  - type: CP14MagicEffect
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/hypnosys.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/hypnosys.yml
@@ -7,7 +7,7 @@
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.5
  - type: CP14MagicEffectVampire
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 5
  - type: CP14MagicEffect
    effects:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/portal.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/portal.yml
@@ -6,7 +6,7 @@
  components:
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.5
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 30
  - type: CP14MagicEffect
    telegraphyEffects:
@@ -15,7 +15,7 @@
      - CP14ImpactEffectBloodEssence
    effects:
    - !type:CP14SpellTeleportToVampireSingleton
-  - type: CP14MagicEffectSomaticAspect
+  - type: CP14ActionFreeHandsRequired
  - type: Action
    icon:
      sprite: _CP14/Actions/Spells/vampire.rsi
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/power_explosion.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/power_explosion.yml
@@ -7,9 +7,9 @@
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.4
  - type: CP14MagicEffectVampire
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 50
-  - type: CP14MagicEffectPacifiedBlock
+  - type: CP14ActionDangerous
  - type: CP14MagicEffect
    effects:
    - !type:CP14SpellSpawnEntityOnUser
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/power_punch.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/power_punch.yml
@@ -4,9 +4,9 @@
  name: Demonstration of strength
  description: By channeling the power of the oldest vampire clan, you instantly strike your target, causing them to fly back and lose their balance.
  components:
-  - type: CP14MagicEffectPacifiedBlock
+  - type: CP14ActionDangerous
  - type: CP14MagicEffectVampire
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 20
  - type: CP14MagicEffect
    effects:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/resurrection.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/resurrection.yml
@@ -6,13 +6,13 @@
  components:
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.7
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 50
  - type: CP14MagicEffectVampire
-  - type: CP14MagicEffectSkillPointCost
+  - type: CP14ActionSkillPointCost
    skillPoint: Blood
    count: 1
-  - type: CP14MagicEffectTargetMobStatusRequired
+  - type: CP14ActionTargetMobStatusRequired
    allowedStates:
    - Dead
  - type: CP14MagicEffect
@@ -41,7 +41,7 @@
            Asphyxiation: -500
            Bloodloss: -100
      - !type:Jitter
-  - type: CP14MagicEffectVerbalAspect
+  - type: CP14ActionSpeaking
    startSpeech: "Redi animam meam..."
    endSpeech: "Eu rezei por ti"
  - type: CP14MagicEffectCastingVisual
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/search_vampire.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/search_vampire.yml
@@ -4,7 +4,7 @@
  name: Blood connection
  description: You can sense the location of vampires from your clan from miles away.
  components:
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 10
  - type: CP14MagicEffect
    effects:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/beer_creation.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/beer_creation.yml
@@ -7,10 +7,9 @@
  - type: Sprite
    sprite: _CP14/Actions/Spells/water.rsi
    state: beer_creation
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 20
  - type: CP14MagicEffect
-    magicType: Water
    effects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
@@ -18,10 +17,10 @@
    - !type:CP14SpellSpawnInHandEntity
      spawns:
      - CP14LiquidDropBeer
-  - type: CP14MagicEffectVerbalAspect
+  - type: CP14ActionSpeaking
    startSpeech: "beer..."
    endSpeech: "Arriva la birra"
-  - type: CP14MagicEffectSomaticAspect
+  - type: CP14ActionFreeHandsRequired
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneBeerCreation
  - type: Action
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/freeze.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/freeze.yml
@@ -9,10 +9,9 @@
    state: freeze
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.8
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 7
  - type: CP14MagicEffect
-    magicType: Water
    effects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
@@ -28,11 +27,11 @@
      - !type:AdjustTemperature
        amount: -12000
      - !type:ExtinguishReaction
-  - type: CP14MagicEffectVerbalAspect
+  - type: CP14ActionSpeaking
    startSpeech: "Vos adepto frigus..."
  - type: CP14MagicEffectCastingVisual
    proto: CP14RunePlantFreeze
-  - type: CP14MagicEffectPacifiedBlock
+  - type: CP14ActionDangerous
  - type: Action
    icon:
      sprite: _CP14/Actions/Spells/water.rsi
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_arrow.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_arrow.yml
@@ -7,10 +7,9 @@
  - type: Sprite
    sprite: _CP14/Actions/Spells/water.rsi
    state: ice_arrow
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 7
  - type: CP14MagicEffect
-    magicType: Water
    effects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
@@ -18,10 +17,10 @@
    - !type:CP14SpellSpawnInHandEntity
      spawns:
      - CP14IceArrow
-  - type: CP14MagicEffectVerbalAspect
+  - type: CP14ActionSpeaking
    startSpeech: "Sagitta glaciei..."
    endSpeech: "in manu mea"
-  - type: CP14MagicEffectSomaticAspect
+  - type: CP14ActionFreeHandsRequired
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneWaterCreation
  - type: Action
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_dagger.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_dagger.yml
@@ -7,10 +7,9 @@
  - type: Sprite
    sprite: _CP14/Actions/Spells/water.rsi
    state: ice_dagger
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 25
  - type: CP14MagicEffect
-    magicType: Water
    effects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
@@ -18,10 +17,10 @@
    - !type:CP14SpellSpawnInHandEntity
      spawns:
      - CP14IceDagger
-  - type: CP14MagicEffectVerbalAspect
+  - type: CP14ActionSpeaking
    startSpeech: "Un pittore sulla..."
    endSpeech: "soglia della mano"
-  - type: CP14MagicEffectSomaticAspect
+  - type: CP14ActionFreeHandsRequired
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneWaterCreation
  - type: Action
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_shards.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_shards.yml
@@ -9,21 +9,20 @@
    state: ice_shards
  - type: CP14MagicEffectCastSlowdown
    speedMultiplier: 0.75
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 5
  - type: CP14MagicEffect
-    magicType: Water
    effects:
    - !type:CP14SpellProjectile
      prototype: CP14IceShard
    - !type:CP14SpellSpawnEntityOnUser
      spawns:
      - CP14ImpactEffectWaterCreation
-  - type: CP14MagicEffectVerbalAspect
+  - type: CP14ActionSpeaking
    endSpeech: "Glacies acus!"
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneIceShards
-  - type: CP14MagicEffectPacifiedBlock
+  - type: CP14ActionDangerous
  - type: Action
    icon:
      sprite: _CP14/Actions/Spells/water.rsi
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_trap.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_trap.yml
@@ -0,0 +1,193 @@
+- type: entity
+  id: CP14ActionSpellIceTrap
+  parent: CP14ActionSpellBase
+  name: Ice trap
+  description: Creates a ice trap at the selected location. Don't forget to recharge it with mana.
+  components:
+  - type: Sprite
+    sprite: _CP14/Actions/Spells/water.rsi
+    state: ice_trap
+  - type: CP14MagicEffectCastSlowdown
+    speedMultiplier: 0.9
+  - type: CP14ActionManaCost
+    manaCost: 40
+  - type: CP14MagicEffect
+    telegraphyEffects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14ImpactEffectIceTrap
+    effects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14SpawnMagicIceTrap
+  - type: CP14ActionSpeaking
+    startSpeech: "Signum glaciei..."
+    endSpeech: "hunc locum custodi"
+  - type: CP14MagicEffectCastingVisual
+    proto: CP14RuneIceTrap
+  - type: Action
+    icon:
+      sprite: _CP14/Actions/Spells/water.rsi
+      state: ice_trap
+  - type: TargetAction
+    range: 3
+  - type: WorldTargetAction
+    event: !type:CP14DelayedWorldTargetActionEvent
+      cooldown: 4
+
+- type: entity
+  id: CP14RuneIceTrap
+  parent: CP14BaseMagicTrap
+  categories: [ HideSpawnMenu ]
+  save: false
+  components:
+  - type: PointLight
+    color: "#eea911"
+  - type: Sprite
+    layers:
+    - state: small_circle
+      color: "#5eabeb"
+      shader: unshaded
+    - state: rune_ice
+      color: "#5eabeb"
+      shader: unshaded
+
+- type: entity
+  id: CP14ImpactEffectIceTrap
+  parent: CP14BaseMagicImpact
+  categories: [ HideSpawnMenu ]
+  save: false
+  components:
+  - type: Sprite
+    layers:
+    - state: particles_up
+      color: "#5eabeb"
+      shader: unshaded
+
+- type: entity
+  id: CP14SpawnMagicIceTrap
+  parent: CP14BaseMagicTrap
+  name: ice trap
+  description: A rune of ice drawn on the ground using magic — it's best not to step on it.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Sprite
+    layers:
+    - state: small_circle
+      color: "#5eabeb"
+      shader: unshaded
+    - state: rune_ice
+      color: "#5eabeb"
+      shader: unshaded
+  - type: Fixtures
+    fixtures:
+      trap:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.2,-0.2,0.2,0.2"
+        hard: false
+        mask:
+          - MobMask
+        layer:
+          - SlipLayer
+  - type: CP14MagicEnergyExaminable
+  - type: CP14MagicEnergyContainer
+    maxEnergy: 42
+    energy: 42
+    unsafeSupport: true
+  - type: CP14MagicEnergyDraw
+    energy: -0.5
+    delay: 5
+  - type: CP14MagicUnsafeDamage
+  - type: Destructible
+    thresholds:
+      - trigger:
+          !type:DamageTrigger
+          damage: 1
+        behaviors:
+          - !type:DoActsBehavior
+            acts: [ "Destruction" ]
+  - type: TriggerOnCollide
+    fixtureID: trap
+  - type: DeleteOnTrigger
+  - type: EmitSoundOnTrigger
+    sound:
+      collection: ToySqueak
+  - type: SpawnOnTrigger
+    proto: CP14ActionSpellIceTrapEffect
+
+- type: entity
+  id: CP14ActionSpellIceTrapEffect
+  name: ice circle
+  categories: [ HideSpawnMenu ]
+  save: false
+  components:
+  - type: Sprite
+    sprite: _CP14/Effects/Magic/cast_impact.rsi
+    drawdepth: Mobs
+    noRot: true
+    layers:
+      - state: circle_decrease
+        color: "#5eabeb"
+        shader: unshaded
+  - type: TimedDespawn
+    lifetime: 1
+  - type: Tag
+    tags:
+      - HideContextMenu
+  - type: CP14AreaEntityEffect
+    range: 1
+    effects:
+    - !type:CP14SpellApplyEntityEffect
+      effects:
+      - !type:HealthChange
+        ignoreResistances: false
+        damage:
+          types:
+            Cold: 10
+      - !type:MovespeedModifier
+        walkSpeedModifier: 0.0
+        sprintSpeedModifier: 0.0
+        statusLifetime: 3
+      - !type:AdjustTemperature
+        amount: -50000
+      - !type:ExtinguishReaction
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14WindowMagicIceBlock
+  - type: EmitSoundOnTrigger
+    sound:
+      path: /Audio/Effects/balloon-pop.ogg
+      params:
+        variation: 0.1
+        volume: -2
+  - type: TriggerOnSpawn
+
+- type: entity
+  parent: CP14BaseSpellScrollWater
+  id: CP14SpellScrollIceTrap
+  name: ice trap spell scroll
+  components:
+  - type: CP14SpellStorage
+    spells:
+    - CP14ActionSpellIceTrap
+
+- type: entity
+  parent: CP14SpawnMagicIceTrap
+  id: CP14SpawnMagicIceTrapInvisible
+  suffix: Invisible. Permanent
+  components:
+  - type: Visibility
+    layer: 16
+  - type: CP14MagicEnergyDraw
+    energy: 0
+    delay: 0
+
+- type: entity
+  parent: CP14SpawnMagicIceTrap
+  id: CP14SpawnMagicIceTrapPermanent
+  suffix: Permanent
+  components:
+  - type: CP14MagicEnergyDraw
+    energy: 0
+    delay: 0
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/water_creation.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/water_creation.yml
@@ -7,10 +7,9 @@
  - type: Sprite
    sprite: _CP14/Actions/Spells/water.rsi
    state: water_creation
-  - type: CP14MagicEffectManaCost
+  - type: CP14ActionManaCost
    manaCost: 10
  - type: CP14MagicEffect
-    magicType: Water
    effects:
    - !type:CP14SpellSpawnEntityOnTarget
      spawns:
@@ -18,7 +17,7 @@
    - !type:CP14SpellSpawnInHandEntity
      spawns:
      - CP14LiquidDropWater
-  - type: CP14MagicEffectSomaticAspect
+  - type: CP14ActionFreeHandsRequired
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneWaterCreation
  - type: Action
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/base.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/base.yml
@@ -44,3 +44,20 @@
    sprite: _CP14/Effects/Magic/cast_impact.rsi
    noRot: true

+- type: entity
+  id: CP14BaseMagicTrap
+  name: magic trap
+  description: Manifestation of magical energy in the physical plane
+  abstract: true
+  components:
+  - type: Transform
+    anchored: false
+  - type: InteractionOutline
+  - type: Damageable
+    damageContainer: CP14Spectral
+  - type: Physics
+    bodyType: Static
+  - type: Sprite
+    noRot: true
+    drawDepth: FloorTiles
+    sprite: _CP14/Effects/Magic/magic_trap.rsi
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/scrolls.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/scrolls.yml
@@ -150,3 +150,14 @@
      shader: unshaded
      color: "#1c94d9"

+- type: entity
+  abstract: true
+  id: CP14BaseSpellScrollElectric
+  parent: CP14BaseSpellScroll
+  components:
+  - type: Sprite
+    layers:
+    - state: paper_filled
+    - state: magic
+      shader: unshaded
+      color: "#e8ff4c"
--- a/Resources/Prototypes/_CP14/Entities/Clothing/Masks/vampire_mask.yml
+++ b/Resources/Prototypes/_CP14/Entities/Clothing/Masks/vampire_mask.yml
@@ -4,24 +4,16 @@
  - CP14ClothingMaskBase
  - CP14BaseMajorContraband
  id: CP14ClothingMaskVampireVoiceBase
-  description: This mask reeks of blood. The spells inside it distort the speaker's voice.
+  description: This mask reeks of blood. Effectively conceals the identity of the wearer.
  suffix: Voice mask
  components:
  - type: HideLayerClothing
    slots:
    - Snout
  - type: IdentityBlocker
-  - type: VoiceMask
-  - type: UserInterface
-    interfaces:
-      enum.ChameleonUiKey.Key:
-        type: ChameleonBoundUserInterface
-      enum.VoiceMaskUIKey.Key:
-        type: VoiceMaskBoundUserInterface
  - type: PhysicalComposition
    materialComposition:
      CP14Leather: 10
-      CP14BloodEssence: 1

 - type: entity
  parent: CP14ClothingMaskVampireVoiceBase
--- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/demiplane.yml
+++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/demiplane.yml
@@ -48,6 +48,8 @@
      - id: CP14BaseLockpick
      - id: CP14EnergyCrystalMediumEmpty
      - id: CP14ClothingCloakAmuletGold
+      - id: CP14SpellScrollElectricTrap
+      - id: CP14SpellScrollIceTrap
      # Rare standard village crates loot
      - !type:NestedSelector
        tableId: CP14StationCrateLoot
@@ -84,6 +86,7 @@
        weight: 2 #Temp (small amount T2 loot)
      - !type:GroupSelector
        children:
+        - id: CP14SpellScrollFireTrap
        - id: CP14SpellScrollShadowStep
        - id: CP14SpellScrollFireball
        - id: CP14SpellScrollBeerCreation
--- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/demiplane_rifts.yml
+++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/demiplane_rifts.yml
@@ -98,6 +98,20 @@
      children:
      - id: CP14MobMonsterMosquito

+- type: entity
+  parent: CP14BaseMobGroupSpawner
+  id: CP14MobGroupSpawnerSpineguard
+  suffix: 1-2 spineguards
+  components:
+  - type: EntityTableSpawner
+    deleteSpawnerAfterSpawn: false
+    offset: 1
+    table: !type:GroupSelector
+      rolls: !type:RangeNumberSelector
+        range: 1, 2
+      children:
+      - id: CP14MobMonsterSpineguard
+
 - type: entity
  parent: CP14BaseMobGroupSpawner
  id: CP14MobGroupSpawnerRabbits
--- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml
+++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/mobs.yml
@@ -157,6 +157,22 @@
    prototypes:
    - CP14MobMonsterMole

+- type: entity
+  name: spineguard spawner
+  id: CP14SpawnMobMonsterSpineguard
+  parent: MarkerBase
+  categories: [ ForkFiltered ]
+  components:
+  - type: Sprite
+    layers:
+    - sprite: Markers/cross.rsi
+      state: green
+    - sprite: _CP14/Mobs/Monster/spineguard.rsi
+      state: live
+  - type: ConditionalSpawner
+    prototypes:
+    - CP14MobMonsterSpineguard
+
 - type: entity
  name: bloodworm mosquitoes spawner
  id: CP14SpawnMobMonsterMosquito
--- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/spineguard.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/spineguard.yml
@@ -0,0 +1,117 @@
+- type: entity
+  id: CP14MobMonsterSpineguard
+  parent: CP14SimpleMobBase
+  name: spineguard
+  description: Makes its prey weaker letting other monsters do the kill.
+  categories: [ ForkFiltered ]
+  components:
+  - type: HTN
+    rootTask:
+      task: CP14MonsterCompound
+    blackboard:
+      NavSmash: !type:Bool
+        true
+      VisionRadius: !type:Single
+        16
+      AggroVisionRadius: !type:Single
+        12
+  - type: NpcFactionMember
+    factions:
+    - CP14Monster
+  - type: NPCUseActionOnTarget
+    actionId: CP14ActionVulnSpikes
+  - type: Sprite
+    drawdepth: Mobs
+    layers:
+    - map: ["enum.DamageStateVisualLayers.Base"]
+      sprite: _CP14/Mobs/Monster/spineguard.rsi
+      state: live
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeCircle
+          radius: 0.35
+        density: 350
+        mask:
+        - MobMask
+        layer:
+        - MobLayer
+  - type: ReplacementAccent
+    accent: xeno
+  - type: Appearance
+  - type: Body
+    prototype: Animal
+  - type: MobThresholds
+    thresholds:
+      0: Alive
+      100: Dead
+  - type: SlowOnDamage
+    speedModifierThresholds:
+      50: 0.8
+      75: 0.5
+  - type: PassiveDamage # Slight passive regen. Assuming one damage type, comes out to about 6 damage a minute from base.yml.
+    allowedStates:
+    - Alive
+    damageCap: 100
+    damage:
+      types:
+        Poison: -0.1
+      groups:
+        Brute: -0.1
+        Burn: -0.1
+  - type: Stamina
+    critThreshold: 200
+  - type: CombatMode
+  - type: MeleeWeapon
+    angle: 0
+    animation: WeaponArcBite
+    damage:
+      types:
+        Slash: 1
+        Piercing: 3
+        Structural: 3
+  - type: MovementSpeedModifier
+    baseWalkSpeed: 2.5
+    baseSprintSpeed: 2.5
+  - type: DamageStateVisuals
+    states:
+      Alive:
+        Base: live
+      Dead:
+        Base: dead
+  - type: Butcherable
+    spawned:
+    - id: CP14FoodMeatMonster
+      amount: 3
+    - id: CP14FoodMeatPig
+      amount: 1
+      prob: 0.3
+    - id: CP14FoodMeatMonsterLeg
+      amount: 1
+      prob: 0.6
+    - id: CP14RuggedLeather1
+      amount: 1
+      prob: 0.75
+    - id: CP14Leather1
+      amount: 1
+      maxAmount: 3
+    - id: CP14ScrapLeather
+      amount: 1
+      maxAmount: 2
+      prob: 0.5
+    - id: CP14CheapFur
+      amount: 1
+      prob: 0.25
+  - type: Bloodstream
+    bloodMaxVolume: 200
+    bloodReagent: CP14BloodMonster
+  - type: Grammar
+    attributes:
+      gender: epicene
+  - type: CP14MagicCasterSlowdown
+  - type: CP14MagicEnergyContainer
+  - type: Tag
+    tags:
+      - FootstepSound
+      - CP14Mosquito
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T2.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T2.yml
@@ -91,6 +91,7 @@
        max: 1
    freeLearnedSkills:
    - HydrosophistryT1
+    - SwordMastery
    learnedSkills:
    - CP14ActionSpellIceArrow

--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml
@@ -195,6 +195,8 @@
        type: HumanoidMarkingModifierBoundUserInterface
      enum.StrippingUiKey.Key:
        type: StrippableBoundUserInterface
+      enum.CP14RememberNameUiKey.Key:
+        type: CP14IdentityRecognitionBoundUserInterface
  - type: Puller
  - type: Speech
    speechSounds: Alto
@@ -236,6 +238,7 @@
    - MartialArts
    - Craftsmanship
  - type: CP14VampireEssenceHolder
+  - type: CP14UnknownIdentity

 - type: entity
  parent:
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml
@@ -116,6 +116,7 @@
  components:
  - type: CP14SpellStorage
    spells:
+    - CP14ActionSpellElectricTrap
    - CP14ActionSpellLightningStrike
    - CP14ActionSpellLightningStrikeSmall
    - CP14ActionSpellLightningStrikeSmall
--- a/Resources/Prototypes/_CP14/Entities/StatusEffects/misc.yml
+++ b/Resources/Prototypes/_CP14/Entities/StatusEffects/misc.yml
@@ -12,11 +12,11 @@
    layers:
    - state: sphere
      shader: unshaded
-      color: "#5096d488"
+      color: "#5096d4"
    - state: circle_increase
      sprite: _CP14/Effects/Magic/cast_impact.rsi
      shader: unshaded
-      color: "#74eaf222"
+      color: "#74eaf2"
  - type: PointLight
    radius: 2.5
    energy: 0.9
@@ -66,4 +66,26 @@
  - type: StatusEffect
  - type: StatusEffectAlert
    alert: CP14ConfusedAura
-  - type: CP14HideMagicAuraStatusEffect
+  - type: CP14HideMagicAuraStatusEffect
+
+- type: entity
+  id: CP14StatusEffectVuln
+  name: vulnerability
+  components:
+  - type: StatusEffect
+  - type: StatusEffectAlert
+    alert: CP14Vuln
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: _CP14/Effects/Magic/cast_impact.rsi
+    noRot: true
+    layers:
+    - state: particles_down
+      shader: unshaded
+      color: "#a81e33"
+  - type: PointLight
+    radius: 2.5
+    energy: 0.9
+    color: "#a81e33"
+  - type: CP14DamageModifierStatusEffect
+    globalDefence: 1.4
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml
@@ -67,7 +67,7 @@
        mask:
        - MachineMask
        layer:
-        - WallLayer
+        - MachineLayer
  - type: Damageable
    damageContainer: Inorganic
    damageModifierSet: CP14Wood
--- a/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml
@@ -60,7 +60,7 @@
        mask:
        - MachineMask
        layer:
-        - WallLayer
+        - MachineLayer
  - type: Storage
    grid:
    - 0,0,5,5
--- a/Resources/Prototypes/_CP14/Entities/Structures/Windows/marblebrick.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Windows/marblebrick.yml
@@ -79,4 +79,3 @@
  - type: Construction
    graph: CP14WindowMarbleBrick
    node: CP14WindowMarbleBrickBroken
-
--- a/Resources/Prototypes/_CP14/Entities/Structures/Windows/misc.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Windows/misc.yml
@@ -32,3 +32,78 @@
      params:
        variation: 0.03

+- type: entity
+  id: CP14WindowMagicIceBlock
+  name: magic ice block
+  description: Ice created by magic with a distinct purple hue.
+  categories: [ ForkFiltered ]
+  placement:
+    mode: SnapgridCenter
+    snap:
+    - Window
+  components:
+  - type: Sprite
+    drawdepth: Mobs
+    sprite: _CP14/Structures/Windows/ice_block.rsi
+    color: "#5eabeb"
+  - type: Icon
+    sprite: _CP14/Structures/Windows/ice_block.rsi
+    state: full
+  - type: IconSmooth
+    key: CP14window
+    base: window
+  - type: PlacementReplacement
+    key: walls
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Glass
+  - type: TriggerOnCollide
+    fixtureID: fix1
+  - type: Appearance
+  - type: Transform
+    anchored: true
+  - type: Clickable
+  - type: Physics
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+      fix1:
+        hard: false
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.5,-0.5,0.5,0.5"
+        density: 1000
+        mask:
+        - TableMask
+        layer:
+        - TableLayer
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 15
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WindowShatter
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: MeleeSound
+    soundGroups:
+      Brute:
+        collection: GlassSmash
+  - type: SpeedModifierContacts
+    walkSpeedModifier: 0.1
+    sprintSpeedModifier: 0.1
+  - type: DamageOnAttacked
+    damage:
+      types:
+        Cold: 2
+  - type: DamageOnInteract
+    damage:
+      types:
+        Cold: 2
+  - type: DamageContacts
+    damage:
+      types:
+        Cold: 1
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml
@@ -127,6 +127,23 @@
      minGroupSize: 1
      maxGroupSize: 3

+- type: cp14LocationModifier
+  id: EnemySpineguard
+  levels:
+    min: 3
+    max: 7
+  name: cp14-modifier-spineguard
+  categories:
+    Danger: 0.5
+  requiredTags:
+  - CP14DemiplaneUnderground
+  layers:
+  - !type:CP14OreDunGen
+    entity: CP14MobMonsterSpineguard
+    count: 5
+    minGroupSize: 1
+    maxGroupSize: 2
+
 - type: cp14LocationModifier
  id: EnemyIceSpectre
  levels:
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/trap.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/trap.yml
@@ -0,0 +1,87 @@
+- type: cp14LocationModifier
+  id: IceTrapInvisible
+  levels:
+    min: 3
+    max: 10
+  categories:
+    Danger: 0.1
+  blacklistTags:
+  - CP14DemiplaneHot
+  layers:
+    - !type:CP14OreDunGen
+      entity: CP14SpawnMagicIceTrapInvisible
+      count: 5
+      minGroupSize: 1
+      maxGroupSize: 1
+
+- type: cp14LocationModifier
+  id: IceTrapPermanent
+  levels:
+    min: 3
+    max: 10
+  categories:
+    Danger: 0.1
+  blacklistTags:
+  - CP14DemiplaneHot
+  layers:
+    - !type:CP14OreDunGen
+      entity: CP14SpawnMagicIceTrapPermanent
+      count: 10
+      minGroupSize: 1
+      maxGroupSize: 1
+
+- type: cp14LocationModifier
+  id: FireTrapInvisible
+  levels:
+    min: 3
+    max: 10
+  categories:
+    Danger: 0.1
+  layers:
+    - !type:CP14OreDunGen
+      entity: CP14SpawnMagicFireTrapInvisible
+      count: 5
+      minGroupSize: 1
+      maxGroupSize: 1
+
+- type: cp14LocationModifier
+  id: FireTrapPermanent
+  levels:
+    min: 3
+    max: 10
+  categories:
+    Danger: 0.1
+  layers:
+    - !type:CP14OreDunGen
+      entity: CP14SpawnMagicFireTrapPermanent
+      count: 10
+      minGroupSize: 1
+      maxGroupSize: 1
+
+- type: cp14LocationModifier
+  id: ElectricTrapInvisible
+  levels:
+    min: 2
+    max: 10
+  categories:
+    Danger: 0.1
+  layers:
+    - !type:CP14OreDunGen
+      entity: CP14SpawnMagicElectricTrapInvisible
+      count: 5
+      minGroupSize: 1
+      maxGroupSize: 1
+
+- type: cp14LocationModifier
+  id: ElectricTrapPermanent
+  levels:
+    min: 2
+    max: 10
+  categories:
+    Danger: 0.1
+  layers:
+    - !type:CP14OreDunGen
+      entity: CP14SpawnMagicElectricTrapPermanent
+      count: 10
+      minGroupSize: 1
+      maxGroupSize: 1
--- a/Resources/Prototypes/_CP14/Reagents/monster_toxins.yml
+++ b/Resources/Prototypes/_CP14/Reagents/monster_toxins.yml
@@ -50,3 +50,27 @@
          types:
            Piercing: 1.5
  pricePerUnit: 4.0 #arbitrary for now
+
+- type: reagent
+  id: CP14MonsterToxinVuln
+  name: cp14-reagent-name-toxin-vuln
+  desc: cp14-reagent-desc-toxin-vuln
+  group: CP14MonsterToxins
+  flavor: CP14Vomit
+  color: "#b545ff"
+  physicalDesc: reagent-physical-desc-nondescript
+  metabolisms:
+    Poison:
+      metabolismRate: 0.5
+      effects:
+      - !type:ModifyStatusEffect
+        conditions:
+        - !type:ReagentThreshold
+          reagent: CP14MonsterToxinVuln
+          min: 2
+        effectProto: CP14StatusEffectVuln
+        time: 5
+        refresh: false
+      - !type:CP14StaminaChange
+        staminaDelta: -5
+  pricePerUnit: 4.0 #arbitrary for now
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/Vampire/devourers.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Vampire/devourers.yml
@@ -9,9 +9,6 @@
  - !type:StackResource
    stack: CP14ThinLeather
    count: 2
-  - !type:StackResource
-    stack: CP14BloodEssence
-    count: 1
  result: CP14ClothingMaskVampireVoiceDevourers
  resultCount: 1

--- a/Resources/Prototypes/_CP14/Recipes/Workbench/Vampire/night_children.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Vampire/night_children.yml
@@ -9,9 +9,6 @@
  - !type:StackResource
    stack: CP14ThinLeather
    count: 2
-  - !type:StackResource
-    stack: CP14BloodEssence
-    count: 1
  result: CP14ClothingMaskVampireVoiceNightChildrens
  resultCount: 1

--- a/Resources/Prototypes/_CP14/Recipes/Workbench/Vampire/unnameable.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Vampire/unnameable.yml
@@ -9,9 +9,6 @@
  - !type:StackResource
    stack: CP14ThinLeather
    count: 2
-  - !type:StackResource
-    stack: CP14BloodEssence
-    count: 1
  result: CP14ClothingMaskVampireVoiceUnnameable
  resultCount: 1

--- a/Resources/Prototypes/_CP14/Skill/Basic/electromancy.yml
+++ b/Resources/Prototypes/_CP14/Skill/Basic/electromancy.yml
@@ -49,10 +49,6 @@
  icon:
    sprite: _CP14/Actions/skill_tree.rsi
    state: electro2
-  effects:
-  - !type:ModifyManacost
-    modifiers:
-      Energia: -0.25
  restrictions:
  - !type:NeedPrerequisite
    prerequisite: ElectromancyT1
@@ -74,20 +70,16 @@

 # T3

- type: cp14Skill
-  id: ElectromancyT3
-  skillUiPosition: 13, 0
-  tree: Electromancy
-  name: cp14-skill-electric-t3-name
-  learnCost: 0.5
-  icon:
-    sprite: _CP14/Actions/skill_tree.rsi
-    state: electro3
-  effects:
-  - !type:ModifyManacost
-    modifiers:
-      Energia: -0.25
-  restrictions:
-  - !type:NeedPrerequisite
-    prerequisite: ElectromancyT2
+#- type: cp14Skill
+#  id: ElectromancyT3
+#  skillUiPosition: 13, 0
+#  tree: Electromancy
+#  name: cp14-skill-electric-t3-name
+#  learnCost: 0.5
+#  icon:
+#    sprite: _CP14/Actions/skill_tree.rsi
+#    state: electro3
+#  restrictions:
+#  - !type:NeedPrerequisite
+#    prerequisite: ElectromancyT2

--- a/Resources/Prototypes/_CP14/Skill/Basic/healing.yml
+++ b/Resources/Prototypes/_CP14/Skill/Basic/healing.yml
@@ -79,10 +79,6 @@
  icon:
    sprite: _CP14/Actions/skill_tree.rsi
    state: heal2
-  effects:
-  - !type:ModifyManacost
-    modifiers:
-      Life: -0.25
  restrictions:
  - !type:NeedPrerequisite
    prerequisite: HealingT1
@@ -121,22 +117,18 @@

 # T3

- type: cp14Skill
-  id: HealingT3
-  skillUiPosition: 13, 0
-  tree: Healing
-  name: cp14-skill-life-t3-name
-  learnCost: 0.5
-  icon:
-    sprite: _CP14/Actions/skill_tree.rsi
-    state: heal3
-  effects:
-  - !type:ModifyManacost
-    modifiers:
-      Life: -0.25
-  restrictions:
-  - !type:NeedPrerequisite
-    prerequisite: HealingT2
+#- type: cp14Skill
+#  id: HealingT3
+#  skillUiPosition: 13, 0
+#  tree: Healing
+#  name: cp14-skill-life-t3-name
+#  learnCost: 0.5
+#  icon:
+#    sprite: _CP14/Actions/skill_tree.rsi
+#    state: heal3
+#  restrictions:
+#  - !type:NeedPrerequisite
+#    prerequisite: HealingT2

 #- type: cp14Skill
 #  id: CP14ActionSpellResurrection
--- a/Resources/Prototypes/_CP14/Skill/Basic/hydrosophistry.yml
+++ b/Resources/Prototypes/_CP14/Skill/Basic/hydrosophistry.yml
@@ -80,10 +80,6 @@
  icon:
    sprite: _CP14/Actions/skill_tree.rsi
    state: water2
-  effects:
-  - !type:ModifyManacost
-    modifiers:
-      Water: -0.25
  restrictions:
  - !type:NeedPrerequisite
    prerequisite: HydrosophistryT1
@@ -118,20 +114,16 @@

 # T3

- type: cp14Skill
-  id: HydrosophistryT3
-  skillUiPosition: 13, 0
-  tree: Hydrosophistry
-  name: cp14-skill-water-t3-name
-  learnCost: 0.5
-  icon:
-    sprite: _CP14/Actions/skill_tree.rsi
-    state: water3
-  effects:
-  - !type:ModifyManacost
-    modifiers:
-      Water: -0.25
-  restrictions:
-  - !type:NeedPrerequisite
-    prerequisite: HydrosophistryT2
+#- type: cp14Skill
+#  id: HydrosophistryT3
+#  skillUiPosition: 13, 0
+#  tree: Hydrosophistry
+#  name: cp14-skill-water-t3-name
+#  learnCost: 0.5
+#  icon:
+#    sprite: _CP14/Actions/skill_tree.rsi
+#    state: water3
+#  restrictions:
+#  - !type:NeedPrerequisite
+#    prerequisite: HydrosophistryT2

--- a/Resources/Prototypes/_CP14/Skill/Basic/illusion.yml
+++ b/Resources/Prototypes/_CP14/Skill/Basic/illusion.yml
@@ -50,10 +50,6 @@
  icon:
    sprite: _CP14/Actions/skill_tree.rsi
    state: light2
-  effects:
-  - !type:ModifyManacost
-    modifiers:
-      Light: -0.25
  restrictions:
  - !type:NeedPrerequisite
    prerequisite: IllusionT1
@@ -88,20 +84,16 @@

 # T3

- type: cp14Skill
-  id: IllusionT3
-  skillUiPosition: 13, 0
-  tree: Illusion
-  name: cp14-skill-illusion-t3-name
-  learnCost: 0.5
-  icon:
-    sprite: _CP14/Actions/skill_tree.rsi
-    state: light3
-  effects:
-  - !type:ModifyManacost
-    modifiers:
-      Light: -0.25
-  restrictions:
-  - !type:NeedPrerequisite
-    prerequisite: IllusionT2
+#- type: cp14Skill
+#  id: IllusionT3
+#  skillUiPosition: 13, 0
+#  tree: Illusion
+#  name: cp14-skill-illusion-t3-name
+#  learnCost: 0.5
+#  icon:
+#    sprite: _CP14/Actions/skill_tree.rsi
+#    state: light3
+#  restrictions:
+#  - !type:NeedPrerequisite
+#    prerequisite: IllusionT2

--- a/Resources/Prototypes/_CP14/Skill/Basic/pyrokinetic.yml
+++ b/Resources/Prototypes/_CP14/Skill/Basic/pyrokinetic.yml
@@ -83,10 +83,6 @@
  icon:
    sprite: _CP14/Actions/skill_tree.rsi
    state: pyro2
-  effects:
-  - !type:ModifyManacost
-    modifiers:
-      Fire: -0.25
  restrictions:
  - !type:NeedPrerequisite
    prerequisite: PyrokineticT1
@@ -123,20 +119,16 @@

 # T3

- type: cp14Skill
-  id: PyrokineticT3
-  skillUiPosition: 13, 0
-  tree: Pyrokinetic
-  name: cp14-skill-pyro-t3-name
-  learnCost: 0.5
-  icon:
-    sprite: _CP14/Actions/skill_tree.rsi
-    state: pyro3
-  effects:
-  - !type:ModifyManacost
-    modifiers:
-      Fire: -0.25
-  restrictions:
-  - !type:NeedPrerequisite
-    prerequisite: PyrokineticT2
+#- type: cp14Skill
+#  id: PyrokineticT3
+#  skillUiPosition: 13, 0
+#  tree: Pyrokinetic
+#  name: cp14-skill-pyro-t3-name
+#  learnCost: 0.5
+#  icon:
+#    sprite: _CP14/Actions/skill_tree.rsi
+#    state: pyro3
+#  restrictions:
+#  - !type:NeedPrerequisite
+#    prerequisite: PyrokineticT2

--- a/Resources/Prototypes/_CP14/secret_weights.yml
+++ b/Resources/Prototypes/_CP14/secret_weights.yml
@@ -1,6 +1,6 @@
 - type: weightedRandom
  id: Secret
  weights:
-    CP14Peaceful: 1
-    CP14GameRuleVampireClanBattleTriple: 1
-    CP14GameRuleVampireClanBattleDouble: 1
+    CP14Peaceful: 0.2
+    CP14VampireClansBattleDouble: 0.4
+    CP14VampireClansBattleTriple: 0.4