From 773ba439740c2341870f7280e172f24ae69ece59 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Fri, 15 Jun 2018 04:48:48 -0500 Subject: [PATCH] [MIRROR] Fixes null bullets from being fired after they're deleted (#7102) * Fixes null bullets from being fired after they're deleted (#38437) * Adds handle_atom_del check to if deleted bullets are equal to ammo type and chambered round. * works for me * Update _box_magazine.dm * Fixes null bullets from being fired after they're deleted --- code/modules/projectiles/boxes_magazines/_box_magazine.dm | 6 +++++- code/modules/projectiles/gun.dm | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index 5ab3146a91..476240a852 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -131,4 +131,8 @@ var/turf_mag = get_turf(src) for(var/obj/item/ammo in stored_ammo) ammo.forceMove(turf_mag) - stored_ammo -= ammo \ No newline at end of file + stored_ammo -= ammo + +/obj/item/ammo_box/magazine/handle_atom_del(atom/A) + stored_ammo -= A + update_icon() diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 5e511ed6e2..569f886ec2 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -348,7 +348,7 @@ var/state = "bayonet" //Generic state. if(bayonet.icon_state in icon_states('icons/obj/guns/bayonets.dmi')) //Snowflake state? state = bayonet.icon_state - var/icon/bayonet_icons = 'icons/obj/guns/bayonets.dmi' + var/icon/bayonet_icons = 'icons/obj/guns/bayonets.dmi' knife_overlay = mutable_appearance(bayonet_icons, state) knife_overlay.pixel_x = knife_x_offset knife_overlay.pixel_y = knife_y_offset @@ -528,3 +528,8 @@ if(zoomable) azoom = new() azoom.gun = src + +/obj/item/gun/handle_atom_del(atom/A) + if(A == chambered) + chambered = null + update_icon()