From a231c6fe98f670528c191921735b17a3a71f8ec8 Mon Sep 17 00:00:00 2001
From: FlatHack <steven.noah@outlook.com>
Date: Mon, 15 Jun 2026 15:54:54 +0200
Subject: [PATCH] Las Vegas Fix

---
 DATA/MISSIONS/mbases.ini                      | 643 ++++++++++++++++--
 .../SYSTEMS/Li06/Bases/LI06_01_Base.ini       |   5 +
 .../SYSTEMS/Li06/Bases/Rooms/LI06_01_bar.ini  | 151 +---
 .../Li06/Bases/Rooms/LI06_01_planetscape.ini  | 185 +----
 .../Li06/Bases/Rooms/li06_01_planetscape2.ini |  38 ++
 DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini           |  17 +-
 6 files changed, 664 insertions(+), 375 deletions(-)
 create mode 100644 DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/li06_01_planetscape2.ini

diff --git a/DATA/MISSIONS/mbases.ini b/DATA/MISSIONS/mbases.ini
index 1eedacc3..63f450b3 100644
--- a/DATA/MISSIONS/mbases.ini
+++ b/DATA/MISSIONS/mbases.ini
@@ -46033,7 +46033,6 @@ fixture = st0301_fix_weaponsdealer, Zs/NPC/Equipment/01/A/Stand, scripts\vendors
 
 ; Omicron Beta 2
 
-
 ; Safe Dock
 
 [MBase]
@@ -46050,17 +46049,17 @@ character_density = 3
 
 [MBase]
 nickname = LI06_01_Base
-local_faction = li_lsf_grp
-diff = 3
+local_faction = gd_z_grp
+diff = 1
 msg_id_prefix = gcs_refer_base_LI06_01_Base
 
 [MVendor]
-num_offers = 2, 4
+num_offers = 0, 0
 
 [BaseFaction]
 faction = li_p_grp
 weight = 9
-offers_missions = 
+offers_missions =
 mission_type = DestroyMission, 0.112387, 0.351002, 20
 npc = LI0601_lpolice_001_m
 
@@ -46077,7 +46076,7 @@ offers_missions = false
 [BaseFaction]
 faction = co_ti_grp
 weight = 64
-offers_missions = 
+offers_missions =
 mission_type = DestroyMission, 0.112387, 0.351002, 40
 npc = LI0601_planetform_001_m
 npc = LI0601_planetform_002_m
@@ -46091,7 +46090,7 @@ npc = LI0601_universal_001_m
 [BaseFaction]
 faction = gd_bh_grp
 weight = 18
-offers_missions = 
+offers_missions =
 mission_type = DestroyMission, 0.112387, 0.351002, 40
 npc = LI0601_bounty_001_f
 npc = LI0601_bounty_002_m
@@ -46132,41 +46131,6 @@ bribe = co_ti_grp, 10000, 16100
 bribe = gd_bh_grp, 10000, 16101
 accessory = prop_neuralnet_B_right
 
-[GF_NPC]
-nickname = LI0601_fix_bartender
-body = li_bartender_body
-head = rh_bartender_head
-lefthand = benchmark_male_hand_left
-righthand = benchmark_male_hand_right
-individual_name = 244652
-affiliation = co_ti_grp
-voice = rvp111
-bribe = co_be_grp, 10000, 16100
-bribe = co_nws_grp, 10000, 16100
-bribe = co_ss_grp, 10000, 16100
-bribe = co_ti_grp, 10000, 16101
-
-[GF_NPC]
-nickname = LI0601_fix_ship
-base_appr = Robot_body_c
-individual_name = 244655
-affiliation = co_ti_grp
-voice = rvp003
-
-[GF_NPC]
-nickname = LI0601_fix_trader
-base_appr = Robot_body_a
-individual_name = 244653
-affiliation = co_ti_grp
-voice = rvp003
-
-[GF_NPC]
-nickname = LI0601_fix_weaponsdealer
-base_appr = Robot_body_e
-individual_name = 244654
-affiliation = co_ti_grp
-voice = rvp003
-
 [GF_NPC]
 nickname = LI0601_lpolice_001_m
 body = li_male_guard_body
@@ -46246,17 +46210,600 @@ bribe = co_ni_grp, 10000, 16100
 bribe = co_ss_grp, 10000, 16101
 bribe = co_ti_grp, 10000, 16100
 
