diff --git a/binaries/data/mods/official/entities/template_entity.xml b/binaries/data/mods/official/entities/template_entity.xml
index 6d22ed815a..259e69bfb5 100755
--- a/binaries/data/mods/official/entities/template_entity.xml
+++ b/binaries/data/mods/official/entities/template_entity.xml
@@ -78,6 +78,5 @@
 	
 	
 	<Script File="scripts/entity_functions.js" />
-	<Event On="Initialize" Function="entityInit" />
 	<Event On="PrepareOrder" Function="entityEventPrepareOrder" />
 </Entity>	
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/template_entity_full.xml b/binaries/data/mods/official/entities/template_entity_full.xml
index ac1a83ff74..ed4ea43d70 100644
--- a/binaries/data/mods/official/entities/template_entity_full.xml
+++ b/binaries/data/mods/official/entities/template_entity_full.xml
@@ -25,4 +25,5 @@
 	<Event On="Movement" Function="entityEventMovement" />
 	<Event On="Death" Function="entityDestroyed" />
 
+	<Event On="Initialize" Function="entityInit" />
 </Entity>
\ No newline at end of file
diff --git a/binaries/data/mods/official/entities/template_entity_quasi.xml b/binaries/data/mods/official/entities/template_entity_quasi.xml
index 6fad78852b..45c60878e1 100644
--- a/binaries/data/mods/official/entities/template_entity_quasi.xml
+++ b/binaries/data/mods/official/entities/template_entity_quasi.xml
@@ -3,4 +3,5 @@
 <Entity
 	Parent="template_entity"
 >
+	<Event On="Initialize" Function="entityInitQuasi" />
 </Entity>
diff --git a/binaries/data/mods/official/scripts/entity_functions.js b/binaries/data/mods/official/scripts/entity_functions.js
index f23e899696..4025828207 100644
--- a/binaries/data/mods/official/scripts/entity_functions.js
+++ b/binaries/data/mods/official/scripts/entity_functions.js
@@ -26,11 +26,15 @@ const ACTION_REPAIR = 6;
 const PRODUCTION_TRAIN = 1;
 const PRODUCTION_RESEARCH = 2;
 
+
 // ====================================================================
 
 function entityInit()
 {
 	// Initialise an entity when it is first spawned (generate starting hitpoints, etc).
+	
+	// This function is called for all "full" entities - those inheriting from template_entity_full; there is a simpler version below
+	// called entityInitQuasi for quasi-entities (rocks, trees, etc) for which most of the things dealt with here don't apply.
 
 	// If the entity is a foundation, we must deduct resource costs here
 	if( this.building )
@@ -324,6 +328,58 @@ function entityInit()
 
 // ====================================================================
 
+function entityInitQuasi()
+{
+	// Initialization function for quasi-entities like trees, rocks, etc; only sets up resources
+
+	if (this.traits.supply)
+	{
+		// If entity has supply, set current to same.
+		if (this.traits.supply.max)
+			this.traits.supply.curr = this.traits.supply.max;
+
+		// If entity has type of supply and no subtype, set subtype to same
+		// (so we don't have to say type="wood", subtype="wood"
+		if (this.traits.supply.type && !this.traits.supply.subtype)
+			this.traits.supply.subtype = this.traits.supply.type;
+			
+		// The "dropsitecount" array holds the number of units with gather aura in range of the object;
+		// this is important so that if you have two mills near something and one of them is destroyed,
+		// you can still gather from the thing. Initialize it to 0 (ungatherable) for every player unless
+		// the entity is forageable (e.g. for huntable animals).
+		this.traits.supply.dropsitecount = new Array();
+		initialCount = this.traits.supply.subtype.meat ? 1 : 0;
+		for( i=0; i<=8; i++ )
+		{
+			this.traits.supply.dropsitecount[i] = initialCount;
+		}
+	}
+	
+	// Generate civ code (1st four characters of civ name, in lower case eg "Carthaginians" => "cart").
+	if (this.traits.id && this.traits.id.civ)
+	{
+		this.traits.id.civ_code = this.traits.id.civ.toString().substring (0, 4);
+		this.traits.id.civ_code = this.traits.id.civ_code.toString().toLowerCase();
+
+		// Exception to make the Romans into rome.
+		if (this.traits.id.civ_code == "roma") this.traits.id.civ_code = "rome";
+		// Exception to make the Hellenes into hele.
+		if (this.traits.id.civ_code == "hell") this.traits.id.civ_code = "hele";
+	}
+	
+	if(!this.traits.id)
+	{
+		this.traits.id = new Object();
+	}
+	
+	if(!this.traits.promotion)
+	{
+		this.traits.promotion = new Object();
+	}
+}
+
+// ====================================================================
+
 // Attach any auras the entity is entitled to. This was moved to a separate function so that buildings can have their auras 
 // attached to them only when they finish construction.
 function attachAuras()