Merge pull request #61484 from Daved27hundred/teargas

Teargas grenades now spawn
CleverRaven · Oct 7, 2022 · e07b909 · e07b909
2 parents 47353c6 + a1fea37
commit e07b909
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -49,6 +49,7 @@
       { "group": "guns_cop", "prob": 100 },
       { "group": "mags_cop", "prob": 40 },
       { "group": "ammo_swat", "prob": 20 },
+      { "item": "gasbomb", "prob": 1 },
       { "group": "guns_swat", "prob": 20 },
       { "group": "mags_swat", "prob": 20 },
       { "group": "eod_armor", "prob": 20 },
@@ -1520,6 +1521,7 @@
       { "item": "rm120c", "prob": 2, "charges": [ 0, 5 ] },
       { "item": "rm20", "prob": 1, "charges": [ 0, 20 ] },
       { "item": "20x66_beanbag", "prob": 10, "charges": [ 1, 10 ] },
+      { "item": "gasbomb", "count": [ 1, 6 ], "prob": 20 },
       { "item": "m79", "prob": 8, "charges-max": 0 },
       { "item": "40x46mm_m651", "prob": 20, "charges": [ 1, 6 ] },
       { "item": "40x46mm_m1006", "prob": 10, "charges": [ 1, 6 ] }

diff --git a/data/json/monsterdrops/zombie_cop.json b/data/json/monsterdrops/zombie_cop.json
@@ -206,6 +206,7 @@
           { "item": "two_way_radio", "prob": 30 },
           { "item": "whistle", "prob": 5 },
           { "item": "flashbang", "prob": 10 },
+          { "item": "gasbomb", "prob": 10 },
           { "item": "sm_extinguisher", "prob": 5 },
           { "item": "rope_30", "prob": 10 }
         ],