+[GF_NPC]
+nickname = li06_01_base_bar_npc_01
+body = pl_female2_journeyman_body
+head = sh_female2_head_gen
+lefthand = benchmark_female_hand_left
+righthand = benchmark_female_hand_right
+affiliation = gd_bh_grp
+voice = rvp511
+misn = DestroyMission, 0, 0.112387
+bribe = li_p_grp, 10000, 16100
+bribe = co_kt_grp, 10000, 16100
+bribe = gd_bh_grp, 10000, 16101
+rumor = base_0_rank, mission_end, 1, 131271
+rumor = base_0_rank, mission_end, 2, 131272
+rumor = base_0_rank, mission_end, 1, 131273
+rumor = base_0_rank, mission_end, 2, 131274
+rumor = base_0_rank, mission_end, 1, 131275
+rumor = base_0_rank, mission_end, 2, 131276
+rumor_type2 = mission_01a_accepted, freetime_01_02, 1, 393438
+rumor_type2 = mission_01b_loaded, freetime_01_02, 1, 393439
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393440
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393441
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393442
+rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393571
+rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393572
+rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393573
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393574
+rumor_type2 = mission_02_loaded, mission_02_loaded, 1, 393575
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393577
+rumor_type2 = mission_02_loaded, mission_02_loaded, 1, 393578
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393579
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393580
+rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393584
+rumor_type2 = mission_02_accepted, freetime_02_03, 1, 393586
+rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393591
+rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594
+rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393600
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605
+rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606
+rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607
+rumor_type2 = mission_02_loaded, mission_04_accepted, 1, 393648
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393443
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393649
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393399
+rumor_type2 = mission_01a_loaded, mission_02_accepted, 1, 393428
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393467
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393366
+accessory = prop_neuralnet_B
+individual_name = 263015
+
+[GF_NPC]
+nickname = li06_01_base_bar_npc_02
+body = sh_male2_body
+head = br_sales_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = gd_bh_grp
+voice = rvp101
+misn = DestroyMission, 0, 0.112387
+bribe = li_p_grp, 10000, 16100
+bribe = co_be_grp, 10000, 16100
+bribe = co_os_grp, 10000, 16100
+bribe = gd_bh_grp, 10000, 16101
+rumor = base_0_rank, mission_end, 1, 131271
+rumor = base_0_rank, mission_end, 2, 131272
+rumor = base_0_rank, mission_end, 1, 131273
+rumor = base_0_rank, mission_end, 2, 131274
+rumor = base_0_rank, mission_end, 1, 131275
+rumor = base_0_rank, mission_end, 2, 131276
+rumor_type2 = mission_01a_accepted, freetime_01_02, 1, 393438
+rumor_type2 = mission_01b_loaded, freetime_01_02, 1, 393439
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393440
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393441
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393442
+rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393571
+rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393572
+rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393573
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393574
+rumor_type2 = mission_02_loaded, mission_02_loaded, 1, 393575
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393577
+rumor_type2 = mission_02_loaded, mission_02_loaded, 1, 393578
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393579
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393580
+rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393584
+rumor_type2 = mission_02_accepted, freetime_02_03, 1, 393586
+rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393591
+rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594
+rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393600
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605
+rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606
+rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607
+rumor_type2 = mission_02_loaded, mission_04_accepted, 1, 393648
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393444
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393649
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393400
+rumor_type2 = mission_01a_loaded, mission_02_accepted, 1, 393429
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393468
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393367
+accessory = prop_neuralnet_B
+individual_name = 263014
+
+[GF_NPC]
+nickname = li06_01_base_bar_npc_03
+body = br_quigly_body
+head = pi_pirate4_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = co_be_grp
+voice = rvp131
+bribe = co_be_grp, 10000, 16101
+bribe = co_os_grp, 10000, 16100
+bribe = gd_bh_grp, 10000, 16100
+rumor = base_0_rank, mission_end, 1, 131277
+rumor = base_0_rank, mission_end, 2, 131278
+rumor = base_0_rank, mission_end, 2, 131279
+rumor_type2 = mission_01a_accepted, freetime_01_02, 1, 393438
+rumor_type2 = mission_01b_loaded, freetime_01_02, 1, 393439
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393440
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393441
+rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393572
+rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393573
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393574
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393577
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393579
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393580
+rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393584
+rumor_type2 = mission_02_accepted, freetime_02_03, 1, 393586
+rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393591
+rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594
+rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393600
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605
+rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606
+rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607
+rumor_type2 = mission_02_loaded, mission_04_accepted, 1, 393648
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393445
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393401
+rumor_type2 = mission_01a_loaded, mission_02_accepted, 1, 393428
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393469
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393368
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393649
+know = 251651, 253634, 3000, 2
+knowdb = br01_02
+know = 251668, 253635, 2800, 2
+knowdb = br04_02
+individual_name = 263013
+
+[GF_NPC]
+nickname = li06_01_base_bar_npc_04
+body = sc_scientist3_body
+head = rh_sales_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = co_me_grp
+voice = rvp106
+misn = DestroyMission, 0, 0.112387
+rumor = base_0_rank, mission_end, 1, 131280
+rumor = base_0_rank, mission_end, 2, 131281
+rumor = base_0_rank, mission_end, 3, 131282
+rumor = base_0_rank, mission_end, 1, 131283
+rumor = base_0_rank, mission_end, 2, 131284
+rumor = base_0_rank, mission_end, 1, 131285
+rumor = base_0_rank, mission_end, 2, 131286
+rumor = base_0_rank, mission_end, 1, 131287
+rumor = base_0_rank, mission_end, 2, 131288
+rumor = base_0_rank, mission_end, 1, 131289
+rumor_type2 = mission_01a_loaded, mission_01b_loaded, 1, 393429
+rumor_type2 = mission_01a_accepted, freetime_01_02, 1, 393438
+rumor_type2 = mission_01b_loaded, freetime_01_02, 1, 393439
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393440
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393441
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393442
+rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393572
+rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393573
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393574
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393577
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393579
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393580
+rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393584
+rumor_type2 = mission_02_accepted, freetime_02_03, 1, 393586
+rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393591
+rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594
+rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393600
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605
+rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606
+rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607
+rumor_type2 = mission_02_loaded, mission_04_accepted, 1, 393648
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393446
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393402
+rumor_type2 = mission_01a_loaded, mission_02_accepted, 1, 393428
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393649
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393470
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393369
+know = 251776, 253636, 1500, 1
+knowdb = li04_01
+individual_name = 263012
+
+[GF_NPC]
+nickname = li06_01_base_bar_npc_05
+body = sc_scientist3_body
+head = ge_male3_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = co_me_grp
+voice = rvp111
+misn = DestroyMission, 0, 0.112387
+rumor = base_0_rank, mission_end, 1, 131280
+rumor = base_0_rank, mission_end, 2, 131281
+rumor = base_0_rank, mission_end, 3, 131282
+rumor = base_0_rank, mission_end, 1, 131283
+rumor = base_0_rank, mission_end, 2, 131284
+rumor = base_0_rank, mission_end, 1, 131285
+rumor = base_0_rank, mission_end, 2, 131286
+rumor = base_0_rank, mission_end, 1, 131287
+rumor = base_0_rank, mission_end, 2, 131288
+rumor = base_0_rank, mission_end, 1, 131289
+rumor_type2 = mission_01a_loaded, mission_01b_loaded, 1, 393429
+rumor_type2 = mission_01a_accepted, freetime_01_02, 1, 393438
+rumor_type2 = mission_01b_loaded, freetime_01_02, 1, 393439
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393440
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393441
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393442
+rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393572
+rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393573
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393574
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393577
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393579
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393580
+rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393584
+rumor_type2 = mission_02_accepted, freetime_02_03, 1, 393586
+rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393591
+rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594
+rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393600
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605
+rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606
+rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607
+rumor_type2 = mission_02_loaded, mission_04_accepted, 1, 393648
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393471
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393370
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393649
+know = 251764, 253637, 500, 1
+knowdb = li01_14
+individual_name = 263011
+
+[GF_NPC]
+nickname = li06_01_base_bar_npc_06
+body = sc_scientist3_body
+head = br_bartender_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = co_me_grp
+voice = rvp101
+misn = DestroyMission, 0, 0.112387
+rumor = base_0_rank, mission_end, 1, 131280
+rumor = base_0_rank, mission_end, 2, 131281
+rumor = base_0_rank, mission_end, 3, 131282
+rumor = base_0_rank, mission_end, 1, 131283
+rumor = base_0_rank, mission_end, 2, 131284
+rumor = base_0_rank, mission_end, 1, 131285
+rumor = base_0_rank, mission_end, 2, 131286
+rumor = base_0_rank, mission_end, 1, 131287
+rumor = base_0_rank, mission_end, 2, 131288
+rumor = base_0_rank, mission_end, 1, 131289
+rumor_type2 = mission_01a_loaded, mission_01b_loaded, 1, 393429
+rumor_type2 = mission_01a_accepted, freetime_01_02, 1, 393438
+rumor_type2 = mission_01b_loaded, freetime_01_02, 1, 393439
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393440
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393441
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393442
+rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393572
+rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393573
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393574
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393577
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393579
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393580
+rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393584
+rumor_type2 = mission_02_accepted, freetime_02_03, 1, 393586
+rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393591
+rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594
+rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393600
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605
+rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606
+rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607
+rumor_type2 = mission_02_loaded, mission_04_accepted, 1, 393648
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393472
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393371
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393649
+individual_name = 263010
+
+[GF_NPC]
+nickname = li06_01_base_bar_npc_07
+body = sc_scientist3_body
+head = br_quigly_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = co_me_grp
+voice = rvp111
+misn = DestroyMission, 0, 0.112387
+rumor = base_0_rank, mission_end, 1, 131280
+rumor = base_0_rank, mission_end, 2, 131281
+rumor = base_0_rank, mission_end, 3, 131282
+rumor = base_0_rank, mission_end, 1, 131283
+rumor = base_0_rank, mission_end, 2, 131284
+rumor = base_0_rank, mission_end, 1, 131285
+rumor = base_0_rank, mission_end, 2, 131286
+rumor = base_0_rank, mission_end, 1, 131287
+rumor = base_0_rank, mission_end, 2, 131288
+rumor = base_0_rank, mission_end, 1, 131289
+rumor_type2 = mission_01a_loaded, mission_01b_loaded, 1, 393429
+rumor_type2 = mission_01a_accepted, freetime_01_02, 1, 393438
+rumor_type2 = mission_01b_loaded, freetime_01_02, 1, 393439
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393440
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393441
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393442
+rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393572
+rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393573
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393574
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393577
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393579
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393580
+rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393584
+rumor_type2 = mission_02_accepted, freetime_02_03, 1, 393586
+rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393591
+rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594
+rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393600
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605
+rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606
+rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607
+rumor_type2 = mission_02_loaded, mission_04_accepted, 1, 393648
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393473
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393372
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393649
+know = 251776, 253638, 1800, 1
+knowdb = li04_01
+individual_name = 263009
+
+[GF_NPC]
+nickname = li06_01_base_bar_npc_08
+body = li_bartender_body
+head = li_captain_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = co_me_grp
+voice = rvp106
+bribe = co_me_grp, 10000, 16101
+bribe = co_ni_grp, 10000, 16100
+bribe = co_ss_grp, 10000, 16100
+bribe = co_vr_grp, 10000, 16100
+rumor = base_0_rank, mission_end, 1, 131280
+rumor = base_0_rank, mission_end, 2, 131281
+rumor = base_0_rank, mission_end, 1, 131283
+rumor = base_0_rank, mission_end, 2, 131284
+rumor = base_0_rank, mission_end, 1, 131285
+rumor = base_0_rank, mission_end, 2, 131286
+rumor = base_0_rank, mission_end, 1, 131287
+rumor = base_0_rank, mission_end, 2, 131288
+rumor = base_0_rank, mission_end, 1, 131289
+rumor = base_0_rank, mission_end, 1, 131290
+rumor = base_0_rank, mission_end, 1, 131291
+rumor_type2 = mission_01a_loaded, mission_01b_loaded, 1, 393429
+rumor_type2 = mission_01a_accepted, freetime_01_02, 1, 393438
+rumor_type2 = mission_01b_loaded, freetime_01_02, 1, 393439
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393440
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393441
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393442
+rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393572
+rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393573
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393574
+rumor_type2 = mission_02_loaded, mission_02_loaded, 1, 393575
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393577
+rumor_type2 = mission_02_loaded, mission_02_loaded, 1, 393578
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393579
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393580
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393581
+rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393583
+rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393584
+rumor_type2 = mission_02_accepted, freetime_02_03, 1, 393586
+rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393591
+rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594
+rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393600
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605
+rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606
+rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607
+rumor_type2 = mission_02_loaded, mission_04_accepted, 1, 393648
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393474
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393373
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393649
+individual_name = 263008
+
+[GF_NPC]
+nickname = li06_01_base_bar_npc_09
+body = li_male_guard_body
+head = sh_male1_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = li_p_grp
+voice = rvp111
+misn = DestroyMission, 0, 0.112387
+bribe = li_p_grp, 10000, 16101
+bribe = co_be_grp, 10000, 16100
+bribe = co_kt_grp, 10000, 16100
+bribe = co_os_grp, 10000, 16100
+bribe = gd_bh_grp, 10000, 16100
+rumor = base_0_rank, mission_end, 2, 131292
+rumor = base_0_rank, mission_end, 2, 131293
+rumor = base_0_rank, mission_end, 2, 131294
+rumor_type2 = mission_01a_loaded, mission_01b_loaded, 1, 393429
+rumor_type2 = mission_01a_accepted, freetime_01_02, 1, 393438
+rumor_type2 = mission_01b_loaded, freetime_01_02, 1, 393439
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393440
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393441
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393442
+rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393571
+rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393572
+rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393573
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393574
+rumor_type2 = mission_02_loaded, mission_02_loaded, 1, 393575
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393577
+rumor_type2 = mission_02_loaded, mission_02_loaded, 1, 393578
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393579
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393580
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393581
+rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393583
+rumor_type2 = mission_02_accepted, freetime_02_03, 1, 393586
+rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393591
+rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605
+rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606
+rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607
+rumor_type2 = mission_02_loaded, mission_04_accepted, 1, 393648
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393478
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393377
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393649
+accessory = prop_hat_male_li_grd
+individual_name = 263007
+
+[GF_NPC]
+nickname = li06_01_base_bar_npc_10
+body = rh_reichman_body
+head = li_sales_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = co_rs_grp
+voice = rvp146
+bribe = co_alg_grp, 10000, 16100
+bribe = co_ni_grp, 10000, 16100
+bribe = co_rs_grp, 10000, 16101
+rumor = base_0_rank, mission_end, 1, 131295
+rumor = base_0_rank, mission_end, 1, 131296
+rumor = base_0_rank, mission_end, 1, 131297
+rumor_type2 = mission_01a_accepted, freetime_01_02, 1, 393438
+rumor_type2 = mission_01b_loaded, freetime_01_02, 1, 393439
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393440
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393441
+rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393572
+rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393573
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393574
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393577
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393579
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393580
+rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393584
+rumor_type2 = mission_02_accepted, freetime_02_03, 1, 393586
+rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393591
+rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594
+rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393600
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605
+rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606
+rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607
+rumor_type2 = mission_02_loaded, mission_04_accepted, 1, 393648
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393479
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393378
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393649
+know = 251786, 253639, 2500, 2
+knowdb = rh01_06
+know = 251761, 253640, 500, 1
+knowdb = li01_11
+know = 251780, 253641, 700, 1
+knowdb = li04_05
+individual_name = 263006
+
+[GF_NPC]
+nickname = li06_01_base_bar_npc_11
+body = li_tilton_body
+head = li_rockford_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = co_ss_grp
+voice = rvp101
+bribe = co_hsp_grp, 10000, 16100
+bribe = co_me_grp, 10000, 16100
+bribe = co_ni_grp, 10000, 16100
+bribe = co_ss_grp, 10000, 16101
+bribe = co_vr_grp, 10000, 16100
+rumor = base_0_rank, mission_end, 1, 131298
+rumor = base_0_rank, mission_end, 1, 131299
+rumor = base_0_rank, mission_end, 1, 131300
+rumor_type2 = mission_01a_accepted, freetime_01_02, 1, 393438
+rumor_type2 = mission_01b_loaded, freetime_01_02, 1, 393439
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393440
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393441
+rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393572
+rumor_type2 = freetime_01_02, mission_02_accepted, 1, 393573
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393574
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393577
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393579
+rumor_type2 = mission_02_loaded, mission_02_accepted, 1, 393580
+rumor_type2 = mission_02_loaded, freetime_02_03, 1, 393584
+rumor_type2 = mission_02_accepted, freetime_02_03, 1, 393586
+rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393591
+rumor_type2 = freetime_03_04, mission_04_loaded, 1, 393594
+rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393600
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393603
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393604
+rumor_type2 = mission_04_loaded, mission_04_accepted, 1, 393605
+rumor_type2 = mission_03_loaded, mission_04_accepted, 1, 393606
+rumor_type2 = freetime_03_04, mission_04_accepted, 1, 393607
+rumor_type2 = mission_02_loaded, mission_04_accepted, 1, 393648
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393480
+rumor_type2 = base_0_rank, mission_04_loaded, 1, 393379
+rumor_type2 = freetime_01_02, mission_02_loaded, 1, 393649
+know = 251775, 253642, 700, 1
+knowdb = li03_04
+know = 251757, 253643, 600, 1
+knowdb = li01_07
+know = 251780, 253644, 500, 1
+knowdb = li04_05
+know = 251786, 253645, 2500, 2
+knowdb = rh01_06
+individual_name = 263005
+
+[GF_NPC]
+nickname = li06_01_base_planetscape_npc_01
+body = sc_scientist3_body
+head = pl_male2_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = co_me_grp
+voice = rvp101
+individual_name = 263004
+
+[GF_NPC]
+nickname = li06_01_base_planetscape_npc_02
+body = sc_scientist3_body
+head = br_brighton_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = co_me_grp
+voice = rvp106
+individual_name = 263003
+
+[GF_NPC]
+nickname = li06_01_base_planetscape_npc_03
+body = sc_scientist3_body
+head = ge_male1_head
+lefthand = benchmark_male_hand_left
+righthand = benchmark_male_hand_right
+affiliation = co_me_grp
+voice = rvp101
+individual_name = 263002
+
 [MRoom]
