Merge pull request #7492 from mwerezak/casings

Fixes shotgun shell description
This commit is contained in:
Mloc
2014-12-22 13:29:32 +00:00
3 changed files with 5 additions and 2 deletions

View File

@@ -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

View File

@@ -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)

View File

@@ -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