action refactor proper ecs edition (#27422)

2025-05-28 19:52:11 +00:00
parent a9f7cfbcb6
commit b3825dce97
111 changed files with 1995 additions and 2901 deletions
--- a/Resources/Prototypes/Actions/anomaly.yml
+++ b/Resources/Prototypes/Actions/anomaly.yml
@@ -1,9 +1,11 @@
 - type: entity
+  parent: BaseAction
  id: ActionAnomalyPulse
  name: Anomaly pulse
  description: Release a pulse of energy of your abnormal nature
  components:
-  - type: InstantAction
+  - type: Action
+    useDelay: 30
    icon: Structures/Specific/anomaly.rsi/anom1.png
+  - type: InstantAction
    event: !type:ActionAnomalyPulseEvent
-    useDelay: 30
--- a/Resources/Prototypes/Actions/borgs.yml
+++ b/Resources/Prototypes/Actions/borgs.yml
@@ -1,26 +1,28 @@
- type: entity
+- type: entity
+  parent: BaseMentalAction # allow reading laws when crit
  id: ActionViewLaws
  name: View Laws
  description: View the laws that you must follow.
  components:
-  - type: InstantAction
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: Action
    itemIconStyle: NoItem
    icon:
      sprite: Interface/Actions/actions_borg.rsi
      state: state-laws
-    event: !type:ToggleLawsScreenEvent
    useDelay: 0.5
+  - type: InstantAction
+    event: !type:ToggleLawsScreenEvent

 - type: entity
+  parent: BaseAction
  id: ActionSelectBorgType
  name: Select Cyborg Type
  components:
-  - type: InstantAction
+  - type: Action
    itemIconStyle: NoItem
    icon:
      sprite: Interface/Actions/actions_borg.rsi
      state: select-type
-    event: !type:BorgToggleSelectTypeEvent
    useDelay: 0.5
+  - type: InstantAction
+    event: !type:BorgToggleSelectTypeEvent
--- a/Resources/Prototypes/Actions/crit.yml
+++ b/Resources/Prototypes/Actions/crit.yml
@@ -1,47 +1,50 @@
 # Actions added to mobs in crit.
 - type: entity
+  abstract: true
+  parent: BaseMentalAction
+  id: BaseCritAction
+  components:
+  - type: Action
+    itemIconStyle: NoItem
+
+- type: entity
+  parent: BaseCritAction
  id: ActionCritSuccumb
  name: Succumb
  description: Accept your fate.
  components:
-  - type: InstantAction
-    itemIconStyle: NoItem
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: Action
+    startDelay: true
+    useDelay: 10
    icon:
      sprite: Mobs/Ghosts/ghost_human.rsi
      state: icon
+  - type: InstantAction
    event: !type:CritSuccumbEvent
-    startDelay: true
-    useDelay: 10

 - type: entity
+  parent: BaseCritAction
  id: ActionCritFakeDeath
  name: Fake Death
  description: Pretend to take your final breath while staying alive.
  components:
-  - type: InstantAction
-    itemIconStyle: NoItem
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: Action
+    useDelay: 30
    icon:
      sprite: Interface/Actions/actions_crit.rsi
      state: fakedeath
+  - type: InstantAction
    event: !type:CritFakeDeathEvent
-    useDelay: 30

 - type: entity
+  parent: ActionCritSuccumb # for use delay
  id: ActionCritLastWords
  name: Say Last Words
  description: Whisper your last words to anyone nearby, and then succumb to your fate. You only have 30 characters to work with.
  components:
-  - type: InstantAction
-    itemIconStyle: NoItem
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: Action
    icon:
      sprite: Interface/Actions/actions_crit.rsi
      state: lastwords
+  - type: InstantAction
    event: !type:CritLastWordsEvent
-    startDelay: true
-    useDelay: 10
--- a/Resources/Prototypes/Actions/diona.yml
+++ b/Resources/Prototypes/Actions/diona.yml
@@ -1,24 +1,26 @@
 - type: entity
+  parent: BaseSuicideAction
  id: DionaGibAction
  name: Gib Yourself!
  description: Split apart into 3 nymphs.
  components:
-  - type: InstantAction
+  - type: Action
    icon:
      sprite: Mobs/Species/Diona/organs.rsi
      state: brain
+  - type: InstantAction
    event: !type:GibActionEvent {}
-    checkCanInteract: false
-    checkConsciousness: false

 - type: entity
+  parent: BaseAction
  id: DionaReformAction
  name: Reform
  description: Reform back into a whole Diona.
  components:
-  - type: InstantAction
+  - type: Action
+    useDelay: 600 # Once every 10 minutes. Keep them dead for a fair bit before reforming
    icon:
      sprite: Mobs/Species/Diona/parts.rsi
      state: full
+  - type: InstantAction
    event: !type:ReformEvent {}
-    useDelay: 600 # Once every 10 minutes. Keep them dead for a fair bit before reforming
--- a/Resources/Prototypes/Actions/internals.yml
+++ b/Resources/Prototypes/Actions/internals.yml
@@ -1,14 +1,16 @@
- type: entity
+- type: entity
+  parent: BaseAction
  id: ActionToggleInternals
  name: Toggle Internals
  description: Breathe from the equipped gas tank. Also requires equipped breath mask.
  components:
-  - type: InstantAction
+  - type: Action
+    useDelay: 1
    icon:
      sprite: Interface/Alerts/internals.rsi
      state: internal2
    iconOn:
      sprite: Interface/Alerts/internals.rsi
      state: internal1
+  - type: InstantAction
    event: !type:ToggleActionEvent
-    useDelay: 1
--- a/Resources/Prototypes/Actions/mapping.yml
+++ b/Resources/Prototypes/Actions/mapping.yml
@@ -0,0 +1,48 @@
+- type: entity
+  abstract: true
+  parent: BaseMentalAction
+  id: BaseMappingAction
+  components:
+  - type: Action
+    clientExclusive: true
+
+- type: entity
+  parent: BaseMappingAction
+  id: BaseMappingDecalAction # not abstract but the event has to be set in code
+  components:
+  - type: TargetAction
+    repeat: true
+    range: -1
+  - type: WorldTargetAction
+    event: null # has to be set with SetEvent in DecalPlacementSystem
+
+- type: entity
+  parent: BaseMappingAction
+  id: BaseMappingSpawnAction # not abstract but the event has to be set in code
+  components:
+  - type: Action
+    icon: Tiles/cropped_parallax.png
+  - type: InstantAction
+    event: null # has to be set with SetEvent in MappingSystem
+
+- type: entity
+  parent: BaseMappingAction
+  id: ActionMappingEraser
+  name: action-name-mapping-erase
+  components:
+  - type: Action
+    icon: Interface/VerbIcons/delete.svg.192dpi.png
+  - type: InstantAction
+    event: !type:StartPlacementActionEvent
+      eraser: true
+
+# these are used for mapping actions yml files
+- type: entity
+  parent: BaseMappingSpawnAction
+  id: BaseMappingEntityAction # not abstract but the event has to be set in code
+  components:
+  - type: Action
+    autoPopulate: False
+    temporary: True
+  - type: InstantAction
+    event: null # has to be set with SetEvent in ActionsSystem
--- a/Resources/Prototypes/Actions/mech.yml
+++ b/Resources/Prototypes/Actions/mech.yml
@@ -1,37 +1,48 @@
 - type: entity
+  abstract: true
+  parent: BaseAction
+  id: BaseMechAction
+  components:
+  - type: Action
+    itemIconStyle: NoItem
+
+- type: entity
+  parent: BaseMechAction
  id: ActionMechCycleEquipment
  name: Cycle
  description: Cycles currently selected equipment
  components:
-  - type: InstantAction
-    itemIconStyle: NoItem
+  - type: Action
+    useDelay: 0.5
    icon:
      sprite: Interface/Actions/actions_mecha.rsi
      state: mech_cycle_equip_on
+  - type: InstantAction
    event: !type:MechToggleEquipmentEvent
-    useDelay: 0.5

 - type: entity
+  parent: BaseMechAction
  id: ActionMechOpenUI
  name: Control Panel
  description: Opens the control panel for the mech
  components:
-  - type: InstantAction
-    itemIconStyle: NoItem
+  - type: Action
+    useDelay: 1
    icon:
      sprite: Interface/Actions/actions_mecha.rsi
      state: mech_view_stats
+  - type: InstantAction
    event: !type:MechOpenUiEvent
-    useDelay: 1

 - type: entity
+  parent: BaseMechAction
  id: ActionMechEject
  name: Eject
  description: Ejects the pilot from the mech
  components:
-  - type: InstantAction
-    itemIconStyle: NoItem
+  - type: Action
    icon:
      sprite: Interface/Actions/actions_mecha.rsi
      state: mech_eject
+  - type: InstantAction
    event: !type:MechEjectPilotEvent
--- a/Resources/Prototypes/Actions/ninja.yml
+++ b/Resources/Prototypes/Actions/ninja.yml
@@ -1,73 +1,82 @@
 # gloves
 - type: entity
+  parent: BaseToggleAction
  id: ActionToggleNinjaGloves
  name: Toggle ninja gloves
  description: Toggles all glove actions on left click. Includes your doorjack, draining power, stunning enemies and hacking certain computers.
  components:
-  - type: InstantAction
+  - type: Action
    priority: -13
-    event: !type:ToggleActionEvent {}

 # suit
 - type: entity
+  parent: BaseAction
  id: ActionCreateThrowingStar
  name: Create throwing star
  description: Channels suit power into creating a throwing star that deals extra stamina damage.
  components:
-  - type: InstantAction
+  - type: Action
    useDelay: 0.5
    icon:
      sprite: Objects/Weapons/Throwable/throwing_star.rsi
      state: icon
    itemIconStyle: NoItem
    priority: -10
+  - type: InstantAction
    event: !type:CreateItemEvent {}

 - type: entity
+  parent: BaseAction
  id: ActionRecallKatana
  name: Recall katana
  description: Teleports the Energy Katana linked to this suit to its wearer, cost based on distance.
  components:
-  - type: InstantAction
+  - type: Action
    useDelay: 1
    icon:
      sprite: Objects/Weapons/Melee/energykatana.rsi
      state: icon
    itemIconStyle: NoItem
    priority: -11
+  - type: InstantAction
    event: !type:RecallKatanaEvent {}

 - type: entity
+  parent: BaseAction
  id: ActionNinjaEmp
  name: EM Burst
  description: Disable any nearby technology with an electro-magnetic pulse.
  components:
-  - type: InstantAction
+  - type: Action
    icon:
      sprite: Objects/Weapons/Grenades/empgrenade.rsi
      state: icon
    itemIconStyle: BigAction
    priority: -13
+  - type: InstantAction
    event: !type:NinjaEmpEvent {}

 - type: entity
+  parent: BaseAction
  id: ActionTogglePhaseCloak
  name: Phase cloak
  description: Toggles your suit's phase cloak. Beware that if you are hit, all abilities are disabled for 5 seconds, including your cloak!
  components:
-  - type: InstantAction
+  - type: Action
    # have to plan (un)cloaking ahead of time
    useDelay: 5
    priority: -9
+  - type: InstantAction
    event: !type:ToggleActionEvent

 # katana
 - type: entity
+  parent: BaseAction
  id: ActionEnergyKatanaDash
  name: Katana dash
  description: Teleport to anywhere you can see, if your Energy Katana is in your hand.
  components:
-  - type: WorldTargetAction
+  - type: Action
    icon:
      sprite: Objects/Magic/magicactions.rsi
      state: blink
@@ -77,6 +86,8 @@
      params:
        volume: 5
    priority: -12
-    event: !type:DashEvent
+  - type: TargetAction
    checkCanAccess: false
    range: 0
+  - type: WorldTargetAction
+    event: !type:DashEvent
--- a/Resources/Prototypes/Actions/polymorph.yml
+++ b/Resources/Prototypes/Actions/polymorph.yml
@@ -1,4 +1,5 @@
- type: entity
+- type: entity
+  parent: BaseAction
  id: ActionRevertPolymorph
  name: Revert
  description: Revert back into your original form.
@@ -7,54 +8,59 @@
    event: !type:RevertPolymorphActionEvent

 - type: entity
-  id: ActionPolymorph
+  abstract: true
+  parent: BaseAction
+  id: BaseActionPolymorph
  components:
+  - type: Action
+    itemIconStyle: NoItem
+    useDelay: 60
  - type: InstantAction
    event: !type:PolymorphActionEvent
-    itemIconStyle: NoItem

 - type: entity
+  parent: BaseActionPolymorph
  id: ActionPolymorphWizardSpider
  name: Spider Polymorph
  description: Polymorphs you into a Spider.
  components:
-  - type: InstantAction
-    useDelay: 60
-    event: !type:PolymorphActionEvent
-      protoId: WizardSpider
-    itemIconStyle: NoItem
+  - type: Action
    icon:
      sprite: Mobs/Animals/spider.rsi
      state: tarantula
+  - type: InstantAction
+    event: !type:PolymorphActionEvent
+      protoId: WizardSpider

 - type: entity
+  parent: BaseActionPolymorph
  id: ActionPolymorphWizardRod
  name: Rod Form
  description: CLANG!
  components:
-  - type: InstantAction
-    useDelay: 60
-    event: !type:PolymorphActionEvent
-      protoId: WizardRod
-    itemIconStyle: NoItem
+  - type: Action
    icon:
      sprite: Objects/Fun/immovable_rod.rsi
      state: icon
+  - type: InstantAction
+    event: !type:PolymorphActionEvent
+      protoId: WizardRod

 - type: entity
+  parent: BaseActionPolymorph
  id: ActionPolymorphJaunt
  name: Ethereal Jaunt
  description: Melt into the Ethereal Plane for a quick getaway!
  components:
  - type: Magic
-  - type: InstantAction
+  - type: Action
    useDelay: 30
-    event: !type:PolymorphActionEvent
-      protoId: Jaunt
-    itemIconStyle: NoItem
    icon:
      sprite: Objects/Magic/magicactions.rsi
      state: jaunt
+  - type: InstantAction
+    event: !type:PolymorphActionEvent
+      protoId: Jaunt
    # TODO: Effect ECS (from cardboard box)
  - type: ActionUpgrade
    effectedLevels:
@@ -62,31 +68,19 @@
      3: ActionPolymorphJauntIII

 - type: entity
-  id: ActionPolymorphJauntII
  parent: ActionPolymorphJaunt
+  id: ActionPolymorphJauntII
  name: Ethereal Jaunt II
  description: Melt into the Ethereal Plane for an even quicker getaway!
  components:
-  - type: InstantAction
+  - type: Action
    useDelay: 25
-    event: !type:PolymorphActionEvent
-      protoId: Jaunt
-    itemIconStyle: NoItem
-    icon:
-      sprite: Objects/Magic/magicactions.rsi
-      state: jaunt

 - type: entity
-  id: ActionPolymorphJauntIII
  parent: ActionPolymorphJaunt
+  id: ActionPolymorphJauntIII
  name: Ethereal Jaunt III
  description: Are you even tangible anymore?
  components:
-  - type: InstantAction
+  - type: Action
    useDelay: 20
-    event: !type:PolymorphActionEvent
-      protoId: Jaunt
-    itemIconStyle: NoItem
-    icon:
-      sprite: Objects/Magic/magicactions.rsi
-      state: jaunt
--- a/Resources/Prototypes/Actions/revenant.yml
+++ b/Resources/Prototypes/Actions/revenant.yml
@@ -1,48 +1,58 @@
 - type: entity
+  parent: BaseAction
  id: ActionRevenantShop
  name: Shop
  description: Opens the ability shop.
  components:
-  - type: InstantAction
+  - type: Action
    icon: Interface/Actions/shop.png
+  - type: InstantAction
    event: !type:RevenantShopActionEvent

 - type: entity
+  parent: BaseAction
  id: ActionRevenantDefile
  name: Defile
  description: Costs 30 Essence.
  components:
-  - type: InstantAction
-    icon: Interface/Actions/defile.png
-    event: !type:RevenantDefileActionEvent
+  - type: Action
    useDelay: 15
+    icon: Interface/Actions/defile.png
+  - type: InstantAction
+    event: !type:RevenantDefileActionEvent

 - type: entity
+  parent: BaseAction
  id: ActionRevenantOverloadLights
  name: Overload Lights
  description: Costs 40 Essence.
  components:
-  - type: InstantAction
+  - type: Action
    icon: Interface/Actions/overloadlight.png
-    event: !type:RevenantOverloadLightsActionEvent
    useDelay: 20
+  - type: InstantAction
+    event: !type:RevenantOverloadLightsActionEvent

 #- type: entity
+#  parent: BaseAction
 #  id: ActionRevenantBlight
 #  name: Blight
 #  description: Costs 50 Essence.
 #  components:
-#  - type: InstantAction
+#  - type: Action
 #    icon: Interface/Actions/blight.png
-#    event: !type:RevenantBlightActionEvent
 #    useDelay: 20
+#  - type: InstantAction
+#    event: !type:RevenantBlightActionEvent

 - type: entity
+  parent: BaseAction
  id: ActionRevenantMalfunction
  name: Malfunction
  description: Costs 60 Essence.
  components:
-  - type: InstantAction
+  - type: Action
    icon: Interface/Actions/malfunction.png
-    event: !type:RevenantMalfunctionActionEvent
    useDelay: 20
+  - type: InstantAction
+    event: !type:RevenantMalfunctionActionEvent
--- a/Resources/Prototypes/Actions/security.yml
+++ b/Resources/Prototypes/Actions/security.yml
@@ -1,5 +1,6 @@
 # gloves
 - type: entity
+  parent: BaseAction
  id: ActionToggleKnuckleDustersStun
  name: Toggle stun knuckle dusters
  description: Toggles the duster's built in stun baton.
--- a/Resources/Prototypes/Actions/speech.yml
+++ b/Resources/Prototypes/Actions/speech.yml
@@ -1,10 +1,12 @@
- type: entity
+- type: entity
+  parent: BaseAction
  id: ActionConfigureMeleeSpeech
  name: Set Battlecry
  description: Set a custom battlecry for when you attack!
  components:
-  - type: InstantAction
+  - type: Action
    itemIconStyle: BigItem
    priority: -20
    useDelay: 1
+  - type: InstantAction
    event: !type:MeleeSpeechConfigureActionEvent
--- a/Resources/Prototypes/Actions/spider.yml
+++ b/Resources/Prototypes/Actions/spider.yml
@@ -1,19 +1,23 @@
 - type: entity
+  parent: BaseAction
  id: ActionSpiderWeb
  name: Spider Web
  description: Spawns a web that slows your prey down.
  components:
-  - type: InstantAction
+  - type: Action
    icon: Interface/Actions/web.png
-    event: !type:SpiderWebActionEvent
    useDelay: 25
+  - type: InstantAction
+    event: !type:SpiderWebActionEvent

 - type: entity
+  parent: BaseAction
  id: ActionSericulture
  name: Weave silk
  description: Weave a bit of silk for use in arts and crafts.
  components:
-  - type: InstantAction
+  - type: Action
    icon: Interface/Actions/web.png
-    event: !type:SericultureActionEvent
    useDelay: 1
+  - type: InstantAction
+    event: !type:SericultureActionEvent
--- a/Resources/Prototypes/Actions/station_ai.yml
+++ b/Resources/Prototypes/Actions/station_ai.yml
@@ -1,28 +1,32 @@
-# Actions
+# Actions
 - type: entity
+  parent: BaseAction
  id: ActionJumpToCore
  name: Jump to core
  description: Sends your eye back to the core.
  components:
-  - type: InstantAction
+  - type: Action
    priority: -9
    itemIconStyle: BigAction
    icon:
      sprite: Interface/Actions/actions_ai.rsi
      state: ai_core
+  - type: InstantAction
    event: !type:JumpToCoreEvent

 - type: entity
+  parent: BaseAction
  id: ActionSurvCameraLights
  name: Toggle camera lights
  description: Enable surveillance camera lights near wherever you're viewing.
  components:
-  - type: InstantAction
+  - type: Action
    priority: -5
    itemIconStyle: BigAction
    icon:
      sprite: Interface/Actions/actions_ai.rsi
      state: camera_light
+  - type: InstantAction
    event: !type:RelayedActionComponentChangeEvent
      components:
      - type: LightOnCollideCollider
@@ -39,17 +43,17 @@


 - type: entity
+  parent: BaseMentalAction
  id: ActionAIViewLaws
  name: View Laws
  description: View the laws that you must follow.
  components:
-  - type: InstantAction
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: Action
    priority: -3
    itemIconStyle: NoItem
    icon:
      sprite: Interface/Actions/actions_ai.rsi
      state: state_laws
-    event: !type:ToggleLawsScreenEvent
    useDelay: 0.5
+  - type: InstantAction
+    event: !type:ToggleLawsScreenEvent
--- a/Resources/Prototypes/Actions/types.yml
+++ b/Resources/Prototypes/Actions/types.yml
@@ -1,130 +1,167 @@
 # base actions

+# base prototype for all action entities
 - type: entity
-  id: BaseSuicideAction
  abstract: true
+  id: BaseAction
+  components:
+  - type: Action
+
+# an action that is done all in le head and cant be prevented by any means
+- type: entity
+  abstract: true
+  parent: BaseAction
+  id: BaseMentalAction
+  components:
+  - type: Action
+    checkCanInteract: false
+    checkConsciousness: false
+
+- type: entity
+  abstract: true
+  parent: BaseMentalAction
+  id: BaseSuicideAction
  components:
  - type: ConfirmableAction
    popup: suicide-action-popup

+- type: entity
+  abstract: true
+  parent: BaseAction
+  id: BaseImplantAction
+  components:
+  - type: InstantAction
+    event: !type:ActivateImplantEvent
+
+- type: entity
+  abstract: true
+  parent: BaseAction
+  id: BaseToggleAction
+  components:
+  - type: InstantAction
+    event: !type:ToggleActionEvent
+
 # actions

 - type: entity
+  parent: BaseAction
  id: ActionScream
  name: Scream
  description: AAAAAAAAAAAAAAAAAAAAAAAAA
  components:
-  - type: InstantAction
+  - type: Action
    useDelay: 10
    icon: Interface/Actions/scream.png
-    event: !type:ScreamActionEvent
    checkCanInteract: false
+  - type: InstantAction
+    event: !type:ScreamActionEvent

 - type: entity
+  parent: BaseMentalAction
  id: ActionTurnUndead
  name: Turn Undead
  description: Succumb to your infection and become a zombie.
  components:
-  - type: InstantAction
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: Action
    icon: Interface/Actions/zombie-turn.png
+  - type: InstantAction
    event: !type:ZombifySelfActionEvent

 - type: entity
+  parent: BaseToggleAction
  id: ActionToggleLight
  name: Toggle Light
  description: Turn the light on and off.
  components:
-  - type: InstantAction
+  - type: Action
    useDelay: 1
    icon: { sprite: Objects/Tools/flashlight.rsi, state: flashlight }
    iconOn: { sprite: Objects/Tools/flashlight.rsi, state: flashlight-on }
-    event: !type:ToggleActionEvent

 - type: entity
+  parent: BaseAction
  id: ActionOpenStorageImplant
  name: Toggle Storage Implant
  description: Opens or closes the storage implant embedded under your skin
  components:
-  - type: InstantAction
+  - type: Action
    itemIconStyle: BigAction
    priority: -20
    icon:
      sprite: Clothing/Back/Backpacks/backpack.rsi
      state: icon
-    event: !type:OpenStorageImplantEvent
    useDelay: 1
+  - type: InstantAction
+    event: !type:OpenStorageImplantEvent

 - type: entity
-  parent: BaseSuicideAction
+  parent: [BaseSuicideAction, BaseImplantAction]
  id: ActionActivateMicroBomb
  name: Activate Microbomb
  description: Activates your internal microbomb, completely destroying you and your equipment
  components:
-  - type: InstantAction
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: Action
    itemIconStyle: BigAction
    priority: -20
    icon:
      sprite: Actions/Implants/implants.rsi
      state: explosive
-    event: !type:ActivateImplantEvent

 - type: entity
-  parent: BaseSuicideAction
+  parent: [BaseSuicideAction, BaseImplantAction]
  id: ActionActivateDeathAcidifier
  name: Activate Death-Acidifier
  description: Activates your death-acidifier, completely melting you and your equipment
  components:
-  - type: InstantAction
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: Action
    itemIconStyle: BigAction
    priority: -20
    icon:
      sprite: Objects/Magic/magicactions.rsi
      state: gib
-    event: !type:ActivateImplantEvent

 - type: entity
+  parent: BaseAction
  id: ActionActivateFreedomImplant
  name: Break Free
  description: Activating your freedom implant will free you from any hand restraints
  components:
  - type: LimitedCharges
    maxCharges: 3
-  - type: InstantAction
+  - type: Action
    checkCanInteract: false
    itemIconStyle: BigAction
    priority: -20
    icon:
      sprite: Actions/Implants/implants.rsi
      state: freedom
+  - type: InstantAction
    event: !type:UseFreedomImplantEvent

 - type: entity
+  parent: BaseAction
  id: ActionOpenUplinkImplant
  name: Open Uplink
  description: Opens the syndicate uplink embedded under your skin
  components:
-  - type: InstantAction
+  - type: Action
    itemIconStyle: BigAction
    priority: -20
    icon:
      sprite: Objects/Devices/communication.rsi
      state: old-radio
+  - type: InstantAction
    event: !type:OpenUplinkImplantEvent

 - type: entity
+  parent: BaseImplantAction
  id: ActionActivateEmpImplant
  name: Activate EMP
  description: Triggers a small EMP pulse around you
  components:
  - type: LimitedCharges
    maxCharges: 3
-  - type: InstantAction
+  - type: Action
    checkCanInteract: false
    useDelay: 5
    itemIconStyle: BigAction
@@ -132,16 +169,16 @@
    icon:
      sprite: Objects/Weapons/Grenades/empgrenade.rsi
      state: icon
-    event: !type:ActivateImplantEvent

 - type: entity
+  parent: BaseAction
  id: ActionActivateScramImplant
  name: SCRAM!
  description: Randomly teleports you within a large distance.
  components:
  - type: LimitedCharges
    maxCharges: 2
-  - type: InstantAction
+  - type: Action
    checkCanInteract: false
    useDelay: 5
    itemIconStyle: BigAction
@@ -149,9 +186,11 @@
    icon:
      sprite: Structures/Specific/anomaly.rsi
      state: anom4
+  - type: InstantAction
    event: !type:UseScramImplantEvent

 - type: entity
+  parent: BaseAction
  id: ActionActivateDnaScramblerImplant
  name: Scramble DNA
  description:  Randomly changes your name and appearance.
@@ -160,190 +199,199 @@
    popup: dna-scrambler-action-popup
  - type: LimitedCharges
    maxCharges: 1
-  - type: InstantAction
+  - type: Action
    itemIconStyle: BigAction
    priority: -20
    icon:
      sprite: Clothing/OuterClothing/Hardsuits/lingspacesuit.rsi
      state: icon
+  - type: InstantAction
    event: !type:UseDnaScramblerImplantEvent

 - type: entity
+  parent: BaseAction
  id: ActionToggleSuitPiece
  name: Toggle Suit Piece
  description: Remember to equip the important pieces of your suit before going into action.
  components:
-  - type: InstantAction
+  - type: Action
    itemIconStyle: BigItem
    useDelay: 1 # equip noise spam.
+  - type: InstantAction
    event: !type:ToggleClothingEvent

 - type: entity
+  parent: BaseAction
  id: ActionCombatModeToggle
  name: "[color=red]Combat Mode[/color]"
  description: Enter combat mode
  components:
-  - type: InstantAction
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: Action
    icon: Interface/Actions/harmOff.png
    iconOn: Interface/Actions/harm.png
-    event: !type:ToggleCombatActionEvent
    priority: -100
+  - type: InstantAction
+    event: !type:ToggleCombatActionEvent

 - type: entity
-  id: ActionCombatModeToggleOff
  parent: ActionCombatModeToggle
-  name: "[color=red]Combat Mode[/color]"
-  description: Enter combat mode
+  id: ActionCombatModeToggleOff
  components:
-  - type: InstantAction
+  - type: Action
    enabled: false
    autoPopulate: false
-    priority: -100

 - type: entity
+  parent: BaseAction
  id: ActionChangeVoiceMask
  name: Set name
  description: Change the name others hear to something else.
  components:
-  - type: InstantAction
+  - type: Action
    icon: { sprite: Interface/Actions/voice-mask.rsi, state: icon }
+  - type: InstantAction
    event: !type:VoiceMaskSetNameEvent

 - type: entity
+  parent: BaseAction
  id: ActionVendingThrow
  name: Dispense Item
  description: Randomly dispense an item from your stock.
  components:
-  - type: InstantAction
+  - type: Action
    useDelay: 30
+  - type: InstantAction
    event: !type:VendingMachineSelfDispenseEvent

 - type: entity
+  parent: BaseToggleAction
  id: ActionToggleBlock
  name: Block
  description: Raise or lower your shield.
  components:
-  - type: InstantAction
+  - type: Action
    icon: { sprite: Objects/Weapons/Melee/shields.rsi, state: teleriot-icon }
-    iconOn: Objects/Weapons/Melee/shields.rsi/teleriot-on.png
-    event: !type:ToggleActionEvent
+    iconOn: { sprite: Objects/Weapons/Melee/shields.rsi, state: teleriot-on }

 - type: entity
+  parent: BaseMentalAction
  id: ActionClearNetworkLinkOverlays
  name: Clear network link overlays
  description: Clear network link overlays.
  components:
-  - type: InstantAction
+  - type: Action
    clientExclusive: true
-    checkCanInteract: false
-    checkConsciousness: false
    temporary: true
    icon: { sprite: Objects/Tools/multitool.rsi, state: icon }
+  - type: InstantAction
    event: !type:ClearAllOverlaysEvent

 - type: entity
+  parent: BaseAction
  id: ActionAnimalLayEgg
  name: Lay egg
  description: Uses hunger to lay an egg.
  components:
-  - type: InstantAction
+  - type: Action
    icon: { sprite: Objects/Consumable/Food/egg.rsi, state: icon }
    useDelay: 60
+  - type: InstantAction
    event: !type:EggLayInstantActionEvent

 - type: entity
+  parent: BaseMentalAction
  id: ActionSleep
  name: Sleep
  description: Go to sleep.
  components:
-  - type: InstantAction
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: Action
    icon: { sprite: Clothing/Head/Hats/pyjamasyndicatered.rsi, state: icon }
+  - type: InstantAction
    event: !type:SleepActionEvent

 - type: entity
+  parent: BaseMentalAction
  id: ActionWake
  name: Wake up
  description: Stop sleeping.
  components:
-  - type: InstantAction
-    icon: { sprite: Clothing/Head/Hats/pyjamasyndicatered.rsi, state: icon }
-    checkCanInteract: false
-    checkConsciousness: false
-    event: !type:WakeActionEvent
+  - type: Action
    startDelay: true
    useDelay: 2
+    icon: { sprite: Clothing/Head/Hats/pyjamasyndicatered.rsi, state: icon }
+  - type: InstantAction
+    event: !type:WakeActionEvent

 - type: entity
+  parent: BaseImplantAction
  id: ActionActivateHonkImplant
  name: Honk
  description: Activates your honking implant, which will produce the signature sound of the clown.
  components:
-  - type: InstantAction
+  - type: Action
    icon: { sprite: Objects/Fun/bikehorn.rsi, state: icon }
-    event: !type:ActivateImplantEvent
-    useDelay: 1

 - type: entity
+  parent: BaseAction
  id: ActionFireStarter
  name: Ignite
  description: Ignites enemies in a radius around you.
  components:
-  - type: InstantAction
+  - type: Action
    priority: -1
    useDelay: 30
    icon: Interface/Actions/firestarter.png
+  - type: InstantAction
    event: !type:FireStarterActionEvent

 - type: entity
+  parent: BaseMentalAction
  id: ActionToggleEyes
  name: Open/Close eyes
  description: Close your eyes to protect your peepers, or open your eyes to enjoy the pretty lights.
  components:
-  - type: InstantAction
+  - type: Action
    icon: Interface/Actions/eyeopen.png
    iconOn: Interface/Actions/eyeclose.png
-    event: !type:ToggleEyesActionEvent
    useDelay: 1 # so u cant give yourself and observers eyestrain by rapidly spamming the action
-    checkCanInteract: false
-    checkConsciousness: false
+  - type: InstantAction
+    event: !type:ToggleEyesActionEvent

 - type: entity
+  parent: BaseToggleAction
  id: ActionToggleWagging
  name: Wagging Tail
  description: Start or stop wagging your tail.
  components:
-    - type: InstantAction
-      icon: { sprite: Mobs/Customization/reptilian_parts.rsi, state: tail_smooth_behind }
-      iconOn: { sprite: Mobs/Customization/reptilian_parts.rsi, state: tail_smooth_behind }
-      itemIconStyle: NoItem
-      useDelay: 1 # emote spam
-      event: !type:ToggleActionEvent
+  - type: Action
+    icon: { sprite: Mobs/Customization/reptilian_parts.rsi, state: tail_smooth_behind }
+    iconOn: { sprite: Mobs/Customization/reptilian_parts.rsi, state: tail_smooth_behind }
+    itemIconStyle: NoItem
+    useDelay: 1 # emote spam

 - type: entity
+  parent: BaseAction
  id: FakeMindShieldToggleAction
  name: '[color=green]Toggle Fake Mindshield[/color]'
  description: Turn the Fake Mindshield implant's transmission on/off
  components:
-  - type: InstantAction
+  - type: Action
    icon: { sprite: Interface/Actions/actions_fakemindshield.rsi, state: icon }
    iconOn: { sprite: Interface/Actions/actions_fakemindshield.rsi, state: icon-on }
    itemIconStyle: NoItem
    useDelay: 1
+  - type: InstantAction
    event: !type:FakeMindShieldToggleEvent

 - type: entity
+  parent: BaseToggleAction
  id: ActionToggleParamedicSiren
  name: Toggle Paramedic Siren
  description: Toggles the paramedic siren on and off.
  components:
-  - type: InstantAction 
+  - type: Action
    icon:
      sprite: Clothing/OuterClothing/Hardsuits/paramed.rsi
      state: icon-siren
    useDelay: 1
    itemIconStyle: BigAction
-    event: !type:ToggleActionEvent