From 789e298bd52d9f75a624f6d027c4673808e6a74f Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Sun, 11 Aug 2024 13:36:06 +0700
Subject: [PATCH 01/46] Add files via upload

---
 .../civilian_weapon_attacks.json                | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 data/json/monster_special_attacks/civilian_weapon_attacks.json

diff --git a/data/json/monster_special_attacks/civilian_weapon_attacks.json b/data/json/monster_special_attacks/civilian_weapon_attacks.json
new file mode 100644
index 0000000000000..3d2f505062398
--- /dev/null
+++ b/data/json/monster_special_attacks/civilian_weapon_attacks.json
@@ -0,0 +1,17 @@
+{
+    "type": "monster_attack",
+    "attack_type": "melee",
+    "id": "civilian_weapon_knife_fighter",
+    "cooldown": 1,
+    "move_cost": 72,
+    "accuracy": 2,
+    "//": "copied from butler knife feral",
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 2 }, { "damage_type": "stab", "amount": 14 } ],
+    "condition": { "test_eoc": "is_disarmed" },
+    "hit_dmg_u": "%1$s hits your %2$s with a knife!",
+    "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a knife!",
+    "miss_msg_u": "%1$s tries to hit you, but you dodge!",
+    "miss_msg_npc": "%1$s tries to hit <npcname>, but they dodge!",
+    "no_dmg_msg_u": "%1$s hits your %2$s without penetrating your armor.",
+    "no_dmg_msg_npc": "%1$s hits <npcname>'s %2$s without penetrating their armor."
+  }

From 6d4d5f94473634bb4914031c155d18a043775f22 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Sun, 11 Aug 2024 13:37:33 +0700
Subject: [PATCH 02/46] Update monster_gun.json

---
 .../monster_special_attacks/monster_gun.json    | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json
index bb0f91cbf44a3..034f74983e936 100644
--- a/data/json/monster_special_attacks/monster_gun.json
+++ b/data/json/monster_special_attacks/monster_gun.json
@@ -270,13 +270,24 @@
     "melee_damage": { "bash": 8 }
   },
   {
-    "id": "civilian_cop_glock22",
+    "id": "civilian_glock22",
     "copy-from": "glock_22",
     "looks_like": "glock_22",
     "flags": [ "PSEUDO" ],
     "type": "GUN",
-    "name": { "str_sp": "Cops' Glock 22" },
-    "description": "A gun carried by overconfident officer monsters, more inaccurate for balancing reasons.",
+    "name": { "str_sp": "Fighters' Glock 22" },
+    "description": "A gun carried by civilian monsters, more inaccurate for balancing reasons.",
+    "dispersion": 960,
+    "durability": 5
+  },
+  {
+    "id": "civilian_remington870",
+    "copy-from": "remington_870",
+    "looks_like": "remington_870",
+    "flags": [ "PSEUDO" ],
+    "type": "GUN",
+    "name": { "str_sp": "Cops' Remington 870" },
+    "description": "A shotgun carried by civilian monsters, more inaccurate for balancing reasons.",
     "dispersion": 960,
     "durability": 5
   },

From 7cd0aabd806187b52165f5ddca2f365bade51023 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Sun, 11 Aug 2024 13:43:32 +0700
Subject: [PATCH 03/46] Update monster_gun.json

---
 data/json/monster_special_attacks/monster_gun.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json
index 034f74983e936..a8a747371dabb 100644
--- a/data/json/monster_special_attacks/monster_gun.json
+++ b/data/json/monster_special_attacks/monster_gun.json
@@ -270,12 +270,12 @@
     "melee_damage": { "bash": 8 }
   },
   {
-    "id": "civilian_glock22",
-    "copy-from": "glock_22",
-    "looks_like": "glock_22",
+    "id": "civilian_glock19",
+    "copy-from": "glock_19",
+    "looks_like": "glock_19",
     "flags": [ "PSEUDO" ],
     "type": "GUN",
-    "name": { "str_sp": "Fighters' Glock 22" },
+    "name": { "str_sp": "Fighters' Glock 19" },
     "description": "A gun carried by civilian monsters, more inaccurate for balancing reasons.",
     "dispersion": 960,
     "durability": 5

From 07808b50f6e74d9c710d440c17b43475b8dc1868 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Sun, 11 Aug 2024 13:56:56 +0700
Subject: [PATCH 04/46] Update monster_gun.json

---
 data/json/monster_special_attacks/monster_gun.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json
index a8a747371dabb..a1a01fb6a4b51 100644
--- a/data/json/monster_special_attacks/monster_gun.json
+++ b/data/json/monster_special_attacks/monster_gun.json
@@ -281,13 +281,13 @@
     "durability": 5
   },
   {
-    "id": "civilian_remington870",
-    "copy-from": "remington_870",
-    "looks_like": "remington_870",
+    "id": "civilian_Augrifle",
+    "copy-from": "steyr_aug",
+    "looks_like": "steyr_aug",
     "flags": [ "PSEUDO" ],
     "type": "GUN",
-    "name": { "str_sp": "Cops' Remington 870" },
-    "description": "A shotgun carried by civilian monsters, more inaccurate for balancing reasons.",
+    "name": { "str_sp": "Cops' Aug rifle" },
+    "description": "A rifle carried by cop monsters, more inaccurate for balancing reasons.",
     "dispersion": 960,
     "durability": 5
   },

From b3d7123588b0a61ae81e783ba780a101827e53de Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Mon, 12 Aug 2024 18:08:53 +0700
Subject: [PATCH 05/46] Update civilians.json

---
 data/json/monsters/civilians.json | 82 ++++++++++++++++++++++++-------
 1 file changed, 65 insertions(+), 17 deletions(-)

diff --git a/data/json/monsters/civilians.json b/data/json/monsters/civilians.json
index 5f3a85a3381cb..9dbf1dc344d3e 100644
--- a/data/json/monsters/civilians.json
+++ b/data/json/monsters/civilians.json
@@ -52,7 +52,7 @@
     "id": "mon_civilian_police",
     "type": "MONSTER",
     "name": { "str": "overconfident officer" },
-    "description": "Gun in hand, this police officer is determined to make a last stand against the horde.",
+    "description": "Assault rifle in hand, this police officer is determined to make a last stand against the horde.",
     "copy-from": "mon_civilian_panic",
     "diff": 5,
     "aggro_character": false,
@@ -64,32 +64,36 @@
     "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_syn_armored" ],
     "chat_topics": [ "TALK_CIVILIAN_OFFICER" ],
     "//": "Copied from zombie cop",
-    "melee_skill": 6,
+    "melee_skill": 4,
     "melee_dice": 2,
     "melee_dice_sides": 4,
-    "//2": "Uses a baton for melee attacks",
-    "melee_damage": [ { "damage_type": "bash", "amount": 5 } ],
+    "//2": "Unwieldy rifle butt for melee",
+    "melee_damage": [ { "damage_type": "bash", "amount": 3 } ],
     "death_drops": {
       "subtype": "collection",
-      "items": [ { "group": "mon_zombie_cop_death_drops", "prob": 100 }, { "item": "glock_22", "prob": 100, "charges": [ 0, 6 ] } ]
+      "items": [
+        { "group": "mon_zombie_cop_death_drops", "prob": 100 },
+        { "item": "remington_870", "prob": 100, "charges": [ 0, 6 ] }
+      ]
     },
     "zombify_into": "mon_zombie_cop",
     "extend": { "flags": [ "DROPS_AMMO", "WIELDED_WEAPON" ] },
-    "starting_ammo": { "40fmj": 10 },
+    "starting_ammo": { "223": 15 },
+    "//3": "Range starts from 0 to get some shots out",
     "special_attacks": [
       {
         "type": "gun",
         "cooldown": 10,
-        "move_cost": 150,
-        "gun_type": "civilian_cop_glock22",
-        "ammo_type": "40fmj",
-        "fake_skills": [ [ "gun", 2 ], [ "pistol", 3 ] ],
+        "move_cost": 100,
+        "gun_type": "civilian_Augrifle",
+        "ammo_type": "223",
+        "fake_skills": [ [ "gun", 2 ], [ "rifle", 3 ] ],
         "fake_dex": 8,
         "fake_per": 10,
-        "ranges": [ [ 2, 14, "DEFAULT" ] ],
+        "ranges": [ [ 0, 14, "DEFAULT" ] ],
         "condition": { "test_eoc": "is_disarmed" },
         "require_targeting_player": false,
-        "description": "The officer fires their Glock 22!"
+        "description": "The officer fires their AUG assault rifle!"
       }
     ],
     "armor": { "bash": 6, "cut": 6, "stab": 6, "bullet": 6, "electric": 2 }
@@ -98,7 +102,7 @@
     "id": "mon_civilian_zombiefighter",
     "type": "MONSTER",
     "name": { "str": "futile fighter" },
-    "description": "Obviously, this aggravated yet rallied human has lost their wits and tries to fight the undead with just a stick in their hands.",
+    "description": "Obviously, this aggravated yet rallied person has lost their wits and tries to fight the undead with just a knife in their hands.",
     "copy-from": "mon_civilian_panic",
     "chat_topics": [ "TALK_CIVILIAN_FIGHTER" ],
     "diff": 3,
@@ -106,21 +110,64 @@
     "aggression": 100,
     "morale": 100,
     "melee_skill": 2,
