Merge branch 'merge-test'

.gitignore

@@ -1,3 +1,4 @@
+sku.0/sys.server/compiled/game/datatables/admin/swag_admin.tab
 object_template_crc_string_table.tab
 quest_crc_string_table.tab
 

sku.0/sys.server/compiled/game/datatables/admin/command_permissions.tab

@@ -1,171 +1,171 @@
-Command	Level
-s	i{50}
-server.shutdown	50
-server.error	
-server.who	
-server.getMissionBoardId	
-server.getPlanetId	
-server.memUsage	
-server.clock	
-server.releaseAuth	
-server.showObjectSpheres	
-server.showTriggerSpheres	
-server.listenForMessage	
-server.snapAllObjectsToTerrain	
-server.getSceneId	
-server.setGodMode	5
-server.reloadCommandTable	50
-server.reloadAdminTable	50
-server.reloadTable	15
-server.dataTableGetString	
-server.reloadTerrain	
-server.listRegions	
-server.messageCount	
-server.setPublic	16
-server.profiler	
-server.setFrameRateLimit	
-server.testStructurePlacement	
-server.setDebugFlag	
-server.validateWorld	
-server.setUniverseProcess	
-server.getRegionsAt	
-server.enableNewJedi	
-server.startSave	5
-server.saveBuildoutArea	
-server.clientSaveBuildoutArea	
-server.destroyPersistedBuildoutAreaDuplicates	
-server.dumpCreatures	
-script.attach	5
-script.detach	
-script.list	5
-script.pause	
-script.reload	15
-script.triggerAll	
-script.triggerOne	
-script.scriptingEnabled	
-script.enableLogging	
-resource.activate	
-resource.addtocontainer	10
-resource.fillcontainer	10
-resource.checktree	
-resource.deactivate	
-resource.discardHopper	
-resource.getSurveyList	
-resource.harvest	
-resource.name	
-resource.pools	
-resource.removefromcontainer	10
-resource.spawntree	
-resource.survey	
-resource.tree	
-resource.viewcontainer	
-objvar.set	5
-objvar.setlist	15
-objvar.get	10
-objvar.list	5
-objvar.remove	5
-object.addLocationTarget	
-object.authority	
-object.create	
-object.cellCreate	
-object.count	
-object.createAt	5
-object.createManyAt	
-object.createIn	5
-object.createTranslateRotate	
-object.cellCreateTranslateRotate	
-object.setInterestRadius	
-object.createTriggerVolume	
-object.destroy	10
-object.find	5
-object.fixHouseItemLimit	10
-object.getHeight	
-object.getInventoryId	5
-object.getDatapadId	5
-object.getServerTemplate	
-object.getProxyList	
-object.gotoObject	5
-object.isIncapacitated	5
-object.isProxy	5
-object.listVolumeContainer	
-object.loadContents	15
-object.move	5
-object.moveToMe	5
-object.persist	15
-object.planetWarp	5
-object.reloadServerTemplate	
-object.removeLocationTarget	
-object.removeTriggerVolume	
-object.renamePlayer	5
-object.rotate	5
-object.scaleMovement	
-object.scaleSize	
-object.setName	5
-object.snap	
-object.spawn	5
-object.stopWatching	
-object.triggerVolumes	
-object.watch	
-object.watchAIPath	
-object.watchPathMap	
-object.unstick	15
-object.attribs	
-object.enqueueCommand	
-object.hide	5
-object.getAttributes	
-object.createPathNodes	
-object.destroyPathNodes	
-object.reloadPathNodes	
-object.setPathLinkDistance	
-object.markCityEntrance	
-object.unmarkCityEntrance	
-object.setOwner	5
-object.getOwner	5
-object.askConsent	
-object.debugFar	
-object.buildingObserve	
-object.addJediSlot	
-object.makeSpectral	
-object.getHibernating	5
-object.getBehavior	5
-object.getStandingOn	5
-object.getBattlefieldMarkerRegionName	
-object.setBattlefieldMarkerRegionName	
-object.unload	
-object.moveToPlayerAndUnload	5
-object.restoreHouse	5
-object.restoreCharacter	4
-object.deletePersistedContents	5
-object.moveHouseItemToMe	5
-object.reinitializevendor	5
-object.setAdminTitle	5
-npc.hail	
-npc.goodbye	
-npc.respond	
-bank.balance	5
-bank.bankTransfer	15
-bank.cashTransfer	15
-bank.deposit	15
-bank.namedTransfer	
-bank.withdraw	15
-manufacture.addIngredient	
-manufacture.removeIngredient	
-manufacture.listIngredients	
-manufacture.addSchematic	
-manufacture.removeSchematic	
-manufacture.listSchematic	
-manufacture.start	
-manufacture.stop	
-manufacture.getObjects	
-manufacture.listObjects	
-default.serverhelp	5
-craft.draft	
-craft.fillslot	
-craft.nextstage	
-craft.experiment	
-craft.customize
-craft.makeprototype
-craft.makeschematic
-craft.stop
-craft.enableSchematicFilter
-craft.disableSchematicFilter
+Command	Level
+s	i{50}
+server.shutdown	50
+server.error	50
+server.who	50
+server.getMissionBoardId	50
+server.getPlanetId	50
+server.memUsage	50
+server.clock	50
+server.releaseAuth	50
+server.showObjectSpheres	50
+server.showTriggerSpheres	50
+server.listenForMessage	50
+server.snapAllObjectsToTerrain	50
+server.getSceneId	50
+server.setGodMode	5
+server.reloadCommandTable	50
+server.reloadAdminTable	50
+server.reloadTable	50
+server.dataTableGetString	50
+server.reloadTerrain	50
+server.listRegions	50
+server.messageCount	50
+server.setPublic	50
+server.profiler	50
+server.setFrameRateLimit	50
+server.testStructurePlacement	50
+server.setDebugFlag	50
+server.validateWorld	50
+server.setUniverseProcess	50
+server.getRegionsAt	50
+server.enableNewJedi	50
+server.startSave	50
+server.saveBuildoutArea	50
+server.clientSaveBuildoutArea	50
+server.destroyPersistedBuildoutAreaDuplicates	50
+server.dumpCreatures	50
+script.attach	50
+script.detach	50
+script.list	50
+script.pause	50
+script.reload	50
+script.triggerAll	50
+script.triggerOne	50
+script.scriptingEnabled	50
+script.enableLogging	50
+resource.activate	50
+resource.addtocontainer	50
+resource.fillcontainer	50
+resource.checktree	50
+resource.deactivate	50
+resource.discardHopper	50
+resource.getSurveyList	50
+resource.harvest	50
+resource.name	50
+resource.pools	50
+resource.removefromcontainer	50
+resource.spawntree	50
+resource.survey	50
+resource.tree	50
+resource.viewcontainer	50
+objvar.set	50
+objvar.setlist	50
+objvar.get	50
+objvar.list	50
+objvar.remove	50
+object.addLocationTarget	50
+object.authority	50
+object.create	50
+object.cellCreate	50
+object.count	50
+object.createAt	50
+object.createManyAt	50
+object.createIn	50
+object.createTranslateRotate	50
+object.cellCreateTranslateRotate	50
+object.setInterestRadius	50
+object.createTriggerVolume	50
+object.destroy	50
+object.find	50
+object.fixHouseItemLimit	50
+object.getHeight	50
+object.getInventoryId	50
+object.getDatapadId	50
+object.getServerTemplate	50
+object.getProxyList	50
+object.gotoObject	50
+object.isIncapacitated	50
+object.isProxy	50
+object.listVolumeContainer	50
+object.loadContents	50
+object.move	50
+object.moveToMe	50
+object.persist	50
+object.planetWarp	50
+object.reloadServerTemplate	50
+object.removeLocationTarget	50
+object.removeTriggerVolume	50
+object.renamePlayer	50
+object.rotate	50
+object.scaleMovement	50
+object.scaleSize	50
+object.setName	50
+object.snap	50
+object.spawn	50
+object.stopWatching	50
+object.triggerVolumes	50
+object.watch	50
+object.watchAIPath	50
+object.watchPathMap	50
+object.unstick	50
+object.attribs	50
+object.enqueueCommand	50
+object.hide	50
+object.getAttributes	50
+object.createPathNodes	50
+object.destroyPathNodes	50
+object.reloadPathNodes	50
+object.setPathLinkDistance	50
+object.markCityEntrance	50
+object.unmarkCityEntrance	50
+object.setOwner	50
+object.getOwner	50
+object.askConsent	50
+object.debugFar	50
+object.buildingObserve	50
+object.addJediSlot	50
+object.makeSpectral	50
+object.getHibernating	50
+object.getBehavior	50
+object.getStandingOn	50
+object.getBattlefieldMarkerRegionName	50
+object.setBattlefieldMarkerRegionName	50
+object.unload	50
+object.moveToPlayerAndUnload	50
+object.restoreHouse	50
+object.restoreCharacter	50
+object.deletePersistedContents	50
+object.moveHouseItemToMe	50
+object.reinitializevendor	50
+object.setAdminTitle	50
+npc.hail	50
+npc.goodbye	50
+npc.respond	50
+bank.balance	50
+bank.bankTransfer	50
+bank.cashTransfer	50
+bank.deposit	50
+bank.namedTransfer	50
+bank.withdraw	50
+manufacture.addIngredient	50
+manufacture.removeIngredient	50
+manufacture.listIngredients	50
+manufacture.addSchematic	50
+manufacture.removeSchematic	50
+manufacture.listSchematic	50
+manufacture.start	50
+manufacture.stop	50
+manufacture.getObjects	50
+manufacture.listObjects	50
+default.serverhelp	50
+craft.draft	50
+craft.fillslot	50
+craft.nextstage	50
+craft.experiment	50
+craft.customize	50
+craft.makeprototype	50
+craft.makeschematic	50
+craft.stop	50
+craft.enableSchematicFilter	50
+craft.disableSchematicFilter	50

