Merge branch 'development' into pre611-minor-fixes

Author: Causeless

Data/Techion.rte/Devices/Weapons/Nucleo/NucleoShot.lua

@@ -43,10 +43,10 @@ function OnMessage(self, message, context)
 		self.detDelay = 4000/math.sqrt(math.max(1, #self.connectableParticles));
 		self.Vel = Vector(self.Vel.X, self.Vel.Y):DegRotate(#self.connectableParticles * RangeRand(-1, 1));
 		for k, particle in pairs(self.connectableParticles) do
-			particle:SendMessage("Nucleo_NewConnectableParticle", self);
+			particle:SendMessage("Nucleo_NewConnectableParticle", self.UniqueID);
 		end
 	elseif message == "Nucleo_NewConnectableParticle" then
-		table.insert(self.connectableParticles, context);
+		table.insert(self.connectableParticles, MovableMan:FindObjectByUniqueID(context));
 	elseif message == "Nucleo_Explode" then
 		Explode(self);
 	end

Source/Entities/MovableObject.cpp

@@ -347,7 +347,7 @@ int MovableObject::ReadProperty(const std::string_view& propName, Reader& reader
 	MatchProperty("RandomizeEffectRotAngle", { reader >> m_RandomizeEffectRotAngle; });
 	MatchProperty("RandomizeEffectRotAngleEveryFrame", { reader >> m_RandomizeEffectRotAngleEveryFrame; });
 	MatchProperty("EffectStopTime", {
-		reader >> m_EffectStopTime; 
+		reader >> m_EffectStopTime;
 		m_EffectStopTime = std::max(m_EffectStopTime, static_cast<int>(g_TimerMan.GetDeltaTimeMS()) + 1);
 	});
 	MatchProperty("EffectStartStrength", {