-nickname = bar
-character_density = 4
-fixture = LI0601_fix_bartender, Zs/NPC/Bartender/01/A/Stand, scripts\vendors\li_host_fidget.thn, bartender
+nickname = Bar
+character_density = 7
+fixture = li06_01_base_bar_npc_08, Zs/NPC/Bartender/01/A/Stand, scripts\vendors\li_host_fidget.thn, bartender
 
 [MRoom]
 nickname = Planetscape
 character_density = 3
-fixture = LI0601_fix_ship, Zs/NPC/Shipdealer/01/A/Stand, scripts\vendors\li_shipdealer_fidget.thn, ShipDealer
-fixture = LI0601_fix_trader, Zs/NPC/Trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader
-fixture = LI0601_fix_weaponsdealer, Zs/NPC/Equipment/01/A/Stand, scripts\vendors\li_equipdealer_fidget.thn, Equipment
+fixture = li06_01_base_planetscape_npc_01, Zs/NPC/trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader
+fixture = li06_01_base_planetscape_npc_02, Zs/NPC/trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader
+fixture = li06_01_base_planetscape_npc_03, Zs/NPC/trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader
+
+[MRoom]
+nickname = Planetscape2
+character_density = 3
 
 [MBase]
 nickname = LI06_02_Base
diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_01_Base.ini b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_01_Base.ini
index 653f9100..68f3b312 100644
--- a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_01_Base.ini
+++ b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/LI06_01_Base.ini
@@ -1,6 +1,7 @@
 [BaseInfo]
 nickname = LI06_01_Base
 start_room = Planetscape
+price_variance = 0.15
 
 [Room]
 nickname = Bar
@@ -9,3 +10,7 @@ file = Universe\Systems\LI06\Bases\Rooms\LI06_01_bar.ini
 [Room]
 nickname = Planetscape
 file = Universe\Systems\LI06\Bases\Rooms\LI06_01_planetscape.ini
+
+[Room]
+nickname = Planetscape2
+file = UNIVERSE\SYSTEMS\LI06\Bases\ROOMS\li06_01_planetscape2.ini
diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_01_bar.ini b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_01_bar.ini
index 8d978b68..6b0e96ca 100644
--- a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_01_bar.ini
+++ b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_01_bar.ini
@@ -1,7 +1,6 @@
 [Room_Info]
-set_script = Scripts\Bases\Pl_03_bar_hardpoint_01.thn
-scene = all, ambient, Scripts\Bases\Pl_03_bar_ambi_int_01.thn
-scene = all, ambient, Scripts\Bases\Pl_03_bar_traffic_01.thn, TRAFFIC_PRIORITY
+set_script = Scripts\Bases\Pl_01_bar_hardpoint_01.thn
+scene = all, ambient, Scripts\Bases\Pl_01_bar_ambi_int_01.thn
 
 [Room_Sound]
 music = music_bar_li02