+    "special_attacks": [ { "id": "civilian_weapon_knife_fighter" } ],
+    "melee_dice": 2,
+    "melee_dice_sides": 3,
+    "death_drops": {
+      "subtype": "collection",
+      "items": [ { "group": "default_zombie_death_drops", "prob": 100 }, { "group": "survivor_knife", "prob": 100 } ]
+    }
+  },
+  {
+    "id": "mon_civilian_zombiegunner",
+    "type": "MONSTER",
+    "name": { "str": "firearmed fighter" },
+    "description": "Handgun in hand, this person is determined to make a last stand against the horde.",
+    "copy-from": "mon_civilian_panic",
+    "chat_topics": [ "TALK_CIVILIAN_GUNNER" ],
+    "diff": 3,
+    "aggro_character": false,
+    "aggression": 100,
+    "morale": 100,
+    "melee_skill": 2,
     "melee_dice": 2,
     "melee_dice_sides": 3,
-    "melee_damage": [ { "damage_type": "bash", "amount": 4 } ]
+    "death_drops": {
+      "subtype": "collection",
+      "items": [
+        { "group": "default_zombie_death_drops", "prob": 100 },
+        { "group": "feral_handgun", "prob": 100, "charges": [ 0, 6 ] }
+      ]
+    },
+    "starting_ammo": { "9mm": 10 },
+    "//3": "Range starts from 0 to get some shots out",
+    "special_attacks": [
+      {
+        "type": "gun",
+        "cooldown": 10,
+        "move_cost": 150,
+        "gun_type": "civilian_glock19",
+        "ammo_type": "9mm",
+        "fake_skills": [ [ "gun", 2 ], [ "pistol", 3 ] ],
+        "fake_dex": 8,
+        "fake_per": 10,
+        "ranges": [ [ 0, 14, "DEFAULT" ] ],
+        "condition": { "test_eoc": "is_disarmed" },
+        "require_targeting_player": false,
+        "description": "The gunman fires their sidearm!"
+      }
+    ]
   },
   {
     "id": "mon_civilian_icu",
     "type": "MONSTER",
-    "name": { "str": "hospitalized human" },
-    "description": "This being is severely ill in some form or another, requiring intensive care that is not available anymore after the Cataclysm.  There is nothing you can do for them.",
+    "name": { "str": "hospitalized patient" },
+    "description": "This person is severely ill in some form or another, requiring intensive care that is not available anymore after the Cataclysm.  There is nothing you can do for them.",
     "chat_topics": [ "TALK_CIVILIAN_ICU" ],
     "speed": 0,
     "//": "So they are not perpetually fleeing despite lying in a hospital bed",
     "morale": 0,
     "upgrades": { "into": "mon_zombie_crawler" },
-    "zombify_into": "mon_zombie_crawler",
     "delete": { "flags": [ "SEES", "HEARS" ] },
     "copy-from": "mon_civilian_stationary"
   },
@@ -152,6 +199,7 @@
     "monsters": [
       { "monster": "mon_civilian_stationary", "weight": 30, "cost_multiplier": 0, "ends": "3 days" },
       { "monster": "mon_civilian_zombiefighter", "weight": 16, "cost_multiplier": 0, "ends": "3 days" },
+      { "monster": "mon_civilian_zombiegunner", "weight": 12, "cost_multiplier": 0, "ends": "3 days" },
       { "monster": "mon_civilian_police", "weight": 4, "cost_multiplier": 3, "ends": "3 days" },
       {
         "monster": "mon_civilian_parent",

From 5fb9a4273e51493253e876a30c3444c8c10c5db1 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Mon, 12 Aug 2024 18:09:58 +0700
Subject: [PATCH 06/46] Update civilians.json

---
 data/json/monsters/civilians.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/json/monsters/civilians.json b/data/json/monsters/civilians.json
index 9dbf1dc344d3e..4bc5f2161595a 100644
--- a/data/json/monsters/civilians.json
+++ b/data/json/monsters/civilians.json
@@ -73,7 +73,7 @@
       "subtype": "collection",
       "items": [
         { "group": "mon_zombie_cop_death_drops", "prob": 100 },
-        { "item": "remington_870", "prob": 100, "charges": [ 0, 6 ] }
+        { "item": "steyr_aug", "prob": 100, "charges": [ 0, 6 ] }
       ]
     },
     "zombify_into": "mon_zombie_cop",
@@ -136,7 +136,7 @@
       "subtype": "collection",
       "items": [
         { "group": "default_zombie_death_drops", "prob": 100 },
-        { "group": "feral_handgun", "prob": 100, "charges": [ 0, 6 ] }
+        { "group": "feral_handgun", "prob": 100, "charges": [ 0, 10 ] }
       ]
     },
     "starting_ammo": { "9mm": 10 },

From 41c81d0a0134222cde455b7793a1a21816cd320e Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Tue, 3 Dec 2024 20:33:47 +0700
Subject: [PATCH 07/46] Update
 data/json/monster_special_attacks/civilian_weapon_attacks.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .../civilian_weapon_attacks.json              | 37 +++++++++++--------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/data/json/monster_special_attacks/civilian_weapon_attacks.json b/data/json/monster_special_attacks/civilian_weapon_attacks.json
index 3d2f505062398..f8c5e4b199567 100644
--- a/data/json/monster_special_attacks/civilian_weapon_attacks.json
+++ b/data/json/monster_special_attacks/civilian_weapon_attacks.json
@@ -1,17 +1,22 @@
 {
-    "type": "monster_attack",
-    "attack_type": "melee",
-    "id": "civilian_weapon_knife_fighter",
-    "cooldown": 1,
-    "move_cost": 72,
-    "accuracy": 2,
-    "//": "copied from butler knife feral",
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 2 }, { "damage_type": "stab", "amount": 14 } ],
-    "condition": { "test_eoc": "is_disarmed" },
-    "hit_dmg_u": "%1$s hits your %2$s with a knife!",
-    "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a knife!",
-    "miss_msg_u": "%1$s tries to hit you, but you dodge!",
-    "miss_msg_npc": "%1$s tries to hit <npcname>, but they dodge!",
-    "no_dmg_msg_u": "%1$s hits your %2$s without penetrating your armor.",
-    "no_dmg_msg_npc": "%1$s hits <npcname>'s %2$s without penetrating their armor."
-  }
+  "type": "monster_attack",
+  "attack_type": "melee",
+  "id": "civilian_weapon_knife_fighter",
+  "cooldown": 1,
+  "move_cost": 72,
+  "accuracy": 2,
+  "//": "copied from butler knife feral",
+  "damage_max_instance": [
+    { "damage_type": "bash", "amount": 2 },
+    { "damage_type": "stab", "amount": 14 }
+  ],
+  "condition": {
+    "test_eoc": "is_disarmed"
+  },
+  "hit_dmg_u": "%1$s hits your %2$s with a knife!",
+  "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a knife!",
+  "miss_msg_u": "%1$s tries to hit you, but you dodge!",
+  "miss_msg_npc": "%1$s tries to hit <npcname>, but they dodge!",
+  "no_dmg_msg_u": "%1$s hits your %2$s without penetrating your armor.",
+  "no_dmg_msg_npc": "%1$s hits <npcname>'s %2$s without penetrating their armor."
+}

From ef06397fcdf9dc31d57e2350f9087517bf2e79f3 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Tue, 3 Dec 2024 20:33:56 +0700
Subject: [PATCH 08/46] Update data/json/monsters/civilians.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 data/json/monsters/civilians.json | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/data/json/monsters/civilians.json b/data/json/monsters/civilians.json
index 4bc5f2161595a..71b2f7d477ba4 100644
--- a/data/json/monsters/civilians.json
+++ b/data/json/monsters/civilians.json
@@ -71,10 +71,7 @@
     "melee_damage": [ { "damage_type": "bash", "amount": 3 } ],
     "death_drops": {
       "subtype": "collection",
-      "items": [
-        { "group": "mon_zombie_cop_death_drops", "prob": 100 },
-        { "item": "steyr_aug", "prob": 100, "charges": [ 0, 6 ] }
-      ]
+      "items": [ { "group": "mon_zombie_cop_death_drops", "prob": 100 }, { "item": "steyr_aug", "prob": 100, "charges": [ 0, 6 ] } ]
     },
     "zombify_into": "mon_zombie_cop",
     "extend": { "flags": [ "DROPS_AMMO", "WIELDED_WEAPON" ] },

From 1e0e7f432c9582a76ce2d0b79ca0c3da082b9bb3 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Tue, 3 Dec 2024 20:40:12 +0700
Subject: [PATCH 09/46] Update monster_gun.json

---
 .../monster_special_attacks/monster_gun.json  | 118 ++++--------------
 1 file changed, 23 insertions(+), 95 deletions(-)

diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json
index a1a01fb6a4b51..2f55d73b211f0 100644
--- a/data/json/monster_special_attacks/monster_gun.json
+++ b/data/json/monster_special_attacks/monster_gun.json
@@ -4,8 +4,8 @@
     "type": "GUN",
     "symbol": "%",
     "color": "red",
