diff --git a/Server/data/configs/ammo_configs.json b/Server/data/configs/ammo_configs.json
index 4cc7dbc0a..47da425c3 100644
--- a/Server/data/configs/ammo_configs.json
+++ b/Server/data/configs/ammo_configs.json
@@ -125,7 +125,7 @@
     "start_graphic": "232,96",
     "darkbow_graphic": "",
     "projectile": "226,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "813",
@@ -133,7 +133,7 @@
     "start_graphic": "233,96",
     "darkbow_graphic": "",
     "projectile": "227,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "814",
@@ -141,7 +141,7 @@
     "start_graphic": "234,96",
     "darkbow_graphic": "",
     "projectile": "228,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "815",
@@ -149,7 +149,7 @@
     "start_graphic": "235,96",
     "darkbow_graphic": "",
     "projectile": "229,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "816",
@@ -157,7 +157,7 @@
     "start_graphic": "236,96",
     "darkbow_graphic": "",
     "projectile": "230,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "817",
@@ -165,7 +165,7 @@
     "start_graphic": "237,96",
     "darkbow_graphic": "",
     "projectile": "231,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "825",
@@ -221,7 +221,7 @@
     "start_graphic": "206,96",
     "darkbow_graphic": "",
     "projectile": "200,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "832",
@@ -229,7 +229,7 @@
     "start_graphic": "207,96",
     "darkbow_graphic": "",
     "projectile": "201,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "833",
@@ -237,7 +237,7 @@
     "start_graphic": "208,96",
     "darkbow_graphic": "",
     "projectile": "202,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "834",
@@ -245,7 +245,7 @@
     "start_graphic": "209,96",
     "darkbow_graphic": "",
     "projectile": "203,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "835",
@@ -253,7 +253,7 @@
     "start_graphic": "210,96",
     "darkbow_graphic": "",
     "projectile": "204,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "836",
@@ -261,7 +261,7 @@
     "start_graphic": "211,96",
     "darkbow_graphic": "",
     "projectile": "205,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "863",
@@ -325,7 +325,7 @@
     "start_graphic": "219,96",
     "darkbow_graphic": "",
     "projectile": "212,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "871",
@@ -333,7 +333,7 @@
     "start_graphic": "220,96",
     "darkbow_graphic": "",
     "projectile": "213,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "872",
@@ -341,7 +341,7 @@
     "start_graphic": "221,96",
     "darkbow_graphic": "",
     "projectile": "214,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "873",
@@ -349,7 +349,7 @@
     "start_graphic": "223,96",
     "darkbow_graphic": "",
     "projectile": "216,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "874",
@@ -357,7 +357,7 @@
     "start_graphic": "222,96",
     "darkbow_graphic": "",
     "projectile": "215,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "875",
@@ -365,7 +365,7 @@
     "start_graphic": "224,96",
     "darkbow_graphic": "",
     "projectile": "217,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "876",
@@ -373,7 +373,7 @@
     "start_graphic": "225,96",
     "darkbow_graphic": "",
     "projectile": "218,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "877",
@@ -389,7 +389,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "879",
@@ -421,7 +421,7 @@
     "start_graphic": "19,96",
     "darkbow_graphic": "1104,96",
     "projectile": "10,40,36,41,46,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "884",
@@ -437,7 +437,7 @@
     "start_graphic": "18,96",
     "darkbow_graphic": "1105,96",
     "projectile": "9,40,36,41,46,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "886",
@@ -453,7 +453,7 @@
     "start_graphic": "20,96",
     "darkbow_graphic": "1106,96",
     "projectile": "11,40,36,41,46,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "888",
@@ -469,7 +469,7 @@
     "start_graphic": "21,96",
     "darkbow_graphic": "1107,96",
     "projectile": "12,40,36,41,46,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "890",
@@ -485,7 +485,7 @@
     "start_graphic": "22,96",
     "darkbow_graphic": "1108,96",
     "projectile": "13,40,36,41,46,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "892",
@@ -501,7 +501,7 @@
     "start_graphic": "24,96",
     "darkbow_graphic": "1109,96",
     "projectile": "15,40,36,41,46,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "2532",
@@ -565,7 +565,7 @@
     "start_graphic": "273,96",
     "darkbow_graphic": "",
     "projectile": "227,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "4160",
@@ -725,7 +725,7 @@
     "start_graphic": "19,96",
     "darkbow_graphic": "1104,96",
     "projectile": "10,40,36,41,46,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5617",
@@ -733,7 +733,7 @@
     "start_graphic": "18,96",
     "darkbow_graphic": "1105,96",
     "projectile": "9,40,36,41,46,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5618",
@@ -741,7 +741,7 @@
     "start_graphic": "20,96",
     "darkbow_graphic": "1106,96",
     "projectile": "11,40,36,41,46,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5619",
@@ -749,7 +749,7 @@
     "start_graphic": "21,96",
     "darkbow_graphic": "1107,96",
     "projectile": "12,40,36,41,46,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5620",
@@ -757,7 +757,7 @@
     "start_graphic": "22,96",
     "darkbow_graphic": "1108,96",
     "projectile": "13,40,36,41,46,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5621",
@@ -773,7 +773,7 @@
     "start_graphic": "19,96",
     "darkbow_graphic": "1104,96",
     "projectile": "10,40,36,41,46,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5623",
@@ -781,7 +781,7 @@
     "start_graphic": "18,96",
     "darkbow_graphic": "1105,96",
     "projectile": "9,40,36,41,46,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5624",
