diff --git a/DATA/EQUIPMENT/market_misc.ini b/DATA/EQUIPMENT/market_misc.ini
index 34f1b989..ed666f6d 100644
--- a/DATA/EQUIPMENT/market_misc.ini
+++ b/DATA/EQUIPMENT/market_misc.ini
@@ -16960,3 +16960,9 @@ MarketGood = shield01_mark01_hf, 0, -1, 1, 1, 0, 1, 1
 MarketGood = shield01_mark01_lf, 0, -1, 1, 1, 0, 1, 1
 MarketGood = shield03_mark04_fr, 0, -1, 1, 1, 0, 1, 1
 MarketGood = shield03_mark04_hf, 0, -1, 1, 1, 0, 1, 1
+
+[BaseGood]
+base = LI06_06_Base
+MarketGood = ge_s_tractor_01, 0, -1, 1, 1, 0, 1, 1
+MarketGood = ge_s_repair_01, 0, -1, 1, 1, 0, 1, 1
+MarketGood = ge_s_battery_01, 0, -1, 1, 1, 0, 1, 1
diff --git a/DATA/MISSIONS/mbases.ini b/DATA/MISSIONS/mbases.ini
index 0a375bd0..232a8a4c 100644
--- a/DATA/MISSIONS/mbases.ini
+++ b/DATA/MISSIONS/mbases.ini
@@ -47471,7 +47471,7 @@ num_offers = 0, 0
 
 [MBase]
 nickname = LI06_06_Base
-local_faction = li_lsf_grp
+local_faction = gd_bh_grp
 diff = 1
 msg_id_prefix = gcs_refer_base_LI06_06_Base
 
@@ -47488,6 +47488,324 @@ offers_missions = false
 [MVendor]
 num_offers = 0, 0
 
