cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7492 from mwerezak/casings

Browse Source 
Fixes shotgun shell description
This commit is contained in:
Mloc
2014-12-22 13:29:32 +00:00
parent 9a4dd0b6ea d74f49ce9b
commit f647906f3d
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/projectiles/ammunition.dm
View File

@@ -41,6 +41,10 @@
else else
user << "\blue There is no bullet in the casing to inscribe anything into." 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 //Boxes of ammo
/obj/item/ammo_magazine /obj/item/ammo_magazine

2
code/modules/projectiles/ammunition/bullets.dm
View File

@@ -67,7 +67,7 @@
name = "shotgun shell" name = "shotgun shell"
desc = "A blank shell." desc = "A blank shell."
icon_state = "blshell" icon_state = "blshell"
projectile_type = "" projectile_type = "/obj/item/projectile/bullet/chameleon"
matter = list("metal" = 250) matter = list("metal" = 250)

1
code/modules/projectiles/guns/projectile.dm
View File

@@ -38,7 +38,6 @@
return 0 return 0
AC.loc = get_turf(src) //Eject casing onto ground. AC.loc = get_turf(src) //Eject casing onto ground.
if(AC.BB) 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. in_chamber = AC.BB //Load projectile into chamber.
AC.BB.loc = src //Set projectile loc to gun. AC.BB.loc = src //Set projectile loc to gun.
return 1 return 1