From 29621e9f2c10a6b77bbd406ca199b16a091d2b27 Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Thu, 2 Oct 2014 16:34:48 -0700 Subject: [PATCH 1/2] quick fix for #6498 --- code/modules/clothing/under/chameleon.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/under/chameleon.dm b/code/modules/clothing/under/chameleon.dm index 1cb79699c99..e1d8ae414d4 100644 --- a/code/modules/clothing/under/chameleon.dm +++ b/code/modules/clothing/under/chameleon.dm @@ -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. \ No newline at end of file + usr.update_inv_l_hand() //so our overlays update. From a5dacfc5bdf5162281fd4d688d8a0c7d8645cb19 Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Thu, 2 Oct 2014 16:35:44 -0700 Subject: [PATCH 2/2] Update boxes.dm --- code/modules/projectiles/ammunition/boxes.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index 14622ebb294..f0daf2eebbe 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -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 \ No newline at end of file + multiple_sprites = 1 + matter = list()