Feat(update): 2024 10 05 conflict resolution (#97)

Just a blank line conflict with an incipias ship.

copyright

@@ -3409,6 +3409,7 @@ License: CC-BY-SA-4.0
 Comment: Image data: NASA/JPL-Caltech/SwRI/MSSS and Image processing by Brian Swift.
 
 Files:
+ images/icon/swarm*
  images/outfit/twin?blaster*
  images/outfit/twin?mod?blaster*
  images/outfit/repeater*

data/bunrodea/bunrodea weapons.txt

@@ -201,7 +201,7 @@ outfit "Swarm Pod"
 			"frame rate" .01
 		sound "swarm missile"
 		ammo "Swarm Missile"
-		icon "icon/meteor"
+		icon "icon/swarm"
 		"die effect" "missile death"
 		"hit effect" "particle impact"
 		"live effect" "swarm flare" 1000000

data/incipias/incipias ships.txt

@@ -37,6 +37,11 @@ ship "Venta"
 		"thruster slot" 1
 		"gaslining" 1
 		"fuel capacity" 200
+		weapon
+			"blast radius" 224
+			"shield damage" 2240
+			"hull damage" 1120
+			"hit force" 3360
 	outfits
 		"Liquid-Class Shield"
 		"Liquid-Class Shield"
@@ -92,6 +97,11 @@ ship "Nimbus"
 		"thruster slot" 1
 		"gaslining" 1
 		"fuel capacity" 200
+		weapon
+			"blast radius" 100
+			"shield damage" 1000
+			"hull damage" 500
+			"hit force" 1500
 	outfits
 		"Liquid-Class Shield"
 		"Metallic Hydrogen Cell"
@@ -161,6 +171,11 @@ ship "Nimbo Stratus"
 		"thruster slot" 1
 		"gaslining" 1
 		"fuel capacity" 200
+		weapon
+			"blast radius" 12
+			"shield damage" 120
+			"hull damage" 60
+			"hit force" 180
 	outfits
 		"Gas-Class Shield"
 		"Metallic Hydrogen Cell"
@@ -200,6 +215,11 @@ ship "Nimbo Cirrus"
 		"thruster slot" 1
 		"gaslining" 1
 		"fuel capacity" 200
+		weapon
+			"blast radius" 22.5
+			"shield damage" 225
+			"hull damage" 113
+			"hit force" 350
 	outfits
 		"Gas-Class Shield"
 		"Metallic Hydrogen Cell"
@@ -237,6 +257,11 @@ ship "Gero"
 		"thruster slot" 1
 		"gaslining" 1
 		"fuel capacity" 200
+		weapon
+			"blast radius" 26.5
+			"shield damage" 265
+			"hull damage" 133
+			"hit force" 400
 	outfits
 		"Gas-Class Shield"
 		"Metallic Hydrogen Cell"