-    "name": { "str": "barb launching organ" },
-    "description": "A mutated organ capable of launching bony barbs at great speed.",
+    "name": { "str": "barb launching organ", "//~": "NO_I18N" },
+    "description": { "str": "A mutated organ capable of launching bony barbs at great speed.", "//~": "NO_I18N" },
     "material": [ "hflesh" ],
     "flags": [
       "PRIMITIVE_RANGED_WEAPON",
@@ -38,8 +38,8 @@
     "type": "GUN",
     "symbol": "%",
     "color": "red",
-    "name": { "str": "electric alien frond" },
-    "description": "Electricity unnaturally arcs from the tips of this alien frond.",
+    "name": { "str": "electric alien frond", "//~": "NO_I18N" },
+    "description": { "str": "Electricity unnaturally arcs from the tips of this alien frond.", "//~": "NO_I18N" },
     "material": [ "hflesh" ],
     "flags": [
       "PRIMITIVE_RANGED_WEAPON",
@@ -71,8 +71,8 @@
     "type": "GUN",
     "symbol": "%",
     "color": "red",
-    "name": { "str": "fireworks cannon" },
-    "description": "An autoloading fireworks launcher.",
+    "name": { "str": "fireworks cannon", "//~": "NO_I18N" },
+    "description": { "str": "An autoloading fireworks launcher.", "//~": "NO_I18N" },
     "material": [ "steel" ],
     "flags": [
       "PRIMITIVE_RANGED_WEAPON",
@@ -104,8 +104,8 @@
     "type": "GUN",
     "symbol": "%",
     "color": "red",
-    "name": { "str": "viscous barb launcher" },
-    "description": "A mutated organ capable of launching bony barbs at great speed.",
+    "name": { "str": "viscous barb launcher", "//~": "NO_I18N" },
+    "description": { "str": "A mutated organ capable of launching bony barbs at great speed.", "//~": "NO_I18N" },
     "material": [ "hflesh" ],
     "flags": [
       "PRIMITIVE_RANGED_WEAPON",
@@ -137,8 +137,8 @@
     "type": "GUN",
     "symbol": "%",
     "color": "red",
-    "name": { "str": "hurled rubble" },
-    "description": "Stone at the ready to crush that which isn't part of the blob.",
+    "name": { "str": "hurled rubble", "//~": "NO_I18N" },
+    "description": { "str": "Stone at the ready to crush that which isn't part of the blob.", "//~": "NO_I18N" },
     "material": [ "stone" ],
     "flags": [
       "PRIMITIVE_RANGED_WEAPON",
@@ -181,94 +181,19 @@
     "copy-from": "v29",
     "type": "GUN",
     "energy_drain": "0 kJ",
-    "name": { "str": "mounted laser" },
+    "name": { "str": "mounted laser", "//~": "NO_I18N" },
     "flags": [ "PSEUDO", "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING", "NEEDS_NO_LUBE", "NO_TURRET" ]
   },
   {
     "id": "yrax_deterrent_laser",
     "copy-from": "v29",
     "type": "GUN",
-    "name": { "str": "deterrent laser weapon" },
+    "name": { "str": "deterrent laser weapon", "//~": "NO_I18N" },
     "energy_drain": "0 kJ",
     "ammo_effects": [ "LASER" ],
     "ranged_damage": { "damage_type": "electric", "amount": 10, "armor_penetration": 4 },
     "flags": [ "PSEUDO", "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING", "NEEDS_NO_LUBE", "NO_TURRET" ]
   },
-  {
-    "id": "feral_militia_gun",
-    "type": "GUN",
-    "symbol": "R",
-    "color": "dark_gray",
-    "name": { "str": "mad militias' rifle" },
-    "description": "A fake semi-auto rifle for feral militiamen (because monster aiming is too lethal).",
-    "material": [ "steel", "plastic" ],
-    "skill": "rifle",
-    "flags": [ "PSEUDO", "NONCONDUCTIVE", "NO_REPAIR", "NO_SALVAGE", "NO_UNLOAD", "RELOAD_AND_SHOOT" ],
-    "ammo": [ "223" ],
-    "clip_size": 30,
-    "longest_side": "83200 cm",
-    "weight": "5000 g",
-    "volume": "2000 ml",
-    "dispersion": 3000,
-    "range": 100,
-    "durability": 8,
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "223": 1 } } ],
-    "melee_damage": { "bash": 3 }
-  },
-  {
-    "id": "feral_jackboot_gun",
-    "type": "GUN",
-    "symbol": "R",
-    "color": "dark_gray",
-    "name": { "str": "feral bikers' shotgun" },
-    "description": "A fake shotgun for feral bikers (because monster aiming is too lethal).",
-    "material": [ "steel", "aluminum", "plastic" ],
-    "skill": "shotgun",
-    "flags": [ "PSEUDO", "NONCONDUCTIVE", "NO_REPAIR", "NO_SALVAGE", "NO_UNLOAD", "RELOAD_AND_SHOOT" ],
-    "ammo": [ "shot" ],
-    "clip_size": 6,
-    "longest_side": "1166 cm",
-    "weight": "3402 g",
-    "volume": "2450 ml",
-    "dispersion": 3250,
-    "range": 65,
-    "durability": 9,
-    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 1 } } ],
-    "melee_damage": { "bash": 3 }
-  },
-  {
-    "id": "feral_m9",
-    "copy-from": "pistol_base",
-    "looks_like": "glock_17",
-    "type": "GUN",
-    "name": { "str_sp": "Beretta M9A1" },
-    "description": "A poorly maintained and inaccurate version of the M9 for feral security guards, feral preppers, etc.",
-    "ascii_picture": "beretta_m9",
-    "weight": "961 g",
-    "volume": "570 ml",
-    "flags": [ "PSEUDO" ],
-    "longest_side": "249 mm",
-    "price": "650 USD",
-    "price_postapoc": "25 USD",
-    "ranged_damage": { "damage_type": "bullet", "amount": -4 },
-    "material": [ "steel", "aluminum" ],
-    "symbol": "(",
-    "color": "dark_gray",
-    "ammo": [ "9mm" ],
-    "range": 1,
-    "dispersion": 4800,
-    "durability": 7,
-    "min_cycle_recoil": 450,
-    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
-    "pocket_data": [
-      {
-        "magazine_well": "250 ml",
-        "pocket_type": "MAGAZINE_WELL",
-        "item_restriction": [ "m9mag", "m9mag_10rd", "m9mag_17rd", "m9mag_18rd", "m9mag_20rd", "m9bigmag", "m9mag_32rd", "m9mag_35rd" ]
-      }
-    ],
-    "melee_damage": { "bash": 8 }
-  },
   {
     "id": "civilian_glock19",
     "copy-from": "glock_19",
@@ -295,8 +220,8 @@
     "id": "acid_spit",
     "type": "GUN",
     "copy-from": "fake_item",
-    "name": { "str": "acid spit gun" },
-    "description": "Fake gun that fires acid globs.",
+    "name": { "str": "acid spit gun", "//~": "NO_I18N" },
+    "description": { "str": "Fake gun that fires acid globs.", "//~": "NO_I18N" },
     "flags": [ "PSEUDO", "NEVER_JAMS", "NO_TURRET" ],
     "ammo_effects": [ "BLINDS_EYES", "NEVER_MISFIRES", "NO_DAMAGE_SCALING", "NO_PENETRATE_OBSTACLES" ],
     "material": [ "flesh" ],
@@ -310,8 +235,8 @@
     "id": "acid_spray",
     "type": "GUN",
     "copy-from": "fake_item",
-    "name": { "str": "acid dart volley" },
-    "description": "Fake gun that fires acid globs.",
+    "name": { "str": "acid dart volley", "//~": "NO_I18N" },
+    "description": { "str": "Fake gun that fires acid globs.", "//~": "NO_I18N" },
     "flags": [ "NEVER_JAMS", "NO_TURRET", "PSEUDO" ],
     "modes": [ [ "DEFAULT", "auto", 3 ] ],
     "ammo_effects": [ "BLINDS_EYES", "NO_PENETRATE_OBSTACLES", "NEVER_MISFIRES", "NO_DAMAGE_SCALING" ],
@@ -326,8 +251,8 @@
     "id": "acid_sniper",
     "type": "GUN",
     "copy-from": "fake_item",
-    "name": { "str": "acid dart gun" },
-    "description": "Fake gun that fires acid globs.",
+    "name": { "str": "acid dart gun", "//~": "NO_I18N" },
+    "description": { "str": "Fake gun that fires acid globs.", "//~": "NO_I18N" },
     "flags": [ "NEVER_JAMS", "NO_TURRET", "PSEUDO" ],
     "ammo_effects": [ "BLINDS_EYES", "NO_PENETRATE_OBSTACLES", "NEVER_MISFIRES", "NO_DAMAGE_SCALING" ],
     "material": [ "flesh" ],
@@ -341,8 +266,11 @@
     "id": "migo_bio_gun",
     "type": "GUN",
     "copy-from": "fake_item",
-    "name": { "str": "mi-go bio-gun" },
-    "description": "Fake gun that fires some sort of solidified organic matter at very high speed by unknown means of propulsion.",
+    "name": { "str": "mi-go bio-gun", "//~": "NO_I18N" },
+    "description": {
+      "str": "Fake gun that fires some sort of solidified organic matter at very high speed by unknown means of propulsion.",
+      "//~": "NO_I18N"
+    },
     "flags": [ "NEVER_JAMS", "NO_TURRET", "PSEUDO" ],
     "ammo_effects": [ "NEVER_MISFIRES", "NO_PENETRATE_OBSTACLES" ],
     "material": [ "flesh" ],

From 0f60dde927d6a96fb21f545abfdb642d9dbd24d7 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Tue, 3 Dec 2024 20:49:16 +0700
Subject: [PATCH 10/46] Update civilian_weapon_attacks.json


From e572c834d4510a1edb85694327e0373b0beea147 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Tue, 3 Dec 2024 20:54:51 +0700
Subject: [PATCH 11/46] Update monster_gun.json

---
 data/json/monster_special_attacks/monster_gun.json | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json
index 2f55d73b211f0..827035238c5a1 100644
--- a/data/json/monster_special_attacks/monster_gun.json
+++ b/data/json/monster_special_attacks/monster_gun.json
@@ -216,6 +216,17 @@
     "dispersion": 960,
     "durability": 5
   },
