Merge pull request #12465 from Linzolle/shotgun-fix

shotguns no longer delete shells in their chamber after firing
2020-06-08 00:34:31 +02:00
parent 2a54a62ac0 fe6cf2dd44
commit 231c11a6ad
3 changed files with 3 additions and 3 deletions
@@ -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)
@@ -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()
@@ -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)