+[GF_NPC]
+nickname = li06_06_base_bar_npc_01
+body = sh_male2_body
+head = rh_captain_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = gd_bh_grp
+voice = rvp111
+misn = DestroyMission, 0.205129, 0.480486
+rumor = base_0_rank, mission_end, 1, 133080
+rumor = base_0_rank, mission_end, 2, 133081
+rumor = base_0_rank, mission_end, 3, 133082
+rumor = base_0_rank, mission_end, 3, 133083
+rumorknowdb = br02_to_iw03_hole
+rumor = base_0_rank, mission_end, 3, 133084
+rumorknowdb = br02_to_br04_hole
+rumor = base_0_rank, mission_end, 3, 133085
+rumor = base_0_rank, mission_end, 1, 133086
+rumor = base_0_rank, mission_end, 1, 133087
+rumor = base_0_rank, mission_end, 2, 133088
+rumor_type2 = mission_04_accepted, mission_05_accepted, 1, 393622
+rumor_type2 = mission_05_loaded, mission_05_accepted, 1, 393626
+rumor_type2 = mission_05_loaded, mission_05_accepted, 1, 393627
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393632
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393633
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393634
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393635
+rumor_type2 = freetime_06_07, freetime_06_07, 1, 393637
+rumor_type2 = freetime_06_07, freetime_06_07, 1, 393639
+know = 251633, 252623, 6000, 1
+knowdb = br02_to_iw03_hole
+know = 251942, 253871, 10000, 3
+knowdb = Iw04_suprise_ge_armored_1
+individual_name = 263067
+
+[GF_NPC]
+nickname = li06_06_base_bar_npc_02
+body = pl_female2_journeyman_body
+head = ku_newscaster_head_gen
+lefthand = benchmark_female_hand_left
+righthand = benchmark_female_hand_right
+affiliation = gd_bh_grp
+voice = rvp501
+misn = DestroyMission, 0.205129, 0.480486
+rumor = base_0_rank, mission_end, 1, 133080
+rumor = base_0_rank, mission_end, 2, 133081
+rumor = base_0_rank, mission_end, 3, 133082
+rumor = base_0_rank, mission_end, 2, 133083
+rumorknowdb = br02_to_iw03_hole
+rumor = base_0_rank, mission_end, 2, 133084
+rumorknowdb = br02_to_br04_hole
+rumor = base_0_rank, mission_end, 3, 133085
+rumor = base_0_rank, mission_end, 1, 133086
+rumor = base_0_rank, mission_end, 1, 133087
+rumor = base_0_rank, mission_end, 2, 133088
+rumor = base_0_rank, mission_end, 3, 134323
+rumor_type2 = mission_04_accepted, mission_05_accepted, 1, 393622
+rumor_type2 = mission_05_loaded, mission_05_accepted, 1, 393626
+rumor_type2 = mission_05_loaded, mission_05_accepted, 1, 393627
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393632
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393633
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393634
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393635
+rumor_type2 = freetime_06_07, freetime_06_07, 1, 393637
+rumor_type2 = freetime_06_07, freetime_06_07, 1, 393639
+know = 251612, 252622, 5000, 2
+knowdb = br02_to_br04_hole
+accessory = prop_neuralnet_B
+individual_name = 263066
+
+[GF_NPC]
+nickname = li06_06_base_bar_npc_03
+body = pl_female2_journeyman_body
+head = rh_newscaster_head_gen
+lefthand = benchmark_female_hand_left
+righthand = benchmark_female_hand_right
+affiliation = gd_bh_grp
+voice = rvp541
+misn = DestroyMission, 0.205129, 0.480486
+rumor = base_0_rank, mission_end, 1, 133080
+rumor = base_0_rank, mission_end, 2, 133081
+rumor = base_0_rank, mission_end, 3, 133082
+rumor = base_0_rank, mission_end, 2, 133083
+rumorknowdb = br02_to_iw03_hole
+rumor = base_0_rank, mission_end, 3, 133084
+rumorknowdb = br02_to_br04_hole
+rumor = base_0_rank, mission_end, 3, 133085
+rumor = base_0_rank, mission_end, 1, 133086
+rumor = base_0_rank, mission_end, 1, 133087
+rumor = base_0_rank, mission_end, 2, 133088
+rumor_type2 = mission_04_accepted, mission_05_accepted, 1, 393622
+rumor_type2 = mission_05_loaded, mission_05_accepted, 1, 393626
+rumor_type2 = mission_05_loaded, mission_05_accepted, 1, 393627
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393632
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393633
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393634
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393635
+rumor_type2 = freetime_06_07, freetime_06_07, 1, 393637
+rumor_type2 = freetime_06_07, freetime_06_07, 1, 393639
+know = 251633, 252623, 6000, 2
+knowdb = br02_to_iw03_hole
+individual_name = 263065
+
+[GF_NPC]
+nickname = li06_06_base_bar_npc_04
+body = br_brighton_body
+head = pl_male7_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = co_be_grp
+voice = rvp101
+bribe = br_p_grp, 10000, 16100
+bribe = co_be_grp, 10000, 16101
+bribe = br_m_grp, 10000, 16100
+bribe = co_ti_grp, 10000, 16100
+rumor = base_0_rank, mission_end, 1, 133089
+rumor = base_0_rank, mission_end, 1, 133090
+rumor = base_0_rank, mission_end, 1, 133091
+rumor = base_0_rank, mission_end, 1, 133092
+rumor = base_0_rank, mission_end, 1, 133093
+rumor = base_0_rank, mission_end, 1, 133094
+rumor = base_0_rank, mission_end, 3, 134323
+rumor_type2 = mission_04_accepted, mission_05_accepted, 1, 393622
+rumor_type2 = mission_05_loaded, mission_05_accepted, 1, 393626
+rumor_type2 = mission_05_loaded, mission_05_accepted, 1, 393627
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393632
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393633
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393634
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393635
+rumor_type2 = freetime_06_07, freetime_06_07, 1, 393637
+rumor_type2 = freetime_06_07, freetime_06_07, 1, 393639
+individual_name = 263064
+
+[GF_NPC]
+nickname = li06_06_base_bar_npc_05
+body = br_female_guard_body
+head = br_newscaster_head_gen_hat
+lefthand = benchmark_female_hand_left
+righthand = benchmark_female_hand_right
+affiliation = br_p_grp
+voice = rvp541
+misn = DestroyMission, 0.205129, 0.480486
+bribe = br_p_grp, 10000, 16101
+bribe = co_nws_grp, 10000, 16100
+bribe = co_ss_grp, 10000, 16100
+bribe = co_ti_grp, 10000, 16100
+bribe = gd_bh_grp, 10000, 16100
+rumor = base_0_rank, mission_end, 1, 133095
+rumor = base_0_rank, mission_end, 2, 133096
+rumor = base_0_rank, mission_end, 2, 133097
+rumor = base_0_rank, mission_end, 1, 133098
+rumor = base_0_rank, mission_end, 2, 133099
+rumor = base_0_rank, mission_end, 2, 133100
+rumor_type2 = mission_04_accepted, mission_05_accepted, 1, 393622
+rumor_type2 = mission_05_loaded, mission_05_accepted, 1, 393626
+rumor_type2 = mission_05_loaded, mission_05_accepted, 1, 393627
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393632
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393633
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393634
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393635
+rumor_type2 = freetime_06_07, freetime_06_07, 1, 393637
+rumor_type2 = freetime_06_07, freetime_06_07, 1, 393639
+rumor_type2 = base_0_rank, mission_end, 1, 393416
+accessory = prop_hat_female_br_grd_visor
+individual_name = 263063
+
+[GF_NPC]
+nickname = li06_06_base_bar_npc_06
+body = br_male_guard_body
+head = ge_male1_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = br_p_grp
+voice = rvp101
+misn = DestroyMission, 0.205129, 0.480486
+bribe = br_p_grp, 10000, 16101
+bribe = co_be_grp, 10000, 16100
+bribe = co_os_grp, 10000, 16100
+bribe = co_ss_grp, 10000, 16100
+bribe = gd_bh_grp, 10000, 16100
+rumor = base_0_rank, mission_end, 1, 133095
+rumor = base_0_rank, mission_end, 2, 133096
+rumor = base_0_rank, mission_end, 2, 133097
+rumor = base_0_rank, mission_end, 1, 133098
+rumor = base_0_rank, mission_end, 2, 133099
+rumor = base_0_rank, mission_end, 2, 133100
+rumor_type2 = mission_04_accepted, mission_05_accepted, 1, 393622
+rumor_type2 = mission_05_loaded, mission_05_accepted, 1, 393626
+rumor_type2 = mission_05_loaded, mission_05_accepted, 1, 393627
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393632
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393633
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393634
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393635
+rumor_type2 = freetime_06_07, freetime_06_07, 1, 393637
+rumor_type2 = freetime_06_07, freetime_06_07, 1, 393639
+rumor_type2 = base_0_rank, mission_end, 1, 393416
+individual_name = 263062
+
+[GF_NPC]
+nickname = li06_06_base_bar_npc_07
+body = br_bartender_body
+head = pi_pirate4_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = gd_bh_grp
+voice = rvp101
+bribe = br_p_grp, 10000, 16100
+bribe = co_nws_grp, 10000, 16100
+bribe = gd_im_grp, 10000, 16100
+bribe = gd_bh_grp, 10000, 16101
+rumor = base_0_rank, mission_end, 1, 133080
+rumor = base_0_rank, mission_end, 2, 133081
+rumor = base_0_rank, mission_end, 2, 133083
+rumorknowdb = br02_to_iw03_hole
+rumor = base_0_rank, mission_end, 2, 133088
+rumor_type2 = mission_04_accepted, mission_05_accepted, 1, 393621
+rumor_type2 = mission_04_accepted, mission_05_accepted, 1, 393622
+rumor_type2 = mission_05_loaded, mission_05_accepted, 1, 393626
+rumor_type2 = mission_05_loaded, mission_05_accepted, 1, 393627
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393632
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393633
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393634
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393635
+rumor_type2 = freetime_06_07, freetime_06_07, 1, 393637
+rumor_type2 = freetime_06_07, freetime_06_07, 1, 393639
+individual_name = 263061
+
+[GF_NPC]
+nickname = li06_06_base_bar_npc_08
+body = pl_male2_peasant_body
+head = br_captain_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = co_nws_grp
+voice = rvp131
+bribe = co_nws_grp, 10000, 16101
+bribe = co_ti_grp, 10000, 16100
+bribe = gd_im_grp, 10000, 16100
+rumor = base_0_rank, mission_end, 1, 133101
+rumor = base_0_rank, mission_end, 1, 133102
+rumor = base_0_rank, mission_end, 1, 133103
+rumor_type2 = mission_04_accepted, mission_05_accepted, 1, 393622
+rumor_type2 = mission_05_loaded, mission_05_accepted, 1, 393626
+rumor_type2 = mission_05_loaded, mission_05_accepted, 1, 393627
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393632
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393634
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393635
+individual_name = 263060
+
+[GF_NPC]
+nickname = li06_06_base_bar_npc_09
+body = li_tilton_body
+head = pi_pirate2_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = co_ss_grp
+voice = rvp101
+bribe = br_p_grp, 10000, 16100
+bribe = co_ss_grp, 10000, 16101
+bribe = co_ti_grp, 10000, 16100
+bribe = co_vr_grp, 10000, 16100
+rumor = base_0_rank, mission_end, 1, 133104
+rumor = base_0_rank, mission_end, 1, 133105
+rumor = base_0_rank, mission_end, 1, 133106
+rumor_type2 = mission_04_accepted, mission_05_accepted, 1, 393622
+rumor_type2 = mission_05_loaded, mission_05_accepted, 1, 393626
+rumor_type2 = mission_05_loaded, mission_05_accepted, 1, 393627
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393632
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393634
+rumor_type2 = mission_05_accepted, freetime_05_06, 1, 393635
+individual_name = 263059
+
+[GF_NPC]
+nickname = li06_06_base_deck_npc_01
+body = sh_male2_body
+head = rh_hassler_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = gd_bh_grp
+voice = rvp131
+individual_name = 263058
+
+[GF_NPC]
+nickname = li06_06_base_deck_npc_02
+body = sh_male2_body
+head = li_rockford_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = gd_bh_grp
+voice = rvp101
+individual_name = 263057
+
+[GF_NPC]
+nickname = li06_06_base_shipdealer_npc_01
+body = sh_male2_body
+head = rh_wilham_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = gd_bh_grp
+voice = rvp131
+individual_name = 263056
+
+[MRoom]
+nickname = Bar
+character_density = 7
+fixture = li06_06_base_bar_npc_07, Zs/NPC/Bartender/01/A/Stand, scripts\vendors\li_host_fidget.thn, bartender
+
+[MRoom]
+nickname = Deck
+character_density = 3
+fixture = li06_06_base_deck_npc_01, Zs/NPC/trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader
+fixture = li06_06_base_deck_npc_02, Zs/NPC/Equipment/01/A/Stand, scripts\vendors\li_equipdealer_fidget.thn, Equipment
+
+[MRoom]
+nickname = ShipDealer
+character_density = 2
+fixture = li06_06_base_shipdealer_npc_01, Zs/NPC/ShipDealer/01/A/Stand, scripts\vendors\li_shipdealer_fidget.thn, ShipDealer
+
 [MBase]
 nickname = LI06_07_Base
 local_faction = li_n_grp
diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_06_Base.ini b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_06_Base.ini
index 674af009..dd4c1465 100644
--- a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_06_Base.ini
+++ b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_06_Base.ini
@@ -1,6 +1,7 @@
 [BaseInfo]
 nickname = LI06_06_Base
-start_room = Bar
+start_room = Deck
+price_variance = 0.15
 
 [Room]
 nickname = Bar
@@ -9,3 +10,7 @@ file = Universe\Systems\LI06\Bases\Rooms\LI06_06_bar.ini
 [Room]
 nickname = Deck
 file = Universe\Systems\LI06\Bases\Rooms\LI06_06_deck.ini
+
+[Room]
+nickname = ShipDealer
+file = Universe\Systems\LI06\Bases\ROOMS\li06_06_shipdealer.ini
diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_06_bar.ini b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_06_bar.ini
index 3be279fc..7dbfc217 100644
--- a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_06_bar.ini
+++ b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_06_bar.ini
@@ -1,18 +1,17 @@
 [Room_Info]
-set_script = Scripts\Bases\Li_07_bar_hardpoint_01.thn
-scene = all, ambient, Scripts\Bases\Li_07_bar_ambi_int_01.thn
-animation = Sc_loop
+set_script = scripts\bases\br_05_Bar_hardpoint_01.thn
+scene = ambient, scripts\bases\br_05_bar_ambi_Br02_03.thn
 
 [Room_Sound]