+  {
+    "id": "civilian_cop_glock22",
+    "copy-from": "glock_22",
+    "looks_like": "glock_22",
+    "flags": [ "PSEUDO" ],
+    "type": "GUN",
+    "name": { "str": "Cops' Glock 22", "//~": "NO_I18N" },
+    "description": { "str": "A gun carried by overconfident officer monsters, more inaccurate for balancing reasons.", "//~": "NO_I18N" },
+    "dispersion": 960,
+    "durability": 5
+  },
   {
     "id": "acid_spit",
     "type": "GUN",

From 77f30b35071ba71322f92d8aabd7621ba3a30dc7 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Tue, 3 Dec 2024 20:59:30 +0700
Subject: [PATCH 12/46] Update civilian_weapon_attacks.json

---
 data/json/monster_special_attacks/civilian_weapon_attacks.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data/json/monster_special_attacks/civilian_weapon_attacks.json b/data/json/monster_special_attacks/civilian_weapon_attacks.json
index f8c5e4b199567..1ab6ac85930cc 100644
--- a/data/json/monster_special_attacks/civilian_weapon_attacks.json
+++ b/data/json/monster_special_attacks/civilian_weapon_attacks.json
@@ -5,7 +5,6 @@
   "cooldown": 1,
   "move_cost": 72,
   "accuracy": 2,
-  "//": "copied from butler knife feral",
   "damage_max_instance": [
     { "damage_type": "bash", "amount": 2 },
     { "damage_type": "stab", "amount": 14 }

From 3182bca52056d44eb93c4a3143a85998a8025ddc Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Tue, 3 Dec 2024 21:13:18 +0700
Subject: [PATCH 13/46] Update monster_gun.json

I have no idea whats going on here. There is NO feral range guns anymore if i look at the current mainline cdda code, but here it says i remove feral guns. Im reading this wrong

From ad81214943ea91c81c9cbe914083598062e8ac50 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Tue, 3 Dec 2024 21:21:36 +0700
Subject: [PATCH 14/46] Update monster_gun.json

---
 .../monster_special_attacks/monster_gun.json  | 117 ++++++++++++++----
 1 file changed, 93 insertions(+), 24 deletions(-)

diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json
index 827035238c5a1..b4b9c387cc5ac 100644
--- a/data/json/monster_special_attacks/monster_gun.json
+++ b/data/json/monster_special_attacks/monster_gun.json
@@ -4,8 +4,8 @@
     "type": "GUN",
     "symbol": "%",
     "color": "red",
-    "name": { "str": "barb launching organ", "//~": "NO_I18N" },
-    "description": { "str": "A mutated organ capable of launching bony barbs at great speed.", "//~": "NO_I18N" },
+    "name": { "str": "barb launching organ" },
+    "description": "A mutated organ capable of launching bony barbs at great speed.",
     "material": [ "hflesh" ],
     "flags": [
       "PRIMITIVE_RANGED_WEAPON",
@@ -38,8 +38,8 @@
     "type": "GUN",
     "symbol": "%",
     "color": "red",
-    "name": { "str": "electric alien frond", "//~": "NO_I18N" },
-    "description": { "str": "Electricity unnaturally arcs from the tips of this alien frond.", "//~": "NO_I18N" },
+    "name": { "str": "electric alien frond" },
+    "description": "Electricity unnaturally arcs from the tips of this alien frond.",
     "material": [ "hflesh" ],
     "flags": [
       "PRIMITIVE_RANGED_WEAPON",
@@ -71,8 +71,8 @@
     "type": "GUN",
     "symbol": "%",
     "color": "red",
-    "name": { "str": "fireworks cannon", "//~": "NO_I18N" },
-    "description": { "str": "An autoloading fireworks launcher.", "//~": "NO_I18N" },
+    "name": { "str": "fireworks cannon" },
+    "description": "An autoloading fireworks launcher.",
     "material": [ "steel" ],
     "flags": [
       "PRIMITIVE_RANGED_WEAPON",
@@ -104,8 +104,8 @@
     "type": "GUN",
     "symbol": "%",
     "color": "red",
-    "name": { "str": "viscous barb launcher", "//~": "NO_I18N" },
-    "description": { "str": "A mutated organ capable of launching bony barbs at great speed.", "//~": "NO_I18N" },
+    "name": { "str": "viscous barb launcher" },
+    "description": "A mutated organ capable of launching bony barbs at great speed.",
     "material": [ "hflesh" ],
     "flags": [
       "PRIMITIVE_RANGED_WEAPON",
@@ -137,8 +137,8 @@
     "type": "GUN",
     "symbol": "%",
     "color": "red",
-    "name": { "str": "hurled rubble", "//~": "NO_I18N" },
-    "description": { "str": "Stone at the ready to crush that which isn't part of the blob.", "//~": "NO_I18N" },
+    "name": { "str": "hurled rubble" },
+    "description": "Stone at the ready to crush that which isn't part of the blob.",
     "material": [ "stone" ],
     "flags": [
       "PRIMITIVE_RANGED_WEAPON",
@@ -181,19 +181,90 @@
     "copy-from": "v29",
     "type": "GUN",
     "energy_drain": "0 kJ",
-    "name": { "str": "mounted laser", "//~": "NO_I18N" },
+    "name": { "str": "mounted laser" },
     "flags": [ "PSEUDO", "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING", "NEEDS_NO_LUBE", "NO_TURRET" ]
   },
   {
     "id": "yrax_deterrent_laser",
     "copy-from": "v29",
     "type": "GUN",
-    "name": { "str": "deterrent laser weapon", "//~": "NO_I18N" },
+    "name": { "str": "deterrent laser weapon" },
     "energy_drain": "0 kJ",
     "ammo_effects": [ "LASER" ],
     "ranged_damage": { "damage_type": "electric", "amount": 10, "armor_penetration": 4 },
     "flags": [ "PSEUDO", "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING", "NEEDS_NO_LUBE", "NO_TURRET" ]
   },
+    "id": "feral_militia_gun",
+    "type": "GUN",
+    "symbol": "R",
+    "color": "dark_gray",
+    "name": { "str": "mad militias' rifle" },
+    "description": "A fake semi-auto rifle for feral militiamen (because monster aiming is too lethal).",
+    "material": [ "steel", "plastic" ],
+    "skill": "rifle",
+    "flags": [ "PSEUDO", "NONCONDUCTIVE", "NO_REPAIR", "NO_SALVAGE", "NO_UNLOAD", "RELOAD_AND_SHOOT" ],
+    "ammo": [ "223" ],
+    "clip_size": 30,
+    "longest_side": "83200 cm",
+    "weight": "5000 g",
+    "volume": "2000 ml",
+    "dispersion": 3000,
+    "range": 100,
+    "durability": 8,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "223": 1 } } ],
+    "melee_damage": { "bash": 3 }
+  },
+  {
+    "id": "feral_jackboot_gun",
+    "symbol": "R",
+    "color": "dark_gray",
+    "name": { "str": "feral bikers' shotgun" },
+    "description": "A fake shotgun for feral bikers (because monster aiming is too lethal).",
+    "material": [ "steel", "aluminum", "plastic" ],
+    "skill": "shotgun",
+    "flags": [ "PSEUDO", "NONCONDUCTIVE", "NO_REPAIR", "NO_SALVAGE", "NO_UNLOAD", "RELOAD_AND_SHOOT" ],
+    "ammo": [ "shot" ],
+    "clip_size": 6,
+    "longest_side": "1166 cm",
+    "weight": "3402 g",
+    "volume": "2450 ml",
+    "dispersion": 3250,
+    "range": 65,
+    "durability": 9,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 1 } } ],
+    "melee_damage": { "bash": 3 }
+  },
+  { 
+    "id": "feral_m9",
+    "copy-from": "pistol_base",
+    "looks_like": "glock_17",
+    "type": "GUN",
+    "name": { "str_sp": "Beretta M9A1" },
+    "description": "A poorly maintained and inaccurate version of the M9 for feral security guards, feral preppers, etc.",
+    "ascii_picture": "beretta_m9",
+    "weight": "961 g",
+    "volume": "570 ml",
+    "longest_side": "249 mm",
+    "price": "650 USD",
+    "price_postapoc": "25 USD",
+    "ranged_damage": { "damage_type": "bullet", "amount": -4 },
+    "material": [ "steel", "aluminum" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": [ "9mm" ],
+    "range": 1,
+    "dispersion": 4800,
+    "durability": 7,
+    "min_cycle_recoil": 450,
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
+    "pocket_data": [
+      {
+        "magazine_well": "250 ml",
+        "pocket_type": "MAGAZINE_WELL",
+        "item_restriction": [ "m9mag", "m9mag_10rd", "m9mag_17rd", "m9mag_18rd", "m9mag_20rd", "m9bigmag", "m9mag_32rd", "m9mag_35rd" ]
+      }
+    ],
+    "melee_damage": { "bash": 8 }
   {
     "id": "civilian_glock19",
     "copy-from": "glock_19",
@@ -222,8 +293,8 @@
     "looks_like": "glock_22",
     "flags": [ "PSEUDO" ],
     "type": "GUN",
-    "name": { "str": "Cops' Glock 22", "//~": "NO_I18N" },
-    "description": { "str": "A gun carried by overconfident officer monsters, more inaccurate for balancing reasons.", "//~": "NO_I18N" },
+    "name": { "str_sp": "Cops' Glock 22" },
+    "description": "A gun carried by overconfident officer monsters, more inaccurate for balancing reasons.",
     "dispersion": 960,
     "durability": 5
   },
@@ -231,8 +302,8 @@
     "id": "acid_spit",
     "type": "GUN",
     "copy-from": "fake_item",
-    "name": { "str": "acid spit gun", "//~": "NO_I18N" },
-    "description": { "str": "Fake gun that fires acid globs.", "//~": "NO_I18N" },
+    "name": { "str": "acid spit gun" },
+    "description": "Fake gun that fires acid globs.",
     "flags": [ "PSEUDO", "NEVER_JAMS", "NO_TURRET" ],
     "ammo_effects": [ "BLINDS_EYES", "NEVER_MISFIRES", "NO_DAMAGE_SCALING", "NO_PENETRATE_OBSTACLES" ],
     "material": [ "flesh" ],
@@ -246,8 +317,8 @@
     "id": "acid_spray",
     "type": "GUN",
     "copy-from": "fake_item",
-    "name": { "str": "acid dart volley", "//~": "NO_I18N" },
-    "description": { "str": "Fake gun that fires acid globs.", "//~": "NO_I18N" },
+    "name": { "str": "acid dart volley" },
+    "description": "Fake gun that fires acid globs.",
     "flags": [ "NEVER_JAMS", "NO_TURRET", "PSEUDO" ],
     "modes": [ [ "DEFAULT", "auto", 3 ] ],
     "ammo_effects": [ "BLINDS_EYES", "NO_PENETRATE_OBSTACLES", "NEVER_MISFIRES", "NO_DAMAGE_SCALING" ],
@@ -262,8 +333,8 @@
     "id": "acid_sniper",
     "type": "GUN",
     "copy-from": "fake_item",
-    "name": { "str": "acid dart gun", "//~": "NO_I18N" },
-    "description": { "str": "Fake gun that fires acid globs.", "//~": "NO_I18N" },
+    "name": { "str": "acid dart gun" },
+    "description": "Fake gun that fires acid globs.",
     "flags": [ "NEVER_JAMS", "NO_TURRET", "PSEUDO" ],
     "ammo_effects": [ "BLINDS_EYES", "NO_PENETRATE_OBSTACLES", "NEVER_MISFIRES", "NO_DAMAGE_SCALING" ],
     "material": [ "flesh" ],
@@ -277,10 +348,8 @@
     "id": "migo_bio_gun",
     "type": "GUN",
     "copy-from": "fake_item",
-    "name": { "str": "mi-go bio-gun", "//~": "NO_I18N" },
-    "description": {
-      "str": "Fake gun that fires some sort of solidified organic matter at very high speed by unknown means of propulsion.",
-      "//~": "NO_I18N"
+    "name": { "str": "mi-go bio-gun" },
+    "description": "Fake gun that fires some sort of solidified organic matter at very high speed by unknown means of propulsion.",
     },
     "flags": [ "NEVER_JAMS", "NO_TURRET", "PSEUDO" ],
     "ammo_effects": [ "NEVER_MISFIRES", "NO_PENETRATE_OBSTACLES" ],

From e7fec4a3cdaf85a912f162c45157d4cc0874a75c Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Tue, 3 Dec 2024 21:23:51 +0700
Subject: [PATCH 15/46] Update monster_gun.json

---
 data/json/monster_special_attacks/monster_gun.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json
index b4b9c387cc5ac..15bb339724e4b 100644
--- a/data/json/monster_special_attacks/monster_gun.json
+++ b/data/json/monster_special_attacks/monster_gun.json
@@ -213,9 +213,9 @@
     "durability": 8,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "223": 1 } } ],
     "melee_damage": { "bash": 3 }