@@ -789,7 +789,7 @@
     "start_graphic": "20,96",
     "darkbow_graphic": "1106,96",
     "projectile": "11,40,36,41,46,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5625",
@@ -797,7 +797,7 @@
     "start_graphic": "21,96",
     "darkbow_graphic": "1107,96",
     "projectile": "12,40,36,41,46,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5626",
@@ -805,7 +805,7 @@
     "start_graphic": "22,96",
     "darkbow_graphic": "1108,96",
     "projectile": "13,40,36,41,46,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5627",
@@ -813,7 +813,7 @@
     "start_graphic": "24,96",
     "darkbow_graphic": "1109,96",
     "projectile": "15,40,36,41,46,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5628",
@@ -821,7 +821,7 @@
     "start_graphic": "232,96",
     "darkbow_graphic": "",
     "projectile": "226,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5629",
@@ -829,7 +829,7 @@
     "start_graphic": "233,96",
     "darkbow_graphic": "",
     "projectile": "227,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5630",
@@ -837,7 +837,7 @@
     "start_graphic": "235,96",
     "darkbow_graphic": "",
     "projectile": "229,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5631",
@@ -845,7 +845,7 @@
     "start_graphic": "273,96",
     "darkbow_graphic": "",
     "projectile": "227,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5633",
@@ -853,7 +853,7 @@
     "start_graphic": "236,96",
     "darkbow_graphic": "",
     "projectile": "230,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5634",
@@ -861,7 +861,7 @@
     "start_graphic": "237,96",
     "darkbow_graphic": "",
     "projectile": "231,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5635",
@@ -869,7 +869,7 @@
     "start_graphic": "232,96",
     "darkbow_graphic": "",
     "projectile": "226,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5636",
@@ -877,7 +877,7 @@
     "start_graphic": "233,96",
     "darkbow_graphic": "",
     "projectile": "227,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5637",
@@ -885,7 +885,7 @@
     "start_graphic": "234,96",
     "darkbow_graphic": "",
     "projectile": "228,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5638",
@@ -893,7 +893,7 @@
     "start_graphic": "273,96",
     "darkbow_graphic": "",
     "projectile": "227,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5639",
@@ -901,7 +901,7 @@
     "start_graphic": "235,96",
     "darkbow_graphic": "",
     "projectile": "229,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5640",
@@ -909,7 +909,7 @@
     "start_graphic": "236,96",
     "darkbow_graphic": "",
     "projectile": "230,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5641",
@@ -917,7 +917,7 @@
     "start_graphic": "237,96",
     "darkbow_graphic": "",
     "projectile": "231,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5642",
@@ -925,7 +925,7 @@
     "start_graphic": "206,96",
     "darkbow_graphic": "",
     "projectile": "200,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5643",
@@ -933,7 +933,7 @@
     "start_graphic": "207,96",
     "darkbow_graphic": "",
     "projectile": "201,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5644",
@@ -941,7 +941,7 @@
     "start_graphic": "208,96",
     "darkbow_graphic": "",
     "projectile": "202,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5645",
@@ -949,7 +949,7 @@
     "start_graphic": "209,96",
     "darkbow_graphic": "",
     "projectile": "203,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5646",
@@ -957,7 +957,7 @@
     "start_graphic": "210,96",
     "darkbow_graphic": "",
     "projectile": "204,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5647",
@@ -965,7 +965,7 @@
     "start_graphic": "211,96",
     "darkbow_graphic": "",
     "projectile": "205,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5648",
@@ -973,7 +973,7 @@
     "start_graphic": "206,96",
     "darkbow_graphic": "",
     "projectile": "200,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5649",
@@ -981,7 +981,7 @@
     "start_graphic": "207,96",
     "darkbow_graphic": "",
     "projectile": "201,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5650",
@@ -989,7 +989,7 @@
     "start_graphic": "208,96",
     "darkbow_graphic": "",
     "projectile": "202,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5651",
@@ -997,7 +997,7 @@
     "start_graphic": "209,96",
     "darkbow_graphic": "",
     "projectile": "203,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5652",
@@ -1005,7 +1005,7 @@
     "start_graphic": "210,96",
     "darkbow_graphic": "",
     "projectile": "204,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5653",
@@ -1013,7 +1013,7 @@
     "start_graphic": "211,96",
     "darkbow_graphic": "",
     "projectile": "205,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5654",
@@ -1021,7 +1021,7 @@
     "start_graphic": "219,96",
     "darkbow_graphic": "",
     "projectile": "212,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5655",
@@ -1029,7 +1029,7 @@
     "start_graphic": "220,96",
     "darkbow_graphic": "",
     "projectile": "213,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5656",
@@ -1037,7 +1037,7 @@
     "start_graphic": "221,96",
     "darkbow_graphic": "",
     "projectile": "214,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5657",
@@ -1045,7 +1045,7 @@
     "start_graphic": "223,96",
     "darkbow_graphic": "",
     "projectile": "216,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5658",
@@ -1053,7 +1053,7 @@
     "start_graphic": "222,96",
     "darkbow_graphic": "",
     "projectile": "215,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5659",
@@ -1061,7 +1061,7 @@
     "start_graphic": "224,96",
     "darkbow_graphic": "",
     "projectile": "217,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5660",
@@ -1069,7 +1069,7 @@
     "start_graphic": "225,96",
     "darkbow_graphic": "",
     "projectile": "218,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "5661",