-music = music_bar_li05
-ambient = ambience_bar_space
-
-[Camera]
-name = Camera_0
+music = music_bar_generic06
+ambient = ambience_deck_space_smaller
 
 [CharacterPlacement]
 name = Zg/PC/Player/01/A/Stand
-start_script = scripts\bases\Li_07_bar_enter_01.thn
+start_script = Scripts\Bases\br_05_bar_enter_01.thn
+
+[Camera]
+name = Camera_0
 
 [Hotspot]
 name = IDS_HOTSPOT_DECK
@@ -24,6 +23,27 @@ name = IDS_HOTSPOT_BAR
 behavior = ExitDoor
 room_switch = Bar
 
+[Hotspot]
+name = IDS_HOTSPOT_COMMODITYTRADER_ROOM
+behavior = ExitDoor
+room_switch = Deck
+set_virtual_room = Trader
+
+[Hotspot]
+name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM
+behavior = ExitDoor
+room_switch = Deck
+set_virtual_room = Equipment
+
+[Hotspot]
+name = IDS_HOTSPOT_SHIPDEALER_ROOM
+behavior = ExitDoor
+room_switch = ShipDealer
+
 [Hotspot]
 name = IDS_HOTSPOT_NEWSVENDOR
 behavior = NewsVendor
+
+[Hotspot]
+name = IDS_HOTSPOT_MISSIONVENDOR
+behavior = MissionVendor
diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_06_deck.ini b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_06_deck.ini
index d755e2af..a56afbac 100644
--- a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_06_deck.ini
+++ b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_06_deck.ini
@@ -1,10 +1,10 @@
 [Room_Info]