-  },
   {
     "id": "feral_jackboot_gun",
+    "type": "GUN",
     "symbol": "R",
     "color": "dark_gray",
     "name": { "str": "feral bikers' shotgun" },
@@ -244,6 +244,7 @@
     "ascii_picture": "beretta_m9",
     "weight": "961 g",
     "volume": "570 ml",
+    "flags": [ "PSEUDO" ],
     "longest_side": "249 mm",
     "price": "650 USD",
     "price_postapoc": "25 USD",

From 45478911af1c721a1fb1901a0c51587536406f50 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Tue, 3 Dec 2024 21:27:27 +0700
Subject: [PATCH 16/46] Update monster_gun.json

---
 data/json/monster_special_attacks/monster_gun.json | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json
index 15bb339724e4b..5677eaf8b2b6c 100644
--- a/data/json/monster_special_attacks/monster_gun.json
+++ b/data/json/monster_special_attacks/monster_gun.json
@@ -194,6 +194,7 @@
     "ranged_damage": { "damage_type": "electric", "amount": 10, "armor_penetration": 4 },
     "flags": [ "PSEUDO", "NEVER_JAMS", "NO_UNLOAD", "NON_FOULING", "NEEDS_NO_LUBE", "NO_TURRET" ]
   },
+  {
     "id": "feral_militia_gun",
     "type": "GUN",
     "symbol": "R",
@@ -213,7 +214,8 @@
     "durability": 8,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "223": 1 } } ],
     "melee_damage": { "bash": 3 }
-  {
+  },
+  {  
     "id": "feral_jackboot_gun",
     "type": "GUN",
     "symbol": "R",
@@ -234,7 +236,7 @@
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 1 } } ],
     "melee_damage": { "bash": 3 }
   },
-  { 
+  {
     "id": "feral_m9",
     "copy-from": "pistol_base",
     "looks_like": "glock_17",

From 2e4914c8186da42251ed770eb258d54662fcfbb1 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Tue, 3 Dec 2024 21:28:12 +0700
Subject: [PATCH 17/46] Update monster_gun.json

---
 data/json/monster_special_attacks/monster_gun.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json
index 5677eaf8b2b6c..ef7e914c5ad17 100644
--- a/data/json/monster_special_attacks/monster_gun.json
+++ b/data/json/monster_special_attacks/monster_gun.json
@@ -215,7 +215,7 @@
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "223": 1 } } ],
     "melee_damage": { "bash": 3 }
   },
-  {  
+  {
     "id": "feral_jackboot_gun",
     "type": "GUN",
     "symbol": "R",

From dc8a6546c9eac92b98042574ce016a7aa48291a3 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Tue, 3 Dec 2024 21:32:49 +0700
Subject: [PATCH 18/46] Update monster_gun.json

---
 data/json/monster_special_attacks/monster_gun.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json
index ef7e914c5ad17..017bb04d3fd28 100644
--- a/data/json/monster_special_attacks/monster_gun.json
+++ b/data/json/monster_special_attacks/monster_gun.json
@@ -268,6 +268,7 @@
       }
     ],
     "melee_damage": { "bash": 8 }
+  },
   {
     "id": "civilian_glock19",
     "copy-from": "glock_19",

From 9310f01b53d6568b0b3bcf9d5fbdde83e7fdbaef Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Tue, 3 Dec 2024 21:34:58 +0700
Subject: [PATCH 19/46] Update monster_gun.json

---
 data/json/monster_special_attacks/monster_gun.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json
index 017bb04d3fd28..7ee1c53b1962f 100644
--- a/data/json/monster_special_attacks/monster_gun.json
+++ b/data/json/monster_special_attacks/monster_gun.json
@@ -353,7 +353,7 @@
     "type": "GUN",
     "copy-from": "fake_item",
     "name": { "str": "mi-go bio-gun" },
-    "description": "Fake gun that fires some sort of solidified organic matter at very high speed by unknown means of propulsion.",
+    "description": "Fake gun that fires some sort of solidified organic matter at very high speed by unknown means of propulsion."
     },
     "flags": [ "NEVER_JAMS", "NO_TURRET", "PSEUDO" ],
     "ammo_effects": [ "NEVER_MISFIRES", "NO_PENETRATE_OBSTACLES" ],

From 1910e14126db48407ea797c7036fcdf0eb241915 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Tue, 3 Dec 2024 23:41:54 +0700
Subject: [PATCH 20/46] Update monster_gun.json

---
 data/json/monster_special_attacks/monster_gun.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json
index 7ee1c53b1962f..c2dcf8a9f8570 100644
--- a/data/json/monster_special_attacks/monster_gun.json
+++ b/data/json/monster_special_attacks/monster_gun.json
@@ -353,8 +353,7 @@
     "type": "GUN",
     "copy-from": "fake_item",
     "name": { "str": "mi-go bio-gun" },
-    "description": "Fake gun that fires some sort of solidified organic matter at very high speed by unknown means of propulsion."
-    },
+    "description": "Fake gun that fires some sort of solidified organic matter at very high speed by unknown means of propulsion.",
     "flags": [ "NEVER_JAMS", "NO_TURRET", "PSEUDO" ],
     "ammo_effects": [ "NEVER_MISFIRES", "NO_PENETRATE_OBSTACLES" ],
     "material": [ "flesh" ],

From 574bf66b330a1c277cbaad7e842737fc580710b9 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Tue, 3 Dec 2024 23:47:33 +0700
Subject: [PATCH 21/46] Update civilian_weapon_attacks.json

---
 .../civilian_weapon_attacks.json              | 39 +++++++++----------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/data/json/monster_special_attacks/civilian_weapon_attacks.json b/data/json/monster_special_attacks/civilian_weapon_attacks.json
index 1ab6ac85930cc..b39f3c59f26cb 100644
--- a/data/json/monster_special_attacks/civilian_weapon_attacks.json
+++ b/data/json/monster_special_attacks/civilian_weapon_attacks.json
@@ -1,21 +1,18 @@
-{
-  "type": "monster_attack",
-  "attack_type": "melee",
-  "id": "civilian_weapon_knife_fighter",
-  "cooldown": 1,
-  "move_cost": 72,
-  "accuracy": 2,
-  "damage_max_instance": [
-    { "damage_type": "bash", "amount": 2 },
-    { "damage_type": "stab", "amount": 14 }
-  ],
-  "condition": {
-    "test_eoc": "is_disarmed"
-  },
-  "hit_dmg_u": "%1$s hits your %2$s with a knife!",
-  "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a knife!",
-  "miss_msg_u": "%1$s tries to hit you, but you dodge!",
-  "miss_msg_npc": "%1$s tries to hit <npcname>, but they dodge!",
-  "no_dmg_msg_u": "%1$s hits your %2$s without penetrating your armor.",
-  "no_dmg_msg_npc": "%1$s hits <npcname>'s %2$s without penetrating their armor."
-}
+[
+  {
+    "type": "monster_attack",
+    "attack_type": "melee",
+    "id": "civilian_weapon_knife_fighter",
+    "cooldown": 1,
+    "move_cost": 72,
+    "accuracy": 2,
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 2 }, { "damage_type": "stab", "amount": 14 } ],
+    "condition": { "test_eoc": "is_disarmed" },
+    "hit_dmg_u": "%1$s hits your %2$s with a knife!",
+    "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a knife!",
+    "miss_msg_u": "%1$s tries to hit you, but you dodge!",
+    "miss_msg_npc": "%1$s tries to hit <npcname>, but they dodge!",
+    "no_dmg_msg_u": "%1$s hits your %2$s without penetrating your armor.",
+    "no_dmg_msg_npc": "%1$s hits <npcname>'s %2$s without penetrating their armor."
+  }
+]

From 3fbb18233c2d56c7d620033b8d4a101b74cef2e2 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Tue, 3 Dec 2024 23:55:35 +0700
Subject: [PATCH 22/46] Update civilian_weapon_attacks.json