@@ -1077,7 +1077,7 @@
     "start_graphic": "219,96",
     "darkbow_graphic": "",
     "projectile": "212,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5662",
@@ -1085,7 +1085,7 @@
     "start_graphic": "220,96",
     "darkbow_graphic": "",
     "projectile": "213,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5663",
@@ -1093,7 +1093,7 @@
     "start_graphic": "221,96",
     "darkbow_graphic": "",
     "projectile": "214,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5664",
@@ -1101,7 +1101,7 @@
     "start_graphic": "223,96",
     "darkbow_graphic": "",
     "projectile": "216,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5665",
@@ -1109,7 +1109,7 @@
     "start_graphic": "222,96",
     "darkbow_graphic": "",
     "projectile": "215,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5666",
@@ -1117,7 +1117,7 @@
     "start_graphic": "224,96",
     "darkbow_graphic": "",
     "projectile": "217,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "5667",
@@ -1125,7 +1125,7 @@
     "start_graphic": "225,96",
     "darkbow_graphic": "",
     "projectile": "218,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "6061",
@@ -1133,7 +1133,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "6062",
@@ -1141,7 +1141,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "6522",
@@ -1293,7 +1293,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "9287",
@@ -1301,7 +1301,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "9288",
@@ -1309,7 +1309,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "9289",
@@ -1317,7 +1317,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "9290",
@@ -1325,7 +1325,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "9291",
@@ -1333,7 +1333,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "9293",
@@ -1341,7 +1341,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "9294",
@@ -1349,7 +1349,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "9295",
@@ -1357,7 +1357,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "9296",
@@ -1365,7 +1365,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "9297",
@@ -1373,7 +1373,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "9298",
@@ -1381,7 +1381,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "9300",
@@ -1389,7 +1389,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "9301",
@@ -1397,7 +1397,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "9302",
@@ -1405,7 +1405,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "9303",
@@ -1413,7 +1413,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "9304",
@@ -1421,7 +1421,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "9305",
@@ -1429,7 +1429,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "9335",
@@ -1557,7 +1557,7 @@
     "start_graphic": "1116,96",
     "darkbow_graphic": "1114,96",
     "projectile": "1120,40,36,41,46,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "11228",
@@ -1565,7 +1565,7 @@
     "start_graphic": "1116,96",
     "darkbow_graphic": "1114,96",
     "projectile": "1120,40,36,41,46,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "11229",
@@ -1573,7 +1573,7 @@
     "start_graphic": "1116,96",
     "darkbow_graphic": "1114,96",
     "projectile": "1120,40,36,41,46,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "11230",
@@ -1589,7 +1589,7 @@
     "start_graphic": "1123,96",
     "darkbow_graphic": "",
     "projectile": "1122,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "11233",
@@ -1597,7 +1597,7 @@
     "start_graphic": "1123,96",
     "darkbow_graphic": "",
     "projectile": "1122,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "11234",
@@ -1605,7 +1605,7 @@
     "start_graphic": "1123,96",
     "darkbow_graphic": "",
     "projectile": "1122,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "13083",
@@ -1621,7 +1621,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "13085",
@@ -1629,7 +1629,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "13086",
@@ -1637,7 +1637,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "27,38,36,41,32,5,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "13280",
@@ -1661,7 +1661,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "1837,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "13881",
@@ -1669,7 +1669,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "1837,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "13882",
@@ -1677,7 +1677,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "1837,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "13883",
@@ -1701,7 +1701,7 @@
     "start_graphic": "-1,0",
     "darkbow_graphic": "",
     "projectile": "1837,40,36,32,32,15,0",