-set_script = Scripts\Bases\Li_07_Deck_hardpoint_01.thn
-scene = all, ambient, Scripts\Bases\Li_07_Deck_ambi_int_01.thn
+set_script = Scripts\Bases\br_05_Deck_hardpoint_01.thn
+scene = all, ambient, Scripts\Bases\br_05_Deck_ambi_int_01.thn
 animation = Sc_loop
 
 [Room_Sound]
-ambient = ambience_deck_space_larger
+ambient = ambience_deck_space_smaller
 
 [PlayerShipPlacement]
 name = X/Shipcentre/01
@@ -22,12 +22,72 @@ name = IDS_HOTSPOT_BAR
 behavior = ExitDoor
 room_switch = Bar
 
+[Hotspot]
+name = IDS_HOTSPOT_COMMODITYTRADER_ROOM
+behavior = VirtualRoom
+room_switch = Trader
+
+[Hotspot]
+name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM
+behavior = VirtualRoom
+room_switch = Equipment
+
+[Hotspot]
+name = IDS_HOTSPOT_SHIPDEALER_ROOM
+behavior = ExitDoor
+room_switch = ShipDealer
+
+[Hotspot]
+name = IDS_NN_REPAIR_YOUR_SHIP
+behavior = Repair
+virtual_room = Deck
+
+[Hotspot]
+name = IDS_DEALER_FRONT_DESK
+behavior = FrontDesk
+state_read = 1
+state_send = 2
+virtual_room = Trader
+
+[Hotspot]
+name = IDS_HOTSPOT_COMMODITYTRADER
+behavior = StartDealer
+state_read = 2
+state_send = 1
+virtual_room = Trader
+
+[Hotspot]
+name = IDS_DEALER_FRONT_DESK
+behavior = FrontDesk
+state_read = 1
+state_send = 2
+virtual_room = Equipment
+
+[Hotspot]
+name = IDS_HOTSPOT_EQUIPMENTDEALER
+behavior = StartEquipDealer
+state_read = 2
+state_send = 1
+virtual_room = Equipment
+
+[Hotspot]
+name = IDS_EQUIPMENT_ROOM_RIGHT
+behavior = MoveRight
+state_read = 2
+state_send = 1
+virtual_room = Equipment
+
+[Hotspot]
+name = IDS_NN_REPAIR_YOUR_SHIP
+behavior = Repair
+virtual_room = Equipment
+
 [FlashlightSet]
