Merge branch 'development' into cf-143-data-version

# Conflicts:
#	Coalition.rte/Actors/Mecha/BlastRunner/BlastRunner.ini - Fixed manually

Author: Gacyr

.github/CODEOWNERS

@@ -13,8 +13,10 @@
 
 #Sprite Owners
 *.bmp @spriters
+*.png @spriters
 
 #Audio Owners
 *.wav @audio-makers
 *.ogg @audio-makers
+*.flac @audio-makers
 *.mp3 @audio-makers

Base.rte/AI.ini

@@ -11,7 +11,7 @@ AddActor = AHuman
 	GlobalAccScalar = 0
 	ScriptPath = Base.rte/AI/PathFinder.lua
 	SpriteFile = ContentFile
-		FilePath = Base.rte/Null.bmp
+		FilePath = Base.rte/Null.png
 	AtomGroup = AtomGroup
 		CopyOf = Null AtomGroup
 	Health = 100
@@ -25,7 +25,7 @@ AddActor = AHuman
 		HitsMOs = 0
 		GetsHitByMOs = 0
 		SpriteFile = ContentFile
-			FilePath = Base.rte/Null.bmp
+			FilePath = Base.rte/Null.png
 		AtomGroup = AtomGroup
 			CopyOf = Null AtomGroup
 	FGArm = Arm
@@ -34,31 +34,31 @@ AddActor = AHuman
 		HitsMOs = 0
 		GetsHitByMOs = 0
 		SpriteFile = ContentFile
-			FilePath = Base.rte/Null.bmp
+			FilePath = Base.rte/Null.png
 		AtomGroup = AtomGroup
 			CopyOf = Null AtomGroup
 		Hand = ContentFile
-			FilePath = Base.rte/Null.bmp
+			FilePath = Base.rte/Null.png
 		MaxLength = 0
 	BGArm = Arm
 		PresetName = Null Arm BG
 		Mass = 0
 		HitsMOs = 0
 		GetsHitByMOs = 0
 		SpriteFile = ContentFile
-			FilePath = Base.rte/Null.bmp
+			FilePath = Base.rte/Null.png
 		AtomGroup = AtomGroup
 			CopyOf = Null AtomGroup
 		Hand = ContentFile
-			FilePath = Base.rte/Null.bmp
+			FilePath = Base.rte/Null.png
 		MaxLength = 0
 	FGLeg = Leg
 		PresetName = Null Leg FG
 		Mass = 0
 		HitsMOs = 0
 		GetsHitByMOs = 0
 		SpriteFile = ContentFile
-			FilePath = Base.rte/Null.bmp
+			FilePath = Base.rte/Null.png
 		AtomGroup = AtomGroup
 			CopyOf = Null AtomGroup
 	BGLeg = Leg
@@ -67,7 +67,7 @@ AddActor = AHuman
 		HitsMOs = 0
 		GetsHitByMOs = 0
 		SpriteFile = ContentFile
-			FilePath = Base.rte/Null.bmp
+			FilePath = Base.rte/Null.png
 		AtomGroup = AtomGroup
 			CopyOf = Null AtomGroup
 	HandGroup = AtomGroup
@@ -88,7 +88,7 @@ AddDevice = TDExplosive
 	HitsMOs = 0
 	GetsHitByMOs = 0
 	SpriteFile = ContentFile
-		FilePath = Base.rte/Null.bmp
+		FilePath = Base.rte/Null.png
 	Buyable = 0
 	AtomGroup = AtomGroup
 		CopyOf = Null AtomGroup
@@ -105,7 +105,7 @@ AddDevice = TDExplosive
 	HitsMOs = 0
 	GetsHitByMOs = 0
 	SpriteFile = ContentFile
-		FilePath = Base.rte/Null.bmp
+		FilePath = Base.rte/Null.png
 	Buyable = 0
 	AtomGroup = AtomGroup
 		CopyOf = Null AtomGroup
@@ -122,7 +122,7 @@ AddDevice = TDExplosive
 	HitsMOs = 0
 	GetsHitByMOs = 0
 	SpriteFile = ContentFile
-		FilePath = Base.rte/Null.bmp
+		FilePath = Base.rte/Null.png
 	Buyable = 0
 	AtomGroup = AtomGroup
 		CopyOf = Null AtomGroup

Base.rte/Activities/NetworkTest.lua

@@ -141,7 +141,7 @@ function NetworkTest:UpdateActivity()
 	end--]]--
 
 	if self.SoundTimer:IsPastSimMS(1000) then
-		local snd = AudioMan:PlaySound("Dummy.rte/Effects/Sounds/BlasterFire.wav", Vector(math.random(), math.random()));
+		local snd = AudioMan:PlaySound("Dummy.rte/Effects/Sounds/BlasterFire.flac", Vector(math.random(), math.random()));
 		self.SoundTimer:Reset();
 	end
 

Base.rte/Activities/OneManArmy.lua

@@ -295,9 +295,9 @@ function OneManArmy:UpdateActivity()
 				--Get any Actor from the CPU's native tech
 				local passenger = nil;
 				if math.random() >= self:GetCrabToHumanSpawnRatio(PresetMan:GetModuleID(self.CPUTechName)) then
-					passenger = RandomAHuman("Any", self.CPUTechName);
+					passenger = RandomAHuman("Actors - Light", self.CPUTechName);
 				else
-					passenger = RandomACrab("Any", self.CPUTechName);
+					passenger = RandomACrab("Actors - Mecha", self.CPUTechName);
 				end
 				--Equip it with tools and guns if it's a humanoid
 				if IsAHuman(passenger) then

Base.rte/Activities/OneManArmyDiggers.lua

@@ -251,7 +251,7 @@ function OneManArmy:UpdateActivity()
 			-- Set the ship up with a cargo of a few armed and equipped actors
 			for i = 1, actorsInCargo do
 				-- Get any Actor from the CPU's native tech
-				local passenger = RandomAHuman("Any", self.CPUTechName);
+				local passenger = RandomAHuman("Actors - " .. (self.Difficulty > 75 and "Heavy" or "Light"), self.CPUTechName);
 				passenger:AddInventoryItem(CreateHDFirearm("Light Digger", "Base.rte"));
 
 				-- Set AI mode and team so it knows who and what to fight for!

Base.rte/Activities/Prospecting.lua

@@ -35,7 +35,7 @@ function Prospecting:StartActivity()
 
 	-- Set up the unseen layers
 	SceneMan:MakeAllUnseen(Vector(25, 25), Activity.TEAM_1);
-	SceneMan:LoadUnseenLayer("Base.rte/Scenes/UnseenTest.bmp", Activity.TEAM_2);
+	SceneMan:LoadUnseenLayer("Base.rte/Scenes/UnseenTest.png", Activity.TEAM_2);
 end
 
 -----------------------------------------------------------------------------------------