Merge: latest stable version for csgo

addons/sourcemod/configs/scp/downloads.txt

@@ -2,10 +2,10 @@ models/eternity/props/scp/scp_005.mdl
 models/eternity/props/scp/scp_005.dx90.vtx
 models/eternity/props/scp/scp_005.vvd
 models/eternity/props/scp/scp_005.phy
-models/eternity/props/scp/scp_035.mdl
-models/eternity/props/scp/scp_035.dx90.vtx
-models/eternity/props/scp/scp_035.vvd
-models/eternity/props/scp/scp_035.phy
+models/eternity/props/scp/scp_035_v2.mdl
+models/eternity/props/scp/scp_035_v2.dx90.vtx
+models/eternity/props/scp/scp_035_v2.vvd
+models/eternity/props/scp/scp_035_v2.phy
 models/eternity/props/scp/scp_267.mdl
 models/eternity/props/scp/scp_267.dx90.vtx
 models/eternity/props/scp/scp_267.vvd
@@ -90,10 +90,10 @@ models/player/custom_player/eternity/scp_457.dx90.vtx
 models/player/custom_player/eternity/scp_457.mdl
 models/player/custom_player/eternity/scp_457.phy
 models/player/custom_player/eternity/scp_457.vvd
-models/player/custom_player/eternity/scp096.dx90.vtx
-models/player/custom_player/eternity/scp096.mdl
-models/player/custom_player/eternity/scp096.phy
-models/player/custom_player/eternity/scp096.vvd
+models/player/custom_player/eternity/scp096_v2.dx90.vtx
+models/player/custom_player/eternity/scp096_v2.mdl
+models/player/custom_player/eternity/scp096_v2.phy
+models/player/custom_player/eternity/scp096_v2.vvd
 models/player/custom_player/eternity/scp966.dx90.vtx
 models/player/custom_player/eternity/scp966.mdl
 models/player/custom_player/eternity/scp966.phy
@@ -163,6 +163,29 @@ materials/eternity/overlays/win_staff_ru_fh.vtf
 materials/eternity/overlays/arrested_ru_fh.vtf
 materials/eternity/overlays/fists_ru_fh.vtf
 materials/eternity/overlays/inventory_ru_fh.vtf
+materials/eternity/overlays/cadet_chi_fh.vtf
+materials/eternity/overlays/chaos_chi_fh.vtf
+materials/eternity/overlays/commander_chi_fh.vtf
+materials/eternity/overlays/dclass_chi_fh.vtf
+materials/eternity/overlays/drbright_chi_fh.vtf
+materials/eternity/overlays/guard_chi_fh.vtf
+materials/eternity/overlays/lieutenant_medic_chi_fh.vtf
+materials/eternity/overlays/lieutenant_chi_fh.vtf
+materials/eternity/overlays/lieutenant_sapper_chi_fh.vtf
+materials/eternity/overlays/medic_chi_fh.vtf
+materials/eternity/overlays/mtf_chi_fh.vtf
+materials/eternity/overlays/scientist_chi_fh.vtf
+materials/eternity/overlays/scp-035_chi_fh.vtf
+materials/eternity/overlays/scp-049_chi_fh.vtf
+materials/eternity/overlays/scp-096_chi_fh.vtf
+materials/eternity/overlays/scp-106_chi_fh.vtf
+materials/eternity/overlays/scp-173_chi_fh.vtf
+materials/eternity/overlays/scp-457_chi_fh.vtf
+materials/eternity/overlays/scp-966_chi_fh.vtf
+materials/eternity/overlays/win_chaos_chi_fh.vtf
+materials/eternity/overlays/win_mtf_chi_fh.vtf
+materials/eternity/overlays/win_scp_chi_fh.vtf
+materials/eternity/overlays/win_staff_chi_fh.vtf
 materials/eternity/overlays/079.vmt
 materials/eternity/overlays/vignette_effect.vmt
 materials/eternity/overlays/cadet_en_fh.vmt
@@ -219,7 +242,29 @@ materials/eternity/overlays/win_staff_ru_fh.vmt
 materials/eternity/overlays/arrested_ru_fh.vmt
 materials/eternity/overlays/fists_ru_fh.vmt
 materials/eternity/overlays/inventory_ru_fh.vmt
-materials/models/eternity/overlays/inventory_ru_fh.vmt
+materials/eternity/overlays/cadet_chi_fh.vmt
+materials/eternity/overlays/chaos_chi_fh.vmt
+materials/eternity/overlays/commander_chi_fh.vmt
+materials/eternity/overlays/dclass_chi_fh.vmt
+materials/eternity/overlays/drbright_chi_fh.vmt
+materials/eternity/overlays/guard_chi_fh.vmt
+materials/eternity/overlays/lieutenant_medic_chi_fh.vmt
+materials/eternity/overlays/lieutenant_chi_fh.vmt
+materials/eternity/overlays/lieutenant_sapper_chi_fh.vmt
+materials/eternity/overlays/medic_chi_fh.vmt
+materials/eternity/overlays/mtf_chi_fh.vmt
+materials/eternity/overlays/scientist_chi_fh.vmt
+materials/eternity/overlays/scp-035_chi_fh.vmt
+materials/eternity/overlays/scp-049_chi_fh.vmt
+materials/eternity/overlays/scp-096_chi_fh.vmt
+materials/eternity/overlays/scp-106_chi_fh.vmt
+materials/eternity/overlays/scp-173_chi_fh.vmt
+materials/eternity/overlays/scp-457_chi_fh.vmt
+materials/eternity/overlays/scp-966_chi_fh.vmt
+materials/eternity/overlays/win_chaos_chi_fh.vmt
+materials/eternity/overlays/win_mtf_chi_fh.vmt
+materials/eternity/overlays/win_scp_chi_fh.vmt
+materials/eternity/overlays/win_staff_chi_fh.vmt
 materials/models/eternity/players/chaos/belt02.vmt
 materials/models/eternity/players/chaos/belt02.vtf
 materials/models/eternity/players/chaos/belt02_ref.vtf