-icolor = 0, 155, 255
-scale = 0.250000
-gap = 0.000000
-blink = 0.000000
-endpause = 0.000000
+icolor = 255, 200, 100
+scale = 0.5
+gap = 0
+blink = 0.05
+endpause = 0
 hardpoint = HpLightA01
 hardpoint = HpLightA02
 hardpoint = HpLightA03
@@ -56,6 +116,14 @@ hardpoint = HpLightA25
 hardpoint = HpLightA26
 hardpoint = HpLightA27
 hardpoint = HpLightA28
+hardpoint = HpLightA29
+hardpoint = HpLightA30
+hardpoint = HpLightB15
+hardpoint = HpLightB16
+hardpoint = HpLightB17
+hardpoint = HpLightB18
+hardpoint = HpLightB19
+hardpoint = HpLightB20
 hardpoint = HpLightB21
 hardpoint = HpLightB22
 hardpoint = HpLightB23
@@ -64,11 +132,28 @@ hardpoint = HpLightB25
 hardpoint = HpLightB26
 
 [FlashlightSet]
-icolor = 255, 255, 55
-scale = 0.250000
-gap = 0.000000
-blink = 0.050000
-endpause = 0.000000
+icolor = 200, 255, 50
+scale = 0.5
+gap = 0
+blink = 0
+endpause = 0
+hardpoint = HpLightA31
+hardpoint = HpLightA32
+hardpoint = HpLightA33
+hardpoint = HpLightA34
+hardpoint = HpLightA35
+hardpoint = HpLightA36
+hardpoint = HpLightA37
+hardpoint = HpLightA38
+hardpoint = HpLightA39
+hardpoint = HpLightA40
+
+[FlashlightSet]
+icolor = 100, 200, 200
+scale = 0.5
+gap = 0
+blink = 0
+endpause = 0
 numlights = 26
 hardpoint = HpLightB01
 hardpoint = HpLightB02
@@ -84,9 +169,3 @@ hardpoint = HpLightB11
 hardpoint = HpLightB12
 hardpoint = HpLightB13
 hardpoint = HpLightB14
