From a03fca445b0d5ce1f769d179f66d7d20db95da89 Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sat, 28 Dec 2024 12:26:34 -0600
Subject: [PATCH 01/28] Update inkling.raceeffect

---
 species/inkling.raceeffect | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/species/inkling.raceeffect b/species/inkling.raceeffect
index 75fcaf78d5f..b763d75871b 100644
--- a/species/inkling.raceeffect
+++ b/species/inkling.raceeffect
@@ -55,7 +55,7 @@
 				"ocean",
 				"oceanfloor",
 				"flooded",
-                "floodedoceanfloor"
+                                "floodedoceanfloor"
 			],
 			"stats": [{
 					"stat": "maxHealth",

From c60587bd3e489261eb50568deeb69e75d8055aaa Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sat, 28 Dec 2024 12:27:58 -0600
Subject: [PATCH 02/28] Update inkling.species.patch

---
 species/inkling.species.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/species/inkling.species.patch b/species/inkling.species.patch
index a50844dcad3..175bc96199f 100644
--- a/species/inkling.species.patch
+++ b/species/inkling.species.patch
@@ -6,7 +6,7 @@
 
     { "op": "replace",
     "path" : "/charCreationTooltip/description" ,
-    "value" : "Colorful, chatty squid people. Light on their feet, sensitive to climate and liquids, and quite talented with their energy-based firearms.
+    "value" : "Inklings are a vibrant squid people that evolved to come up on land after the annihilation of their planet's previous denizens. They're curious, lively and enthusiastic, and easily get into mischief with their ink-dispensing weapons. Many famous musicians or performers are Inklings: they love nothing more than enjoying all the colors of life.
 
   ^orange;Diet^reset;: Omnivore, but can eat raw meat.
 

From 9a33ebc39ac380a2ebef662f75955e98cb5875ad Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sat, 28 Dec 2024 13:45:23 -0600
Subject: [PATCH 03/28] Update inkling.raceeffect

---
 species/inkling.raceeffect | 210 ++++++++++---------------------------
 1 file changed, 54 insertions(+), 156 deletions(-)

diff --git a/species/inkling.raceeffect b/species/inkling.raceeffect
index b763d75871b..e7c63d67562 100644
--- a/species/inkling.raceeffect
+++ b/species/inkling.raceeffect
@@ -1,205 +1,103 @@
 {
 	"stats": [
-		{
-			"stat": "foodDelta",
-			"baseMultiplier": 1.06
-		},
-		{
-			"stat": "maxEnergy",
-			"effectiveMultiplier": 1.1
-		},
-		{
-			"stat": "maxBreath",
-			"amount": 220
-		},
-		{
-			"stat": "electricResistance",
-			"amount": -0.2
-		},
-		{
-			"stat": "iceResistance",
-			"amount": -0.2
-		},
-		{
-			"stat": "physicalResistance",
-			"amount": 0.1
-		},
-		{
-			"stat": "radioactiveResistance",
-			"amount": 0.3
-		},
-		{
-			"stat": "slimeImmunity",
-			"amount": 1
-		},
-		{
-			"stat": "slimestickImmunity",
-			"amount": 1
-		},
-		{
-			"stat": "wetImmunity",
-			"amount": 1
-		},
-		{
-			"stat": "fallDamageMultiplier",
-			"effectiveMultiplier": 0.65
-		}
-	], // The squid kids like to eat fish, obviously
+		{ "stat": "foodDelta", "baseMultiplier": 1.06 },
+		{ "stat": "maxEnergy", "effectiveMultiplier": 1.1 },
+		{ "stat": "maxBreath", "amount": 220 },
+
+		{ "stat": "fireResistance", "amount": 0.1 },
+		{ "stat": "radioactiveResistance", "amount": 0.3 },
+		{ "stat": "electricResistance", "amount": -0.2 },
+		{ "stat": "iceResistance", "amount": -0.2 },
+
+		{ "stat": "slimeImmunity", "amount": 1 },
+		{ "stat": "slimestickImmunity", "amount": 1 },
+		{ "stat": "wetImmunity", "amount": 1 },
+		{ "stat": "fallDamageMultiplier", "effectiveMultiplier": 0.65}
+	],
+
 	"diet" : [ { "ORGANIC" : false, "MEAT_RAW" : true, "FISH" : true } ],
+
 	"controlModifiers": {
 		"speedModifier": 1.05,
 		"airJumpModifier": 1.2
 	},
+
 	"envEffects": [{
 			"biomes": [
-				"ocean",
-				"oceanfloor",
-				"flooded",
-                                "floodedoceanfloor"
+				"ocean", "oceanfloor"
 			],
-			"stats": [{
-					"stat": "maxHealth",
-					"effectiveMultiplier": 1.15
-				},
-				{
-					"stat": "maxEnergy",
-					"effectiveMultiplier": 1.15
-				},
-				{
-					"stat": "breathProtection",
-					"amount": 1
-				},
-				{
-					"stat": "fallDamageMultiplier",
-					"effectiveMultiplier": 0
-				}
+			"stats": [
+				{ "stat": "maxHealth", "effectiveMultiplier": 1.15 },
+				{ "stat": "maxEnergy", "effectiveMultiplier": 1.15 },
+				{ "stat": "breathProtection", "amount": 1 },
+				{ "stat": "fallDamageMultiplier", "effectiveMultiplier": 0 }
 			],
-			"controlModifiers": {
-				"speedModifier": 1.05
-			}
+			"controlModifiers": { "speedModifier": 1.1 }
 		},
 		{
 			"biomes": "cold",
-			"stats": [{
-					"stat": "maxHealth",
-					"effectiveMultiplier": 0.9
-				},
-				{
-					"stat": "maxEnergy",
-					"effectiveMultiplier": 0.9
-				},
-				{
-					"stat": "energyRegenPercentageRate",
-					"baseMultiplier": 0.8
-				}
+			"stats": [
+				{ "stat": "maxHealth", "effectiveMultiplier": 0.9 },
+				{ "stat": "maxEnergy", "effectiveMultiplier": 0.9 },
+				{ "stat": "energyRegenPercentageRate", "baseMultiplier": 0.8 }
 			]
 		},
 		{
 			"biomes": "hot",
-			"stats": [{
-					"stat": "maxHealth",
-					"effectiveMultiplier": 1.05
-				},
-				{
-					"stat": "maxEnergy",
-					"effectiveMultiplier": 1.05
-				},
-				{
-					"stat": "energyRegenPercentageRate",
-					"baseMultiplier": 1.3
-				}
+			"stats": [
+				{ "stat": "maxHealth", "effectiveMultiplier": 1.05 },
+				{ "stat": "maxEnergy", "effectiveMultiplier": 1.05 },
+				{ "stat": "energyRegenPercentageRate", "baseMultiplier": 1.3 }
 			]
 		}
 	],
 	"liquidEffects": [{
 			"liquids": [
-				5,
-				6,
-				13,
-				60
+				5, 6, 13, 60
 			],
-			"stats": [{
-					"stat": "maxHealth",
-					"effectiveMultiplier": 1.1
-				},
-				{
-					"stat": "maxEnergy",
-					"effectiveMultiplier": 1.1
-				},
-				{
-					"stat": "breathProtection",
-					"amount": 1
-				},
-				{
-					"stat": "fallDamageMultiplier",
-					"effectiveMultiplier": 0
-				}
+			"stats": [
+			{ "stat": "maxHealth", "effectiveMultiplier": 1.1 },
+		        { "stat": "maxEnergy", "effectiveMultiplier": 1.1 },
+		        { "stat": "breathProtection", "amount": 1 },
+			{ "stat": "fallDamageMultiplier", "effectiveMultiplier": 0 }
 			]
 		},
 		{
 			"liquids": [
-				3,
-				12,
-				58
+				3, 12, 58, 88
 			],
-			"stats": [{
-					"stat": "maxHealth",
-					"effectiveMultiplier": 0.7
-				},
-				{
-					"stat": "maxEnergy",
-					"effectiveMultiplier": 0.7
-				},
-				{
-					"stat": "maxBreath",
-					"amount": -100
-				}
+			"stats": [
+			{ "stat": "maxHealth", "effectiveMultiplier": 0.7 },
+			{ "stat": "maxEnergy", "effectiveMultiplier": 0.7 },
+			{ "stat": "maxBreath", "amount": -100 }
 			]
 		}
 	],
 	"weaponEffects": [{
 			"weapons": [
-				"pistol",
-				"machinepistol"
+				"pistol", "machinepistol"
 			],
-			"stats": [{
-					"stat": "powerMultiplier",
-					"effectiveMultiplier": 1.2
-				},
-				{
-					"stat": "maxEnergy",
-					"effectiveMultiplier": 1.15
-				}
+			"stats": [
+			{ "stat": "powerMultiplier",  "effectiveMultiplier": 1.2 },
+			{ "stat": "maxEnergy", "effectiveMultiplier": 1.15 }
 			]
 		},
 		{
 			"weapons": [
-				"sniperrifle",
-				"rifle",
-				"grenadelauncher"
+				"sniperrifle", "rifle", "grenadelauncher"
 			],
-			"stats": [{
-					"stat": "critChance",
-					"amount": 2
-				},
-				{
-					"stat": "critDamage",
-					"amount": 0.05
-				}
+			"stats": [
+			{ "stat": "critChance", "amount": 2 },
+		        { "stat": "critDamage", "amount": 0.05 }
 			]
 		},
 		{
 			"weapons": [
 				"energy"
 			],
-			"stats": [{
-					"stat": "powerMultiplier",
-					"effectiveMultiplier": 1.05
-				},
-				{
-					"stat": "maxEnergy",
-					"effectiveMultiplier": 1.05
-				}
+			"stats": [
+			{ "stat": "powerMultiplier","effectiveMultiplier": 1.05 },
+			{ "stat": "maxEnergy", "effectiveMultiplier": 1.05 }
 			]
 		}
 	],

From 17f986005ddb931eb763b42def12f9000524b499 Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sat, 28 Dec 2024 13:58:31 -0600
Subject: [PATCH 04/28] Create octoling.raceeffect

---
 species/octoling.raceeffect | 109 ++++++++++++++++++++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100644 species/octoling.raceeffect

diff --git a/species/octoling.raceeffect b/species/octoling.raceeffect
new file mode 100644
index 00000000000..9b3339f84a1
--- /dev/null
+++ b/species/octoling.raceeffect
@@ -0,0 +1,109 @@
+{
+	"stats": [
+		{ "stat": "maxEnergy", "effectiveMultiplier": 1.1 },
+		{ "stat": "maxBreath", "amount": 220 },
+
+		{ "stat": "poisonResistance", "amount": 0.3 },
+		{ "stat": "radioactiveResistance", "amount": 0.3 },
+		{ "stat": "cosmicResistance", "amount": -0.25 },
+		{ "stat": "iceResistance", "amount": -0.25 },
+
+		{ "stat": "slimeImmunity", "amount": 1 },
+		{ "stat": "slimestickImmunity", "amount": 1 },
+		{ "stat": "wetImmunity", "amount": 1 },
+		{ "stat": "fallDamageMultiplier", "effectiveMultiplier": 0.65 },
+
+    { "stat": "shotgunMastery", "amount": 0.1 },
+    { "stat": "fuSlimeHeals", "amount": 1 }
+	],
+
+	"diet" : [ { "ORGANIC" : false, "MEAT_RAW" : true, "FISH" : true } ],
+  
+	"controlModifiers": { "airJumpModifier": 1.2 },
+  
+	"envEffects": [{
+			"biomes": [ "ocean", "oceanfloor" ],
+			"stats": [
+				{ "stat": "maxHealth", "effectiveMultiplier": 1.15 },
+				{ "stat": "maxEnergy", "effectiveMultiplier": 1.15 },
+				{ "stat": "breathProtection", "amount": 1 },
+				{ "stat": "fallDamageMultiplier", "effectiveMultiplier": 0 }
+			],
+			"controlModifiers": { "speedModifier": 1.2 }
+		},
+    
+		{
+			"biomes": "cold",
+			"stats": [
+        { "stat": "maxHealth", "effectiveMultiplier": 0.8 },
+				{	"stat": "maxEnergy",	"effectiveMultiplier": 0.8 },
+				{	"stat": "energyRegenPercentageRate", "baseMultiplier": 0.8 } 
+      ],
+				"controlModifiers": {	"speedModifier": 0.8 } 
+		},
+                 
+			{
+			"biomes": "hot",
+			"stats": [
+        { "stat": "maxHealth",	"effectiveMultiplier": 1.1 },
+				{	"stat": "maxEnergy", "effectiveMultiplier": 1.1 },
+				{	"stat": "energyRegenPercentageRate", "baseMultiplier": 1.1 } 
+      ],
+				"controlModifiers": { "speedModifier": 1.1 } 
+		}
+		],
+  
+	"liquidEffects": [{
+			"liquids": [
+				5, 6, 13, 60
+			],
+			"stats": [
+        { "stat": "maxHealth", "effectiveMultiplier": 1.1 },
+				{ "stat": "maxEnergy", "effectiveMultiplier": 1.1 },
+				{	"stat": "breathProtection", "amount": 1 },
+				{ "stat": "fallDamageMultiplier", "effectiveMultiplier": 0 }
+			]
+		},
+		{
+			"liquids": [
+				3, 12, 58, 88
+			],
+			"stats": [
+        { "stat": "maxHealth", "effectiveMultiplier": 0.7	},
+				{ "stat": "maxEnergy", "effectiveMultiplier": 0.7 },
+				{ "stat": "maxBreath", "amount": -100 }
+			]
+		}
+	],
+	"weaponEffects": [{
+			"weapons": [
+				"fistWeapon", "pistol"
+			],
+			"stats": [
+        { "stat": "powerMultiplier", "effectiveMultiplier": 1.2 },
+				{ "stat": "maxEnergy", "effectiveMultiplier": 1.15 }
+			]
+		},
+		{
+			"weapons": [
+				"sniperrifle", "shotgun", "broadsword"
+			],
+			"stats": [
+        { "stat": "critChance", "amount": 2 },
+				{	"stat": "critDamage", "amount": 0.05 }
+			]
+		},
+		{
+			"weapons": [
+				"energy"
+			],
+			"stats": [
+        {	"stat": "powerMultiplier", "effectiveMultiplier": 1.05 },
+				{ "stat": "maxEnergy", "effectiveMultiplier": 1.05 }
+			]
+		}
+	],
+	"special": [
+		"swimboost1"
+	]
+}

From 0dff26a23e810ccf720acc518140920bd3508e29 Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sat, 28 Dec 2024 14:05:56 -0600
Subject: [PATCH 05/28] Update octoling.raceeffect

---
 species/octoling.raceeffect | 132 ++++++++++++++++--------------------
 1 file changed, 59 insertions(+), 73 deletions(-)

diff --git a/species/octoling.raceeffect b/species/octoling.raceeffect
index 9b3339f84a1..14fa7d88f15 100644
--- a/species/octoling.raceeffect
+++ b/species/octoling.raceeffect
@@ -13,97 +13,83 @@
 		{ "stat": "wetImmunity", "amount": 1 },
 		{ "stat": "fallDamageMultiplier", "effectiveMultiplier": 0.65 },
 
-    { "stat": "shotgunMastery", "amount": 0.1 },
-    { "stat": "fuSlimeHeals", "amount": 1 }
+    	{ "stat": "shotgunMastery", "amount": 0.1 },
+    	{ "stat": "fuSlimeHeals", "amount": 1 }
 	],
 
 	"diet" : [ { "ORGANIC" : false, "MEAT_RAW" : true, "FISH" : true } ],
   
 	"controlModifiers": { "airJumpModifier": 1.2 },
   
-	"envEffects": [{
-			"biomes": [ "ocean", "oceanfloor" ],
-			"stats": [
-				{ "stat": "maxHealth", "effectiveMultiplier": 1.15 },
-				{ "stat": "maxEnergy", "effectiveMultiplier": 1.15 },
-				{ "stat": "breathProtection", "amount": 1 },
-				{ "stat": "fallDamageMultiplier", "effectiveMultiplier": 0 }
-			],
+	"envEffects": [
+	{ "biomes": [ "ocean", "oceanfloor" ],
+	  "stats": [
+			{ "stat": "maxHealth", "effectiveMultiplier": 1.15 },
+			{ "stat": "maxEnergy", "effectiveMultiplier": 1.15 },
+			{ "stat": "breathProtection", "amount": 1 },
+			{ "stat": "fallDamageMultiplier", "effectiveMultiplier": 0 }
+				],
 			"controlModifiers": { "speedModifier": 1.2 }
-		},
+	},
     
-		{
-			"biomes": "cold",
-			"stats": [
-        { "stat": "maxHealth", "effectiveMultiplier": 0.8 },
-				{	"stat": "maxEnergy",	"effectiveMultiplier": 0.8 },
-				{	"stat": "energyRegenPercentageRate", "baseMultiplier": 0.8 } 
-      ],
-				"controlModifiers": {	"speedModifier": 0.8 } 
-		},
+	{ "biomes": "cold",
+		"stats": [
+        	{ "stat": "maxHealth", "effectiveMultiplier": 0.8 },
+			{ "stat": "maxEnergy",	"effectiveMultiplier": 0.8 },
+			{ "stat": "energyRegenPercentageRate", "baseMultiplier": 0.8 } 
+    				  ],
+			"controlModifiers": { "speedModifier": 0.8 } 
+				},
                  
-			{
-			"biomes": "hot",
-			"stats": [
-        { "stat": "maxHealth",	"effectiveMultiplier": 1.1 },
-				{	"stat": "maxEnergy", "effectiveMultiplier": 1.1 },
-				{	"stat": "energyRegenPercentageRate", "baseMultiplier": 1.1 } 
-      ],
-				"controlModifiers": { "speedModifier": 1.1 } 
-		}
+	{ "biomes": "hot",
+		"stats": [
+       		{ "stat": "maxHealth",	"effectiveMultiplier": 1.1 },
+			{ "stat": "maxEnergy", "effectiveMultiplier": 1.1 },
+			{ "stat": "energyRegenPercentageRate", "baseMultiplier": 1.1 } 
+      				  ],
+			"controlModifiers": { "speedModifier": 1.1 } 
+				}
 		],
   
-	"liquidEffects": [{
-			"liquids": [
-				5, 6, 13, 60
-			],
+	"liquidEffects": [
+		{ "liquids": [ 5, 6, 13, 60 ],
 			"stats": [
-        { "stat": "maxHealth", "effectiveMultiplier": 1.1 },
-				{ "stat": "maxEnergy", "effectiveMultiplier": 1.1 },
-				{	"stat": "breathProtection", "amount": 1 },
-				{ "stat": "fallDamageMultiplier", "effectiveMultiplier": 0 }
-			]
-		},
-		{
-			"liquids": [
-				3, 12, 58, 88
-			],
+       			 { "stat": "maxHealth", "effectiveMultiplier": 1.1 },
+			 { "stat": "maxEnergy", "effectiveMultiplier": 1.1 },
+			 { "stat": "breathProtection", "amount": 1 },
+			 { "stat": "fallDamageMultiplier", "effectiveMultiplier": 0 }
+				]
+			 },
+			
+		{ "liquids": [ 3, 12, 58, 88 ],
 			"stats": [
-        { "stat": "maxHealth", "effectiveMultiplier": 0.7	},
-				{ "stat": "maxEnergy", "effectiveMultiplier": 0.7 },
-				{ "stat": "maxBreath", "amount": -100 }
-			]
-		}
+       		 { "stat": "maxHealth", "effectiveMultiplier": 0.7 },
+			 { "stat": "maxEnergy", "effectiveMultiplier": 0.7 },
+			 { "stat": "maxBreath", "amount": -100 }
+				]
+			}
 	],
-	"weaponEffects": [{
-			"weapons": [
-				"fistWeapon", "pistol"
-			],
-			"stats": [
-        { "stat": "powerMultiplier", "effectiveMultiplier": 1.2 },
-				{ "stat": "maxEnergy", "effectiveMultiplier": 1.15 }
-			]
+	
+	"weaponEffects": [
+			{ "weapons": [ "fistWeapon", "pistol" ],
+			    "stats": [
+      		     		{ "stat": "powerMultiplier", "effectiveMultiplier": 1.2 },
+			     	{ "stat": "maxEnergy", "effectiveMultiplier": 1.15 }
+			             ]
 		},
-		{
-			"weapons": [
-				"sniperrifle", "shotgun", "broadsword"
-			],
-			"stats": [
-        { "stat": "critChance", "amount": 2 },
-				{	"stat": "critDamage", "amount": 0.05 }
-			]
+			{ "weapons": [ "sniperrifle", "shotgun", "broadsword" ],
+				"stats": [
+				{ "stat": "critChance", "amount": 2 },
+				{ "stat": "critDamage", "amount": 0.05 }
+						 ]
 		},
 		{
-			"weapons": [
-				"energy"
-			],
-			"stats": [
-        {	"stat": "powerMultiplier", "effectiveMultiplier": 1.05 },
+			"weapons": [ "energy" ],
+				"stats": [
+				{ "stat": "powerMultiplier", "effectiveMultiplier": 1.05 },
 				{ "stat": "maxEnergy", "effectiveMultiplier": 1.05 }
-			]
+						]
 		}
 	],
-	"special": [
-		"swimboost1"
-	]
+	"special": [ "swimboost1" ]
 }

From 92f8c7b0ddb297ec19a1aa852fca7db88b0b344e Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sat, 28 Dec 2024 14:20:53 -0600
Subject: [PATCH 06/28] Update inkling.raceeffect

---
 species/inkling.raceeffect | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/species/inkling.raceeffect b/species/inkling.raceeffect
index e7c63d67562..d3bb18c648e 100644
--- a/species/inkling.raceeffect
+++ b/species/inkling.raceeffect
@@ -12,7 +12,10 @@
 		{ "stat": "slimeImmunity", "amount": 1 },
 		{ "stat": "slimestickImmunity", "amount": 1 },
 		{ "stat": "wetImmunity", "amount": 1 },
-		{ "stat": "fallDamageMultiplier", "effectiveMultiplier": 0.65}
+		{ "stat": "tarImmunity", "amount" : 1 },
+
+		{ "stat": "fallDamageMultiplier", "effectiveMultiplier": 0.65 },
+   		{ "stat": "pistolMastery", "amount": 0.1 }
 	],
 
 	"diet" : [ { "ORGANIC" : false, "MEAT_RAW" : true, "FISH" : true } ],
@@ -23,9 +26,7 @@
 	},
 
 	"envEffects": [{
-			"biomes": [
-				"ocean", "oceanfloor"
-			],
+			"biomes": [ "ocean", "oceanfloor" ],
 			"stats": [
 				{ "stat": "maxHealth", "effectiveMultiplier": 1.15 },
 				{ "stat": "maxEnergy", "effectiveMultiplier": 1.15 },
@@ -39,7 +40,7 @@
 			"stats": [
 				{ "stat": "maxHealth", "effectiveMultiplier": 0.9 },
 				{ "stat": "maxEnergy", "effectiveMultiplier": 0.9 },
-				{ "stat": "energyRegenPercentageRate", "baseMultiplier": 0.8 }
+				{ "stat": "energyRegenPercentageRate", "baseMultiplier": 0.9 }
 			]
 		},
 		{

From c76d5b1e9797d5ef34ebc0a3ca566e4e0e0d8cad Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sat, 28 Dec 2024 14:20:54 -0600
Subject: [PATCH 07/28] Update octoling.raceeffect

---
 species/octoling.raceeffect | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/species/octoling.raceeffect b/species/octoling.raceeffect
index 14fa7d88f15..d8824c4d54b 100644
--- a/species/octoling.raceeffect
+++ b/species/octoling.raceeffect
@@ -5,16 +5,16 @@
 
 		{ "stat": "poisonResistance", "amount": 0.3 },
 		{ "stat": "radioactiveResistance", "amount": 0.3 },
-		{ "stat": "cosmicResistance", "amount": -0.25 },
-		{ "stat": "iceResistance", "amount": -0.25 },
+		{ "stat": "cosmicResistance", "amount": -0.3 },
+		{ "stat": "iceResistance", "amount": -0.3 },
 
 		{ "stat": "slimeImmunity", "amount": 1 },
 		{ "stat": "slimestickImmunity", "amount": 1 },
 		{ "stat": "wetImmunity", "amount": 1 },
-		{ "stat": "fallDamageMultiplier", "effectiveMultiplier": 0.65 },
+		{ "stat": "tarImmunity", "amount" : 1 },
 
-    	{ "stat": "shotgunMastery", "amount": 0.1 },
-    	{ "stat": "fuSlimeHeals", "amount": 1 }
+		{ "stat": "fallDamageMultiplier", "effectiveMultiplier": 0.65 },
+    		{ "stat": "shotgunMastery", "amount": 0.1 }
 	],
 
 	"diet" : [ { "ORGANIC" : false, "MEAT_RAW" : true, "FISH" : true } ],
@@ -28,13 +28,13 @@
 			{ "stat": "maxEnergy", "effectiveMultiplier": 1.15 },
 			{ "stat": "breathProtection", "amount": 1 },
 			{ "stat": "fallDamageMultiplier", "effectiveMultiplier": 0 }
-				],
+		   ],
 			"controlModifiers": { "speedModifier": 1.2 }
 	},
     
 	{ "biomes": "cold",
 		"stats": [
-        	{ "stat": "maxHealth", "effectiveMultiplier": 0.8 },
+        		{ "stat": "maxHealth", "effectiveMultiplier": 0.8 },
 			{ "stat": "maxEnergy",	"effectiveMultiplier": 0.8 },
 			{ "stat": "energyRegenPercentageRate", "baseMultiplier": 0.8 } 
     				  ],
@@ -43,7 +43,7 @@
                  
 	{ "biomes": "hot",
 		"stats": [
-       		{ "stat": "maxHealth",	"effectiveMultiplier": 1.1 },
+       			{ "stat": "maxHealth",	"effectiveMultiplier": 1.1 },
 			{ "stat": "maxEnergy", "effectiveMultiplier": 1.1 },
 			{ "stat": "energyRegenPercentageRate", "baseMultiplier": 1.1 } 
       				  ],

From 5ba6ca9b98bbf4bf51d3ac6e6da0ccd86fde5a10 Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sat, 28 Dec 2024 14:24:07 -0600
Subject: [PATCH 08/28] Update inkling.raceeffect

---
 species/inkling.raceeffect | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/species/inkling.raceeffect b/species/inkling.raceeffect
index d3bb18c648e..a80538b3928 100644
--- a/species/inkling.raceeffect
+++ b/species/inkling.raceeffect
@@ -11,8 +11,8 @@
 
 		{ "stat": "slimeImmunity", "amount": 1 },
 		{ "stat": "slimestickImmunity", "amount": 1 },
+		{ "stat": "tarStatusImmunity", "amount" : 1 },
 		{ "stat": "wetImmunity", "amount": 1 },
-		{ "stat": "tarImmunity", "amount" : 1 },
 
 		{ "stat": "fallDamageMultiplier", "effectiveMultiplier": 0.65 },
    		{ "stat": "pistolMastery", "amount": 0.1 }

From 55613039c12d8b90a15bb870607920c8cac26f0d Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sat, 28 Dec 2024 14:24:17 -0600
Subject: [PATCH 09/28] Update octoling.raceeffect

---
 species/octoling.raceeffect | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/species/octoling.raceeffect b/species/octoling.raceeffect
index d8824c4d54b..e7c9bfedd93 100644
--- a/species/octoling.raceeffect
+++ b/species/octoling.raceeffect
@@ -10,8 +10,8 @@
 
 		{ "stat": "slimeImmunity", "amount": 1 },
 		{ "stat": "slimestickImmunity", "amount": 1 },
+		{ "stat": "tarStatusImmunity", "amount" : 1 },
 		{ "stat": "wetImmunity", "amount": 1 },
-		{ "stat": "tarImmunity", "amount" : 1 },
 
 		{ "stat": "fallDamageMultiplier", "effectiveMultiplier": 0.65 },
     		{ "stat": "shotgunMastery", "amount": 0.1 }

From 7400e1e6336226fe1a066bfe954d18837d947681 Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sat, 28 Dec 2024 14:25:35 -0600
Subject: [PATCH 10/28] Update inkling.raceeffect

---
 species/inkling.raceeffect | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/species/inkling.raceeffect b/species/inkling.raceeffect
index a80538b3928..ea6063d10c8 100644
--- a/species/inkling.raceeffect
+++ b/species/inkling.raceeffect
@@ -40,7 +40,7 @@
 			"stats": [
 				{ "stat": "maxHealth", "effectiveMultiplier": 0.9 },
 				{ "stat": "maxEnergy", "effectiveMultiplier": 0.9 },
-				{ "stat": "energyRegenPercentageRate", "baseMultiplier": 0.9 }
+				{ "stat": "energyRegenPercentageRate", "baseMultiplier": 0.8 }
 			]
 		},
 		{

From 0433129b67cda7b341e5aa905c746ed03d652500 Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sat, 28 Dec 2024 14:26:07 -0600
Subject: [PATCH 11/28] Update inkling.species.patch

---
 species/inkling.species.patch | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/species/inkling.species.patch b/species/inkling.species.patch
index 175bc96199f..58072ead81a 100644
--- a/species/inkling.species.patch
+++ b/species/inkling.species.patch
@@ -6,16 +6,16 @@
 
     { "op": "replace",
     "path" : "/charCreationTooltip/description" ,
-    "value" : "Inklings are a vibrant squid people that evolved to come up on land after the annihilation of their planet's previous denizens. They're curious, lively and enthusiastic, and easily get into mischief with their ink-dispensing weapons. Many famous musicians or performers are Inklings: they love nothing more than enjoying all the colors of life.
+    "value" : "Inklings are a vibrant squid people that evolved to come up on land after the nuclear annihilation of their planet's previous denizens. They're curious, lively and enthusiastic, and easily get into mischief with their ink-dispensing weapons. Many famous musicians or performers are Inklings: they love nothing more than enjoying all the colors of life.
 
-  ^orange;Diet^reset;: Omnivore, but can eat raw meat.
+  ^orange;Diet^reset;: Omnivore, but can eat raw fish and meat.
 
 ^orange;Perks^reset;:
   ^green;220^reset;s Breath
-  ^green;Resist^reset;: +^green;10^reset;% Physical, +^green;30^reset;% Radioactive
+  ^green;Resist^reset;: +^green;10^reset;% Fire, +^green;30^reset;% Radioactive
   ^green;20^reset;% Jump Height increase +^green;5^reset;% Movement Speed
   Fall Damage x^green;0.65^reset;.
-  ^cyan;Immune^reset;: Slime, Wet
+  ^cyan;Immune^reset;: Slime, Wet, Tar
   ^cyan;Swim Boost 1^reset;
 
 ^orange;Environment^reset;:
@@ -23,7 +23,7 @@
   On Warm biomes: Health and Energy x^green;1.05^reset;, +^green;30^reset;% regen rate.
   On Cold biomes: Health and Energy x^red;0.9^reset;, -^red;20^reset;% regen rate.
   Oil, Slime, Dark Water, or Healing Water: Health and Energy x^green;1.1^reset;, Inf Breath
-  Poison, Swamp Water, or Contaminated Water: Health and Energy x^red;0.7^reset;, -100 Breath
+  Poison, Swamp Water, Contaminated Water, or Strange Ooze: Health and Energy x^red;0.7^reset;, -100 Breath
 
 ^orange;Weapons^reset;:
   Pistol/Machine Pistol: Damage x^green;1.2^reset;, Energy x^green;1.15^reset;

From d08c426749d80234356bbcb6928daecfa068357b Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sat, 28 Dec 2024 14:32:18 -0600
Subject: [PATCH 12/28] Update octoling.raceeffect

---
 species/octoling.raceeffect | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/species/octoling.raceeffect b/species/octoling.raceeffect
index e7c9bfedd93..95106f822e5 100644
--- a/species/octoling.raceeffect
+++ b/species/octoling.raceeffect
@@ -71,13 +71,13 @@
 	],
 	
 	"weaponEffects": [
-			{ "weapons": [ "fistWeapon", "pistol" ],
+			{ "weapons": [ "pistol" ],
 			    "stats": [
       		     		{ "stat": "powerMultiplier", "effectiveMultiplier": 1.2 },
 			     	{ "stat": "maxEnergy", "effectiveMultiplier": 1.15 }
 			             ]
 		},
-			{ "weapons": [ "sniperrifle", "shotgun", "broadsword" ],
+			{ "weapons": [ "fistWeapon", "shotgun", "broadsword" ],
 				"stats": [
 				{ "stat": "critChance", "amount": 2 },
 				{ "stat": "critDamage", "amount": 0.05 }

From 66e4213d06b1171fac935dca7447e856130c1f90 Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sat, 28 Dec 2024 14:34:27 -0600
Subject: [PATCH 13/28] Update inkling.species.patch

---
 species/inkling.species.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/species/inkling.species.patch b/species/inkling.species.patch
index 58072ead81a..69b7ede872c 100644
--- a/species/inkling.species.patch
+++ b/species/inkling.species.patch
@@ -8,7 +8,7 @@
     "path" : "/charCreationTooltip/description" ,
     "value" : "Inklings are a vibrant squid people that evolved to come up on land after the nuclear annihilation of their planet's previous denizens. They're curious, lively and enthusiastic, and easily get into mischief with their ink-dispensing weapons. Many famous musicians or performers are Inklings: they love nothing more than enjoying all the colors of life.
 
-  ^orange;Diet^reset;: Omnivore, but can eat raw fish and meat.
+^orange;Diet^reset;: Omnivore, but can eat raw fish and meat.
 
 ^orange;Perks^reset;:
   ^green;220^reset;s Breath
@@ -26,12 +26,12 @@
   Poison, Swamp Water, Contaminated Water, or Strange Ooze: Health and Energy x^red;0.7^reset;, -100 Breath
 
 ^orange;Weapons^reset;:
-  Pistol/Machine Pistol: Damage x^green;1.2^reset;, Energy x^green;1.15^reset;
+  Pistol, Machine Pistol: Damage x^green;1.2^reset;, Energy x^green;1.15^reset;
   Sniper Rifle, Grenade Launcher: +^green;2^reset;% Crit Chance, +^green;5^reset;% Crit Damage
   Energy Weapon: Damage x^green;1.05^reset;, Energy x^green;1.05^reset; increase
 
 ^red;Weaknesses^reset;:
-  ^red;Resist^reset;: -^red;20^reset;% Ice & Electric
+  ^red;Resist^reset;: -^red;30^reset;% Ice & Electric
   +^red;6^reset;% Increased Hunger Drain"
     }
 ]

From 8996465d47f40dca2db5113a88929cbd78f9c005 Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sat, 28 Dec 2024 14:34:28 -0600
Subject: [PATCH 14/28] Create octoling.species.patch

---
 species/octoling.species.patch | 36 ++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 species/octoling.species.patch

diff --git a/species/octoling.species.patch b/species/octoling.species.patch
new file mode 100644
index 00000000000..a24db02a73c
--- /dev/null
+++ b/species/octoling.species.patch
@@ -0,0 +1,36 @@
+[
+    { "op": "replace",
+    "path" : "/charCreationTooltip/description" ,
+    "value" : ""
+    },
+
+    { "op": "replace",
+    "path" : "/charCreationTooltip/description" ,
+    "value" : "The octopus cousins of Inklings, famous for their skills in engineering, hacking and electronic music. They're a bit more shy than their relatives, but often more wily, using their own venom in some weapons. Most of them hail from the militaristic Octarian Shogunate, and continue to seek the peace it provides them.
+ 
+^orange;Diet^reset;: Omnivore, but can eat raw fish and meat.
+
+^orange;Perks^reset;:
+  ^green;220^reset;s Breath
+  ^green;Resist^reset;: +^green;30^reset;% Poison, +^green;30^reset;% Radioactive
+  ^green;20^reset;% Jump Height increase
+  Fall Damage x^green;0.65^reset;.
+  ^cyan;Immune^reset;: Slime, Wet, Tar
+  ^cyan;Swim Boost 1^reset;
+
+^orange;Environment^reset;:
+  On Ocean biomes: Health, Energy & Movement Speed x^green;1.15^reset;, Inf Oxygen, Fall Damage Immunity.
+  On Warm biomes: Health, Energy & Movement Speed x^green;1.1^reset;, +^green;10^reset;% regen rate.
+  On Cold biomes: Health, Energy & Movement Speed x^red;0.8^reset;, -^red;20^reset;% regen rate.
+  Oil, Slime, Dark Water, or Healing Water: Health and Energy x^green;1.1^reset;, Inf Breath
+  Poison, Swamp Water, Contaminated Water, or Strange Ooze: Health and Energy x^red;0.7^reset;, -100 Breath
+
+^orange;Weapons^reset;:
+  Pistol: Damage x^green;1.2^reset;, Energy x^green;1.15^reset;
+  Fist, Shotgun & Broadsword: +^green;2^reset;% Crit Chance, +^green;5^reset;% Crit Damage
+  Energy Weapon: Damage x^green;1.05^reset;, Energy x^green;1.05^reset; increase
+
+^red;Weaknesses^reset;:
+  ^red;Resist^reset;: -^red;20^reset;% Ice & Electric
+    }
+]

From afbde039d46919be8f6d830b4a236e0753ba2d3d Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sat, 28 Dec 2024 14:34:49 -0600
Subject: [PATCH 15/28] Update octoling.species.patch


From 87dacdb1f6c5770bd9715cd2ecc8d378044aa899 Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sat, 28 Dec 2024 23:15:37 -0600
Subject: [PATCH 16/28] Update inkling.species.patch

---
 species/inkling.species.patch | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/species/inkling.species.patch b/species/inkling.species.patch
index 69b7ede872c..9e4cf6c4033 100644
--- a/species/inkling.species.patch
+++ b/species/inkling.species.patch
@@ -1,9 +1,4 @@
 [
-    { "op": "replace",
-    "path" : "/charCreationTooltip/description" ,
-    "value" : ""
-    },
-
     { "op": "replace",
     "path" : "/charCreationTooltip/description" ,
     "value" : "Inklings are a vibrant squid people that evolved to come up on land after the nuclear annihilation of their planet's previous denizens. They're curious, lively and enthusiastic, and easily get into mischief with their ink-dispensing weapons. Many famous musicians or performers are Inklings: they love nothing more than enjoying all the colors of life.

From 87ce7f5e7f372f6b732606b7c2aa26cac133f5ea Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sat, 28 Dec 2024 23:16:02 -0600
Subject: [PATCH 17/28] Update octoling.species.patch

---
 species/octoling.species.patch | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/species/octoling.species.patch b/species/octoling.species.patch
index a24db02a73c..d5f3b5bfa15 100644
--- a/species/octoling.species.patch
+++ b/species/octoling.species.patch
@@ -1,9 +1,4 @@
 [
-    { "op": "replace",
-    "path" : "/charCreationTooltip/description" ,
-    "value" : ""
-    },
-
     { "op": "replace",
     "path" : "/charCreationTooltip/description" ,
     "value" : "The octopus cousins of Inklings, famous for their skills in engineering, hacking and electronic music. They're a bit more shy than their relatives, but often more wily, using their own venom in some weapons. Most of them hail from the militaristic Octarian Shogunate, and continue to seek the peace it provides them.

From ee1b67c8d092cd4489451009b1c06f4684b65273 Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sun, 29 Dec 2024 17:22:52 -0600
Subject: [PATCH 18/28] Update statWindow.config

---
 interface/scripted/statWindow/statWindow.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/scripted/statWindow/statWindow.config b/interface/scripted/statWindow/statWindow.config
index 83898d9d57c..fea81c20e2b 100644
--- a/interface/scripted/statWindow/statWindow.config
+++ b/interface/scripted/statWindow/statWindow.config
@@ -299,7 +299,7 @@
   },
 
 
-	"races":	[ "apex", "avian", "floran", "glitch", "human", "hylotl", "novakid", "mauskin", "bunnine", "shadow", "elduukhar", "argonian", "avali", "fuslimeperson", "kyani", "slimeperson", "deerfolk", "lastree", "avikan", "bunnykin", "callistan", "calskies","droden", "elunite", "familiar", "felin", "fenerox", "gardevan", "aegi", "greckan", "gyrusen", "calskie", "kazdra", "kemono", "kineptic", "lamia", "mantizi","fumantizi", "mlp", "munari", "neko", "nightar", "ningen", "orcana", "fupeglaci","peglaci", "phox", "ponex", "sergal", "skelekin", "trink", "vespoid", "viera", "moogle", "vulpes", "wasphive", "arachne", "Indix", "skath", "pygs", "kitsune", "indix", "thelusian", "fukirhos", "kirhos", "radien", "woggle", "dragon", "tauren", "lucario", "inkling", "eevee", "elysian", "fennix", "lombax_striped", "lombax_pointed", "saturn", "saturn2", "satkyterran", "saturnmothman", "blattra", "sarasinor", "webber", "candavaswebber", "Zoroark","everis","changenykt", "demon", "shade", "veluu", "cat", "deerkin", "terrakin","merrkin", "spiritguardian", "spirittree", "fragmentedruin", "juux", "fupeglaci", "remorian", "lutrin", "irken", "carakinox", "harpy", "alicorn", "batpony", "changeling", "pony", "pegasus", "hippogriff", "unicorn", "ponex", "attarran", "alrune", "taurikin", "protogenrace1", "shoggoth","mindflayer","zombie","arcanian","squamaeft","scyphojel","vashknaaren","vashknaarenbiped","gic_realisticfloran","gic_realistichuman","gic_realisticglitch","mechineki" ],
+	"races":	[ "apex", "avian", "floran", "glitch", "human", "hylotl", "novakid", "mauskin", "bunnine", "shadow", "elduukhar", "argonian", "avali", "fuslimeperson", "kyani", "slimeperson", "deerfolk", "lastree", "avikan", "bunnykin", "callistan", "calskies","droden", "elunite", "familiar", "felin", "fenerox", "gardevan", "aegi", "greckan", "gyrusen", "calskie", "kazdra", "kemono", "kineptic", "lamia", "mantizi","fumantizi", "mlp", "munari", "neko", "nightar", "ningen", "orcana", "fupeglaci","peglaci", "phox", "ponex", "sergal", "skelekin", "trink", "vespoid", "viera", "moogle", "vulpes", "wasphive", "arachne", "Indix", "skath", "pygs", "kitsune", "indix", "thelusian", "fukirhos", "kirhos", "radien", "woggle", "dragon", "tauren", "lucario", "inkling", "octoling", "eevee", "elysian", "fennix", "lombax_striped", "lombax_pointed", "saturn", "saturn2", "satkyterran", "saturnmothman", "blattra", "sarasinor", "webber", "candavaswebber", "Zoroark","everis","changenykt", "demon", "shade", "veluu", "cat", "deerkin", "terrakin","merrkin", "spiritguardian", "spirittree", "fragmentedruin", "juux", "fupeglaci", "remorian", "lutrin", "irken", "carakinox", "harpy", "alicorn", "batpony", "changeling", "pony", "pegasus", "hippogriff", "unicorn", "ponex", "attarran", "alrune", "taurikin", "protogenrace1", "shoggoth","mindflayer","zombie","arcanian","squamaeft","scyphojel","vashknaaren","vashknaarenbiped","gic_realisticfloran","gic_realistichuman","gic_realisticglitch","mechineki" ],
 	"elements":	[ "physical", "fire", "poison", "ice", "electric", "radioactive", "cosmic", "shadow" ],
 	"statuses" : {
 		// Cold

From 9e077b4c884e2304403ad834ca162d828a9104a8 Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sun, 29 Dec 2024 17:29:46 -0600
Subject: [PATCH 19/28] Update octoling.species.patch

---
 species/octoling.species.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/species/octoling.species.patch b/species/octoling.species.patch
index d5f3b5bfa15..0856ea2100b 100644
--- a/species/octoling.species.patch
+++ b/species/octoling.species.patch
@@ -26,6 +26,6 @@
   Energy Weapon: Damage x^green;1.05^reset;, Energy x^green;1.05^reset; increase
 
 ^red;Weaknesses^reset;:
-  ^red;Resist^reset;: -^red;20^reset;% Ice & Electric
+  ^red;Resist^reset;: -^red;20^reset;% Ice & Electric"
     }
 ]

From 8ca63f1ad64b761a6c05ac4e5b438a1ded24330f Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sun, 29 Dec 2024 17:41:07 -0600
Subject: [PATCH 20/28] Update inkling.raceeffect

---
 species/inkling.raceeffect | 1 +
 1 file changed, 1 insertion(+)

diff --git a/species/inkling.raceeffect b/species/inkling.raceeffect
index ea6063d10c8..a51e5ef32d8 100644
--- a/species/inkling.raceeffect
+++ b/species/inkling.raceeffect
@@ -12,6 +12,7 @@
 		{ "stat": "slimeImmunity", "amount": 1 },
 		{ "stat": "slimestickImmunity", "amount": 1 },
 		{ "stat": "tarStatusImmunity", "amount" : 1 },
+		{ "stat": "tarImmunity", "amount" : 1 },
 		{ "stat": "wetImmunity", "amount": 1 },
 
 		{ "stat": "fallDamageMultiplier", "effectiveMultiplier": 0.65 },

From f65bbe46660531abb10f450d0598d9bc572f5054 Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sun, 29 Dec 2024 17:42:04 -0600
Subject: [PATCH 21/28] Update octoling.raceeffect

---
 species/octoling.raceeffect | 1 +
 1 file changed, 1 insertion(+)

diff --git a/species/octoling.raceeffect b/species/octoling.raceeffect
index 95106f822e5..b82f3dd610e 100644
--- a/species/octoling.raceeffect
+++ b/species/octoling.raceeffect
@@ -11,6 +11,7 @@
 		{ "stat": "slimeImmunity", "amount": 1 },
 		{ "stat": "slimestickImmunity", "amount": 1 },
 		{ "stat": "tarStatusImmunity", "amount" : 1 },
+	        { "stat": "tarImmunity", "amount" : 1 },
 		{ "stat": "wetImmunity", "amount": 1 },
 
 		{ "stat": "fallDamageMultiplier", "effectiveMultiplier": 0.65 },

From 4614042d8b0f76179df4816b3e8145c25ddb9789 Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sun, 29 Dec 2024 18:21:29 -0600
Subject: [PATCH 22/28] Update octoling.raceeffect

---
 species/octoling.raceeffect | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/species/octoling.raceeffect b/species/octoling.raceeffect
index b82f3dd610e..bf02e3f08b1 100644
--- a/species/octoling.raceeffect
+++ b/species/octoling.raceeffect
@@ -78,7 +78,13 @@
 			     	{ "stat": "maxEnergy", "effectiveMultiplier": 1.15 }
 			             ]
 		},
-			{ "weapons": [ "fistWeapon", "shotgun", "broadsword" ],
+			{ "weapons": [ "fistWeapon" ],
+			    "stats": [
+      		     		{ "stat": "powerMultiplier", "effectiveMultiplier": 1.2 },
+			     	{ "stat": "critChance", "amount": 2 }
+			             ]
+		},
+			{ "weapons": [ "shotgun", "broadsword" ],
 				"stats": [
 				{ "stat": "critChance", "amount": 2 },
 				{ "stat": "critDamage", "amount": 0.05 }

From 841d6feaa9ca312e9420f1dbce8a3dd2c65981ed Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sun, 29 Dec 2024 18:47:04 -0600
Subject: [PATCH 23/28] Update octoling.raceeffect

---
 species/octoling.raceeffect | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/species/octoling.raceeffect b/species/octoling.raceeffect
index bf02e3f08b1..c681695acb2 100644
--- a/species/octoling.raceeffect
+++ b/species/octoling.raceeffect
@@ -78,7 +78,7 @@
 			     	{ "stat": "maxEnergy", "effectiveMultiplier": 1.15 }
 			             ]
 		},
-			{ "weapons": [ "fistWeapon" ],
+			{ "weapons": [ "fist" ],
 			    "stats": [
       		     		{ "stat": "powerMultiplier", "effectiveMultiplier": 1.2 },
 			     	{ "stat": "critChance", "amount": 2 }

From a29f0ce81df7ba70a4d201a6337c1a39b4c8ecc4 Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sun, 29 Dec 2024 18:48:29 -0600
Subject: [PATCH 24/28] Update octoling.raceeffect

---
 species/octoling.raceeffect | 1 +
 1 file changed, 1 insertion(+)

diff --git a/species/octoling.raceeffect b/species/octoling.raceeffect
index c681695acb2..06ac6637a61 100644
--- a/species/octoling.raceeffect
+++ b/species/octoling.raceeffect
@@ -16,6 +16,7 @@
 
 		{ "stat": "fallDamageMultiplier", "effectiveMultiplier": 0.65 },
     		{ "stat": "shotgunMastery", "amount": 0.1 }
+		{ "stat": "fistMastery", "amount": 0.1 }
 	],
 
 	"diet" : [ { "ORGANIC" : false, "MEAT_RAW" : true, "FISH" : true } ],

From 1f63e589d95952bbda4a529108e9d3ba1ef361dd Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sun, 29 Dec 2024 18:51:09 -0600
Subject: [PATCH 25/28] Update inkling.raceeffect

---
 species/inkling.raceeffect | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/species/inkling.raceeffect b/species/inkling.raceeffect
index a51e5ef32d8..0af3f1fd4aa 100644
--- a/species/inkling.raceeffect
+++ b/species/inkling.raceeffect
@@ -16,7 +16,8 @@
 		{ "stat": "wetImmunity", "amount": 1 },
 
 		{ "stat": "fallDamageMultiplier", "effectiveMultiplier": 0.65 },
-   		{ "stat": "pistolMastery", "amount": 0.1 }
+   		{ "stat": "pistolMastery", "amount": 0.1 },
+		{ "stat": "sniperrifleMastery", "amount" : 0.1 }
 	],
 
 	"diet" : [ { "ORGANIC" : false, "MEAT_RAW" : true, "FISH" : true } ],

From 7d57e6746c1cd2dfe2d00461c8e02861f31809e6 Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sun, 29 Dec 2024 19:09:46 -0600
Subject: [PATCH 26/28] Update inkling.raceeffect

---
 species/inkling.raceeffect | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/species/inkling.raceeffect b/species/inkling.raceeffect
index 0af3f1fd4aa..a8e6a0d2012 100644
--- a/species/inkling.raceeffect
+++ b/species/inkling.raceeffect
@@ -96,7 +96,7 @@
 		},
 		{
 			"weapons": [
-				"energy"
+				"slime"
 			],
 			"stats": [
 			{ "stat": "powerMultiplier","effectiveMultiplier": 1.05 },

From 74cae73d4c1f176b300df218df8fdbe26c5ccff0 Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Sun, 29 Dec 2024 19:09:57 -0600
Subject: [PATCH 27/28] Update octoling.raceeffect

---
 species/octoling.raceeffect | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/species/octoling.raceeffect b/species/octoling.raceeffect
index 06ac6637a61..29e0a428116 100644
--- a/species/octoling.raceeffect
+++ b/species/octoling.raceeffect
@@ -92,7 +92,7 @@
 						 ]
 		},
 		{
-			"weapons": [ "energy" ],
+			"weapons": [ "slime" ],
 				"stats": [
 				{ "stat": "powerMultiplier", "effectiveMultiplier": 1.05 },
 				{ "stat": "maxEnergy", "effectiveMultiplier": 1.05 }

From ec86a6cc4528ceade8e87fe87f3bb425e6efe382 Mon Sep 17 00:00:00 2001
From: Marine <39680394+marinebeast@users.noreply.github.com>
Date: Fri, 3 Jan 2025 17:29:32 -0600
Subject: [PATCH 28/28] Update octoling.raceeffect

---
 species/octoling.raceeffect | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/species/octoling.raceeffect b/species/octoling.raceeffect
index 29e0a428116..56abee841c7 100644
--- a/species/octoling.raceeffect
+++ b/species/octoling.raceeffect
@@ -15,7 +15,7 @@
 		{ "stat": "wetImmunity", "amount": 1 },
 
 		{ "stat": "fallDamageMultiplier", "effectiveMultiplier": 0.65 },
-    		{ "stat": "shotgunMastery", "amount": 0.1 }
+    		{ "stat": "shotgunMastery", "amount": 0.1 },
 		{ "stat": "fistMastery", "amount": 0.1 }
 	],