diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index ef73d714447..f3c5db5da22 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -87,7 +87,7 @@ desc = "A .45 rubber bullet casing." caliber = ".45" icon_state = "r-casing" - projectile_type = /obj/item/projectile/bullet/weakbullet4 + projectile_type = /obj/item/projectile/bullet/midbullet_r /obj/item/ammo_casing/c45 desc = "A .45 bullet casing." diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index 24b77ee9bb5..e621b1906b4 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -208,12 +208,16 @@ caliber = ".45" max_ammo = 8 multiple_sprites = 1 -/obj/item/ammo_box/magazine/m45/enforcer45 - name = "handgun magazine (.45)" - icon_state = "enforcer" - ammo_type = /obj/item/ammo_casing/rubber45 -/obj/item/ammo_box/magazine/m45/enforcer45/update_icon() +/obj/item/ammo_box/magazine/enforcer + name = "handgun magazine (9mm)" + icon_state = "enforcer" + ammo_type = /obj/item/ammo_casing/rubber9mm + max_ammo = 8 + multiple_sprites = 1 + caliber = "9mm" + +/obj/item/ammo_box/magazine/enforcer/update_icon() ..() overlays.Cut() @@ -221,21 +225,21 @@ if(ammo && is_rubber()) overlays += image('icons/obj/ammo.dmi', icon_state = "enforcer-r") -/obj/item/ammo_box/magazine/m45/enforcer45/examine(mob/user, var/distance) +/obj/item/ammo_box/magazine/enforcer/examine(mob/user, var/distance) ..() if(distance <= 2) to_chat(user, "It seems to be loaded with [is_rubber() ? "rubber" : "lethal"] bullets.")//only can see the topmost one. -/obj/item/ammo_box/magazine/m45/enforcer45/proc/is_rubber()//if the topmost bullet is a rubber one +/obj/item/ammo_box/magazine/enforcer/proc/is_rubber()//if the topmost bullet is a rubber one var/ammo = ammo_count() if(!ammo) return 0 - if(istype(contents[contents.len], /obj/item/ammo_casing/rubber45)) + if(istype(contents[contents.len], /obj/item/ammo_casing/rubber9mm)) return 1 return 0 -/obj/item/ammo_box/magazine/m45/enforcer45/lethal - ammo_type = /obj/item/ammo_casing/c45 +/obj/item/ammo_box/magazine/enforcer/lethal + ammo_type = /obj/item/ammo_casing/c9mm /obj/item/ammo_box/magazine/wt550m9 name = "wt550 magazine (4.6x30mm)" diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index 7ac82f99d5c..b9fdc969a66 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -27,15 +27,27 @@ can_suppress = 0 /obj/item/gun/projectile/automatic/pistol/enforcer - name = "Enforcer .45" + name = "Enforcer" desc = "A pistol of modern design." icon_state = "enforcer_grey" force = 10 - mag_type = /obj/item/ammo_box/magazine/m45/enforcer45 + mag_type = /obj/item/ammo_box/magazine/enforcer can_suppress = TRUE unique_reskin = TRUE can_flashlight = TRUE +/obj/item/gun/projectile/automatic/pistol/enforcer/New() + ..() + options["Grey slide"] = "enforcer_grey" + options["Red slide"] = "enforcer_red" + options["Green slide"] = "enforcer_green" + options["Tan slide"] = "enforcer_tan" + options["Black slide"] = "enforcer_black" + options["Green Handle"] = "enforcer_greengrip" + options["Tan Handle"] = "enforcer_tangrip" + options["Red Handle"] = "enforcer_redgrip" + options["Cancel"] = null + /obj/item/gun/projectile/automatic/pistol/enforcer/update_icon() ..() if(current_skin) @@ -54,17 +66,11 @@ /obj/item/gun/projectile/automatic/pistol/enforcer/ui_action_click() toggle_gunlight() -/obj/item/gun/projectile/automatic/pistol/enforcer/New() +/obj/item/gun/projectile/automatic/pistol/enforcer/lethal + +/obj/item/gun/projectile/automatic/pistol/enforcer/lethal/New() + magazine = new/obj/item/ammo_box/magazine/enforcer/lethal ..() - options["Grey slide"] = "enforcer_grey" - options["Red slide"] = "enforcer_red" - options["Green slide"] = "enforcer_green" - options["Tan slide"] = "enforcer_tan" - options["Black slide"] = "enforcer_black" - options["Green Handle"] = "enforcer_greengrip" - options["Tan Handle"] = "enforcer_tangrip" - options["Red Handle"] = "enforcer_redgrip" - options["Cancel"] = null /obj/item/gun/projectile/automatic/pistol/deagle name = "desert eagle" diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm index 79f4509e7de..1cc35d2ce38 100644 --- a/code/modules/projectiles/guns/projectile/toy.dm +++ b/code/modules/projectiles/guns/projectile/toy.dm @@ -42,8 +42,8 @@ ..() /obj/item/gun/projectile/automatic/toy/pistol/enforcer - name = "Enforcer trainer" - desc = "A foam version of the Enforcer meant to be used for training new caddets who can't be trusted with rubber bullets." + name = "Foam Enforcer" + desc = "A foam shooting version of the Enforcer meant to be used for training new caddets who can't be trusted with rubber bullets." icon_state = "enforcer" mag_type = /obj/item/ammo_box/magazine/toy/enforcer can_flashlight = TRUE diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 8e697d1e86e..6c19971a996 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -123,6 +123,10 @@ damage = 20 stamina = 65 //two rounds from the c20r knocks people down +/obj/item/projectile/bullet/midbullet_r + damage = 5 + stamina = 75 //Still two rounds to knock people down + /obj/item/projectile/bullet/midbullet2 damage = 25