git-svn-id: http://tgstation13.googlecode.com/svn/trunk@214 316c924e-a436-60f5-8080-3fe189b3f50e

This commit is contained in:
uhangi@gmail.com
2010-09-29 02:41:02 +00:00
parent 56914c6282
commit e700403b99
8 changed files with 152 additions and 6 deletions
+24 -2
View File
@@ -298,8 +298,25 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
return 1
return 1
return 1
return 1
else if (istype(A, /obj/item/weapon/ammo/blshell))
//var/obj/item/weapon/ammo/gshell/A = B
if ((src.s1 > 0 && src.s2 > 0))
user << "\blue It's already fully loaded!"
return 1
else
user << "\blue You load the shell into the shotgun."
if (src.s1 == 0)
del(A)
src.s1 = 3
return 1
else if (src.s2 == 0)
del(A)
src.s2 = 3
return 1
return 1
return 1
return 1
/obj/item/weapon/gun/shotgun/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag)
if (flag)
@@ -362,7 +379,12 @@ obj/item/weapon/gun/revolver/attackby(obj/item/weapon/ammo/a357/A as obj, mob/us
if (!istype(U, /turf))
del(A)
return
return
else if (src.s1 == 3)
src.pumped--
src.s1 = src.s2
src.s2 = 0
spawn( 0 )
return
+12
View File
@@ -10,6 +10,18 @@
..()
return
/obj/item/weapon/storage/blankbox/New()
new /obj/item/weapon/ammo/blshell( src )
new /obj/item/weapon/ammo/blshell( src )
new /obj/item/weapon/ammo/blshell( src )
new /obj/item/weapon/ammo/blshell( src )
new /obj/item/weapon/ammo/blshell( src )
new /obj/item/weapon/ammo/blshell( src )
new /obj/item/weapon/ammo/blshell( src )
..()
return
/obj/item/weapon/storage/flashbang_kit/New()
new /obj/item/weapon/flashbang( src )