Merge pull request #6584 from Iamgoofball/patch-6

quick fix for #6498
This commit is contained in:
Zuhayr
2014-10-05 10:10:50 +10:30
2 changed files with 5 additions and 2 deletions

View File

@@ -425,6 +425,7 @@
caliber = ".45"
origin_tech = "combat=2;materials=2;syndicate=8"
ammo_type = "/obj/item/ammo_casing/chameleon"
matter = list()
var/list/gun_choices = list()
New()
@@ -464,4 +465,4 @@
flags_inv = A.flags_inv
if(usr)
usr.update_inv_r_hand()
usr.update_inv_l_hand() //so our overlays update.
usr.update_inv_l_hand() //so our overlays update.

View File

@@ -143,10 +143,12 @@
ammo_type = "/obj/item/ammo_casing/chameleon"
max_ammo = 7
multiple_sprites = 1
matter = list()
/obj/item/ammo_magazine/chameleon/empty
name = "magazine (.45)"
icon_state = "45"
ammo_type = "/obj/item/ammo_casing/chameleon"
max_ammo = 0
multiple_sprites = 1
multiple_sprites = 1
matter = list()