-hardpoint = HpLightB15
-hardpoint = HpLightB16
-hardpoint = HpLightB17
-hardpoint = HpLightB18
-hardpoint = HpLightB19
-hardpoint = HpLightB20
diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/li06_06_shipdealer.ini b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/li06_06_shipdealer.ini
new file mode 100644
index 00000000..b1ef8bd9
--- /dev/null
+++ b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/li06_06_shipdealer.ini
@@ -0,0 +1,61 @@
+[Room_Info]
+set_script = Scripts\Bases\Br_05_Deck_hardpoint_SDlr.thn
+scene = all, ambient, Scripts\Bases\br_05_Deck_ambi_int_01.thn
+
+[Spiels]
+ShipDealer = manhattan_ship_spiel
+
+[Camera]
+name = Camera_0
+
+[Room_Sound]
+ambient = ambience_shipbuy
+
+[CharacterPlacement]
+name = Zg/PC/Player/01/A/Stand
+
+[ForSaleShipPlacement]
+name = X/Shipcentre/01
+
+[Hotspot]
+name = IDS_HOTSPOT_DECK
+behavior = ExitDoor
+room_switch = Deck
+
+[Hotspot]
+name = IDS_HOTSPOT_BAR
+behavior = ExitDoor
+room_switch = Bar
+
+[Hotspot]
+name = IDS_HOTSPOT_COMMODITYTRADER_ROOM
+behavior = ExitDoor
+room_switch = Deck
+set_virtual_room = Trader
+
+[Hotspot]
+name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM
+behavior = ExitDoor
+room_switch = Deck
+set_virtual_room = Equipment
+
+[Hotspot]
+name = IDS_HOTSPOT_SHIPDEALER_ROOM
+behavior = ExitDoor
+room_switch = ShipDealer
+
+[Hotspot]
+name = IDS_NN_REPAIR_YOUR_SHIP
+behavior = Repair
+
+[Hotspot]
+name = IDS_DEALER_FRONT_DESK
+behavior = FrontDesk
+state_read = 1
+state_send = 2
+
+[Hotspot]
+name = IDS_HOTSPOT_SHIPDEALER
+behavior = StartShipDealer
+state_read = 2
+state_send = 1
diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini b/DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini
index 624ea497..94f7d2e6 100644
--- a/DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini
+++ b/DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini
@@ -352,20 +352,20 @@ voice = atc_leg_m01
 
 [Object]
 nickname = LI06_06
-pos = -44720.51, 70.28, -43203.14
-ids_info = 65713
+pos = -45484.648438, 70.279999, -43852.656250
 behavior = NOTHING
 pilot = pilot_solar_easy
 dock_with = LI06_06_Base
 base = LI06_06_Base
-reputation = li_lsf_grp
-rotate = 180, 27.15, 180   
+reputation = gd_bh_grp
+rotate = 180.000000, 42.150002, 180.000000   
 archetype = smallstation1
 ids_name = 450030
 loadout = smallstation_li_01
 difficulty_level = 1
-space_costume = benchmark_male_head, benchmark_male_body
+space_costume = pl_female2_head, pi_pirate3_body
 voice = atc_leg_m01
+ids_info = 263068
 
 ;endregion
 
@@ -521,12 +521,12 @@ sort = 99.500000
 density = 0
 relief_time = 0
 
-[zone]
+[Zone]
 nickname = Zone_LI06_planet_2_ring
 pos = -46767, 0, -45697
-rotate = 0, 0, 0
-shape = ring
-size = 5000, 200, 200
+rotate = 90, 0, 0
+shape = RING
+size = 8000, 4000, 200
 sort = 0.000000
 
 [Object]
@@ -539,7 +539,7 @@ archetype = planet_desored_1500
 atmosphere_range = 1800
 burn_color = 255, 222, 160
 ids_info = 66069
-ring = Zone_LI06_planet_2_ring, solar\rings\lava.ini
+ring = Zone_LI06_planet_2_ring, solar\rings\ice.ini
 
 ;endregion
 
diff --git a/DATA/UNIVERSE/universe.ini b/DATA/UNIVERSE/universe.ini
index 341a77a6..648431fe 100644
--- a/DATA/UNIVERSE/universe.ini
+++ b/DATA/UNIVERSE/universe.ini
@@ -1769,8 +1769,8 @@ BGCS_base_run_by = W02bF33
 [Base]
 nickname = LI06_06_Base
 system = LI06
-strid_name = 0
-file = Universe\Systems\LI06\Bases\LI06_06_Base.ini
+strid_name = 450030
+file = UNIVERSE\SYSTEMS\Li06\Bases\LI06_06_Base.ini
 BGCS_base_run_by = W02bF33
 
 [Base]