@@ -12,13 +11,7 @@ name = Camera_0
 
 [CharacterPlacement]
 name = Zg/PC/Player/01/A/Stand
-start_script = scripts\bases\Pl_03_bar_enter_01.thn
-
-[PlayerShipPlacement]
-name = X/Shipcentre/01
-
-[ForSaleShipPlacement]
-name = X/Shipcentre/02
+start_script = scripts\bases\Pl_01_bar_enter_01.thn
 
 [Hotspot]
 name = IDS_HOTSPOT_PLANETSCAPE
@@ -55,141 +48,3 @@ behavior = NewsVendor
 [Hotspot]
 name = IDS_HOTSPOT_MISSIONVENDOR
 behavior = MissionVendor
-
-[FlashlightSet]
-icolor = 155, 55, 55
-scale = 1.000000
-blink = 1.000000
-endpause = 0.750000
-hardpoint = HP_LightA01
-
-[FlashlightSet]
-icolor = 155, 55, 55
-scale = 1.000000
-blink = 1.000000
-endpause = 0.750000
-hardpoint = HP_LightA02
-
-[FlashlightSet]
-icolor = 155, 55, 55
-scale = 1.000000
-blink = 1.000000
-endpause = 0.750000
-hardpoint = HP_LightA03
-
-[FlashlightSet]
-icolor = 155, 55, 55
-scale = 1.000000
-blink = 1.000000
-endpause = 0.750000
-hardpoint = HP_LightA04
-
-[FlashlightSet]
-icolor = 155, 55, 55
-scale = 1.000000
-blink = 1.000000
-endpause = 0.750000
-hardpoint = HP_LightA05
-
-[FlashlightSet]
-icolor = 155, 55, 55
-scale = 1.000000
-blink = 1.000000
-endpause = 0.750000
-hardpoint = HP_LightA06
-
-[FlashlightSet]
-icolor = 155, 55, 55
-scale = 1.000000
-blink = 1.000000
-endpause = 0.750000
-hardpoint = HP_LightA07
-
-[FlashlightSet]
-icolor = 155, 55, 55
-scale = 1.000000
-blink = 1.000000
-endpause = 0.750000
-hardpoint = HP_LightA08
-
-[FlashlightSet]
-icolor = 155, 55, 55
-scale = 1.000000
-blink = 1.000000
-endpause = 0.750000
-hardpoint = HP_LightA09
-
-[FlashlightSet]
-icolor = 155, 55, 55
-scale = 1.000000
-blink = 1.000000
-endpause = 0.750000
-hardpoint = HP_LightA10
-
-[FlashlightSet]
-icolor = 255, 225, 133
-scale = 2.500000
-blink = 1.500000
-endpause = 1.500000
-hardpoint = HP_LightB01
-hardpoint = HP_LightB02
-hardpoint = HP_LightB03
-hardpoint = HP_LightB04
-hardpoint = HP_LightB05
-hardpoint = HP_LightB06
-hardpoint = HP_LightB07
-hardpoint = HP_LightB08
-hardpoint = HP_LightB09
-hardpoint = HP_LightB10
-
-[FlashlightSet]
-icolor = 255, 225, 133
-scale = 2.500000
-blink = 1.500000
-endpause = 0.500000
-hardpoint = HP_LightC01
-hardpoint = HP_LightC02
-hardpoint = HP_LightC03
-
-[FlashlightSet]
-icolor = 255, 225, 133
-scale = 2.500000
-blink = 1.500000
-endpause = 0.500000
-hardpoint = HP_LightD01
-hardpoint = HP_LightD02
-hardpoint = HP_LightD03
-
-[FlashlightSet]
-icolor = 75, 25, 0
-scale = 9.000000
-gap = 0.000000
-blink = 2.500000
-endpause = 0.250000
-hardpoint = HP_LightE01
-hardpoint = HP_LightE02
-hardpoint = HP_LightE07
-hardpoint = HP_LightE08
-hardpoint = HP_LightE10
-hardpoint = HP_LightE11
-hardpoint = HP_LightE14
-hardpoint = HP_LightE15
-hardpoint = HP_LightE18
-hardpoint = HP_LightE19
-
-[FlashlightSet]
-icolor = 155, 0, 0
-scale = 9.000000
-gap = 0.000000
-blink = 5.000000
-endpause = 0.250000
-hardpoint = HP_LightE03
-hardpoint = HP_LightE04
-hardpoint = HP_LightE05
-hardpoint = HP_LightE06
-hardpoint = HP_LightE09
-hardpoint = HP_LightE12
-hardpoint = HP_LightE13
-hardpoint = HP_LightE16
-hardpoint = HP_LightE17
-hardpoint = HP_LightE20
diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_01_planetscape.ini b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_01_planetscape.ini
index 7c90058f..f9c97a1f 100644
--- a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_01_planetscape.ini
+++ b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/LI06_01_planetscape.ini
@@ -1,26 +1,31 @@
 [Room_Info]
