mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Merge pull request #7492 from mwerezak/casings
Fixes shotgun shell description
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user