5 files changed, 23 insertions, 0 deletions
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index 4cf529ec0..4f1cef5be 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -711,4 +711,10 @@ impHandler(setHomunculusName)
     return true;
 }
 
+impHandler(fireHomunculus)
+{
+    homunculusHandler->fire();
+    return true;
+}
+
 }  // namespace Actions
diff --git a/src/actions/commands.h b/src/actions/commands.h
index 5a1bffddb..085b89663 100644
--- a/src/actions/commands.h
+++ b/src/actions/commands.h
@@ -75,6 +75,7 @@ namespace Actions
     decHandler(serverUnIgnoreWhisper);
     decHandler(setPetName);
     decHandler(setHomunculusName);
+    decHandler(fireHomunculus);
 }  // namespace Actions
 
 #undef decHandler
diff --git a/src/input/inputaction.h b/src/input/inputaction.h
index 36adeda3c..77bed24b7 100644
--- a/src/input/inputaction.h
+++ b/src/input/inputaction.h
@@ -485,6 +485,7 @@ namespace InputAction
         TARGET_PET,
         PET_SET_NAME,
         HOMUNCULUS_SET_NAME,
+        HOMUNCULUS_FIRE,
         TOTAL
     };
 }  // namespace InputAction
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h
index 6f4d1e32f..a80d443ff 100644
--- a/src/input/inputactionmap.h
+++ b/src/input/inputactionmap.h
@@ -4106,6 +4106,15 @@ static const InputActionData inputActionData[InputAction::TOTAL] = {
         InputAction::NO_VALUE, 50,
         InputCondition::INGAME,
         "sethomunname|homunsetname|sethomunculusname|homunculussetname",
+        false},
+    {"keyHomunculusFire",
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        InputType::UNKNOWN, InputAction::NO_VALUE,
+        Input::GRP_DEFAULT,
+        &Actions::fireHomunculus,
+        InputAction::NO_VALUE, 50,
+        InputCondition::INGAME,
+        "firehomunculus|homunculusfire",
         false}
 };
 
diff --git a/src/input/pages/basic.cpp b/src/input/pages/basic.cpp
index df573389d..13b3a770c 100644
--- a/src/input/pages/basic.cpp
+++ b/src/input/pages/basic.cpp
@@ -230,6 +230,12 @@ SetupActionData setupActionDataBasic[] =
         "",
     },
     {
+        // TRANSLATORS: input action name
+        N_("Fire your homunculus"),
+        InputAction::HOMUNCULUS_FIRE,
+        "",
+    },
+    {
         "",
         InputAction::NO_VALUE,
         ""