diff --git a/DATA/EQUIPMENT/st_good.ini b/DATA/EQUIPMENT/st_good.ini
index 0b7e69a0..218e0f22 100644
--- a/DATA/EQUIPMENT/st_good.ini
+++ b/DATA/EQUIPMENT/st_good.ini
@@ -1865,6 +1865,123 @@ ids_info = 263960
 shop_archetype = equipment\models\st\ku_thruster.3db
 material_library = equipment\models\ku_equip.mat
 
+; REM cloak module
+[Good]
+nickname = cloak_module
+equipment = cloak_module
+category = equipment
+price = 50000000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_vector_coil.3db
+combinable = false
+ids_name = 476000
+ids_info = 476001
+shop_archetype = equipment\models\st\ku_thruster.3db
+material_library = equipment\models\ku_equip.mat
+
+; REM admin cloak module
+[Good]
+nickname = cloak_module_admin
+equipment = cloak_module_admin
+category = equipment
+price = 1
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_vector_coil.3db
+combinable = false
+ids_name = 476002
+ids_info = 476003
+shop_archetype = equipment\models\st\ku_thruster.3db
+material_library = equipment\models\ku_equip.mat
+
+; REM Nomad Cloak Module
+[Good]
+nickname = cloak_module_nomad
+equipment = cloak_module_nomad
+category = equipment
+price = 50000000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_vector_coil.3db
+combinable = false
+ids_name = 476004
+ids_info = 476005
+shop_archetype = equipment\models\st\ku_thruster.3db
+material_library = equipment\models\ku_equip.mat
+
+; REM Osiris Cloak Module
+[Good]
+nickname = cloak_module_osiris
+equipment = cloak_module_osiris
+category = equipment
+price = 50000000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_vector_coil.3db
+combinable = false
+ids_name = 476006
+ids_info = 476007
+shop_archetype = equipment\models\st\ku_thruster.3db
+material_library = equipment\models\ku_equip.mat
+
+; REM Gunboat Cloak Module
+[Good]
+nickname = cloak_module_gunboat
+equipment = cloak_module_gunboat
+category = equipment
+price = 50000000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_vector_coil.3db
+combinable = false
+ids_name = 476008
+ids_info = 476009
+shop_archetype = equipment\models\st\ku_thruster.3db
+material_library = equipment\models\ku_equip.mat
+
+; REM Cruiser Cloak Module
+[Good]
+nickname = cloak_module_cruiser
+equipment = cloak_module_cruiser
+category = equipment
+price = 50000000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_vector_coil.3db
+combinable = false
+ids_name = 476010
+ids_info = 476011
+shop_archetype = equipment\models\st\ku_thruster.3db
+material_library = equipment\models\ku_equip.mat
+
+; REM Battleship Cloak Module
+[Good]
+nickname = cloak_module_battleship
+equipment = cloak_module_battleship
+category = equipment
+price = 50000000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_vector_coil.3db
+combinable = false
+ids_name = 476012
+ids_info = 476013
+shop_archetype = equipment\models\st\ku_thruster.3db
+material_library = equipment\models\ku_equip.mat
+
+; REM Nomad Gunboat Cloak Module
+[Good]
+nickname = cloak_module_nomad_gunboat
+equipment = cloak_module_nomad_gunboat
+category = equipment
+price = 50000000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_vector_coil.3db
+combinable = false
+ids_name = 476014
+ids_info = 476015
+shop_archetype = equipment\models\st\ku_thruster.3db
+material_library = equipment\models\ku_equip.mat
+
+; REM Nomad Battleship Cloak Module
+[Good]
+nickname = cloak_module_nomad_battleship
+equipment = cloak_module_nomad_battleship
+category = equipment
+price = 50000000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_vector_coil.3db
+combinable = false
+ids_name = 476016
+ids_info = 476017
+shop_archetype = equipment\models\st\ku_thruster.3db
+material_library = equipment\models\ku_equip.mat
+
 ; Sublight-Modul
 [Good]
 nickname = jump_drive
