From e879235d94e94fb7499ef9b6cb0b03e8b355481a Mon Sep 17 00:00:00 2001
From: Nekura <no@no.no>
Date: Tue, 20 Oct 2026 04:41:53 +0200
Subject: [PATCH] Add REM key commands (REMNANT controls tab)

USER_REM_* in keymap.ini/keylist.ini for the native REM client (sensor
probe, REM windows), names/descriptions 524500-524513 in Infocards.lua.
---
 DATA/INTERFACE/keylist.ini | 19 +++++++++++++++
 DATA/INTERFACE/keymap.ini  | 50 ++++++++++++++++++++++++++++++++++++++
 EXE/REM/Lua/Infocards.lua  | 17 +++++++++++++
 3 files changed, 86 insertions(+)

diff --git a/DATA/INTERFACE/keylist.ini b/DATA/INTERFACE/keylist.ini
index 53a4dc54..ff189801 100644
--- a/DATA/INTERFACE/keylist.ini
+++ b/DATA/INTERFACE/keylist.ini
@@ -319,4 +319,23 @@ id = USER_TRADE_REQUEST
 group_num = 2
 name = 1504
 
+[key]
+id = USER_REM_SENSOR_PROBE
 
+[key]
+id = USER_REM_ACTIVATE_PROBE
+
+[key]
+id = USER_REM_WAYPOINTS
+
+[key]
+id = USER_REM_BASE
+
+[key]
+id = USER_REM_MISSIONS
+
+[key]
+id = USER_REM_CONTRACTS
+
+[key]
+id = USER_REM_PLAYER
diff --git a/DATA/INTERFACE/keymap.ini b/DATA/INTERFACE/keymap.ini
index 8042941d..a453f7c7 100644
--- a/DATA/INTERFACE/keymap.ini
+++ b/DATA/INTERFACE/keymap.ini
@@ -1018,8 +1018,56 @@ nickname = DBG_FIRE_FORWARD
 state = keydown
 key = 32
 
+; REM: REM key commands (REM client, rem_hotkeys.h), unbound by default
+[KeyCmd]
+nickname = USER_REM_SENSOR_PROBE
+ids_name = 524500
+ids_info = 524501
+state = keydown
+
+[KeyCmd]
+nickname = USER_REM_ACTIVATE_PROBE
+ids_name = 524502
+ids_info = 524503
+state = keydown
+
+[KeyCmd]
+nickname = USER_REM_WAYPOINTS
+ids_name = 524504
+ids_info = 524505
+state = keydown
+
+[KeyCmd]
+nickname = USER_REM_BASE
+ids_name = 524506
+ids_info = 524507
+state = keydown
+
+[KeyCmd]
+nickname = USER_REM_MISSIONS
+ids_name = 524508
+ids_info = 524509
+state = keydown
+
+[KeyCmd]
+nickname = USER_REM_CONTRACTS
+ids_name = 524510
+ids_info = 524511
+state = keydown
+
+[KeyCmd]
+nickname = USER_REM_PLAYER
+ids_name = 524512
+ids_info = 524513
+state = keydown
+
 [KeyMap]
 nickname = IDR_ALWAYS_PRESENT
+key = USER_REM_WAYPOINTS
+key = USER_REM_BASE
+key = USER_REM_MISSIONS
+key = USER_REM_CONTRACTS
+key = USER_REM_PLAYER
 key = USER_YES
 key = USER_NO
 key = USER_CANCEL
@@ -1055,6 +1103,8 @@ nickname = IDR_GAMEFLOW
 
 [KeyMap]
 nickname = IDR_SPACE
+key = USER_REM_SENSOR_PROBE
+key = USER_REM_ACTIVATE_PROBE
 key = USER_MANEUVER_FREE_FLIGHT
 key = USER_MANEUVER_GOTO
 key = USER_MANEUVER_DOCK
diff --git a/EXE/REM/Lua/Infocards.lua b/EXE/REM/Lua/Infocards.lua
index 6ea13e44..11be9618 100644
--- a/EXE/REM/Lua/Infocards.lua
+++ b/EXE/REM/Lua/Infocards.lua
@@ -2,6 +2,7 @@
 -- 50000 to 50020 reserved for anomaly
 -- 524288 to 524353 reserved for engclass plugin
 -- 524400 - 524499 reserved for per-client dynamic trade mission infocards (server sync, SINGLE:)
+-- 524500 - 524549 reserved for REM key commands (DATA/INTERFACE/keymap.ini, Controls page)
 
 -- Test Infocard
 rem.AddInfoCard(9000, "Spam")
@@ -10,6 +11,22 @@ rem.AddInfoCard(9000, "Spam")
 -- HotkeyMenu Infocard (Override)
 rem.AddInfoCard(1904, "REMNANT")
 
+-- REM key commands (name, description) -- Options > Controls
+rem.AddInfoCard(524500, "JETTISON SENSOR PROBE")
+rem.AddInfoCard(524501, "Drops a sensor probe from the cargo hold beside the ship.")
+rem.AddInfoCard(524502, "ACTIVATE SENSOR PROBE")
+rem.AddInfoCard(524503, "Starts the scan of the targeted sensor probe.")
+rem.AddInfoCard(524504, "REM WAYPOINTS")
+rem.AddInfoCard(524505, "Opens the REM waypoint sharing window.")
+rem.AddInfoCard(524506, "REM BASE MANAGER")
+rem.AddInfoCard(524507, "Opens the REM base manager (depot, market, crafting, research).")
+rem.AddInfoCard(524508, "REM MISSIONS")
+rem.AddInfoCard(524509, "Opens the REM missions window (story progress, races).")
+rem.AddInfoCard(524510, "REM CONTRACTS")
+rem.AddInfoCard(524511, "Opens the REM contract network (bounties).")
+rem.AddInfoCard(524512, "REM PLAYER")
+rem.AddInfoCard(524513, "Opens the REM player window (stats, skills, bank).")
+
 -- RACE INFOCARDS
 rem.AddInfoCard(9001, "1")
 rem.AddInfoCard(9002, "2")