diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_4_4_ws.tab b/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_4_4_ws.tab
old mode 100644
new mode 100755
index 38595b06d..c88e8a1ed
--- a/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_4_4_ws.tab
+++ b/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_4_4_ws.tab
@@ -60,7 +60,7 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 5286039	0	object/static/item/wp_rifle_laser_combined.iff	0	543.721	278	326.626	0.724836	0	0	0.688922		$|
 5286040	0	object/static/item/item_vibroaxe.iff	0	543.93	278.727	325.524	1	0	0	0		$|
 5286041	0	object/static/item/item_vibrolance.iff	0	543.674	278	325.511	1	0	0	0		$|
-5535563	0	object/building/general/naboo_pirate_bunker.iff	0	566.181	278	318.74	0.714143	0	-0.7	0		$|
+5535563	0	object/building/general/naboo_pirate_bunker.iff	0	566.181	278	318.74	0.714143	0	-0.7	0	theme_park.dungeon.generic_spawner	spawn_table|4|datatables/spawning/poi_spawner/naboo/naboopiratebunker.iff|$|
 6336787	0	object/static/structure/corellia/corl_imprv_column_s03.iff	0	534.408	277.715	338.459	0.873744	0.309075	-0.35406	0.125244		$|
 6336788	0	object/static/structure/corellia/corl_imprv_column_s03.iff	0	522.07	277.648	328.718	0.877529	0.252337	-0.391881	0.112687		$|
 6336789	0	object/static/structure/corellia/corl_imprv_column_s03.iff	0	537.239	278	301.041	-0.68531	0.160461	0.691647	0.161945		$|
diff --git a/sku.0/sys.server/compiled/game/datatables/spawning/poi_spawner/naboo/naboopiratebunker.tab b/sku.0/sys.server/compiled/game/datatables/spawning/poi_spawner/naboo/naboopiratebunker.tab
new file mode 100755
index 000000000..6a62042ac
--- /dev/null
+++ b/sku.0/sys.server/compiled/game/datatables/spawning/poi_spawner/naboo/naboopiratebunker.tab
@@ -0,0 +1,31 @@
+spawns	name	room	loc_x	loc_y	loc_z	yaw	script	mood	animation_mood	respawn_time	spawn_objvar	special_room	special_room_script	room_objvar	room_objvar_name	room_objvar_value
+s	s	s	f	f	f	f	s	s	s	i	s	s	s	s	s	s
+naboo_pirate_cutthroat		world	-1501.606445	278	-1735.476807	-18				360	 int:ai.defaultCalmBehavior=2					
+naboo_pirate_armsman		world	-1497.237427	278	-1719.133911	-126				360	 int:ai.defaultCalmBehavior=2					
+naboo_pirate		world	-1513.869141	278	-1732.320068	-98				360	 int:ai.defaultCalmBehavior=2					
+naboo_pirate		entry	-0.233219996	0.25	3.732197046	20				360						
+naboo_pirate		hall1	-3.950844049	0.25	-1.294033051	0				360						
+naboo_pirate		hall2	-0.112139001	0.25	-3.764121056	-90				360						
+naboo_pirate_lieutenant		anteroom	-1.419350028	-12	31.02835464	90				3600						
+naboo_pirate_crewman		anteroom	6.466962814	-12	35.7900238	175				360						
+naboo_pirate_crewman		anteroom	9.788734436	-12	30.77035332	-90				360						
+naboo_pirate_crewman		anteroom	5.822159767	-12	27.08896828	-145				360						
+naboo_pirate_armsman		anteroom	-0.161907107	-12	34.05101395	125				360						
+naboo_pirate		powerroom	23.93203163	-12	28.00281143	-30				360						
+naboo_pirate_crewman		powerroom	27.18827629	-12	34.94610214	171				360						
+naboo_pirate_crewman		powerroom	32.15625763	-12	33.62967682	-111				360						
+naboo_pirate_crewman		powerroom	33.19425964	-12	29.210886	-86				360						
+pirate_crewman		powerroom	29.51615906	-12	26.06126595	-95				360						
+naboo_pirate_armsman		computerroom	0.921953976	-16	60.29486084	107				1200						
+naboo_pirate_armsman		computerroom	6.001183987	-16	60.54418945	-115				1200						
+naboo_pirate_armsman		computerroom	-0.201535001	-16	82.70975494	175				1200						
+naboo_pirate_armsman		computerroom	5.823836803	-16	82.5242691	170				1200						
+naboo_dread_pirate		computerroom	3.170216084	-16	85.50937653	179				3600						
+naboo_pirate_armsman		computerroom	-18.73309517	-16	76.59276581	90				1200						
+naboo_pirate_armsman		computerroom	-18.35630608	-16	80.75948334	90				1200						
+naboo_pirate_armsman		computerroom	25.37516022	-16	81.15124512	-95				1200						
+naboo_pirate_armsman		computerroom	24.94099808	-16	77.50966644	-95				1200						
+naboo_pirate_crewman		barracks	40.50311279	-16	59.89369583	-90				360						
+naboo_pirate_crewman		barracks	60.37868118	-16	59.94346619	-9				360						
+naboo_pirate_crewman		barracks	52.6499176	-16	84.14039612	173				360						
+naboo_pirate_crewman		barracks	74.2124939	-16	58.86469269	-11				360