diff --git a/DATA/EQUIPMENT/weapon_equip.ini b/DATA/EQUIPMENT/weapon_equip.ini
index 8ff2412b..f8947f75 100644
--- a/DATA/EQUIPMENT/weapon_equip.ini
+++ b/DATA/EQUIPMENT/weapon_equip.ini
@@ -24,6 +24,186 @@ cloakin_fx = no_cloakeffect01
 cloakout_fx = no_cloakeffect01
 debris_type = debris_normal
 
+; REM cloak module (players: module slot 1, hp_cloak on HpVelocity in shiparch.ini)
+[CloakingDevice]
+nickname = cloak_module
+ids_name = 476000
+ids_info = 476001
+hit_pts = 8000
+DA_archetype = equipment\models\st\li_refractor_shield.3db
+material_library = equipment\models\li_equip.mat
+material_library = Ships\nomad\nomad_fx.txm
+HP_child = HpConnect
+mass = 2000
+volume = 0
+power_usage = 0
+cloakin_time = 4
+cloakout_time = 4
+cloakin_fx = no_cloakeffect01
+cloakout_fx = no_cloakeffect01
+debris_type = debris_normal
+lootable = false
+
+; REM admin cloak: no rules (rem-server [Native.Cloak] FreeDevices), not sold - /addcargo
+[CloakingDevice]
+nickname = cloak_module_admin
+ids_name = 476002
+ids_info = 476003
+hit_pts = 8000
+DA_archetype = equipment\models\st\li_refractor_shield.3db
+material_library = equipment\models\li_equip.mat
+material_library = Ships\nomad\nomad_fx.txm
+HP_child = HpConnect
+mass = 2000
+volume = 0
+power_usage = 0
+cloakin_time = 1
+cloakout_time = 1
+cloakin_fx = no_cloakeffect01
+cloakout_fx = no_cloakeffect01
+debris_type = debris_normal
+lootable = false
+
+; REM cloak module: Nomad Cloak Module
+[CloakingDevice]
+nickname = cloak_module_nomad
+ids_name = 476004
+ids_info = 476005
+hit_pts = 8000
+DA_archetype = equipment\models\st\li_refractor_shield.3db
+material_library = equipment\models\li_equip.mat
+material_library = Ships\nomad\nomad_fx.txm
+HP_child = HpConnect
+mass = 2000
+volume = 0
+power_usage = 0
+cloakin_time = 4
+cloakout_time = 4
+cloakin_fx = no_cloakeffect05
+cloakout_fx = no_cloakeffect05
+debris_type = debris_normal
+lootable = false
+
+; REM cloak module: Osiris Cloak Module
+[CloakingDevice]
+nickname = cloak_module_osiris
+ids_name = 476006
+ids_info = 476007
+hit_pts = 8000
+DA_archetype = equipment\models\st\li_refractor_shield.3db
+material_library = equipment\models\li_equip.mat
+material_library = Ships\nomad\nomad_fx.txm
+HP_child = HpConnect
+mass = 2000
+volume = 0
+power_usage = 0
+cloakin_time = 5
+cloakout_time = 5
+cloakin_fx = no_cloakeffect06
+cloakout_fx = no_cloakeffect06
+debris_type = debris_normal
+lootable = false
+
+; REM cloak module: Gunboat Cloak Module
+[CloakingDevice]
+nickname = cloak_module_gunboat
+ids_name = 476008
+ids_info = 476009
+hit_pts = 8000
+DA_archetype = equipment\models\st\li_refractor_shield.3db
+material_library = equipment\models\li_equip.mat
+material_library = Ships\nomad\nomad_fx.txm
+HP_child = HpConnect
+mass = 2000
+volume = 0
+power_usage = 0
+cloakin_time = 10
+cloakout_time = 10
+cloakin_fx = no_cloakeffect02
+cloakout_fx = no_cloakeffect02
+debris_type = debris_normal
+lootable = false
+
+; REM cloak module: Cruiser Cloak Module
+[CloakingDevice]
+nickname = cloak_module_cruiser
+ids_name = 476010
+ids_info = 476011
+hit_pts = 8000
+DA_archetype = equipment\models\st\li_refractor_shield.3db
+material_library = equipment\models\li_equip.mat
+material_library = Ships\nomad\nomad_fx.txm
+HP_child = HpConnect
+mass = 2000
+volume = 0
+power_usage = 0
+cloakin_time = 10
+cloakout_time = 10
+cloakin_fx = no_cloakeffect03
+cloakout_fx = no_cloakeffect03
+debris_type = debris_normal
+lootable = false
+
+; REM cloak module: Battleship Cloak Module
+[CloakingDevice]
+nickname = cloak_module_battleship
+ids_name = 476012
+ids_info = 476013
+hit_pts = 8000
+DA_archetype = equipment\models\st\li_refractor_shield.3db
+material_library = equipment\models\li_equip.mat
+material_library = Ships\nomad\nomad_fx.txm
+HP_child = HpConnect
+mass = 2000
+volume = 0
+power_usage = 0
+cloakin_time = 10
+cloakout_time = 10
+cloakin_fx = no_cloakeffect04
+cloakout_fx = no_cloakeffect04
+debris_type = debris_normal
+lootable = false
+
+; REM cloak module: Nomad Gunboat Cloak Module
+[CloakingDevice]
+nickname = cloak_module_nomad_gunboat
+ids_name = 476014
+ids_info = 476015
+hit_pts = 8000
+DA_archetype = equipment\models\st\li_refractor_shield.3db
+material_library = equipment\models\li_equip.mat
+material_library = Ships\nomad\nomad_fx.txm
+HP_child = HpConnect
+mass = 2000
+volume = 0
+power_usage = 0
+cloakin_time = 10
+cloakout_time = 10
+cloakin_fx = no_cloakeffect_gunboat
+cloakout_fx = no_cloakeffect_gunboat
+debris_type = debris_normal
+lootable = false
+
+; REM cloak module: Nomad Battleship Cloak Module
+[CloakingDevice]
+nickname = cloak_module_nomad_battleship
+ids_name = 476016
+ids_info = 476017
+hit_pts = 8000
+DA_archetype = equipment\models\st\li_refractor_shield.3db
+material_library = equipment\models\li_equip.mat
+material_library = Ships\nomad\nomad_fx.txm
+HP_child = HpConnect
+mass = 2000
+volume = 0
+power_usage = 0
+cloakin_time = 10
+cloakout_time = 10
+cloakin_fx = no_cloakeffect_battleship
+cloakout_fx = no_cloakeffect_battleship
+debris_type = debris_normal
+lootable = false
+
 [CloakingDevice]
 nickname = cloak_nomad
 ids_name = 1