@@ -598,13 +643,15 @@ sound/eternity/scp/049/alert_3.wav
 sound/eternity/scp/049/step1.mp3
 sound/eternity/scp/049/step2.mp3
 sound/eternity/scp/049/step3.mp3
-sound/eternity/scp/096/crying.mp3
-sound/eternity/scp/096/doorbroke1.mp3
-sound/eternity/scp/096/doorbroke2.mp3
-sound/eternity/scp/096/doorbroke3.mp3
-sound/eternity/scp/096/rage.mp3
-sound/eternity/scp/096/rage_start.mp3
-sound/eternity/scp/096/tranquility.mp3
+sound/eternity/scp/096/cry_hidden.mp3
+sound/eternity/scp/096/cry_loop.mp3
+sound/eternity/scp/096/rage_init.mp3
+sound/eternity/scp/096/rage_end.mp3
+sound/eternity/scp/096/rage_loop.mp3
+sound/eternity/scp/096/pry_door1.mp3
+sound/eternity/scp/096/pry_door2.mp3
+sound/eternity/scp/096/pry_door3.mp3
+sound/eternity/scp/096/pry_gate.mp3
 sound/eternity/scp/106/portal1.mp3
 sound/eternity/scp/106/portal2.mp3
 sound/eternity/scp/106/portal3.mp3

addons/sourcemod/configs/scp/workshop/2424265786/scp_site101/914.json

@@ -96,9 +96,6 @@
             "weapon_breachcharge": [
                 ["weapon_breachcharge", 100, 0]
             ],
-            "weapon_knife": [
-                ["weapon_knife", 100, 0]
-            ],
             "weapon_hammer": [
                 ["weapon_hammer", 100, 0]
             ],
@@ -302,9 +299,6 @@
             "weapon_breachcharge": [
                 ["plastic", 20, 80]
             ],
-            "weapon_knife": [
-                ["iron_ingot", 0, 100]
-            ],
             "weapon_hammer": [
                 ["iron_ingot", 0, 100]
             ],
@@ -419,9 +413,9 @@
         },
         "one_by_one": {
             "player": {
-                "40":["Injure", 10, 100],
+                "50":["Injure", 10, 100],
                 "30":["Butchering", 1, 100],
-                "20":["Speed", 10, 100]
+                "20":["Metamarphose", 50, 40]
             },
             "card_o5": [
                 ["card_facility_manager", 50, 80]
@@ -463,11 +457,9 @@
                 ["flashlight", 10, 80]
             ],
             "flashlight": [
-                ["radio", 10, 80],
-                ["visor_nv", 10, 80]
+                ["radio", 10, 80]
             ],
             "visor_nv": [
-                ["radio", 10, 80],
                 ["flashlight", 10, 80]
             ],
             "iron_ingot": [
@@ -515,14 +507,11 @@
             "weapon_breachcharge": [
                 ["weapon_xm1014", 60, 60]
             ],
-            "weapon_knife": [
-                ["weapon_axe", 15, 80]
-            ],
             "weapon_hammer": [
                 ["weapon_spanner", 15, 80]
             ],
             "weapon_axe": [
-                ["weapon_knife", 15, 80]
+                ["weapon_spanner", 15, 80]
             ],
             "weapon_spanner": [
                 ["weapon_axe", 15, 80]
@@ -656,14 +645,14 @@
             "card_mog_lieutenant": [
                 ["card_mog_commander", 3, 90]
             ],
-            "card_guard": [
+            "card_senior_guard": [
                 ["card_mog_lieutenant", 3, 90]
             ],
-            "card_senior_guard": [
-                ["card_guard", 3, 90]
+            "card_guard": [
+                ["card_senior_guard", 3, 90]
             ],
             "card_zone_manager": [
-                ["card_senior_guard", 3, 90]
+                ["card_guard", 3, 90]
             ],
             "card_major_scientist": [
                 ["card_zone_manager", 3, 90]
@@ -735,10 +724,7 @@
                 ["weapon_mac10", 20, 80]
             ],
             "weapon_breachcharge": [
-                ["weapon_negev", 20, 80]
-            ],
-            "weapon_knife": [
-                ["weapon_hegrenade", 20, 80]
+                ["weapon_negev", 50, 80]
             ],
             "weapon_hammer": [
                 ["weapon_smokegrenade", 20, 80]
@@ -855,7 +841,7 @@
         },
         "very_fine": {
             "player": [
-                ["Metamarphose", 75, 20]
+                ["Metamarphose", 75, 10]
             ],
             "card_o5": [
                 ["005_picklock", 70, 20]
@@ -958,9 +944,6 @@
             "weapon_breachcharge": [
                 ["weapon_scar20", 60, 30]
             ],
-            "weapon_knife": [
-                ["weapon_hkp2000", 90, 15]
-            ],
             "weapon_hammer": [
                 ["weapon_taser", 90, 15]
             ],