-    "poison_damage": "28"
+    "poison_damage": "10"
   },
   {
     "itemId": "13955",
@@ -1709,7 +1709,7 @@
     "start_graphic": "1837,96",
     "darkbow_graphic": "",
     "projectile": "1840,40,36,32,32,15,0",
-    "poison_damage": "38"
+    "poison_damage": "15"
   },
   {
     "itemId": "13956",
@@ -1717,7 +1717,7 @@
     "start_graphic": "1837,96",
     "darkbow_graphic": "",
     "projectile": "1840,40,36,32,32,15,0",
-    "poison_damage": "48"
+    "poison_damage": "20"
   },
   {
     "itemId": "13957",
diff --git a/Server/data/configs/npc_configs.json b/Server/data/configs/npc_configs.json
index 15ac290d8..87b666074 100644
--- a/Server/data/configs/npc_configs.json
+++ b/Server/data/configs/npc_configs.json
@@ -2006,7 +2006,7 @@
     "defence_animation": "6255",
     "weakness": "0",
     "slayer_exp": "23",
-    "poison_amount": "3",
+    "poison_amount": "15",
     "magic_animation": "0",
     "death_animation": "6256",
     "name": "Poison Scorpion",
@@ -2517,7 +2517,7 @@
     "respawn_delay": "30",
     "defence_animation": "5328",
     "weakness": "2",
-    "poison_amount": "6",
+    "poison_amount": "30",
     "magic_animation": "0",
     "death_animation": "5329",
     "name": "Poison spider",
@@ -3330,7 +3330,7 @@
     "respawn_delay": "50",
     "defence_animation": "0",
     "weakness": "8",
-    "poison_amount": "11",
+    "poison_amount": "55",
     "magic_animation": "0",
     "death_animation": "836",
     "name": "Tribesman",
@@ -10513,7 +10513,7 @@
     "respawn_delay": "30",
     "defence_animation": "5328",
     "weakness": "2",
-    "poison_amount": "6",
+    "poison_amount": "30",
     "magic_animation": "0",
     "death_animation": "5329",
     "name": "Poison spider",
@@ -12353,7 +12353,7 @@
     "defence_animation": "6227",
     "weakness": "7",
     "slayer_exp": "90",
-    "poison_amount": "4",
+    "poison_amount": "20",
     "magic_animation": "0",
     "death_animation": "6228",
     "name": "Kalphite Soldier",
@@ -12377,7 +12377,7 @@
     "respawn_delay": "65",
     "defence_animation": "6232",
     "weakness": "7",
-    "poison_amount": "6",
+    "poison_amount": "30",
     "magic_animation": "6223",
     "death_animation": "6230",
     "name": "Kalphite Guardian",
@@ -12424,7 +12424,7 @@
     "respawn_delay": "65",
     "defence_animation": "6232",
     "weakness": "7",
-    "poison_amount": "6",
+    "poison_amount": "30",
     "magic_animation": "6223",
     "death_animation": "6230",
     "name": "Kalphite Guardian",
@@ -12444,7 +12444,7 @@
     "melee_animation": "6241",
     "range_animation": "6241",
     "attack_speed": "4",
-    "poisonous": "true",
+    "poisonous": "",
     "magic_level": "150",
     "respawn_delay": "0",
     "defence_animation": "6232",
@@ -13455,6 +13455,7 @@
     "respawn_delay": "60",
     "defence_animation": "0",
     "weakness": "3",
+    "poison_amount": "30",
     "magic_animation": "811",
     "death_animation": "836",
     "name": "Saradomin wizard",
@@ -16454,6 +16455,7 @@
     "defence_animation": "267",
     "weakness": "1",
     "slayer_exp": "22",
+    "poison_amount": "40",
     "magic_animation": "266",
     "death_animation": "265",
     "name": "Cave crawler",
@@ -16476,6 +16478,7 @@
     "respawn_delay": "25",
     "defence_animation": "267",
     "slayer_exp": "22",
+    "poison_amount": "40",
     "magic_animation": "266",
     "death_animation": "265",
     "name": "Cave crawler",
@@ -16498,6 +16501,7 @@
     "respawn_delay": "25",
     "defence_animation": "267",
     "slayer_exp": "22",
+    "poison_amount": "40",
     "magic_animation": "266",
     "death_animation": "265",
     "name": "Cave crawler",
@@ -16520,6 +16524,7 @@
     "respawn_delay": "25",
     "defence_animation": "267",
     "slayer_exp": "22",
+    "poison_amount": "40",
     "magic_animation": "266",
     "death_animation": "265",
     "name": "Cave crawler",
@@ -19313,7 +19318,7 @@
     "defence_animation": "0",
     "weakness": "1",
     "slayer_exp": "25",
-    "poison_amount": "3",
+    "poison_amount": "15",
     "magic_animation": "0",
     "death_animation": "1792",
     "name": "Cave slime",
@@ -20627,6 +20632,7 @@
     "poisonous": "true",
     "defence_animation": "1946",
     "weakness": "7",
+    "poison_amount": "15",
     "magic_animation": "0",
     "death_animation": "5464",
     "name": "Scarabs",
@@ -20964,6 +20970,7 @@
     "respawn_delay": "60",
     "defence_animation": "0",
     "weakness": "6",
+    "poison_amount": "15",
     "magic_animation": "0",
     "death_animation": "1946",
     "name": "Scarab swarm",
@@ -25076,7 +25083,7 @@
     "respawn_delay": "60",
     "defence_animation": "0",
     "weakness": "1",
-    "poison_amount": "11",
+    "poison_amount": "55",
     "magic_animation": "0",
     "death_animation": "278",
     "name": "Bush snake",
@@ -25095,7 +25102,7 @@
     "poisonous": "true",
     "respawn_delay": "60",
     "defence_animation": "276",
-    "poison_amount": "11",
+    "poison_amount": "55",
     "death_animation": "278",
     "name": "Bush snake",
     "defence_level": "1",
@@ -25211,7 +25218,7 @@
     "respawn_delay": "50",
     "defence_animation": "0",
     "weakness": "9",
-    "poison_amount": "11",
+    "poison_amount": "55",
     "magic_animation": "0",
     "death_animation": "836",
     "name": "Tribesman",
@@ -29571,6 +29578,7 @@
     "respawn_delay": "60",
     "defence_animation": "2937",
     "weakness": "9",
+    "poison_amount": "40",
     "magic_animation": "2936",
     "death_animation": "2938",
     "name": "Jogre Champion",
@@ -29609,7 +29617,7 @@
     "examine": "Champion of the jogres.",
     "melee_animation": "5485",
     "range_animation": "5493",
-    "poisonous": "true",
+    "poisonous": "",
     "respawn_delay": "60",
     "defence_animation": "5493",
     "weakness": "9",
@@ -32631,6 +32639,7 @@
     "respawn_delay": "60",
     "defence_animation": "0",
     "weakness": "10",
+    "poison_amount": "35",
     "magic_animation": "0",
     "death_animation": "7249",
     "name": "Wild jade vine",
@@ -32652,6 +32661,7 @@
     "respawn_delay": "60",
     "defence_animation": "0",
     "weakness": "10",
+    "poison_amount": "35",
     "magic_animation": "0",
     "death_animation": "7249",
     "name": "Wild jade vine",
@@ -32673,6 +32683,7 @@
     "respawn_delay": "60",
     "defence_animation": "0",
     "weakness": "10",
+    "poison_amount": "35",
     "magic_animation": "0",
     "death_animation": "7249",
     "name": "Wild jade vine",
@@ -32694,6 +32705,7 @@
     "respawn_delay": "60",
     "defence_animation": "0",
     "weakness": "10",
+    "poison_amount": "35",
     "magic_animation": "0",
     "death_animation": "7249",
     "name": "Wild jade vine",
@@ -33773,7 +33785,7 @@
     "respawn_delay": "60",
     "defence_animation": "6227",
     "weakness": "6",
-    "poison_amount": "4",
+    "poison_amount": "20",
     "magic_animation": "0",
     "death_animation": "6228",
     "name": "Kalphite Soldier",
@@ -53840,11 +53852,11 @@
     "examine": "A servant of the god Zamorak. ",
     "melee_animation": "6945",
     "attack_speed": "6",
-    "poisonous": "true",
+    "poisonous": "",
     "respawn_delay": "150",
     "weakness": "9",
     "slayer_exp": "350",
-    "poison_amount": "16",
+    "poison_amount": "",
     "magic_animation": "6945",
     "death_animation": "6946",
     "lifepoints": "255",
@@ -54943,7 +54955,7 @@
     "combat_style": "2",
     "melee_animation": "811",
     "range_animation": "811",
-    "poisonous": "true",
+    "poisonous": "",
     "magic_level": "60",
     "respawn_delay": "25",
     "end_gfx": "76",
@@ -58366,11 +58378,11 @@
     "examine": "A ghost of a knight slain during the god wars.",
     "melee_animation": "7441",
     "range_animation": "7522",
-    "poisonous": "true",
+    "poisonous": "",
     "magic_level": "80",
     "defence_animation": "7443",
     "slayer_exp": "143",
-    "poison_amount": "8",
+    "poison_amount": "",
     "magic_animation": "7508",
     "death_animation": "7442",
     "name": "Revenant knight",
@@ -58522,11 +58534,11 @@
     "examine": "A ghost of a knight slain during the god wars.",
     "melee_animation": "7441",
     "range_animation": "7522",
-    "poisonous": "true",
+    "poisonous": "",
     "magic_level": "80",
     "defence_animation": "7443",
     "slayer_exp": "143",
-    "poison_amount": "8",
+    "poison_amount": "",
     "magic_animation": "7508",
     "death_animation": "7442",
     "name": "Revenant knight",
@@ -58681,11 +58693,11 @@
     "examine": "A ghost of a knight slain during the god wars.",
     "melee_animation": "7441",
     "range_animation": "7522",
-    "poisonous": "true",
+    "poisonous": "",
     "magic_level": "80",
     "defence_animation": "7443",
     "slayer_exp": "143",
-    "poison_amount": "8",
+    "poison_amount": "",
     "magic_animation": "7508",
     "death_animation": "7442",
     "name": "Revenant knight",
@@ -58742,11 +58754,11 @@
     "examine": "A ghost of a knight slain during the god wars.",
     "melee_animation": "7441",
     "range_animation": "7522",
-    "poisonous": "true",
+    "poisonous": "",
     "magic_level": "80",
     "defence_animation": "7443",
     "slayer_exp": "143",
-    "poison_amount": "8",
+    "poison_amount": "",
     "magic_animation": "7508",
     "death_animation": "7442",
     "name": "Revenant knight",
@@ -58822,11 +58834,11 @@
     "examine": "A ghost of a knight slain during the god wars.",
     "melee_animation": "7441",
     "range_animation": "7522",
-    "poisonous": "true",
+    "poisonous": "",
     "magic_level": "80",
     "defence_animation": "7443",
     "slayer_exp": "143",
-    "poison_amount": "8",
+    "poison_amount": "",
     "magic_animation": "7508",
     "death_animation": "7442",
     "name": "Revenant knight",
@@ -59145,11 +59157,11 @@
     "examine": "A ghost of a knight slain during the god wars.",
     "melee_animation": "7441",
     "range_animation": "7522",
-    "poisonous": "true",
+    "poisonous": "",
     "magic_level": "80",
     "defence_animation": "7443",
     "slayer_exp": "143",
-    "poison_amount": "8",
+    "poison_amount": "",
     "magic_animation": "7508",
     "death_animation": "7442",
     "name": "Revenant knight",
@@ -59225,11 +59237,11 @@
     "examine": "A ghost of a knight slain during the god wars.",
     "melee_animation": "7441",
     "range_animation": "7522",
-    "poisonous": "true",
+    "poisonous": "",
     "magic_level": "80",
     "defence_animation": "7443",
     "slayer_exp": "143",
-    "poison_amount": "8",
+    "poison_amount": "",
     "magic_animation": "7508",
     "death_animation": "7442",
     "name": "Revenant knight",
@@ -59427,6 +59439,7 @@
     "examine": "A ghost of an ork slain during the god wars.",
     "melee_animation": "7411",
     "range_animation": "7518",
+    "poisonous": "",
     "magic_level": "70",
     "defence_animation": "7413",
     "magic_animation": "7505",
@@ -59446,11 +59459,11 @@
     "examine": "A ghost of a knight slain during the god wars.",
     "melee_animation": "7441",
     "range_animation": "7522",
-    "poisonous": "true",
+    "poisonous": "",
     "magic_level": "80",
     "defence_animation": "7443",
     "slayer_exp": "143",
-    "poison_amount": "8",
+    "poison_amount": "",
     "magic_animation": "7508",
     "death_animation": "7442",
     "name": "Revenant knight",
@@ -59605,11 +59618,11 @@
     "examine": "A ghost of a knight slain during the god wars.",
     "melee_animation": "7441",
     "range_animation": "7522",
-    "poisonous": "true",
+    "poisonous": "",
     "magic_level": "80",
     "defence_animation": "7443",
     "slayer_exp": "143",
-    "poison_amount": "8",
+    "poison_amount": "",
     "magic_animation": "7508",
     "death_animation": "7442",
     "name": "Revenant knight",
@@ -59620,7 +59633,8 @@
     "id": "6673",
     "clue_level": "2",
     "range_level": "80",
-    "attack_level": "80"
+    "attack_level": "80",
+    "prj_height": ""
   },
   {
     "spawn_animation": "7426",
@@ -59666,11 +59680,11 @@
     "examine": "A ghost of a knight slain during the god wars.",
     "melee_animation": "7441",
     "range_animation": "7522",
-    "poisonous": "true",
+    "poisonous": "",
     "magic_level": "80",
     "defence_animation": "7443",
     "slayer_exp": "143",
-    "poison_amount": "8",
+    "poison_amount": "",
     "magic_animation": "7508",
     "death_animation": "7442",
     "name": "Revenant knight",
@@ -59989,11 +60003,11 @@
     "examine": "A ghost of a knight slain during the god wars.",
     "melee_animation": "7441",
     "range_animation": "7522",
-    "poisonous": "true",
+    "poisonous": "",
     "magic_level": "80",
     "defence_animation": "7443",
     "slayer_exp": "143",
-    "poison_amount": "8",
+    "poison_amount": "",
     "magic_animation": "7508",
     "death_animation": "7442",
     "name": "Revenant knight",
@@ -60426,11 +60440,11 @@
     "examine": "A ghost of a knight slain during the god wars.",
     "melee_animation": "7441",
     "range_animation": "7522",
-    "poisonous": "true",
+    "poisonous": "",
     "magic_level": "80",
     "defence_animation": "7443",
     "slayer_exp": "143",
-    "poison_amount": "8",
+    "poison_amount": "",
     "magic_animation": "7508",
     "death_animation": "7442",
     "name": "Revenant knight",
@@ -60667,11 +60681,11 @@
     "examine": "A ghost of a knight slain during the god wars.",
     "melee_animation": "7441",
     "range_animation": "7522",
-    "poisonous": "true",
+    "poisonous": "",
     "magic_level": "80",
     "defence_animation": "7443",
     "slayer_exp": "143",
-    "poison_amount": "8",
+    "poison_amount": "",
     "magic_animation": "7508",
     "death_animation": "7442",
     "name": "Revenant knight",
@@ -60746,11 +60760,11 @@
     "examine": "A ghost of a knight slain during the god wars.",
     "melee_animation": "7441",
     "range_animation": "7522",
-    "poisonous": "true",
+    "poisonous": "",
     "magic_level": "80",
     "defence_animation": "7443",
     "slayer_exp": "143",
-    "poison_amount": "8",
+    "poison_amount": "",
     "magic_animation": "7508",
     "death_animation": "7442",
     "name": "Revenant knight",
@@ -63810,9 +63824,9 @@
     "melee_animation": "8591",
     "range_animation": "8594",
     "combat_audio": "408,410,409",
-    "poisonous": "true",
+    "poisonous": "",
     "defence_animation": "8592",
-    "poison_amount": "8",
+    "poison_amount": "",
     "magic_animation": "8594",
     "death_animation": "8593",
     "name": "Revenant dragon",
@@ -63831,9 +63845,9 @@
     "melee_animation": "8591",
     "range_animation": "8594",
     "combat_audio": "408,410,409",
-    "poisonous": "true",
+    "poisonous": "",
     "defence_animation": "8592",
-    "poison_amount": "8",
+    "poison_amount": "",
     "magic_animation": "8594",
     "death_animation": "8593",
     "name": "Revenant dragon",
diff --git a/Server/src/main/content/global/skill/magic/lunar/LunarListeners.kt b/Server/src/main/content/global/skill/magic/lunar/LunarListeners.kt
index bb81bff18..632173652 100644
--- a/Server/src/main/content/global/skill/magic/lunar/LunarListeners.kt
+++ b/Server/src/main/content/global/skill/magic/lunar/LunarListeners.kt
@@ -21,6 +21,7 @@ import core.game.node.scenery.Scenery
 import core.game.system.command.Privilege
 import core.game.system.config.NPCConfigParser
 import core.game.system.task.Pulse
+import core.game.system.timer.impl.PoisonImmunity
 import core.game.world.map.Location
 import core.game.world.map.RegionManager
 import core.game.world.repository.Repository
@@ -379,7 +380,7 @@ class LunarListeners : SpellListener("lunar"), Commands {
         setInterfaceText(player, "Hitpoints : ${npc.definition.handlers[NPCConfigParser.LIFEPOINTS] ?: 0}", Components.DREAM_MONSTER_STAT_522, 2)
         setInterfaceText(player, "Max hit : ${npc.getSwingHandler(false).calculateHit(npc, player, 1.0)}", Components.DREAM_MONSTER_STAT_522, 3)
 
-        val poisonStatus = if(npc.definition.handlers.getOrDefault(NPCConfigParser.POISON_IMMUNE,false) == true){
+        val poisonStatus = if(npc.isPoisonImmune){
             "This creature is immune to poison."
         } else "This creature is not immune to poison."
 
@@ -818,7 +819,10 @@ class LunarListeners : SpellListener("lunar"), Commands {
                     return@define
                 }
                 if(dmg != null) {
-                    p.let { applyPoison(it, it, dmg) }
+                    p.let {
+                        removeTimer<PoisonImmunity>(it)
+                        applyPoison(it, it, dmg)
+                    }
                 } else {
                     sendMessage(player, "Damage must be an integer. Format:")
                     sendMessage(player, "::poison username damage")
diff --git a/Server/src/main/content/region/asgarnia/trollheim/handlers/gwd/GWDTsutsarothSwingHandler.java b/Server/src/main/content/region/asgarnia/trollheim/handlers/gwd/GWDTsutsarothSwingHandler.java
index d90bd3f35..8a4de99a8 100644
--- a/Server/src/main/content/region/asgarnia/trollheim/handlers/gwd/GWDTsutsarothSwingHandler.java
+++ b/Server/src/main/content/region/asgarnia/trollheim/handlers/gwd/GWDTsutsarothSwingHandler.java
@@ -73,7 +73,7 @@ public final class GWDTsutsarothSwingHandler extends CombatSwingHandler {
 			hit = RandomFunction.random(max);
 			state.setMaximumHit(max);
 			if (style == CombatStyle.MELEE) {
-                                applyPoison(victim, entity, 16);
+				applyPoison(victim, entity, 80);
 			}
 			if (special) {
 				((Player) victim).getSkills().decrementPrayerPoints((double) hit / 2);
diff --git a/Server/src/main/content/region/karamja/handlers/TribesmanNPC.java b/Server/src/main/content/region/karamja/handlers/TribesmanNPC.java
deleted file mode 100644
index 184357c1d..000000000
--- a/Server/src/main/content/region/karamja/handlers/TribesmanNPC.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package content.region.karamja.handlers;
-
-import core.game.node.entity.npc.AbstractNPC;
-import core.game.world.map.Location;
-import core.plugin.Initializable;
-import core.game.system.config.NPCConfigParser;
-
-/**
- * Represents the tribesamn npc.
- * @author 'Vexia
- * @version 1.0
- */
-@Initializable
-public final class TribesmanNPC extends AbstractNPC {
-
-	/**
-	 * Represents the npc ids.
-	 */
-	private static final int[] IDS = new int[] { 191, 2496, 2497 };
-
-	/**
-	 * Constructs a new {@code TribesmanNPC} {@code Object}.
-	 * @param id the id.
-	 * @param location the location.
-	 */
-	public TribesmanNPC(int id, Location location) {
-		super(id, location, true);
-		getDefinition().getHandlers().put(NPCConfigParser.POISONOUS, true);
-	}
-
-	/**
-	 * Constructs a new {@code TribesmanNPC} {@code Object}.
-	 */
-	public TribesmanNPC() {
-		super(0, null);
-	}
-
-	@Override
-	public AbstractNPC construct(int id, Location location, Object... objects) {
-		return new TribesmanNPC(id, location);
-	}
-
-	@Override
-	public int[] getIds() {
-		return IDS;
-	}
-
-}
diff --git a/Server/src/main/content/region/wilderness/handlers/revenants/RevenantCombatHandler.java b/Server/src/main/content/region/wilderness/handlers/revenants/RevenantCombatHandler.java
index 01040043e..0c509175f 100644
--- a/Server/src/main/content/region/wilderness/handlers/revenants/RevenantCombatHandler.java
+++ b/Server/src/main/content/region/wilderness/handlers/revenants/RevenantCombatHandler.java
@@ -74,8 +74,10 @@ public class RevenantCombatHandler extends MultiSwingHandler {
 				}
 			}
 		}
-		if (!isPoisoned(victim) && (WildernessZone.getWilderness(entity) >= 50 || entity.getId() == 6998)) {
-                        applyPoison(victim, entity, 6);
+		if (entity.getId() == 6998) {
+			applyPoison(victim, entity, 40);
+		} else if (WildernessZone.getWilderness(entity) >= 50) {
+			applyPoison(victim, entity, 30);
 		}
 		super.impact(entity, victim, state);
 	}
diff --git a/Server/src/main/core/api/ContentAPI.kt b/Server/src/main/core/api/ContentAPI.kt
index 0767a9c91..615e51996 100644
--- a/Server/src/main/core/api/ContentAPI.kt
+++ b/Server/src/main/core/api/ContentAPI.kt
@@ -3044,8 +3044,12 @@ fun applyPoison (entity: Entity, source: Entity, severity: Int) {
     val existingTimer = getTimer<Poison>(entity)
 
     if (existingTimer != null) {
-        existingTimer.severity = severity
-        existingTimer.damageSource = source
+        if (existingTimer.severity > severity) {
+            return
+        } else {
+            existingTimer.severity = severity
+            existingTimer.damageSource = source
+        }
     } else {
         registerTimer(entity, spawnTimer<Poison>(source, severity))
     }
diff --git a/Server/src/main/core/game/node/entity/combat/MeleeSwingHandler.kt b/Server/src/main/core/game/node/entity/combat/MeleeSwingHandler.kt
index b00afddb0..a20d7f5d8 100644
--- a/Server/src/main/core/game/node/entity/combat/MeleeSwingHandler.kt
+++ b/Server/src/main/core/game/node/entity/combat/MeleeSwingHandler.kt
@@ -115,16 +115,23 @@ open class MeleeSwingHandler (vararg flags: SwingHandlerFlag)
                 val name = entity.equipment.getNew(3).name
                 var damage = -1
                 if (name.contains("(p++") || name.contains("(s)") || name.contains("(kp)")) {
-                    damage = 68
+                    damage = 30
                 } else if (name.contains("(p+)")) {
-                    damage = 58
+                    damage = 25
                 } else if (name.contains("(p)")) {
-                    damage = 48
+                    damage = 20
                 }
                 if (damage > -1 && RandomFunction.random(10) < 4) {
                     applyPoison (victim, entity, damage)
                 }
             }
+        } else if (entity is NPC) {
+            val poisonous = entity.isPoisonous
+            val damage = entity.poisonSeverity()
+
+            if (poisonous && damage > -1 && RandomFunction.random(10) < 4) {
+                applyPoison (victim, entity, damage)
+            }
         }
         super.adjustBattleState(entity, victim, state)
     }
diff --git a/Server/src/main/core/game/node/entity/combat/RangeSwingHandler.kt b/Server/src/main/core/game/node/entity/combat/RangeSwingHandler.kt
index a197d8b9c..335a32abc 100644
--- a/Server/src/main/core/game/node/entity/combat/RangeSwingHandler.kt
+++ b/Server/src/main/core/game/node/entity/combat/RangeSwingHandler.kt
@@ -134,6 +134,13 @@ open class RangeSwingHandler (vararg flags: SwingHandlerFlag) : CombatSwingHandl
             if (state.estimatedHit > 0 && damage > 8 && RandomFunction.random(10) < 4) {
                 applyPoison(victim, entity, damage)
             }
+        } else if (entity is NPC) {
+            val poisonous = entity.isPoisonous
+            val damage = entity.poisonSeverity()
+
+            if (poisonous && damage > -1 && RandomFunction.random(10) < 4) {
+                applyPoison (victim, entity, damage)
+            }
         }
         super.adjustBattleState(entity, victim, state)
     }