diff --git a/DATA/INTERFACE/keylist.ini b/DATA/INTERFACE/keylist.ini
index 7f0e191d..07bce845 100644
--- a/DATA/INTERFACE/keylist.ini
+++ b/DATA/INTERFACE/keylist.ini
@@ -331,6 +331,9 @@ id = USER_REM_WAYPOINT_BOT
 [key]
 id = USER_REM_SECTOR_SCANNER
 
+[key]
+id = USER_CLOAK
+
 [key]
 id = USER_REM_HUDLESS
 
diff --git a/DATA/INTERFACE/keymap.ini b/DATA/INTERFACE/keymap.ini
index 0de98bba..6cfd2b73 100644
--- a/DATA/INTERFACE/keymap.ini
+++ b/DATA/INTERFACE/keymap.ini
@@ -1079,6 +1079,14 @@ ids_name = 524528
 ids_info = 524529
 state = keydown
 
+; REM: the player cloak (cloaking device in a module slot, rem-server [Native.Cloak])
+[KeyCmd]
+nickname = USER_CLOAK
+ids_name = 524530
+ids_info = 524531
+state = keydown
+key = "C", SHIFT
+
 [KeyMap]
 nickname = IDR_ALWAYS_PRESENT
 key = USER_REM_WAYPOINTS
