cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 05:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #161 from aranclanos/First

Browse Source 
Fixed issues related to shotguns (& revolvers) and their shells.
This commit is contained in:
Pete Goodfellow
2013-03-28 09:41:23 -07:00
parent 1673f79e0b b8caf8768e
commit 18656b2bd7
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/projectile.dm
+1
View File
@@ -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
code/modules/projectiles/guns/projectile/shotgun.dm
+6 -2
View File
@@ -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 << "<span class='notice'>You break \the [src].</span>"
user << "<span class='notice'>You open \the [src].</span>"
update_icon()
attackby(var/obj/item/A as obj, mob/user as mob)