Merge branch 'master' into cached_property

Author: jordanbriere

addons/source-python/data/source-python/weapons/csgo.ini

@@ -190,6 +190,16 @@
         item_definition_index = 24
         tags = "all,primary,smg"
 
+    [[mp5sd]]
+        slot = 0
+        maxammo = 120
+        ammoprop = 7
+        clip = 30
+        cost = 1500
+        item_definition_index = 23
+        parent_class = "weapon_mp7"
+        tags = "all,primary,smg"
+
     # Shotguns
     [[mag7]]
         slot = 0
@@ -367,7 +377,7 @@
         item_definition_index = 42
         tags = "all,knife,melee"
 
-    [[knife_bayonet]]
+    [[bayonet]]
         slot = 2
         item_definition_index = 500
         parent_class = "weapon_knife"
@@ -466,6 +476,36 @@
         slot = 2
         tags = "all,knife,melee"
 
+    [[knife_css]]
+        slot = 2
+        item_definition_index = 503
+        parent_class = "weapon_knife"
+        tags = "all,knife,melee,earned"
+
+    [[knife_cord]]
+        slot = 2
+        item_definition_index = 517
+        parent_class = "weapon_knife"
+        tags = "all,knife,melee,earned"
+
+    [[knife_canis]]
+        slot = 2
+        item_definition_index = 518
+        parent_class = "weapon_knife"
+        tags = "all,knife,melee,earned"
+
+    [[knife_outdoor]]
+        slot = 2
+        item_definition_index = 521
+        parent_class = "weapon_knife"
+        tags = "all,knife,melee,earned"
+
+    [[knife_skeleton]]
+        slot = 2
+        item_definition_index = 525
+        parent_class = "weapon_knife"
+        tags = "all,knife,melee,earned"
+
     [[melee]]
         slot = 2
         tags = "all,melee"
@@ -590,13 +630,24 @@
         item_definition_index = 49
         tags = "all,objective"
 
+    [[bumpmine]]
+        slot = 4
+        item_definition_index = 85
+        maxammo = "ammo_grenade_limit_bumpmine"
+        tags = "all,tool"
+
     [[healthshot]]
         slot = 11
         item_definition_index = 57
         maxammo = "ammo_item_limit_healthshot"
         ammoprop = 21
         tags = "all,tool,coop"
 
+    [[shield]]
+        slot = 11
+        item_definition_index = 37
+        tags = "all,tool"
+
     [[tablet]]
         slot = 12
         item_definition_index = 72

addons/source-python/docs/source-python/source/general/known-issues.rst

@@ -9,3 +9,9 @@ same time on a Linux server. There are some issues with the symbols of the
 shared Python libraries (``libpython2.5.so.1.0`` and ``libpython3.4m.so.1.0``),
 which causes either EventScripts to be loaded with Source.Python's Python
 version or vice versa. This doesn't work well and results in a crash on startup.
+
+SourceMod's Accelerator incompatibility
+---------------------------------------------------
+If you are running `SourceMod's Accelerator <https://forums.alliedmods.net/showthread.php?t=277703&>`_
+with Source.Python, you may experience random crashes that would normally be caught since this extension
+prevents us from catching and preventing them.