From d74f49ce9b80a62918c21be0a94ee1d73bb6c6e4 Mon Sep 17 00:00:00 2001 From: mwerezak Date: Mon, 10 Nov 2014 00:15:29 -0500 Subject: [PATCH] Fixes shotgun shell description Fixes shotgun shell description not indicating when a shell is spent. --- code/modules/projectiles/ammunition.dm | 4 ++++ code/modules/projectiles/ammunition/bullets.dm | 2 +- code/modules/projectiles/guns/projectile.dm | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 972f6206ae1..1fc7458731f 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -41,6 +41,10 @@ else user << "\blue There is no bullet in the casing to inscribe anything into." +/obj/item/ammo_casing/examine(mob/user) + ..() + if (!BB) + user << "This one is spent." //Boxes of ammo /obj/item/ammo_magazine diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index e524c9765c9..134b9a6ca34 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -67,7 +67,7 @@ name = "shotgun shell" desc = "A blank shell." icon_state = "blshell" - projectile_type = "" + projectile_type = "/obj/item/projectile/bullet/chameleon" matter = list("metal" = 250) diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm index b326dbf437a..80c7e715bcc 100644 --- a/code/modules/projectiles/guns/projectile.dm +++ b/code/modules/projectiles/guns/projectile.dm @@ -38,7 +38,6 @@ return 0 AC.loc = get_turf(src) //Eject casing onto ground. if(AC.BB) - AC.desc += " This one is spent." //descriptions are magic - only when there's a projectile in the casing in_chamber = AC.BB //Load projectile into chamber. AC.BB.loc = src //Set projectile loc to gun. return 1