diff --git a/Server/src/main/core/game/node/entity/npc/NPC.java b/Server/src/main/core/game/node/entity/npc/NPC.java
index b1d4aba99..8c2600642 100644
--- a/Server/src/main/core/game/node/entity/npc/NPC.java
+++ b/Server/src/main/core/game/node/entity/npc/NPC.java
@@ -563,6 +563,14 @@ public class NPC extends Entity {
 		return definition.getConfiguration(NPCConfigParser.POISON_IMMUNE, false);
 	}
 
+	public boolean isPoisonous() {
+		return definition.getConfiguration(NPCConfigParser.POISONOUS, false);
+	}
+
+	public int poisonSeverity() {
+		return definition.getConfiguration(NPCConfigParser.POISON_AMOUNT, 0);
+	}
+
 	@Override
 	public void finalizeDeath(Entity killer) {
 		super.finalizeDeath(killer);
diff --git a/Server/src/main/core/game/system/timer/impl/Poison.kt b/Server/src/main/core/game/system/timer/impl/Poison.kt
index 6f87d40a9..7dbf9f2b0 100644
--- a/Server/src/main/core/game/system/timer/impl/Poison.kt
+++ b/Server/src/main/core/game/system/timer/impl/Poison.kt
@@ -20,14 +20,6 @@ class Poison : PersistTimer (30, "poison", flags = arrayOf(TimerFlag.ClearOnDeat
     lateinit var damageSource: Entity
 
     var severity = 0
-        set (value) {
-            if (value != field - 1 && value % 10 == 8) {//This was Arios's incorrect attempt at replicating severity, convert it to correct values.
-                (damageSource as? Player)?.debug ("[PoisonTimer] Warning: Converting suspect Arios severity into true severity. If numbers look wrong, this could be why.")
-                field = (value / 10) * 5
-                (damageSource as? Player)?.debug ("[PoisonTimer] Warning: New Severity: $field.")
-            } else field = value
-        }
-
     override fun save (root: JSONObject, entity: Entity) {
         root["source-uid"] = (damageSource as? Player)?.details?.uid ?: -1
         root["severity"] = severity.toString()
diff --git a/Server/src/main/core/game/system/timer/impl/PoisonImmunity.kt b/Server/src/main/core/game/system/timer/impl/PoisonImmunity.kt
index 1695fce7b..c90608e58 100644
--- a/Server/src/main/core/game/system/timer/impl/PoisonImmunity.kt
+++ b/Server/src/main/core/game/system/timer/impl/PoisonImmunity.kt
@@ -31,11 +31,7 @@ class PoisonImmunity : PersistTimer (1, "poison:immunity", isSoft = true, flags
     override fun run (entity: Entity) : Boolean {
         ticksRemaining--
 
-        if (entity is Player && ticksRemaining == secondsToTicks(30)) {
-            sendMessage(entity, colorize("%RYou have 30 seconds remaining on your poison immunity."))
-            playAudio(entity, Sounds.CLOCK_TICK_1_3120, 0, 3)
-        }
-        else if (entity is Player && ticksRemaining == 0) {
+        if (entity is Player && ticksRemaining == 0) {
             sendMessage(entity, colorize("%RYour poison immunity has expired."))
             playAudio(entity, Sounds.DRAGON_POTION_FINISHED_2607)
         }