Merge remote-tracking branch 'origin/master' into LootDrops

scripts/object/building/player/city/cityhall_tatooine.py

@@ -3,14 +3,6 @@ from engine.resources.scene import Point3D
 from engine.resources.scene import Quaternion
 
 def setup(core, object):
-<<<<<<< HEAD
-	
-	structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', Point3D(float(18.9), float(1.5), float(10)), Quaternion(float(1), float(1), float(1), float(0)),7)
-	#structureterminal.setAttachment('radial_filename', 'structure_management_terminal')
-	structureterminal.setAttachment('housing_parentstruct', object)
-	
-	cityterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_city.iff', Point3D(float(0), float(2.6), float(0)), Quaternion(float(1), float(1), float(1), float(0)),3)
-=======
 	sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -13.7, 3, 9.1, -1, 0, -1)
 	print(sign)
 	object.setAttachment("structureSign", sign)
@@ -23,7 +15,6 @@ def setup(core, object):
 	#cityterminal.setAttachment('housing_parentstruct', object)
 	
 	city_vote_terminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_city_vote.iff', Point3D(float(0), float(1.85), float(-8.5)), Quaternion(float(1), float(1), float(1), float(0)),3)
->>>>>>> upstream/master
 	#cityterminal.setAttachment('housing_parentstruct', object)
 	
 	return

scripts/object/tangible/deed/city_deed/cityhall_tatooine_deed.py

@@ -5,11 +5,7 @@ def setup(core, object):
 	object.setConstructorTemplate('object/building/player/shared_construction_structure.iff')
 	object.setStructureTemplate('object/tangible/deed/city_deed/shared_cityhall_tatooine_deed.iff')
 	#object.setLotRequirement(5)
-<<<<<<< HEAD
-	#object.setBMR(100)
-=======
 	object.setBMR(308)
->>>>>>> upstream/master
 	return
 
 def use(core, actor, object):

scripts/object/tangible/terminal/terminal_city.py

@@ -1,4 +1,5 @@
 import sys
 
 def setup(core, object):
+	object.setAttachment('radial_filename', 'terminal/city_maintenance_terminal')
 	return