sku.0/sys.server/compiled/game/datatables/admin/stella_admin.tab

@@ -1,8 +1,9 @@
-AdminAccounts	AdminLevel	AdminSkill	AdminComment	AdminComment2	AdminIpBlocks	AdminIpComment
-s	i{0}	s	c	c	s	c
-demo	40	admin		all account names must be lower case		Stella-Demo-Account
-swgnoobs	50	admin				SWGNoobs MainAdminAccount
-darth	50	admin				Darthargus Main AdminAccount
-sririerac	40	admin				
-cekis	50	admin				Cekis AdminAccount
-silentguardian	40	admin				Silent AdminAccount
+AdminAccounts	AdminLevel	AdminSkill	AdminComment	AdminComment2	AdminIpBlocks	AdminIpComment	AdminSuid	OldAdminSuid
+s	i{0}	s	c	c	s	c	i{0}	i{0}
+demo	40	admin		all account names must be lower case		Stella-Demo-Account	1	-695782159
+swgnoobs	50	admin				SWGNoobs MainAdminAccount	6	1856394569
+darth	50	admin				Darthargus Main AdminAccount	4	39468200
+sririerac	40	admin					5	-1657710596
+cekis	50	admin				Cekis AdminAccount	9	-78823672
+silentguardian	10	admin				Silent AdminAccount	11	-1250432769
+celestial	5	csr					985	586410758

sku.0/sys.server/compiled/game/datatables/buildout/corellia/corellia_2_1_ws.tab

@@ -352,3 +352,4 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 -2	0	object/tangible/npc/rebel_recruiter_spawner.iff	0	987	4	1779	0	0	1	0		$|
 1284174	0	object/tangible/ground_spawning/mob_spawner.iff	0	628	23	2005	1	0	0	0		$|
 -3	0	object/tangible/ground_spawning/area_spawner.iff	0	705	23	1966	0.819152044	0	0.573576436	0	systems.spawning.spawner_area	fltMaxSpawnTime|2|30.000000|fltMinSpawnTime|2|15.000000|fltRadius|2|0.000000|intDefaultBehavior|0|1|intGoodLocationSpawner|0|0|intSpawnCount|0|1|intSpawnSystem|0|1|registerWithController|0|1|strName|4|junk_dealer|strSpawnerType|4|area|strSpawns|4|junk_dealer|$|
+-9	0	object/tangible/planet_map_location/city.iff	0	625	23	1995	1	0	0	0		$|