-set_script = Scripts\Bases\Pl_03_pad_hardpoint_01.thn
-scene = all, ambient, Scripts\Bases\Pl_03_pad_ambi_day_01.thn
-scene = all, ambient, Scripts\Bases\Pl_03_pad_traffic_01.thn, TRAFFIC_PRIORITY
+set_script = Scripts\Bases\Pl_01_pad_hardpoint_01.thn
+scene = all, ambient, Scripts\Bases\Pl_01_pad_ambi_day_01.thn
+scene = all, ambient, Scripts\Bases\Pl_01_pad_traffic_01.thn, TRAFFIC_PRIORITY
+
+[Spiels]
+CommodityDealer = manhattan_commodity_spiel
+EquipmentDealer = manhattan_equipment_spiel
+ShipDealer = pittsburgh_ship_spiel
 
 [Room_Sound]
 ambient = ambience_planetscape_rocky
-music = music_californiaminor, oneshot
-
-[Camera]
-name = Camera_0
+music = music_pittsburgh, oneshot
 
 [CharacterPlacement]
 name = Zg/PC/Player/01/A/Stand
 
 [PlayerShipPlacement]
 name = X/Shipcentre/01
-landing_script = scripts\bases\Pl_03_pad_land_01.thn
-launching_script = scripts\bases\Pl_03_pad_launch_01.thn
+landing_script = scripts\bases\Pl_01_pad_land_01.thn
+launching_script = scripts\bases\Pl_01_pad_launch_01.thn
 
 [ForSaleShipPlacement]
 name = X/Shipcentre/02
 