diff --git a/EXE/REM/Lua/Infocards.lua b/EXE/REM/Lua/Infocards.lua
index ec59a592..52e2d602 100644
--- a/EXE/REM/Lua/Infocards.lua
+++ b/EXE/REM/Lua/Infocards.lua
@@ -31,7 +31,7 @@ rem.AddInfoCard(450010, "Planet Las Vegas")
 rem.AddInfoCard(450011, "Planet Las Vegas Docking Ring")
 rem.AddInfoCard(450020, "Planet Reno")
 rem.AddInfoCard(450021, "Planet Reno Docking Ring")
-rem.AddInfoCard(450030, "Carson Station")
+rem.AddInfoCard(450030, "Sentinel Outpost")
 rem.AddInfoCard(450035, "Hoover Station")
 rem.AddInfoCard(450040, "Helios Station")
 rem.AddInfoCard(450045, "Primm Station")
@@ -833,6 +833,19 @@ rem.AddInfoCard(263052, "Helios Station Bartender Nadia Mercer")
 rem.AddInfoCard(263053, "Bounty Hunters Guild Maya Cortez")
 rem.AddInfoCard(263054, "Bounty Hunters Guild Tobias Sato")
 rem.AddInfoCard(263055, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><TEXT>CLASS: Dunkirk</TEXT><PARA/><TEXT>CREW: </TEXT><TRA color="#FF0000"/><TEXT>CLASSIFIED</TEXT><TRA color="default"/><PARA/><TEXT>ARMAMENT: </TEXT><TRA color="#FF0000"/><TEXT>CLASSIFIED</TEXT><PARA/><POP/></RDL>]])
+rem.AddInfoCard(263056, "Sentinel Outpost Ship Dealer Caleb Reyes")
+rem.AddInfoCard(263057, "Sentinel Outpost Equipment Dealer Anika Reyes")
+rem.AddInfoCard(263058, "Sentinel Outpost Trade Dealer Kara Wolfe")
+rem.AddInfoCard(263059, "Universal Shipping Anika Larsen")
+rem.AddInfoCard(263060, "Gateway Shipping Jonas Archer")
+rem.AddInfoCard(263061, "Sentinel Outpost Bartender Hanna Mason")
+rem.AddInfoCard(263062, "Bretonia Police Rafael Larsen")
+rem.AddInfoCard(263063, "Bretonia Police Leona Cortez")
+rem.AddInfoCard(263064, "Border World Exports Marek Bennett")
+rem.AddInfoCard(263065, "Bounty Hunters Guild Rafael Archer")
+rem.AddInfoCard(263066, "Bounty Hunters Guild Samira Schneider")
+rem.AddInfoCard(263067, "Bounty Hunters Guild Maya Patel")
+rem.AddInfoCard(263068, [[<?xml version="1.0" encoding="UTF-16"?><RDL><PUSH/><TEXT>CLASS: Dunkirk</TEXT><PARA/><TEXT>CREW: </TEXT><TRA color="#FF0000"/><TEXT>CLASSIFIED</TEXT><TRA color="default"/><PARA/><TEXT>ARMAMENT: </TEXT><TRA color="#FF0000"/><TEXT>CLASSIFIED</TEXT><PARA/><PARA/><TEXT>Built to monitor the traffic moving through Nevada's trade lanes, this Bounty Hunter station serves as a forward operating post for trackers, contract brokers, and patrol wings assigned to the Las Vegas sector. Its location allows quick response to pirate activity near the debris fields, where criminals and smugglers often try to vanish into the wreckage.</TEXT><PARA/><TEXT>The station is heavily secured and keeps its own records separate from the local authorities. Hunters stationed here are known to favor fast contracts, quiet deals, and aggressive pursuit, making the post one of the most effective choke points in the system. Few fugitives pass through Nevada without hearing of the station first.</TEXT><PARA/><POP/></RDL>]])
 
 
 -- Thrust Velocity Extensions Equipment