diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index fe44c984d4a..283eb9e0af8 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -37,6 +37,7 @@ if(AC.BB) in_chamber = AC.BB //Load projectile into chamber. AC.BB.loc = src //Set projectile loc to gun. + AC.BB = null return 1 return 0 diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm index abb3185baf1..30c22961209 100644 --- a/code/modules/projectiles/guns/projectile/shotgun.dm +++ b/code/modules/projectiles/guns/projectile/shotgun.dm @@ -18,6 +18,9 @@ load_into_chamber() if(in_chamber) + var/obj/item/ammo_casing/AC = current_shell + AC.desc += " This one is spent." + AC.BB = null //remove the ammunition from the shell return 1 return 0 @@ -86,11 +89,12 @@ var/obj/item/ammo_casing/AC = loaded[1] //load next casing. loaded -= AC //Remove casing from loaded list. - AC.desc += " This one is spent." if(AC.BB) in_chamber = AC.BB //Load projectile into chamber. AC.BB.loc = src //Set projectile loc to gun. + AC.BB = null //Remove the ammunition from the shell + AC.desc += " This one is spent." return 1 return 0 @@ -104,7 +108,7 @@ loaded -= shell shell.loc = get_turf(src.loc) - user << "You break \the [src]." + user << "You open \the [src]." update_icon() attackby(var/obj/item/A as obj, mob/user as mob)