+[Camera]
+name = Camera_0
+
 [Hotspot]
 name = IDS_HOTSPOT_PLANETSCAPE
 behavior = ExitDoor
@@ -49,7 +54,7 @@ room_switch = ShipDealer
 [Hotspot]
 name = IDS_NN_REPAIR_YOUR_SHIP
 behavior = Repair
-virtual_room = Deck
+virtual_room = Planetscape
 
 [Hotspot]
 name = IDS_DEALER_FRONT_DESK
@@ -109,163 +114,3 @@ virtual_room = ShipDealer
 name = IDS_NN_REPAIR_YOUR_SHIP
 behavior = Repair
 virtual_room = ShipDealer
-
-[FlashlightSet]
-icolor = 155, 55, 55
-scale = 1.000000
-blink = 1.000000
-endpause = 0.750000
-hardpoint = HP_LightA01
-
-[FlashlightSet]
-icolor = 155, 55, 55
-scale = 1.000000
-blink = 1.000000
-endpause = 0.750000
-hardpoint = HP_LightA02
-
-[FlashlightSet]
-icolor = 155, 55, 55
-scale = 1.000000
-blink = 1.000000
-endpause = 0.750000
-hardpoint = HP_LightA03
-
-[FlashlightSet]
-icolor = 155, 55, 55
-scale = 1.000000
-blink = 1.000000
-endpause = 0.750000
-hardpoint = HP_LightA04
-
-[FlashlightSet]
-icolor = 155, 55, 55
-scale = 1.000000
-blink = 1.000000
-endpause = 0.750000
-hardpoint = HP_LightA05
-
-[FlashlightSet]
-icolor = 155, 55, 55
-scale = 1.000000
-blink = 1.000000
-endpause = 0.750000
-hardpoint = HP_LightA06
-
-[FlashlightSet]
-icolor = 155, 55, 55
-scale = 1.000000
-blink = 1.000000
-endpause = 0.750000
-hardpoint = HP_LightA07
-
-[FlashlightSet]
-icolor = 155, 55, 55
-scale = 1.000000
-blink = 1.000000
-endpause = 0.750000
-hardpoint = HP_LightA08
-
-[FlashlightSet]
-icolor = 155, 55, 55
-scale = 1.000000
-blink = 1.000000
-endpause = 0.750000
-hardpoint = HP_LightA09
-
-[FlashlightSet]
-icolor = 155, 55, 55
-scale = 1.000000
-blink = 1.000000
-endpause = 0.750000
-hardpoint = HP_LightA10
-
-[FlashlightSet]
-icolor = 155, 55, 55
-scale = 0.800000
-blink = 1.500000
-endpause = 0.500000
-hardpoint = HP_LightA11
-hardpoint = HP_LightA12
-hardpoint = HP_LightA13
-hardpoint = HP_LightA14
-hardpoint = HP_LightA15
-
-[FlashlightSet]
-icolor = 155, 55, 55
-scale = 0.800000
-blink = 1.500000
-endpause = 0.500000
-hardpoint = HP_LightA16
-hardpoint = HP_LightA17
-hardpoint = HP_LightA18
-hardpoint = HP_LightA19
-hardpoint = HP_LightA20
-
-[FlashlightSet]
-icolor = 255, 225, 133
-scale = 2.500000
-blink = 1.500000
-endpause = 1.500000
-hardpoint = HP_LightB01
-hardpoint = HP_LightB02
-hardpoint = HP_LightB03
-hardpoint = HP_LightB04
-hardpoint = HP_LightB05
-hardpoint = HP_LightB06
-hardpoint = HP_LightB07
-hardpoint = HP_LightB08
-hardpoint = HP_LightB09
-hardpoint = HP_LightB10
-
-[FlashlightSet]
-icolor = 255, 225, 133
-scale = 2.500000
-blink = 1.500000
-endpause = 0.500000
-hardpoint = HP_LightC01
-hardpoint = HP_LightC02
-hardpoint = HP_LightC03
-
-[FlashlightSet]
-icolor = 255, 225, 133
-scale = 2.500000
-blink = 1.500000
-endpause = 0.500000
-hardpoint = HP_LightD01
-hardpoint = HP_LightD02
-hardpoint = HP_LightD03
-
-[FlashlightSet]
-icolor = 75, 25, 0
-scale = 9.000000
-gap = 0.000000
-blink = 2.500000
-endpause = 0.250000
-hardpoint = HP_LightE01
-hardpoint = HP_LightE02
-hardpoint = HP_LightE07
-hardpoint = HP_LightE08
-hardpoint = HP_LightE10
-hardpoint = HP_LightE11
-hardpoint = HP_LightE14
-hardpoint = HP_LightE15
-hardpoint = HP_LightE18
-hardpoint = HP_LightE19
-
-[FlashlightSet]
-icolor = 155, 0, 0
-scale = 9.000000
-gap = 0.000000
-blink = 5.000000
-endpause = 0.250000
-hardpoint = HP_LightE03
-hardpoint = HP_LightE04
-hardpoint = HP_LightE05
-hardpoint = HP_LightE06
-hardpoint = HP_LightE09
-hardpoint = HP_LightE12
-hardpoint = HP_LightE13
-hardpoint = HP_LightE16
-hardpoint = HP_LightE17
-hardpoint = HP_LightE20
diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/li06_01_planetscape2.ini b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/li06_01_planetscape2.ini
new file mode 100644
index 00000000..6d02a44f
--- /dev/null
+++ b/DATA/UNIVERSE/SYSTEMS/Li06/Bases/Rooms/li06_01_planetscape2.ini
@@ -0,0 +1,38 @@
+[Room_Info]
+set_script = Scripts\Bases\Pl_01_pad_hardpoint_01.thn
+scene = all, ambient, Scripts\Bases\Pl_01_pad_ambi_day_01.thn
+scene = all, ambient, Scripts\Bases\Pl_01_pad_traffic_01.thn, TRAFFIC_PRIORITY
+
+[Room_Sound]
+ambient = ambience_planetscape_rocky
+
+[PlayerShipPlacement]
+name = X/Shipcentre/01
+
+[Camera]
+name = Camera_0
+
+[Hotspot]
+name = IDS_HOTSPOT_PLANETSCAPE
+behavior = ExitDoor
+room_switch = Planetscape
+
+[Hotspot]
+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 = VirtualRoom
+room_switch = ShipDealer
diff --git a/DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini b/DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini
index c2e57694..160688ed 100644
--- a/DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini
+++ b/DATA/UNIVERSE/SYSTEMS/Li06/LI06.ini
@@ -239,23 +239,22 @@ spin = 0.000000, 0.000000, 0.000000
 rotate = 0, 0, 0
 pos = 47728, 0, -16603
 archetype = planet_desert_800
