From fe6cf2dd44dfcce8eedfb0ca63abef94753248ac Mon Sep 17 00:00:00 2001 From: Linzolle Date: Sat, 6 Jun 2020 14:22:23 -0500 Subject: [PATCH] ramsay broke every shotgun --- code/modules/projectiles/guns/ballistic.dm | 2 +- code/modules/projectiles/guns/ballistic/shotgun.dm | 2 +- code/modules/projectiles/guns/ballistic/toy.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index e45483569e..4aeefde6d4 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -25,7 +25,7 @@ else icon_state = "[initial(icon_state)][suppressed ? "-suppressed" : ""][sawn_off ? "-sawn" : ""]" -/obj/item/gun/ballistic/process_chamber(empty_chamber = 1) +/obj/item/gun/ballistic/process_chamber(mob/living/user, empty_chamber = 1) var/obj/item/ammo_casing/AC = chambered //Find chambered round if(istype(AC)) //there's a chambered round if(casing_ejector) diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm index 17f5cc4262..a182ce2e35 100644 --- a/code/modules/projectiles/guns/ballistic/shotgun.dm +++ b/code/modules/projectiles/guns/ballistic/shotgun.dm @@ -23,7 +23,7 @@ A.update_icon() update_icon() -/obj/item/gun/ballistic/shotgun/process_chamber(empty_chamber = 0) +/obj/item/gun/ballistic/shotgun/process_chamber(mob/living/user, empty_chamber = 0) return ..() //changed argument value /obj/item/gun/ballistic/shotgun/chamber_round() diff --git a/code/modules/projectiles/guns/ballistic/toy.dm b/code/modules/projectiles/guns/ballistic/toy.dm index 4060a02c0f..5cdd773894 100644 --- a/code/modules/projectiles/guns/ballistic/toy.dm +++ b/code/modules/projectiles/guns/ballistic/toy.dm @@ -57,7 +57,7 @@ casing_ejector = FALSE can_suppress = FALSE -/obj/item/gun/ballistic/shotgun/toy/process_chamber(empty_chamber = 0) +/obj/item/gun/ballistic/shotgun/toy/process_chamber(mob/living/user, empty_chamber = 0) ..() if(chambered && !chambered.BB) qdel(chambered)