@@ -1123,6 +1131,7 @@ nickname = IDR_GAMEFLOW
 [KeyMap]
 nickname = IDR_SPACE
 key = USER_REM_SECTOR_SCANNER
+key = USER_CLOAK
 key = USER_REM_WAYPOINT_BOT
 key = USER_REM_SENSOR_PROBE
 key = USER_REM_ACTIVATE_PROBE
diff --git a/DATA/SHIPS/shiparch.ini b/DATA/SHIPS/shiparch.ini
index 0701c756..6164a88f 100644
--- a/DATA/SHIPS/shiparch.ini
+++ b/DATA/SHIPS/shiparch.ini
@@ -81,6 +81,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_fighter_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = port fin_lod1
@@ -217,6 +218,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_elite_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = Li_star_wing_lod1
@@ -494,6 +496,7 @@ hp_type = hp_turret_special_1, HpTurret01, HpTurret02, HpTurret03, HpTurret04, H
 hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_freighter_power_special_10, HpPower01
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 steering_torque = 54000, 54000, 104000
 angular_drag = 60000, 60000, 60000
 rotation_inertia = 16800, 16800, 16800
@@ -1109,6 +1112,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_fighter_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = br_fighter_tail_lod1
@@ -1209,6 +1213,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_elite_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = br_port_wing_lod1
@@ -1353,6 +1358,7 @@ hp_type = hp_turret_special_1, HpTurret01, HpTurret02, HpTurret03, HpTurret04, H
 hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_freighter_power_special_10, HpPower01
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = br_freighter_port_wing_lod1
@@ -1989,6 +1995,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_fighter_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = wing_starboard_lod1
@@ -2287,6 +2294,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_elite_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = starboard_wing_lod1
@@ -2429,6 +2437,7 @@ hp_type = hp_turret_special_1, HpTurret01, HpTurret02, HpTurret03, HpTurret04, H
 hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_freighter_power_special_10, HpPower01
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 HP_tractor_source = HpTractor_Source
 num_exhaust_nozzles = 2
 
@@ -3128,6 +3137,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_fighter_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = port_wing_lod1
@@ -3257,6 +3267,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_elite_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = Rh_port_wing_lod1
@@ -3399,6 +3410,7 @@ hp_type = hp_turret_special_1, HpTurret01, HpTurret02, HpTurret03, HpTurret04, H
 hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_freighter_power_special_10, HpPower01
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 HP_tractor_source = HpTractor_Source
 num_exhaust_nozzles = 2
 
@@ -3936,6 +3948,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_fighter_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = bh_topfin_lod1
@@ -4071,6 +4084,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_elite_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = bh_topfin_lod1
@@ -4215,6 +4229,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_elite_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = bh_topfin_lod1
@@ -4352,6 +4367,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_fighter_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 HP_tractor_source = HpTractor_Source
 num_exhaust_nozzles = 2
 
@@ -4465,6 +4481,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_elite_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = fins_top_lod1
@@ -4592,6 +4609,7 @@ hp_type = hp_turret_special_1, HpTurret01, HpTurret02, HpTurret03, HpTurret04
 hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_freighter_power_special_10, HpPower01
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 HP_tractor_source = HpTractor_Source
 num_exhaust_nozzles = 2
 
@@ -4706,6 +4724,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_fighter_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 
 [CollisionGroup]
@@ -4872,6 +4891,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_elite_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = wing_port_lod1
@@ -5020,6 +5040,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_elite_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 hp_type = hp_rem_module02, HpJump
 
 [CollisionGroup]
@@ -5166,6 +5187,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_fighter_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 hp_type = hp_elite_shield_special_2, HpCloak01
 
 [CollisionGroup]