---
 .../monster_special_attacks/civilian_weapon_attacks.json     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/data/json/monster_special_attacks/civilian_weapon_attacks.json b/data/json/monster_special_attacks/civilian_weapon_attacks.json
index b39f3c59f26cb..165602db710fc 100644
--- a/data/json/monster_special_attacks/civilian_weapon_attacks.json
+++ b/data/json/monster_special_attacks/civilian_weapon_attacks.json
@@ -6,7 +6,10 @@
     "cooldown": 1,
     "move_cost": 72,
     "accuracy": 2,
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 2 }, { "damage_type": "stab", "amount": 14 } ],
+    "damage_max_instance": [
+      { "damage_type": "bash", "amount": 2 },
+      { "damage_type": "stab", "amount": 14 }
+    ],
     "condition": { "test_eoc": "is_disarmed" },
     "hit_dmg_u": "%1$s hits your %2$s with a knife!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a knife!",

From ac07fb10358fa91fae9f2ef59fb4d15d5da8a40d Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Tue, 3 Dec 2024 23:58:42 +0700
Subject: [PATCH 23/46] Update
 data/json/monster_special_attacks/civilian_weapon_attacks.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 .../monster_special_attacks/civilian_weapon_attacks.json     | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/data/json/monster_special_attacks/civilian_weapon_attacks.json b/data/json/monster_special_attacks/civilian_weapon_attacks.json
index 165602db710fc..b39f3c59f26cb 100644
--- a/data/json/monster_special_attacks/civilian_weapon_attacks.json
+++ b/data/json/monster_special_attacks/civilian_weapon_attacks.json
@@ -6,10 +6,7 @@
     "cooldown": 1,
     "move_cost": 72,
     "accuracy": 2,
-    "damage_max_instance": [
-      { "damage_type": "bash", "amount": 2 },
-      { "damage_type": "stab", "amount": 14 }
-    ],
+    "damage_max_instance": [ { "damage_type": "bash", "amount": 2 }, { "damage_type": "stab", "amount": 14 } ],
     "condition": { "test_eoc": "is_disarmed" },
     "hit_dmg_u": "%1$s hits your %2$s with a knife!",
     "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a knife!",

From 2254db7bcf7f0e4901c6012970d303fb1cafcd3b Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Wed, 4 Dec 2024 00:01:05 +0700
Subject: [PATCH 24/46] Update civilian_weapon_attacks.json


From 9534a52302ad13484cc64b9bc7b2405abda98d59 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Wed, 4 Dec 2024 00:02:51 +0700
Subject: [PATCH 25/46] Update civilian_weapon_attacks.json

---
 data/json/monster_special_attacks/civilian_weapon_attacks.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/data/json/monster_special_attacks/civilian_weapon_attacks.json b/data/json/monster_special_attacks/civilian_weapon_attacks.json
index b39f3c59f26cb..785db7098c1a3 100644
--- a/data/json/monster_special_attacks/civilian_weapon_attacks.json
+++ b/data/json/monster_special_attacks/civilian_weapon_attacks.json
@@ -14,5 +14,3 @@
     "miss_msg_npc": "%1$s tries to hit <npcname>, but they dodge!",
     "no_dmg_msg_u": "%1$s hits your %2$s without penetrating your armor.",
     "no_dmg_msg_npc": "%1$s hits <npcname>'s %2$s without penetrating their armor."
-  }
-]

From bd4e8bce49bf493802650586e2dc5dc7be669afc Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Wed, 4 Dec 2024 11:38:56 +0700
Subject: [PATCH 26/46] Update
 data/json/monster_special_attacks/monster_gun.json

Co-authored-by: Procyonae <45432782+Procyonae@users.noreply.github.com>
---
 data/json/monster_special_attacks/monster_gun.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json
index c2dcf8a9f8570..ff35934243837 100644
--- a/data/json/monster_special_attacks/monster_gun.json
+++ b/data/json/monster_special_attacks/monster_gun.json
@@ -276,7 +276,7 @@
     "flags": [ "PSEUDO" ],
     "type": "GUN",
     "name": { "str_sp": "Fighters' Glock 19" },
-    "description": "A gun carried by civilian monsters, more inaccurate for balancing reasons.",
+    "description": { "str": "A gun carried by civilian monsters, more inaccurate for balancing reasons.  If you see this, it's a bug.", "//~": "NO_I18N" },
     "dispersion": 960,
     "durability": 5
   },

From 2ed36c068a0d98cf06730b543c663aad6ade7633 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Wed, 4 Dec 2024 11:45:36 +0700
Subject: [PATCH 27/46] Update
 data/json/monster_special_attacks/monster_gun.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 data/json/monster_special_attacks/monster_gun.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json
index ff35934243837..48852aff5b0ff 100644
--- a/data/json/monster_special_attacks/monster_gun.json
+++ b/data/json/monster_special_attacks/monster_gun.json
@@ -276,7 +276,10 @@
     "flags": [ "PSEUDO" ],
     "type": "GUN",
     "name": { "str_sp": "Fighters' Glock 19" },
-    "description": { "str": "A gun carried by civilian monsters, more inaccurate for balancing reasons.  If you see this, it's a bug.", "//~": "NO_I18N" },
+    "description": {
+      "str": "A gun carried by civilian monsters, more inaccurate for balancing reasons.  If you see this, it's a bug.",
+      "//~": "NO_I18N"
+    },
     "dispersion": 960,
     "durability": 5
   },

From 9562f0b6379317e1137fdf885ceb08d77bc5a4d3 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Wed, 4 Dec 2024 11:51:36 +0700
Subject: [PATCH 28/46] Update monster_gun.json

---
 data/json/monster_special_attacks/monster_gun.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json
index 48852aff5b0ff..196ab5908bdfa 100644
--- a/data/json/monster_special_attacks/monster_gun.json
+++ b/data/json/monster_special_attacks/monster_gun.json
@@ -290,7 +290,7 @@
     "flags": [ "PSEUDO" ],
     "type": "GUN",
     "name": { "str_sp": "Cops' Aug rifle" },
-    "description": "A rifle carried by cop monsters, more inaccurate for balancing reasons.",
+    "//~": "A rifle carried by cop monsters, more inaccurate for balancing reasons.",
     "dispersion": 960,
     "durability": 5
   },

From 44f5007f3dfe895e76af183ad5adc3686041be44 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Wed, 4 Dec 2024 12:06:56 +0700
Subject: [PATCH 29/46] Update monster_gun.json

---
 data/json/monster_special_attacks/monster_gun.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json