-atmosphere_range = 850
+atmosphere_range = 900
 burn_color = 255, 222, 160
 ids_info = 262030
 ring = Zone_LI06_planet_1_ring, solar\rings\lava.ini
 base = LI06_01_Base
-reputation = li_lsf_grp
-dock_with = LI06_01_Base
+reputation = gd_z_grp
 behavior = NOTHING
 difficulty_level = 1
-space_costume = benchmark_male_head, benchmark_male_body
+space_costume = pi_pirate1_head, pi_pirate6_body
 
 [zone]
 nickname = LI06_planet_1_death
 pos = 47728, 0, -16603
 shape = SPHERE
-size = 900
-damage = 5000
+size = 850
+damage = 200000
 sort = 99.500000
 density = 0
 relief_time = 0
@@ -265,7 +264,7 @@ nickname = Zone_LI06_planet_1_ring
 pos = 47728, 0, -16603
 rotate = 160.03, 27.87, -158.959
 shape = ring
-size = 2500, 200, 200
+size = 4500, 200, 200
 sort = 0.000000
 
 [Object]
@@ -278,7 +277,7 @@ pilot = pilot_solar_easy
 dock_with = LI06_01_Base
 pos = 46830.766, 8.715, -16394.025  
 rotate = 1.775, -77.686, 0.161
-reputation = li_lsf_grp
+reputation = gd_z_grp
 difficulty_level = 1
 space_costume = , robot_body_A
 voice = atc_leg_f01a
@@ -290,7 +289,7 @@ archetype = docking_fixture
 ids_info = 66489
 behavior = NOTHING
 dock_with = LI06_01_Base
-reputation = li_lsf_grp
+reputation = gd_z_grp
 base = LI06_01_Base
 pos = 46825.613, 259.057, -16393.086
 rotate = -1.263, -82.294, 2.335