@@ -5266,6 +5288,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_fighter_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = port_wing_lod1
@@ -5382,6 +5405,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_fighter_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = cv_port_wing_lod1
@@ -5525,6 +5549,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_elite_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = cv_port_wing_lod1
@@ -5658,6 +5683,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_elite_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 hp_type = hp_rem_module02, HpJump
 hp_type = hp_elite_shield_special_2, HpCloak01
 
@@ -5809,6 +5835,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_elite_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = cv_port_wing_g_lod1
@@ -5958,6 +5985,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_elite_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = cv_port_wing_b_lod1
@@ -6097,6 +6125,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_fighter_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = bw_port_wing01_lod1
@@ -6207,6 +6236,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_elite_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = bw_port_wing01_lod1
@@ -6397,6 +6427,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_elite_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 hp_type = hp_rem_module02, HpJump
 
 [CollisionGroup]
@@ -6532,6 +6563,7 @@ hp_type = hp_turret_special_1, HpTurret01, HpTurret02, HpTurret03, HpTurret04, H
 hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_freighter_power_special_10, HpPower01
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 steering_torque = 54000, 54000, 54000
 angular_drag = 60000, 60000, 60000
 rotation_inertia = 16800, 16800, 16800
@@ -6667,6 +6699,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_elite_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = Or_star_wing_lod1
@@ -8689,6 +8722,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_elite_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 
 [CollisionGroup]
@@ -8860,6 +8894,7 @@ hp_type = hp_turret_special_1, HpTurret01
 hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_freighter_power_special_10, HpPower01
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 hp_type = hp_fighter_power_special_1, HpPower02
 surface_hit_effects = 0, small_hull_hit_light01, small_hull_hit_light02, small_hull_hit_light03
 surface_hit_effects = 150, small_hull_hit_medium01, small_hull_hit_medium02, small_hull_hit_medium03
@@ -8967,6 +9002,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_elite_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = starboard_wing_lod1
@@ -9102,6 +9138,7 @@ hp_type = hp_countermeasure_dropper, HpEngine02
 hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_freighter_power_special_10, HpPower01
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 hp_type = hp_fighter_power_special_1, HpPower02
 
 
@@ -9148,6 +9185,7 @@ hp_type = hp_freighter_shield_special_1, HpCargo01, HpCargo02
 hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_freighter_power_special_10, HpPower01
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 steering_torque = 22405000, 22405000, 22405000
 angular_drag = 64000000, 64000000, 64000000
 rotation_inertia = 2000000, 18000000, 18000000
@@ -9222,6 +9260,7 @@ cockpit = cockpits\hc_transport.ini
 hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_freighter_power_special_10, HpPower01
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 
 ; Alpaca
@@ -9301,6 +9340,7 @@ hp_type = hp_turret_special_1, HpTurret01, HpTurret02, HpTurret03, HpTurret04, H
 hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_freighter_power_special_10, HpPower01
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 steering_torque = 54000, 54000, 104000
 angular_drag = 60000, 60000, 60000
 rotation_inertia = 16800, 16800, 16800
@@ -9397,6 +9437,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_elite_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = Or_star_wing_s_lod1
@@ -9490,6 +9531,7 @@ hp_type = hp_turret_special_1, HpTurret_U1_01, HpTurret_U1_02, HpTurret_U1_03, H
 hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_freighter_power_special_10, HpPower01
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = lifter_clamp01_lod1
@@ -9575,6 +9617,7 @@ hp_type = hp_countermeasure_dropper, HpCM01
 hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_freighter_power_special_10, HpPower01
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 hp_type = hp_fighter_power_special_1, HpPower02
 
 [CollisionGroup]
@@ -10123,6 +10166,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_elite_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 
 ; HALLOWEEN JACK O LANTERN NPC
@@ -10242,6 +10286,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_elite_power_special_10, HpPower01
 hp_type = hp_fighter_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 hp_type = hp_rem_module02, HpJump
 
 [CollisionGroup]