index 196ab5908bdfa..011b83932a109 100644
--- a/data/json/monster_special_attacks/monster_gun.json
+++ b/data/json/monster_special_attacks/monster_gun.json
@@ -284,12 +284,12 @@
     "durability": 5
   },
   {
-    "id": "civilian_Augrifle",
-    "copy-from": "steyr_aug",
-    "looks_like": "steyr_aug",
+    "id": "civilian_AR-15",
+    "copy-from": "modular_ar15",
+    "looks_like": "modular_ar15",
     "flags": [ "PSEUDO" ],
     "type": "GUN",
-    "name": { "str_sp": "Cops' Aug rifle" },
+    "name": { "str_sp": "Cops' AR15" },
     "//~": "A rifle carried by cop monsters, more inaccurate for balancing reasons.",
     "dispersion": 960,
     "durability": 5

From ba4dc9b9c1b52a7668baf5d85737b7b3dacbf8ea Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Wed, 4 Dec 2024 12:07:34 +0700
Subject: [PATCH 30/46] Update civilians.json

---
 data/json/monsters/civilians.json | 55 ++++++++++++++++++++++++++++---
 1 file changed, 51 insertions(+), 4 deletions(-)

diff --git a/data/json/monsters/civilians.json b/data/json/monsters/civilians.json
index 71b2f7d477ba4..24ade4d9ff19d 100644
--- a/data/json/monsters/civilians.json
+++ b/data/json/monsters/civilians.json
@@ -52,6 +52,52 @@
     "id": "mon_civilian_police",
     "type": "MONSTER",
     "name": { "str": "overconfident officer" },
+    "description": "Gun in hand, this police officer is determined to make a last stand against the horde.",
+    "copy-from": "mon_civilian_panic",
+    "diff": 5,
+    "aggro_character": false,
+    "aggression": 100,
+    "morale": 100,
+    "vision_day": 50,
+    "vision_night": 3,
+    "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor" ],
+    "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology", "prof_wp_syn_armored" ],
+    "chat_topics": [ "TALK_CIVILIAN_OFFICER" ],
+    "//": "Copied from zombie cop",
+    "melee_skill": 6,
+    "melee_dice": 2,
+    "melee_dice_sides": 4,
+    "//2": "Uses a baton for melee attacks",
+    "melee_damage": [ { "damage_type": "bash", "amount": 5 } ],
+    "death_drops": {
+      "subtype": "collection",
+      "items": [ { "group": "mon_zombie_cop_death_drops", "prob": 100 }, { "item": "glock_22", "prob": 100, "charges": [ 0, 6 ] } ]
+    },
+    "zombify_into": "mon_zombie_cop",
+    "extend": { "flags": [ "DROPS_AMMO", "WIELDED_WEAPON" ] },
+    "starting_ammo": { "40fmj": 10 },
+    "special_attacks": [
+      {
+        "type": "gun",
+        "cooldown": 10,
+        "move_cost": 150,
+        "gun_type": "civilian_cop_glock22",
+        "ammo_type": "40fmj",
+        "fake_skills": [ [ "gun", 2 ], [ "pistol", 3 ] ],
+        "fake_dex": 8,
+        "fake_per": 10,
+        "ranges": [ [ 2, 14, "DEFAULT" ] ],
+        "condition": { "test_eoc": "is_disarmed" },
+        "require_targeting_player": false,
+        "description": "The officer fires their Glock 22!"
+      }
+    ],
+    "armor": { "bash": 6, "cut": 6, "stab": 6, "bullet": 6, "electric": 2 }
+  },
+  {
+    "id": "mon_civilian_police_rifle",
+    "type": "MONSTER",
+    "name": { "str": "overconfident officer" },
     "description": "Assault rifle in hand, this police officer is determined to make a last stand against the horde.",
     "copy-from": "mon_civilian_panic",
     "diff": 5,
@@ -71,18 +117,18 @@
     "melee_damage": [ { "damage_type": "bash", "amount": 3 } ],
     "death_drops": {
       "subtype": "collection",
-      "items": [ { "group": "mon_zombie_cop_death_drops", "prob": 100 }, { "item": "steyr_aug", "prob": 100, "charges": [ 0, 6 ] } ]
+      "items": [ { "group": "mon_zombie_cop_death_drops", "prob": 100 }, { "item": "modular_ar15", "prob": 100, "charges": [ 0, 6 ] } ]
     },
     "zombify_into": "mon_zombie_cop",
     "extend": { "flags": [ "DROPS_AMMO", "WIELDED_WEAPON" ] },
-    "starting_ammo": { "223": 15 },
+    "starting_ammo": { "223": 20 },
     "//3": "Range starts from 0 to get some shots out",
     "special_attacks": [
       {
         "type": "gun",
         "cooldown": 10,
         "move_cost": 100,
-        "gun_type": "civilian_Augrifle",
+        "gun_type": "civilian_AR-15",
         "ammo_type": "223",
         "fake_skills": [ [ "gun", 2 ], [ "rifle", 3 ] ],
         "fake_dex": 8,
@@ -90,7 +136,7 @@
         "ranges": [ [ 0, 14, "DEFAULT" ] ],
         "condition": { "test_eoc": "is_disarmed" },
         "require_targeting_player": false,
-        "description": "The officer fires their AUG assault rifle!"
+        "description": "The officer fires their AR-15!"
       }
     ],
     "armor": { "bash": 6, "cut": 6, "stab": 6, "bullet": 6, "electric": 2 }
@@ -197,6 +243,7 @@
       { "monster": "mon_civilian_stationary", "weight": 30, "cost_multiplier": 0, "ends": "3 days" },
       { "monster": "mon_civilian_zombiefighter", "weight": 16, "cost_multiplier": 0, "ends": "3 days" },
       { "monster": "mon_civilian_zombiegunner", "weight": 12, "cost_multiplier": 0, "ends": "3 days" },
+      { "monster": "mon_civilian_police_rifle", "weight": 4, "cost_multiplier": 3, "ends": "3 days" },
       { "monster": "mon_civilian_police", "weight": 4, "cost_multiplier": 3, "ends": "3 days" },
       {
         "monster": "mon_civilian_parent",

From 13c33ee4f52b094f4e292decdd51908606fc68f3 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Wed, 4 Dec 2024 15:27:29 +0700
Subject: [PATCH 31/46] Update civilians.json

---
 data/json/monsters/civilians.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/monsters/civilians.json b/data/json/monsters/civilians.json
index 24ade4d9ff19d..7bd5bcd4ce236 100644
--- a/data/json/monsters/civilians.json
+++ b/data/json/monsters/civilians.json
@@ -153,7 +153,7 @@
     "aggression": 100,
     "morale": 100,
     "melee_skill": 2,
-    "special_attacks": [ { "id": "civilian_weapon_knife_fighter" } ],
+    "special_attacks": [ { "id": "feral_weapon_knife_combat_low_skill" } ],
     "melee_dice": 2,
     "melee_dice_sides": 3,
     "death_drops": {

From eda965c4a5ca2d1554f2b616ff915925e9917c8e Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Wed, 4 Dec 2024 15:29:44 +0700
Subject: [PATCH 32/46] Delete
 data/json/monster_special_attacks/civilian_weapon_attacks.json

---
 .../civilian_weapon_attacks.json                 | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 data/json/monster_special_attacks/civilian_weapon_attacks.json

diff --git a/data/json/monster_special_attacks/civilian_weapon_attacks.json b/data/json/monster_special_attacks/civilian_weapon_attacks.json
deleted file mode 100644
index 785db7098c1a3..0000000000000
--- a/data/json/monster_special_attacks/civilian_weapon_attacks.json
+++ /dev/null
@@ -1,16 +0,0 @@
-[
-  {
-    "type": "monster_attack",
-    "attack_type": "melee",
-    "id": "civilian_weapon_knife_fighter",
-    "cooldown": 1,
-    "move_cost": 72,
-    "accuracy": 2,
-    "damage_max_instance": [ { "damage_type": "bash", "amount": 2 }, { "damage_type": "stab", "amount": 14 } ],
-    "condition": { "test_eoc": "is_disarmed" },
-    "hit_dmg_u": "%1$s hits your %2$s with a knife!",
-    "hit_dmg_npc": "%1$s hits <npcname>'s %2$s with a knife!",
-    "miss_msg_u": "%1$s tries to hit you, but you dodge!",
-    "miss_msg_npc": "%1$s tries to hit <npcname>, but they dodge!",
-    "no_dmg_msg_u": "%1$s hits your %2$s without penetrating your armor.",
-    "no_dmg_msg_npc": "%1$s hits <npcname>'s %2$s without penetrating their armor."

From 9f5d9ac5196686f5404368b37d7f05f3c0a662d9 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Wed, 4 Dec 2024 15:36:44 +0700
Subject: [PATCH 33/46] Update laststand.json

---
 data/json/mapgen/map_extras/laststand.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/data/json/mapgen/map_extras/laststand.json b/data/json/mapgen/map_extras/laststand.json
index 6952e46ad8043..b31f9ff584701 100644
--- a/data/json/mapgen/map_extras/laststand.json
+++ b/data/json/mapgen/map_extras/laststand.json
@@ -5,7 +5,9 @@
     "default": "mon_null",
     "monsters": [
       { "monster": "mon_civilian_police", "weight": 1, "cost_multiplier": 1, "ends": "5 days" },
-      { "monster": "mon_civilian_zombiefighter", "weight": 4, "cost_multiplier": 1, "ends": "5 days" }
+      { "monster": "mon_civilian_police_rifle", "weight": 1, "cost_multiplier": 1, "ends": "5 days" },
+      { "monster": "mon_civilian_zombiefighter", "weight": 4, "cost_multiplier": 1, "ends": "5 days" },
+      { "monster": "mon_civilian_zombiegunner", "weight": 4, "cost_multiplier": 1, "ends": "5 days" }
     ]
   },
   {

From be2a1f91e8e81ec95a55117f287815e14b1a60c3 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Wed, 4 Dec 2024 15:42:18 +0700
Subject: [PATCH 34/46] Update civilians.json

---
 data/json/monsters/civilians.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/monsters/civilians.json b/data/json/monsters/civilians.json
index 7bd5bcd4ce236..8e7bba4de4c9c 100644
--- a/data/json/monsters/civilians.json
+++ b/data/json/monsters/civilians.json
@@ -61,7 +61,7 @@
     "vision_day": 50,
     "vision_night": 3,
     "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_body_armor" ],
-    "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology", "prof_wp_syn_armored" ],
+    "families": [ "prof_intro_biology", "prof_physiology", "prof_wp_syn_armored" ],
     "chat_topics": [ "TALK_CIVILIAN_OFFICER" ],
     "//": "Copied from zombie cop",
     "melee_skill": 6,

From fc03d3953e371c8d95d943009d6c7aa180a8a337 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Wed, 4 Dec 2024 15:50:52 +0700
Subject: [PATCH 35/46] Update civilians.json

---
 data/json/npcs/civilians/civilians.json | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/data/json/npcs/civilians/civilians.json b/data/json/npcs/civilians/civilians.json
index de2f4a3739b80..ffb4d2efbea02 100644
--- a/data/json/npcs/civilians/civilians.json
+++ b/data/json/npcs/civilians/civilians.json
@@ -43,6 +43,19 @@
     ],
     "responses": [ { "text": "[Back away.]", "topic": "TALK_DONE" } ]
   },
+  {
+    "type": "talk_topic",
+    "id": "TALK_CIVILIAN_GUNNER",
+    "dynamic_line": [
+      "I'm gonna kill all these <swear> things!",
+      "&They let out a bellowing warcry and wave their gun.",
+      "I'M INVINCIBLE!"
+    ],
+    "responses": [
+      { "text": "Are you crazy?  Get out of here!", "topic": "TALK_CIVILIAN_FIGHTER_EVAC" },
+      { "text": "[Leave them to their futile fight.]", "topic": "TALK_DONE" }
+    ]
+  },
   {
     "type": "talk_topic",
     "id": "TALK_CIVILIAN_ICU",

From ff96fc8079e69196babc270d08e64003c8ea5d69 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Wed, 4 Dec 2024 15:59:41 +0700
Subject: [PATCH 36/46] Update monster_gun.json

---
 .../monster_special_attacks/monster_gun.json  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json
index 011b83932a109..e528c436031b1 100644
--- a/data/json/monster_special_attacks/monster_gun.json
+++ b/data/json/monster_special_attacks/monster_gun.json
@@ -269,6 +269,17 @@
     ],
     "melee_damage": { "bash": 8 }
   },
+  {
+    "id": "civilian_cop_glock22",
+    "copy-from": "glock_22",
+    "looks_like": "glock_22",
+    "flags": [ "PSEUDO" ],
+    "type": "GUN",
+    "name": { "str_sp": "Cops' Glock 22" },
+    "description": "A gun carried by overconfident officer monsters, more inaccurate for balancing reasons.",
+    "dispersion": 960,
+    "durability": 5
+  },
   {
     "id": "civilian_glock19",
     "copy-from": "glock_19",
@@ -294,17 +305,6 @@
     "dispersion": 960,
     "durability": 5
   },