@@ -10517,6 +10562,7 @@ hp_type = hp_fighter_engine_special_10, HpDrive01
 hp_type = hp_elite_power_special_10, HpPower01
 hp_type = hp_elite_power_special_1, HpPower02
 hp_type = hp_rem_module01, HpVelocity
+hp_type = hp_cloak, HpVelocity
 
 [CollisionGroup]
 obj = drone_port_wing01_lod1
diff --git a/EXE/REM/Lua/Infocards.lua b/EXE/REM/Lua/Infocards.lua
index 227c9740..806a9c2e 100644
--- a/EXE/REM/Lua/Infocards.lua
+++ b/EXE/REM/Lua/Infocards.lua
@@ -43,6 +43,8 @@ rem.AddInfoCard(524526, "SECTOR SCANNER")
 rem.AddInfoCard(524527, "Shows / hides the 3D sector scanner (contacts within 7.5 km).")
 rem.AddInfoCard(524528, "HUDLESS")
 rem.AddInfoCard(524529, "Hides the HUD, then also the mouse cursor, then shows both again (screenshots).")
+rem.AddInfoCard(524530, "CLOAK")
+rem.AddInfoCard(524531, "Switches the cloaking device on or off.")
 
 -- RACE INFOCARDS
 rem.AddInfoCard(9001, "1")
@@ -54,6 +56,27 @@ rem.AddInfoCard(9006, "START")
 
 -- Equipment Infocard Overrides
 
+-- Cloak Module Info
+rem.AddInfoCard(476000, "Cloak Module")
+rem.AddInfoCard(476001, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="c"/><TRA bold="true"/><TEXT>Cloak Module</TEXT><TRA bold="false"/><PARA/><JUST loc="l"/><PARA/><TEXT>A cloaking device that fits module slot 1. Once active, it hides the ship from sensors, scanners and targeting systems. Built after the cloaking fields of the Rheinland fighters.</TEXT><PARA/><PARA/><TEXT>Cloak time: 4 s. Effect: no_cloakeffect01.</TEXT><PARA/><PARA/><POP/></RDL>]])
+
+rem.AddInfoCard(476002, "Admin Cloak Module")
+rem.AddInfoCard(476003, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="c"/><TRA bold="true"/><TEXT>Admin Cloak Module</TEXT><TRA bold="false"/><PARA/><JUST loc="l"/><PARA/><TEXT>The cloak module without limits: firing, cruise, docking and the other rules of the server do not switch it off. Not for sale.</TEXT><PARA/><PARA/><POP/></RDL>]])
+rem.AddInfoCard(476004, "Nomad Cloak Module")
+rem.AddInfoCard(476005, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="c"/><TRA bold="true"/><TEXT>Nomad Cloak Module</TEXT><TRA bold="false"/><PARA/><JUST loc="l"/><PARA/><TEXT>A cloaking device that fits module slot 1. Once active, it hides the ship from sensors, scanners and targeting systems. Built after the cloaking fields of the Nomad fighters. The ship fades out in the shimmer of a Nomad field.</TEXT><PARA/><PARA/><TEXT>Cloak time: 4 s. Effect: no_cloakeffect05.</TEXT><PARA/><PARA/><POP/></RDL>]])
+rem.AddInfoCard(476006, "Osiris Cloak Module")
+rem.AddInfoCard(476007, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="c"/><TRA bold="true"/><TEXT>Osiris Cloak Module</TEXT><TRA bold="false"/><PARA/><JUST loc="l"/><PARA/><TEXT>A cloaking device that fits module slot 1. Once active, it hides the ship from sensors, scanners and targeting systems. A copy of the cloaking device of the Osiris, scaled down for smaller hulls.</TEXT><PARA/><PARA/><TEXT>Cloak time: 5 s. Effect: no_cloakeffect06.</TEXT><PARA/><PARA/><POP/></RDL>]])
+rem.AddInfoCard(476008, "Gunboat Cloak Module")
+rem.AddInfoCard(476009, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="c"/><TRA bold="true"/><TEXT>Gunboat Cloak Module</TEXT><TRA bold="false"/><PARA/><JUST loc="l"/><PARA/><TEXT>A cloaking device that fits module slot 1. Once active, it hides the ship from sensors, scanners and targeting systems. The cloaking field of a Rheinland gunboat. Its effect is larger and takes longer to build up.</TEXT><PARA/><PARA/><TEXT>Cloak time: 10 s. Effect: no_cloakeffect02.</TEXT><PARA/><PARA/><POP/></RDL>]])
+rem.AddInfoCard(476010, "Cruiser Cloak Module")
+rem.AddInfoCard(476011, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="c"/><TRA bold="true"/><TEXT>Cruiser Cloak Module</TEXT><TRA bold="false"/><PARA/><JUST loc="l"/><PARA/><TEXT>A cloaking device that fits module slot 1. Once active, it hides the ship from sensors, scanners and targeting systems. The cloaking field of a Rheinland cruiser. A large effect that takes long to build up.</TEXT><PARA/><PARA/><TEXT>Cloak time: 10 s. Effect: no_cloakeffect03.</TEXT><PARA/><PARA/><POP/></RDL>]])
+rem.AddInfoCard(476012, "Battleship Cloak Module")
+rem.AddInfoCard(476013, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="c"/><TRA bold="true"/><TEXT>Battleship Cloak Module</TEXT><TRA bold="false"/><PARA/><JUST loc="l"/><PARA/><TEXT>A cloaking device that fits module slot 1. Once active, it hides the ship from sensors, scanners and targeting systems. The cloaking field of a Rheinland battleship. The largest Rheinland effect, slow to build up.</TEXT><PARA/><PARA/><TEXT>Cloak time: 10 s. Effect: no_cloakeffect04.</TEXT><PARA/><PARA/><POP/></RDL>]])
+rem.AddInfoCard(476014, "Nomad Gunboat Cloak Module")
+rem.AddInfoCard(476015, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="c"/><TRA bold="true"/><TEXT>Nomad Gunboat Cloak Module</TEXT><TRA bold="false"/><PARA/><JUST loc="l"/><PARA/><TEXT>A cloaking device that fits module slot 1. Once active, it hides the ship from sensors, scanners and targeting systems. The cloaking field of a Nomad gunboat. A large Nomad effect that takes longer to build up.</TEXT><PARA/><PARA/><TEXT>Cloak time: 10 s. Effect: no_cloakeffect_gunboat.</TEXT><PARA/><PARA/><POP/></RDL>]])
+rem.AddInfoCard(476016, "Nomad Battleship Cloak Module")
+rem.AddInfoCard(476017, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="c"/><TRA bold="true"/><TEXT>Nomad Battleship Cloak Module</TEXT><TRA bold="false"/><PARA/><JUST loc="l"/><PARA/><TEXT>A cloaking device that fits module slot 1. Once active, it hides the ship from sensors, scanners and targeting systems. The cloaking field of a Nomad battleship. The largest Nomad effect, slow to build up.</TEXT><PARA/><PARA/><TEXT>Cloak time: 10 s. Effect: no_cloakeffect_battleship.</TEXT><PARA/><PARA/><POP/></RDL>]])
+
 -- Sensor Probe Info
 rem.AddInfoCard(264756, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><JUST loc="c"/><TRA bold="true"/><TEXT>Sensor Probe</TEXT><TRA bold="false"/><PARA/><JUST loc="l"/><PARA/><TEXT>The sensor probe is a small, versatile device designed to scan the immediate surroundings for anomalies. Its compact size allows for easy deployment in various environments, making it ideal for scientific research, security applications, and environmental monitoring. The probe is equipped with advanced sensors capable of detecting a wide range of physical, chemical, and biological parameters, providing real-time data and analysis. Its robust design ensures reliable performance in challenging conditions, while its intuitive interface allows for straightforward operation and data interpretation.</TEXT><PARA/><PARA/><TEXT></TEXT><PARA/><PARA/><POP/></RDL>]])