-  {
-    "id": "civilian_cop_glock22",
-    "copy-from": "glock_22",
-    "looks_like": "glock_22",
-    "flags": [ "PSEUDO" ],
-    "type": "GUN",
-    "name": { "str_sp": "Cops' Glock 22" },
-    "description": "A gun carried by overconfident officer monsters, more inaccurate for balancing reasons.",
-    "dispersion": 960,
-    "durability": 5
-  },
   {
     "id": "acid_spit",
     "type": "GUN",

From 6edc19830edec7ad45c435b3e63fa713339c4ba8 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Wed, 4 Dec 2024 16:03:14 +0700
Subject: [PATCH 37/46] Update civilians.json

---
 data/json/monsters/civilians.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/json/monsters/civilians.json b/data/json/monsters/civilians.json
index 8e7bba4de4c9c..ac145d44aaa56 100644
--- a/data/json/monsters/civilians.json
+++ b/data/json/monsters/civilians.json
@@ -211,6 +211,7 @@
     "//": "So they are not perpetually fleeing despite lying in a hospital bed",
     "morale": 0,
     "upgrades": { "into": "mon_zombie_crawler" },
+    "zombify_into": "mon_zombie_crawler",
     "delete": { "flags": [ "SEES", "HEARS" ] },
     "copy-from": "mon_civilian_stationary"
   },

From d01de3d54b291e1cefe5e600783268749576a723 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Wed, 4 Dec 2024 16:49:45 +0700
Subject: [PATCH 38/46] Update monster_gun.json

---
 data/json/monster_special_attacks/monster_gun.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json
index e528c436031b1..c64c24ad6ef16 100644
--- a/data/json/monster_special_attacks/monster_gun.json
+++ b/data/json/monster_special_attacks/monster_gun.json
@@ -301,7 +301,7 @@
     "flags": [ "PSEUDO" ],
     "type": "GUN",
     "name": { "str_sp": "Cops' AR15" },
-    "//~": "A rifle carried by cop monsters, more inaccurate for balancing reasons.",
+    "//": "A rifle carried by cop monsters, more inaccurate for balancing reasons.",
     "dispersion": 960,
     "durability": 5
   },

From ab1b87b719174d85dc730f9eddc0a7dce0fc61f6 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Sat, 7 Dec 2024 00:30:47 +0700
Subject: [PATCH 39/46] Update civilians.json

---
 data/json/npcs/civilians/civilians.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/npcs/civilians/civilians.json b/data/json/npcs/civilians/civilians.json
index ffb4d2efbea02..9ccd2c190d42e 100644
--- a/data/json/npcs/civilians/civilians.json
+++ b/data/json/npcs/civilians/civilians.json
@@ -19,7 +19,7 @@
     "id": "TALK_CIVILIAN_FIGHTER",
     "dynamic_line": [
       "I'm gonna kill all these <swear> things!",
-      "&They let out a bellowing warcry and wave their stick.",
+      "&They let out a bellowing warcry and wave their knife.",
       "I'M INVINCIBLE!"
     ],
     "responses": [

From b53f99fb5940d18da298a515eb1022ca7b1fe92b Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Fri, 13 Dec 2024 20:43:30 +0800
Subject: [PATCH 40/46] Update civilians.json

---
 data/json/monsters/civilians.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/data/json/monsters/civilians.json b/data/json/monsters/civilians.json
index 6bb8e0dfa38c1..279f5fdafa751 100644
--- a/data/json/monsters/civilians.json
+++ b/data/json/monsters/civilians.json
@@ -98,7 +98,7 @@
     "id": "mon_civilian_police_rifle",
     "type": "MONSTER",
     "name": { "str": "overconfident officer" },
-    "description": "Assault rifle in hand, this police officer is determined to make a last stand against the horde.",
+    "description": "Rifle in hand, this police officer is determined to make a last stand against the horde.",
     "copy-from": "mon_civilian_panic",
     "diff": 5,
     "aggro_character": false,
@@ -117,7 +117,10 @@
     "melee_damage": [ { "damage_type": "bash", "amount": 3 } ],
     "death_drops": {
       "subtype": "collection",
-      "items": [ { "group": "mon_zombie_cop_death_drops", "prob": 100 }, { "item": "modular_ar15", "prob": 100, "charges": [ 0, 6 ] } ]
+      "items": [
+        { "group": "mon_zombie_cop_death_drops", "prob": 100 },
+        { "group": "modular_ar15", "prob": 100, "charges": [ 0, 6 ] }
+      ]
     },
     "zombify_into": "mon_zombie_cop",
     "extend": { "flags": [ "DROPS_AMMO", "WIELDED_WEAPON" ] },
@@ -177,10 +180,7 @@
     "melee_dice_sides": 3,
     "death_drops": {
       "subtype": "collection",
-      "items": [
-        { "group": "default_zombie_death_drops", "prob": 100 },
-        { "group": "feral_handgun", "prob": 100, "charges": [ 0, 10 ] }
-      ]
+      "items": [ { "group": "default_zombie_death_drops", "prob": 100 }, { "item": "glock_19", "prob": 100, "charges": [ 0, 6 ] } ]
     },
     "starting_ammo": { "9mm": 10 },
     "//3": "Range starts from 0 to get some shots out",

From d1113e7a2288dfb378b999f2c5c917f6827c1710 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Fri, 13 Dec 2024 20:44:06 +0800
Subject: [PATCH 41/46] Update monster_gun.json

---
 data/json/monster_special_attacks/monster_gun.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/data/json/monster_special_attacks/monster_gun.json b/data/json/monster_special_attacks/monster_gun.json
index 1210643e24157..0fed116755673 100644
--- a/data/json/monster_special_attacks/monster_gun.json
+++ b/data/json/monster_special_attacks/monster_gun.json
@@ -225,10 +225,12 @@
     "looks_like": "modular_ar15",
     "flags": [ "PSEUDO" ],
     "type": "GUN",
+    "ammo": [ "223" ],
     "name": { "str_sp": "Cops' AR15" },
     "//": "A rifle carried by cop monsters, more inaccurate for balancing reasons.",
     "dispersion": 960,
-    "durability": 5
+    "durability": 5,
+    "pocket_data": [ { "magazine_well": "500 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "stanag30" ] } ]
   },
   {
     "id": "acid_spit",

From bcc261a79aea0ac13a6647f9719ab5e92506173c Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Sat, 14 Dec 2024 16:26:33 +0800
Subject: [PATCH 42/46] Update generic_guns_validator.py

---
 tools/json_tools/generic_guns_validator.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/json_tools/generic_guns_validator.py b/tools/json_tools/generic_guns_validator.py
index 099a6f0587583..e29b5fcb759e6 100755
--- a/tools/json_tools/generic_guns_validator.py
+++ b/tools/json_tools/generic_guns_validator.py
@@ -60,6 +60,8 @@
     'gene_sting_gun',
     'ppsh',
     'af2011a1_38super',
+    'civilian_AR-15'
+    'civilian_glock19'
     # Magazines
     'a180mag',
     'a180mag1',

From 61e36ec87d050ea687afa56a0da56216f76f3d44 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Sun, 15 Dec 2024 07:40:54 +0800
Subject: [PATCH 43/46] Update generic_guns_validator.py

---
 tools/json_tools/generic_guns_validator.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/json_tools/generic_guns_validator.py b/tools/json_tools/generic_guns_validator.py
index e29b5fcb759e6..342d59ac25e75 100755
--- a/tools/json_tools/generic_guns_validator.py
+++ b/tools/json_tools/generic_guns_validator.py
@@ -59,9 +59,7 @@
     'american_180',
     'gene_sting_gun',
     'ppsh',
-    'af2011a1_38super',
-    'civilian_AR-15'
-    'civilian_glock19'
+    'af2011a1_38super'
     # Magazines
     'a180mag',
     'a180mag1',

From e6127089adfaa41b9d0dffbd3f1e14d1efc5dfa3 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Sun, 15 Dec 2024 07:41:24 +0800
Subject: [PATCH 44/46] Update generic_guns_validator.py

---
 tools/json_tools/generic_guns_validator.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/json_tools/generic_guns_validator.py b/tools/json_tools/generic_guns_validator.py
index 342d59ac25e75..099a6f0587583 100755
--- a/tools/json_tools/generic_guns_validator.py
+++ b/tools/json_tools/generic_guns_validator.py
@@ -59,7 +59,7 @@
     'american_180',
     'gene_sting_gun',
     'ppsh',
-    'af2011a1_38super'
+    'af2011a1_38super',
     # Magazines
     'a180mag',
     'a180mag1',

From 62af8aa951c2e62e36baf6178f1049cf8de69a64 Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Sun, 15 Dec 2024 07:55:14 +0800
Subject: [PATCH 45/46] Update gg_firearms_migration.json

---
 data/mods/Generic_Guns/firearms/gg_firearms_migration.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
index b193e455932e9..7b450560a28c5 100644
--- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
+++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -124,6 +124,8 @@
       "m1911a1_38super",
       "glock_22",
       "civilian_cop_glock22",
+      "civilian_glock19",
+      "civilian_AR-15",
       "hi_power_40",
       "tommygun",
       "usp_45",

From 41c23fd92a832ccacf21c6aa7aaa67542a20878b Mon Sep 17 00:00:00 2001
From: BioHazardSuit <72607648+BioHazardSuit@users.noreply.github.com>
Date: Sun, 15 Dec 2024 10:08:50 +0800
Subject: [PATCH 46/46] Update civilians.json

---
 data/json/monsters/civilians.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/monsters/civilians.json b/data/json/monsters/civilians.json
index 279f5fdafa751..cca140d5699e8 100644
--- a/data/json/monsters/civilians.json
+++ b/data/json/monsters/civilians.json
@@ -204,7 +204,7 @@
   {
     "id": "mon_civilian_icu",
     "type": "MONSTER",
-    "name": { "str": "hospitalized patient" },
+    "name": { "str": "hospitalized human" },
     "description": "This person is severely ill in some form or another, requiring intensive care that is not available anymore after the Cataclysm.  There is nothing you can do for them.",
     "chat_topics": [ "TALK_CIVILIAN_ICU" ],
     "speed": 0,